testsuites/validation/tc-task-ident.c

1 files changed, 15 insertions, 14 deletions

diff --git a/testsuites/validation/tc-task-ident.c b/testsuites/validation/tc-task-ident.c
index 53beb24c26..67cee3b38b 100644
--- a/testsuites/validation/tc-task-ident.c
+++ b/testsuites/validation/tc-task-ident.c
@@ -66,13 +66,13 @@
  */
 
 typedef enum {
-  RtemsTaskReqIdent_Pre_Name_Self,
-  RtemsTaskReqIdent_Pre_Name_NotSelf,
+  RtemsTaskReqIdent_Pre_Name_WhoAmI,
+  RtemsTaskReqIdent_Pre_Name_NotWhoAmI,
   RtemsTaskReqIdent_Pre_Name_NA
 } RtemsTaskReqIdent_Pre_Name;
 
 typedef enum {
-  RtemsTaskReqIdent_Post_Status_OkAndSelfId,
+  RtemsTaskReqIdent_Post_Status_OkAndWhoAmI,
   RtemsTaskReqIdent_Post_Status_Skip,
   RtemsTaskReqIdent_Post_Status_NA
 } RtemsTaskReqIdent_Post_Status;
@@ -128,8 +128,8 @@ static RtemsTaskReqIdent_Context
   RtemsTaskReqIdent_Instance;
 
 static const char * const RtemsTaskReqIdent_PreDesc_Name[] = {
-  "Self",
-  "NotSelf",
+  "WhoAmI",
+  "NotWhoAmI",
   "NA"
 };
 
@@ -175,20 +175,21 @@ static void RtemsTaskReqIdent_Pre_Name_Prepare(
 )
 {
   switch ( state ) {
-    case RtemsTaskReqIdent_Pre_Name_Self: {
+    case RtemsTaskReqIdent_Pre_Name_WhoAmI: {
       /*
-       * While the ``name`` parameter is rtems_task_self().
+       * While the ``name`` parameter is equal to RTEMS_WHO_AM_I, while ``id``
+       * parameter is not equal to NULL.
        */
       ctx->id_value = 0xffffffff;
       ctx->id = &ctx->id_value;
       break;
     }
 
-    case RtemsTaskReqIdent_Pre_Name_NotSelf: {
+    case RtemsTaskReqIdent_Pre_Name_NotWhoAmI: {
       /*
-       * While the ``name`` is not rtems_task_self() or ``id`` parameter is
-       * NULL, the behaviour of rtems_task_ident() shall be specified by
-       * /rtems/req/ident.
+       * While the ``name`` is not equal to RTEMS_WHO_AM_I or ``id`` parameter
+       * is equal to NULL, the behaviour of rtems_task_ident() shall be
+       * specified by /rtems/req/ident.
        */
       ctx->id = NULL;
       /* Preparation performed by RtemsReqIdent_Run() */
@@ -206,7 +207,7 @@ static void RtemsTaskReqIdent_Post_Status_Check(
 )
 {
   switch ( state ) {
-    case RtemsTaskReqIdent_Post_Status_OkAndSelfId: {
+    case RtemsTaskReqIdent_Post_Status_OkAndWhoAmI: {
       /*
        * The return status of rtems_task_ident() shall be RTEMS_SUCCESSFUL.
        * The value of the object identifier referenced by the ``name``
@@ -284,7 +285,7 @@ static void RtemsTaskReqIdent_Action( RtemsTaskReqIdent_Context *ctx )
 
 static const RtemsTaskReqIdent_Entry
 RtemsTaskReqIdent_Entries[] = {
-  { 0, 0, RtemsTaskReqIdent_Post_Status_OkAndSelfId },
+  { 0, 0, RtemsTaskReqIdent_Post_Status_OkAndWhoAmI },
   { 0, 0, RtemsTaskReqIdent_Post_Status_Skip }
 };
 
@@ -346,7 +347,7 @@ T_TEST_CASE_FIXTURE( RtemsTaskReqIdent, &RtemsTaskReqIdent_Fixture )
   ctx->Map.index = 0;
 
   for (
-    ctx->Map.pcs[ 0 ] = RtemsTaskReqIdent_Pre_Name_Self;
+    ctx->Map.pcs[ 0 ] = RtemsTaskReqIdent_Pre_Name_WhoAmI;
     ctx->Map.pcs[ 0 ] < RtemsTaskReqIdent_Pre_Name_NA;
     ++ctx->Map.pcs[ 0 ]
   ) {