From 586e06ec6222f1cd1f005aa8f4a34a8b33f5d862 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Thu, 11 Mar 2021 21:40:03 +0100
Subject: validation: Improve wording

---
 testsuites/validation/tc-barrier-create.c           |  2 +-
 testsuites/validation/tc-barrier-delete.c           |  4 ++--
 testsuites/validation/tc-message-construct-errors.c |  2 +-
 testsuites/validation/tc-signal-catch.c             | 12 +++++++-----
 testsuites/validation/tc-task-construct-errors.c    |  2 +-
 testsuites/validation/tc-task-create-errors.c       |  2 +-
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/testsuites/validation/tc-barrier-create.c b/testsuites/validation/tc-barrier-create.c
index c69cacfbb2..ec679d1c03 100644
--- a/testsuites/validation/tc-barrier-create.c
+++ b/testsuites/validation/tc-barrier-create.c
@@ -377,7 +377,7 @@ static void RtemsBarrierReqCreate_Pre_Free_Prepare(
 
     case RtemsBarrierReqCreate_Pre_Free_No: {
       /*
-       * The system shall have no inactive partition object available.
+       * The system shall not have an inactive barrier object available.
        */
       ctx->seized_objects = T_seize_objects( Create, NULL );
       break;
diff --git a/testsuites/validation/tc-barrier-delete.c b/testsuites/validation/tc-barrier-delete.c
index e54e5c6dad..eb2d1d4314 100644
--- a/testsuites/validation/tc-barrier-delete.c
+++ b/testsuites/validation/tc-barrier-delete.c
@@ -242,7 +242,7 @@ static void RtemsBarrierReqDelete_Post_Name_Check(
   switch ( state ) {
     case RtemsBarrierReqDelete_Post_Name_Valid: {
       /*
-       * The unique object name shall identify the barrier.
+       * The unique object name shall identify a barrier.
        */
       id = 0;
       sc = rtems_barrier_ident( NAME, &id );
@@ -253,7 +253,7 @@ static void RtemsBarrierReqDelete_Post_Name_Check(
 
     case RtemsBarrierReqDelete_Post_Name_Invalid: {
       /*
-       * The unique object name shall not identify the barrier.
+       * The unique object name shall not identify a barrier.
        */
       sc = rtems_barrier_ident( NAME, &id );
       T_rsc( sc, RTEMS_INVALID_NAME );
diff --git a/testsuites/validation/tc-message-construct-errors.c b/testsuites/validation/tc-message-construct-errors.c
index 807bf7448b..3512b45c65 100644
--- a/testsuites/validation/tc-message-construct-errors.c
+++ b/testsuites/validation/tc-message-construct-errors.c
@@ -416,7 +416,7 @@ static void RtemsMessageReqConstructErrors_Pre_Free_Prepare(
 
     case RtemsMessageReqConstructErrors_Pre_Free_No: {
       /*
-       * The system shall have no inactive message queue object available.
+       * The system shall not have an inactive message queue object available.
        */
       i = 0;
       ctx->seized_objects = T_seize_objects( Create, &i );
diff --git a/testsuites/validation/tc-signal-catch.c b/testsuites/validation/tc-signal-catch.c
index 57cfda28d9..e513fdc621 100644
--- a/testsuites/validation/tc-signal-catch.c
+++ b/testsuites/validation/tc-signal-catch.c
@@ -305,9 +305,11 @@ static void RtemsSignalReqCatch_Pre_Pending_Prepare(
   switch ( state ) {
     case RtemsSignalReqCatch_Pre_Pending_Yes: {
       /*
-       * Where the system has more than one processor, when
-       * rtems_signal_catch() is called, the calling task shall have pending
-       * signals.
+       * Where the system has more than one processor, while the calling task
+       * has pending signals, the rtems_signal_catch() directive shall be
+       * called. Where the system has exactly one processor, while the calling
+       * task has no pending signals, the rtems_signal_catch() directive shall
+       * be called.
        */
       ctx->pending_signals = ( rtems_scheduler_get_processor_maximum() > 1 ) ? 1 : 0;
       break;
@@ -315,8 +317,8 @@ static void RtemsSignalReqCatch_Pre_Pending_Prepare(
 
     case RtemsSignalReqCatch_Pre_Pending_No: {
       /*
-       * When rtems_signal_catch() is called, the calling task shall have no
-       * pending signals.
+       * While the calling task has no pending signals, the
+       * rtems_signal_catch() directive shall be called.
        */
       ctx->pending_signals = 0;
       break;
diff --git a/testsuites/validation/tc-task-construct-errors.c b/testsuites/validation/tc-task-construct-errors.c
index 21a452b1a8..c36bcb7796 100644
--- a/testsuites/validation/tc-task-construct-errors.c
+++ b/testsuites/validation/tc-task-construct-errors.c
@@ -464,7 +464,7 @@ static void RtemsTaskReqConstructErrors_Pre_Free_Prepare(
 
     case RtemsTaskReqConstructErrors_Pre_Free_No: {
       /*
-       * The system shall have no inactive task object available.
+       * The system shall not have an inactive task object available.
        */
       ctx->seized_objects = T_seize_objects( Create, ctx );
       break;
diff --git a/testsuites/validation/tc-task-create-errors.c b/testsuites/validation/tc-task-create-errors.c
index 413ddc1719..cc7c492649 100644
--- a/testsuites/validation/tc-task-create-errors.c
+++ b/testsuites/validation/tc-task-create-errors.c
@@ -426,7 +426,7 @@ static void RtemsTaskReqCreateErrors_Pre_Free_Prepare(
 
     case RtemsTaskReqCreateErrors_Pre_Free_No: {
       /*
-       * The system shall have no inactive task object available.
+       * The system shall not have an inactive task object available.
        */
       ctx->seized_objects = T_seize_objects( Create, ctx );
       break;
-- 
cgit v1.2.3