spec: Canonicalize directives

Use common wording and the new templates for action requirements.

3 files changed, 55 insertions, 55 deletions

diff --git a/spec/rtems/task/req/construct-errors.yml b/spec/rtems/task/req/construct-errors.yml
index 96d6a5ca..7e80d27e 100644
--- a/spec/rtems/task/req/construct-errors.yml
+++ b/spec/rtems/task/req/construct-errors.yml
@@ -143,34 +143,34 @@ post-conditions:
   test-epilogue: null
   test-prologue: null
 pre-conditions:
-- name: Id
+- name: Name
   states:
   - name: Valid
     test-code: |
-      ctx->id = &ctx->id_value;
+      ctx->config.name = NAME;
     text: |
-      The ${../if/construct:/params[1]/name} parameter shall reference an
-      object of type ${../../type/if/id:/name}.
-  - name: 'Null'
+      While the name of the task configuration is valid.
+  - name: Inv
     test-code: |
-      ctx->id = NULL;
+      ctx->config.name = 0;
     text: |
-      The ${../if/construct:/params[1]/name} parameter shall be
-      ${/c/if/null:/name}.
+      While the name of the task configuration is invalid.
   test-epilogue: null
   test-prologue: null
-- name: Name
+- name: Id
   states:
   - name: Valid
     test-code: |
-      ctx->config.name = NAME;
+      ctx->id = &ctx->id_value;
     text: |
-      The name of the task configuration shall be valid.
-  - name: Inv
+      While the ${../if/construct:/params[1]/name} parameter references an
+      object of type ${../../type/if/id:/name}.
+  - name: 'Null'
     test-code: |
-      ctx->config.name = 0;
+      ctx->id = NULL;
     text: |
-      The name of the task configuration shall be invalid.
+      While the ${../if/construct:/params[1]/name} parameter is
+      ${/c/if/null:/name}.
   test-epilogue: null
   test-prologue: null
 - name: SysTsk
@@ -179,12 +179,12 @@ pre-conditions:
     test-code: |
       ctx->config.attributes |= RTEMS_SYSTEM_TASK;
     text: |
-      The attributes of the task configuration shall specify a system task.
+      While the attributes of the task configuration specifies a system task.
   - name: 'No'
     test-code: |
       /* Nothing to do */
     text: |
-      The attributes of the task configuration shall specify an application
+      While the attributes of the task configuration specifies an application
       task.
   test-epilogue: null
   test-prologue: null
@@ -194,18 +194,18 @@ pre-conditions:
     test-code: |
       ctx->config.initial_priority = 254;
     text: |
-      The initial priority of the task configuration shall be valid and
+      While the initial priority of the task configuration is valid and
       non-zero.
   - name: Zero
     test-code: |
       ctx->config.initial_priority = 0;
     text: |
-      The initial priority of the task configuration shall be zero.
+      While the initial priority of the task configuration is zero.
   - name: Inv
     test-code: |
       ctx->config.initial_priority = 0xffffffff;
     text: |
-      The initial priority of the task configuration shall be invalid.
+      While the initial priority of the task configuration is invalid.
   test-epilogue: null
   test-prologue: null
 - name: Free
@@ -214,12 +214,12 @@ pre-conditions:
     test-code: |
       /* Nothing to do */
     text: |
-      The system shall have at least one inactive task object available.
+      While the system has at least one inactive task object available.
   - name: 'No'
     test-code: |
       ctx->seized_objects = T_seize_objects( Create, ctx );
     text: |
-      The system shall not have an inactive task object available.
+      While the system has no inactive task object available.
   test-epilogue: null
   test-prologue: null
 - name: TLS
@@ -228,13 +228,13 @@ pre-conditions:
     test-code: |
       ctx->config.maximum_thread_local_storage_size = MAX_TLS_SIZE;
     text: |
-      The maximum thread-local storage size of the task configuration shall be
+      While the maximum thread-local storage size of the task configuration is
       greater than or equal to the thread-local storage size.
   - name: Small
     test-code: |
       ctx->config.maximum_thread_local_storage_size = 0;
     text: |
-      The maximum thread-local storage size of the task configuration shall be
+      While the maximum thread-local storage size of the task configuration is
       less than the thread-local storage size.
   test-epilogue: null
   test-prologue: null
@@ -244,13 +244,13 @@ pre-conditions:
     test-code: |
       ctx->stack_size = RTEMS_MINIMUM_STACK_SIZE;
     text: |
-      The task stack size of the task configuration shall be greater than or
+      While the task stack size of the task configuration is greater than or
       equal to the configured minimum size.
   - name: Small
     test-code: |
       ctx->stack_size = 0;
     text: |
-      The task stack size of the task configuration shall be less than the
+      While the task stack size of the task configuration is less than the
       configured minimum size.
   test-epilogue: null
   test-prologue: null
@@ -260,12 +260,12 @@ pre-conditions:
     test-code: |
       ctx->create_extension_status = true;
     text: |
-      None of the task create extensions shall fail.
+      While none of the task create extensions fails.
   - name: Err
     test-code: |
       ctx->create_extension_status = false;
     text: |
-      At least one of the task create extensions shall fail.
+      While at least one of the task create extensions fails.
   test-epilogue: null
   test-prologue: null
 rationale: null
diff --git a/spec/rtems/task/req/create-errors.yml b/spec/rtems/task/req/create-errors.yml
index 0861bfe8..ce4dbab0 100644
--- a/spec/rtems/task/req/create-errors.yml
+++ b/spec/rtems/task/req/create-errors.yml
@@ -120,34 +120,34 @@ post-conditions:
   test-epilogue: null
   test-prologue: null
 pre-conditions:
-- name: Id
+- name: Name
   states:
   - name: Valid
     test-code: |
-      ctx->id = &ctx->id_value;
+      ctx->name = NAME;
     text: |
-      The ${../if/create:/params[5]/name} parameter shall reference an object
-      of type ${../../type/if/id:/name}.
-  - name: 'Null'
+      While the ${../if/create:/params[0]/name} parameter is valid.
+  - name: Inv
     test-code: |
-      ctx->id = NULL;
+      ctx->name = 0;
     text: |
-      The ${../if/create:/params[5]/name} parameter shall be
-      ${/c/if/null:/name}.
+      While the ${../if/create:/params[0]/name} parameter is invalid.
   test-epilogue: null
   test-prologue: null
-- name: Name
+- name: Id
   states:
   - name: Valid
     test-code: |
-      ctx->name = NAME;
+      ctx->id = &ctx->id_value;
     text: |
-      The ${../if/create:/params[0]/name} parameter shall be valid.
-  - name: Inv
+      While the ${../if/create:/params[5]/name} parameter references an object
+      of type ${../../type/if/id:/name}.
+  - name: 'Null'
     test-code: |
-      ctx->name = 0;
+      ctx->id = NULL;
     text: |
-      The ${../if/create:/params[0]/name} parameter shall be invalid.
+      While the ${../if/create:/params[5]/name} parameter is
+      ${/c/if/null:/name}.
   test-epilogue: null
   test-prologue: null
 - name: SysTsk
@@ -156,13 +156,13 @@ pre-conditions:
     test-code: |
       ctx->attributes = RTEMS_SYSTEM_TASK;
     text: |
-      The ${../if/create:/params[4]/name} parameter shall specify a system
+      While the ${../if/create:/params[4]/name} parameter specifies a system
       task.
   - name: 'No'
     test-code: |
       ctx->attributes = RTEMS_DEFAULT_ATTRIBUTES;
     text: |
-      The ${../if/create:/params[4]/name} parameter shall specify an
+      While the ${../if/create:/params[4]/name} parameter specifies an
       application task.
   test-epilogue: null
   test-prologue: null
@@ -172,18 +172,18 @@ pre-conditions:
     test-code: |
       ctx->initial_priority = 254;
     text: |
-      The ${../if/create:/params[1]/name} parameter shall be valid and
+      While the ${../if/create:/params[1]/name} parameter is valid and
       non-zero.
   - name: Zero
     test-code: |
       ctx->initial_priority = 0;
     text: |
-      The ${../if/create:/params[1]/name} parameter shall be zero.
+      While the ${../if/create:/params[1]/name} parameter is zero.
   - name: Inv
     test-code: |
       ctx->initial_priority = 0xffffffff;
     text: |
-      The ${../if/create:/params[1]/name} parameter shall be invalid.
+      While the ${../if/create:/params[1]/name} parameter is invalid.
   test-epilogue: null
   test-prologue: null
 - name: Free
@@ -192,12 +192,12 @@ pre-conditions:
     test-code: |
       /* Nothing to do */
     text: |
-      The system shall have at least one inactive task object available.
+      While the system has at least one inactive task object available.
   - name: 'No'
     test-code: |
       ctx->seized_objects = T_seize_objects( Create, ctx );
     text: |
-      The system shall not have an inactive task object available.
+      While the system has no inactive task object available.
   test-epilogue: null
   test-prologue: null
 - name: Stack
@@ -206,20 +206,20 @@ pre-conditions:
     test-code: |
       ctx->stack_size = RTEMS_MINIMUM_STACK_SIZE;
     text: |
-      The ${../if/create:/params[1]/name} parameter shall be greater than or
+      While the ${../if/create:/params[1]/name} parameter is greater than or
       equal to the configured minimum size and less than or equal to the
       maximum stack size which can be allocated by the system.
   - name: Small
     test-code: |
       ctx->stack_size = 0;
     text: |
-      The ${../if/create:/params[1]/name} parameter shall be less than the
+      While the ${../if/create:/params[1]/name} parameter is less than the
       configured minimum size.
   - name: Huge
     test-code: |
       ctx->stack_size = SIZE_MAX;
     text: |
-      The ${../if/create:/params[1]/name} parameter shall be greater than the
+      While the ${../if/create:/params[1]/name} parameter is greater than the
       maximum stack size which can be allocated by the system.
   test-epilogue: null
   test-prologue: null
@@ -229,12 +229,12 @@ pre-conditions:
     test-code: |
       ctx->create_extension_status = true;
     text: |
-      None of the task create extensions shall fail.
+      While none of the task create extensions fails.
   - name: Err
     test-code: |
       ctx->create_extension_status = false;
     text: |
-      At least one of the task create extensions shall fail.
+      While at least one of the task create extensions fails.
   test-epilogue: null
   test-prologue: null
 rationale: null
diff --git a/spec/rtems/task/req/ident.yml b/spec/rtems/task/req/ident.yml
index df187d09..b505199b 100644
--- a/spec/rtems/task/req/ident.yml
+++ b/spec/rtems/task/req/ident.yml
@@ -34,14 +34,14 @@ pre-conditions:
       ctx->id_value = 0xffffffff;
       ctx->id = &ctx->id_value;
     text: |
-      The ${../if/ident:/params[0]/name} parameter shall be
+      While the ${../if/ident:/params[0]/name} parameter is
       ${../if/self:/name}.
   - name: NotSelf
     test-code: |
       ctx->id = NULL;
       /* Preparation performed by ${../../req/ident:/test-run}() */
     text: |
-      When the ${../if/ident:/params[0]/name} is not ${../if/self:/name} or
+      While the ${../if/ident:/params[0]/name} is not ${../if/self:/name} or
       ${../if/ident:/params[2]/name} parameter is ${/c/if/null:/name}, the
       behaviour of ${../if/ident:/name} shall be specified by
       ${../../req/ident}.