validation: Use common wording

This commit is contained in:
Sebastian Huber
2021-03-11 07:57:48 +01:00
parent 92239318b1
commit bfd1b6eef3
5 changed files with 1102 additions and 1095 deletions

View File

@@ -119,10 +119,10 @@ typedef enum {
} RtemsBarrierReqCreate_Post_Class;
typedef enum {
RtemsBarrierReqCreate_Post_IdValue_Assigned,
RtemsBarrierReqCreate_Post_IdValue_Unchanged,
RtemsBarrierReqCreate_Post_IdValue_NA
} RtemsBarrierReqCreate_Post_IdValue;
RtemsBarrierReqCreate_Post_IdVar_Set,
RtemsBarrierReqCreate_Post_IdVar_Nop,
RtemsBarrierReqCreate_Post_IdVar_NA
} RtemsBarrierReqCreate_Post_IdVar;
/**
* @brief Test context for spec:/rtems/barrier/req/create test case.
@@ -522,33 +522,34 @@ static void RtemsBarrierReqCreate_Post_Class_Check(
}
}
static void RtemsBarrierReqCreate_Post_IdValue_Check(
RtemsBarrierReqCreate_Context *ctx,
RtemsBarrierReqCreate_Post_IdValue state
static void RtemsBarrierReqCreate_Post_IdVar_Check(
RtemsBarrierReqCreate_Context *ctx,
RtemsBarrierReqCreate_Post_IdVar state
)
{
switch ( state ) {
case RtemsBarrierReqCreate_Post_IdValue_Assigned: {
case RtemsBarrierReqCreate_Post_IdVar_Set: {
/*
* The value of the object identifier variable shall be equal to the
* object identifier of the barrier created by the rtems_barrier_create()
* call.
* The value of the object referenced by the ``id`` parameter shall be
* set to the object identifier of the created barrier after the return
* of the rtems_barrier_create() call.
*/
T_eq_ptr( ctx->id, &ctx->id_value );
T_ne_u32( ctx->id_value, INVALID_ID );
break;
}
case RtemsBarrierReqCreate_Post_IdValue_Unchanged: {
case RtemsBarrierReqCreate_Post_IdVar_Nop: {
/*
* The value of the object identifier variable shall be unchanged by the
* Objects referenced by the ``id`` parameter in past calls to
* rtems_barrier_create() shall not be accessed by the
* rtems_barrier_create() call.
*/
T_eq_u32( ctx->id_value, INVALID_ID );
break;
}
case RtemsBarrierReqCreate_Post_IdValue_NA:
case RtemsBarrierReqCreate_Post_IdVar_NA:
break;
}
}
@@ -630,242 +631,242 @@ static const uint8_t RtemsBarrierReqCreate_TransitionMap[][ 4 ] = {
RtemsBarrierReqCreate_Post_Status_Ok,
RtemsBarrierReqCreate_Post_Name_Valid,
RtemsBarrierReqCreate_Post_Class_Manual,
RtemsBarrierReqCreate_Post_IdValue_Assigned
RtemsBarrierReqCreate_Post_IdVar_Set
}, {
RtemsBarrierReqCreate_Post_Status_TooMany,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvAddr,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvAddr,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_Ok,
RtemsBarrierReqCreate_Post_Name_Valid,
RtemsBarrierReqCreate_Post_Class_Manual,
RtemsBarrierReqCreate_Post_IdValue_Assigned
RtemsBarrierReqCreate_Post_IdVar_Set
}, {
RtemsBarrierReqCreate_Post_Status_TooMany,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvAddr,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvAddr,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_Ok,
RtemsBarrierReqCreate_Post_Name_Valid,
RtemsBarrierReqCreate_Post_Class_Manual,
RtemsBarrierReqCreate_Post_IdValue_Assigned
RtemsBarrierReqCreate_Post_IdVar_Set
}, {
RtemsBarrierReqCreate_Post_Status_TooMany,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvAddr,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvAddr,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_Ok,
RtemsBarrierReqCreate_Post_Name_Valid,
RtemsBarrierReqCreate_Post_Class_Manual,
RtemsBarrierReqCreate_Post_IdValue_Assigned
RtemsBarrierReqCreate_Post_IdVar_Set
}, {
RtemsBarrierReqCreate_Post_Status_TooMany,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvAddr,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvAddr,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvNum,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvNum,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvAddr,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvAddr,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_Ok,
RtemsBarrierReqCreate_Post_Name_Valid,
RtemsBarrierReqCreate_Post_Class_Auto,
RtemsBarrierReqCreate_Post_IdValue_Assigned
RtemsBarrierReqCreate_Post_IdVar_Set
}, {
RtemsBarrierReqCreate_Post_Status_TooMany,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvAddr,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvAddr,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvName,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvName,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvName,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvName,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvName,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvName,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvName,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvName,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvName,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvName,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvName,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvName,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvName,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvName,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvName,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvName,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvName,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvName,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvName,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvName,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvName,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvName,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvName,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}, {
RtemsBarrierReqCreate_Post_Status_InvName,
RtemsBarrierReqCreate_Post_Name_Invalid,
RtemsBarrierReqCreate_Post_Class_NoObj,
RtemsBarrierReqCreate_Post_IdValue_Unchanged
RtemsBarrierReqCreate_Post_IdVar_Nop
}
};
@@ -1095,7 +1096,7 @@ T_TEST_CASE_FIXTURE( RtemsBarrierReqCreate, &RtemsBarrierReqCreate_Fixture )
ctx,
RtemsBarrierReqCreate_TransitionMap[ index ][ 2 ]
);
RtemsBarrierReqCreate_Post_IdValue_Check(
RtemsBarrierReqCreate_Post_IdVar_Check(
ctx,
RtemsBarrierReqCreate_TransitionMap[ index ][ 3 ]
);

View File

@@ -93,10 +93,10 @@ typedef enum {
} RtemsBarrierReqRelease_Post_Status;
typedef enum {
RtemsBarrierReqRelease_Post_Released_Valid,
RtemsBarrierReqRelease_Post_Released_Unchanged,
RtemsBarrierReqRelease_Post_Released_NA
} RtemsBarrierReqRelease_Post_Released;
RtemsBarrierReqRelease_Post_ReleasedVar_Set,
RtemsBarrierReqRelease_Post_ReleasedVar_Nop,
RtemsBarrierReqRelease_Post_ReleasedVar_NA
} RtemsBarrierReqRelease_Post_ReleasedVar;
/**
* @brief Test context for spec:/rtems/barrier/req/release test case.
@@ -338,31 +338,33 @@ static void RtemsBarrierReqRelease_Post_Status_Check(
}
}
static void RtemsBarrierReqRelease_Post_Released_Check(
RtemsBarrierReqRelease_Context *ctx,
RtemsBarrierReqRelease_Post_Released state
static void RtemsBarrierReqRelease_Post_ReleasedVar_Check(
RtemsBarrierReqRelease_Context *ctx,
RtemsBarrierReqRelease_Post_ReleasedVar state
)
{
switch ( state ) {
case RtemsBarrierReqRelease_Post_Released_Valid: {
case RtemsBarrierReqRelease_Post_ReleasedVar_Set: {
/*
* The value of the variable for the number of released tasks shall equal
* the number of tasks released by the rtems_barrier_release() call.
* The value of the object referenced by the ``released`` parameter shall
* be set to the number of released tasks after the return of the
* rtems_barrier_release() call.
*/
T_eq_u32( ctx->released_value, ctx->waiting_tasks );
break;
}
case RtemsBarrierReqRelease_Post_Released_Unchanged: {
case RtemsBarrierReqRelease_Post_ReleasedVar_Nop: {
/*
* The value of variable for the number of released tasks shall be
* unchanged by the rtems_barrier_release() call.
* Objects referenced by the ``released`` parameter in past calls to
* rtems_barrier_release() shall not be accessed by the
* rtems_barrier_release() call.
*/
T_eq_u32( ctx->released_value, RELEASED_INVALID_VALUE );
break;
}
case RtemsBarrierReqRelease_Post_Released_NA:
case RtemsBarrierReqRelease_Post_ReleasedVar_NA:
break;
}
}
@@ -483,40 +485,40 @@ static T_fixture RtemsBarrierReqRelease_Fixture = {
static const uint8_t RtemsBarrierReqRelease_TransitionMap[][ 2 ] = {
{
RtemsBarrierReqRelease_Post_Status_InvId,
RtemsBarrierReqRelease_Post_Released_Unchanged
RtemsBarrierReqRelease_Post_ReleasedVar_Nop
}, {
RtemsBarrierReqRelease_Post_Status_InvId,
RtemsBarrierReqRelease_Post_Released_Unchanged
RtemsBarrierReqRelease_Post_ReleasedVar_Nop
}, {
RtemsBarrierReqRelease_Post_Status_InvAddr,
RtemsBarrierReqRelease_Post_Released_Unchanged
RtemsBarrierReqRelease_Post_ReleasedVar_Nop
}, {
RtemsBarrierReqRelease_Post_Status_InvAddr,
RtemsBarrierReqRelease_Post_Released_Unchanged
RtemsBarrierReqRelease_Post_ReleasedVar_Nop
}, {
RtemsBarrierReqRelease_Post_Status_Ok,
RtemsBarrierReqRelease_Post_Released_Valid
RtemsBarrierReqRelease_Post_ReleasedVar_Set
}, {
RtemsBarrierReqRelease_Post_Status_Ok,
RtemsBarrierReqRelease_Post_Released_Valid
RtemsBarrierReqRelease_Post_ReleasedVar_Set
}, {
RtemsBarrierReqRelease_Post_Status_InvAddr,
RtemsBarrierReqRelease_Post_Released_Unchanged
RtemsBarrierReqRelease_Post_ReleasedVar_Nop
}, {
RtemsBarrierReqRelease_Post_Status_InvAddr,
RtemsBarrierReqRelease_Post_Released_Unchanged
RtemsBarrierReqRelease_Post_ReleasedVar_Nop
}, {
RtemsBarrierReqRelease_Post_Status_Ok,
RtemsBarrierReqRelease_Post_Released_Valid
RtemsBarrierReqRelease_Post_ReleasedVar_Set
}, {
RtemsBarrierReqRelease_Post_Status_Ok,
RtemsBarrierReqRelease_Post_Released_Valid
RtemsBarrierReqRelease_Post_ReleasedVar_Set
}, {
RtemsBarrierReqRelease_Post_Status_InvAddr,
RtemsBarrierReqRelease_Post_Released_Unchanged
RtemsBarrierReqRelease_Post_ReleasedVar_Nop
}, {
RtemsBarrierReqRelease_Post_Status_InvAddr,
RtemsBarrierReqRelease_Post_Released_Unchanged
RtemsBarrierReqRelease_Post_ReleasedVar_Nop
}
};
@@ -618,7 +620,7 @@ T_TEST_CASE_FIXTURE( RtemsBarrierReqRelease, &RtemsBarrierReqRelease_Fixture )
ctx,
RtemsBarrierReqRelease_TransitionMap[ index ][ 0 ]
);
RtemsBarrierReqRelease_Post_Released_Check(
RtemsBarrierReqRelease_Post_ReleasedVar_Check(
ctx,
RtemsBarrierReqRelease_TransitionMap[ index ][ 1 ]
);

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff