From 91df79cdf2285abdee13b2bdff7b8f8878fc6ec1 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 11 Aug 2020 08:48:00 +0200 Subject: validation: Remove explicit test names --- rtemsspec/tests/spec-validation/tc.yml | 1 - rtemsspec/tests/spec-validation/tc2.yml | 1 - rtemsspec/tests/spec-validation/tc3.yml | 1 - rtemsspec/tests/spec-validation/tc4.yml | 1 - rtemsspec/tests/spec-validation/ts.yml | 1 - rtemsspec/tests/test_content_c.py | 16 + rtemsspec/tests/test_validation.py | 481 ++++++++++++------------- rtemsspec/validation.py | 16 +- spec/req/rtems/barrier/val/ident.yml | 1 - spec/req/rtems/ident-local.yml | 1 - spec/req/rtems/ident.yml | 1 - spec/req/rtems/message/val/ident.yml | 1 - spec/req/rtems/part/val/ident.yml | 1 - spec/req/rtems/ratemon/val/ident.yml | 1 - spec/req/rtems/sem/val/ident.yml | 1 - spec/req/rtems/tasks/ident.yml | 1 - spec/req/rtems/timer/val/ident.yml | 1 - spec/req/rtems/userext/val/ident.yml | 1 - spec/spec/requirement-action.yml | 4 - spec/spec/test-case.yml | 3 - spec/spec/test-name.yml | 20 - spec/spec/test-suite.yml | 3 - spec/testsuites/validation-0.yml | 1 - spec/testsuites/validation/c-library.yml | 1 - spec/testsuites/validation/classic-barrier.yml | 1 - spec/testsuites/validation/profile.yml | 1 - 26 files changed, 258 insertions(+), 304 deletions(-) delete mode 100644 spec/spec/test-name.yml diff --git a/rtemsspec/tests/spec-validation/tc.yml b/rtemsspec/tests/spec-validation/tc.yml index a7359266..9b0af09d 100644 --- a/rtemsspec/tests/spec-validation/tc.yml +++ b/rtemsspec/tests/spec-validation/tc.yml @@ -45,7 +45,6 @@ includes: links: [] local-includes: - x.h -name: Test Case prologue: | /* Test case prologue code */ support: | diff --git a/rtemsspec/tests/spec-validation/tc2.yml b/rtemsspec/tests/spec-validation/tc2.yml index 496a27e0..2af3184c 100644 --- a/rtemsspec/tests/spec-validation/tc2.yml +++ b/rtemsspec/tests/spec-validation/tc2.yml @@ -34,7 +34,6 @@ includes: links: [] local-includes: - y.h -name: Test Case 2 prologue: null support: null target: tc12.c diff --git a/rtemsspec/tests/spec-validation/tc3.yml b/rtemsspec/tests/spec-validation/tc3.yml index 44d0ee6c..8c484761 100644 --- a/rtemsspec/tests/spec-validation/tc3.yml +++ b/rtemsspec/tests/spec-validation/tc3.yml @@ -23,7 +23,6 @@ includes: links: [] local-includes: - z.h -name: Test Case 3 prologue: null support: null target: tc34.c diff --git a/rtemsspec/tests/spec-validation/tc4.yml b/rtemsspec/tests/spec-validation/tc4.yml index b21b483e..a1ab1bc5 100644 --- a/rtemsspec/tests/spec-validation/tc4.yml +++ b/rtemsspec/tests/spec-validation/tc4.yml @@ -11,7 +11,6 @@ fixture: null includes: [] links: [] local-includes: [] -name: Test Case 4 prologue: null support: null target: tc34.c diff --git a/rtemsspec/tests/spec-validation/ts.yml b/rtemsspec/tests/spec-validation/ts.yml index d5480be3..321a4721 100644 --- a/rtemsspec/tests/spec-validation/ts.yml +++ b/rtemsspec/tests/spec-validation/ts.yml @@ -10,6 +10,5 @@ includes: links: [] local-includes: - green.h -name: Blue Green target: ts.c type: test-suite diff --git a/rtemsspec/tests/test_content_c.py b/rtemsspec/tests/test_content_c.py index f1bbf303..5cf3702e 100644 --- a/rtemsspec/tests/test_content_c.py +++ b/rtemsspec/tests/test_content_c.py @@ -360,6 +360,22 @@ def test_function(): zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz z, ... ); +""" + content = CContent() + content.declare_function( + "a *", + "b", [ + "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx x", + "yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy y", + "zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz z", "..." + ], + align=False) + assert str(content) == """a *b( + xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx x, + yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy y, + zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz z, + ... +); """ content = CContent() content.declare_function( diff --git a/rtemsspec/tests/test_validation.py b/rtemsspec/tests/test_validation.py index 88995fba..665df872 100644 --- a/rtemsspec/tests/test_validation.py +++ b/rtemsspec/tests/test_validation.py @@ -49,7 +49,7 @@ def test_validation(tmpdir): /** * @file * - * @ingroup RTEMSTestSuiteBlueGreen + * @ingroup RTEMSTestSuiteTs */ /* @@ -88,7 +88,7 @@ def test_validation(tmpdir): #include /** - * @defgroup RTEMSTestSuiteBlueGreen Blue Green + * @defgroup RTEMSTestSuiteTs spec:/ts * * @ingroup RTEMSTestSuites * @@ -111,9 +111,9 @@ def test_validation(tmpdir): /** * @file * - * @ingroup RTEMSTestCaseClassicTaskIdentification - * @ingroup RTEMSTestCaseTestCase - * @ingroup RTEMSTestCaseTestCase2 + * @ingroup RTEMSTestCaseDirective + * @ingroup RTEMSTestCaseTc + * @ingroup RTEMSTestCaseTc2 */ /* @@ -155,9 +155,9 @@ def test_validation(tmpdir): #include /** - * @defgroup RTEMSTestCaseClassicTaskIdentification Classic Task Identification + * @defgroup RTEMSTestCaseDirective spec:/directive * - * @ingroup RTEMSTestSuiteBlueGreen + * @ingroup RTEMSTestSuiteTs * * @brief Test Case * @@ -165,48 +165,48 @@ def test_validation(tmpdir): */ typedef enum { - ClassicTaskIdentification_Pre_Name_Invalid, - ClassicTaskIdentification_Pre_Name_Self, - ClassicTaskIdentification_Pre_Name_Valid, - ClassicTaskIdentification_Pre_Name_NA -} ClassicTaskIdentification_Pre_Name; + Directive_Pre_Name_Invalid, + Directive_Pre_Name_Self, + Directive_Pre_Name_Valid, + Directive_Pre_Name_NA +} Directive_Pre_Name; typedef enum { - ClassicTaskIdentification_Pre_Node_Local, - ClassicTaskIdentification_Pre_Node_Remote, - ClassicTaskIdentification_Pre_Node_Invalid, - ClassicTaskIdentification_Pre_Node_SearchAll, - ClassicTaskIdentification_Pre_Node_SearchOther, - ClassicTaskIdentification_Pre_Node_SearchLocal, - ClassicTaskIdentification_Pre_Node_NA -} ClassicTaskIdentification_Pre_Node; + Directive_Pre_Node_Local, + Directive_Pre_Node_Remote, + Directive_Pre_Node_Invalid, + Directive_Pre_Node_SearchAll, + Directive_Pre_Node_SearchOther, + Directive_Pre_Node_SearchLocal, + Directive_Pre_Node_NA +} Directive_Pre_Node; typedef enum { - ClassicTaskIdentification_Pre_Id_NullPtr, - ClassicTaskIdentification_Pre_Id_Valid, - ClassicTaskIdentification_Pre_Id_NA -} ClassicTaskIdentification_Pre_Id; + Directive_Pre_Id_NullPtr, + Directive_Pre_Id_Valid, + Directive_Pre_Id_NA +} Directive_Pre_Id; typedef enum { - ClassicTaskIdentification_Post_Status_Ok, - ClassicTaskIdentification_Post_Status_InvAddr, - ClassicTaskIdentification_Post_Status_InvName, - ClassicTaskIdentification_Post_Status_InvNode, - ClassicTaskIdentification_Post_Status_InvId, - ClassicTaskIdentification_Post_Status_NA -} ClassicTaskIdentification_Post_Status; + Directive_Post_Status_Ok, + Directive_Post_Status_InvAddr, + Directive_Post_Status_InvName, + Directive_Post_Status_InvNode, + Directive_Post_Status_InvId, + Directive_Post_Status_NA +} Directive_Post_Status; typedef enum { - ClassicTaskIdentification_Post_Id_Nop, - ClassicTaskIdentification_Post_Id_NullPtr, - ClassicTaskIdentification_Post_Id_Self, - ClassicTaskIdentification_Post_Id_LocalTask, - ClassicTaskIdentification_Post_Id_RemoteTask, - ClassicTaskIdentification_Post_Id_NA -} ClassicTaskIdentification_Post_Id; + Directive_Post_Id_Nop, + Directive_Post_Id_NullPtr, + Directive_Post_Id_Self, + Directive_Post_Id_LocalTask, + Directive_Post_Id_RemoteTask, + Directive_Post_Id_NA +} Directive_Post_Id; /** - * @brief Test context for Classic Task Identification test case. + * @brief Test context for spec:/directive test case. */ typedef struct { /** @@ -238,19 +238,19 @@ typedef struct { * executed. */ bool in_action_loop; -} ClassicTaskIdentification_Context; +} Directive_Context; -static ClassicTaskIdentification_Context - ClassicTaskIdentification_Instance; +static Directive_Context + Directive_Instance; -static const char * const ClassicTaskIdentification_PreDesc_Name[] = { +static const char * const Directive_PreDesc_Name[] = { "Invalid", "Self", "Valid", "NA" }; -static const char * const ClassicTaskIdentification_PreDesc_Node[] = { +static const char * const Directive_PreDesc_Node[] = { "Local", "Remote", "Invalid", @@ -260,186 +260,186 @@ static const char * const ClassicTaskIdentification_PreDesc_Node[] = { "NA" }; -static const char * const ClassicTaskIdentification_PreDesc_Id[] = { +static const char * const Directive_PreDesc_Id[] = { "NullPtr", "Valid", "NA" }; -static const char * const * const ClassicTaskIdentification_PreDesc[] = { - ClassicTaskIdentification_PreDesc_Name, - ClassicTaskIdentification_PreDesc_Node, - ClassicTaskIdentification_PreDesc_Id, +static const char * const * const Directive_PreDesc[] = { + Directive_PreDesc_Name, + Directive_PreDesc_Node, + Directive_PreDesc_Id, NULL }; /* Test rtems_task_ident() support */ -static void ClassicTaskIdentification_Pre_Name_Prepare( - ClassicTaskIdentification_Context *ctx, - ClassicTaskIdentification_Pre_Name state +static void Directive_Pre_Name_Prepare( + Directive_Context *ctx, + Directive_Pre_Name state ) { /* Prologue */ switch ( state ) { - case ClassicTaskIdentification_Pre_Name_Invalid: { + case Directive_Pre_Name_Invalid: { ctx->name = 1; break; } - case ClassicTaskIdentification_Pre_Name_Self: { + case Directive_Pre_Name_Self: { ctx->name = RTEMS_SELF; break; } - case ClassicTaskIdentification_Pre_Name_Valid: { + case Directive_Pre_Name_Valid: { ctx->name = rtems_build_name( 'T', 'A', 'S', 'K' ); break; } - case ClassicTaskIdentification_Pre_Name_NA: + case Directive_Pre_Name_NA: break; } /* Epilogue */ } -static void ClassicTaskIdentification_Pre_Node_Prepare( - ClassicTaskIdentification_Context *ctx, - ClassicTaskIdentification_Pre_Node state +static void Directive_Pre_Node_Prepare( + Directive_Context *ctx, + Directive_Pre_Node state ) { switch ( state ) { - case ClassicTaskIdentification_Pre_Node_Local: { + case Directive_Pre_Node_Local: { ctx->node = 1; break; } - case ClassicTaskIdentification_Pre_Node_Remote: { + case Directive_Pre_Node_Remote: { ctx->node = 2; break; } - case ClassicTaskIdentification_Pre_Node_Invalid: { + case Directive_Pre_Node_Invalid: { ctx->node = 256; break; } - case ClassicTaskIdentification_Pre_Node_SearchAll: { + case Directive_Pre_Node_SearchAll: { ctx->node = RTEMS_SEARCH_ALL_NODES; break; } - case ClassicTaskIdentification_Pre_Node_SearchOther: { + case Directive_Pre_Node_SearchOther: { ctx->node = RTEMS_SEARCH_OTHER_NODES; break; } - case ClassicTaskIdentification_Pre_Node_SearchLocal: { + case Directive_Pre_Node_SearchLocal: { ctx->node = RTEMS_SEARCH_LOCAL_NODE; break; } - case ClassicTaskIdentification_Pre_Node_NA: + case Directive_Pre_Node_NA: break; } } -static void ClassicTaskIdentification_Pre_Id_Prepare( - ClassicTaskIdentification_Context *ctx, - ClassicTaskIdentification_Pre_Id state +static void Directive_Pre_Id_Prepare( + Directive_Context *ctx, + Directive_Pre_Id state ) { switch ( state ) { - case ClassicTaskIdentification_Pre_Id_NullPtr: { + case Directive_Pre_Id_NullPtr: { ctx->id = NULL; break; } - case ClassicTaskIdentification_Pre_Id_Valid: { + case Directive_Pre_Id_Valid: { ctx->id_value = 0xffffffff; ctx->id = &ctx->id_value; break; } - case ClassicTaskIdentification_Pre_Id_NA: + case Directive_Pre_Id_NA: break; } } -static void ClassicTaskIdentification_Post_Status_Check( - ClassicTaskIdentification_Context *ctx, - ClassicTaskIdentification_Post_Status state +static void Directive_Post_Status_Check( + Directive_Context *ctx, + Directive_Post_Status state ) { switch ( state ) { - case ClassicTaskIdentification_Post_Status_Ok: { + case Directive_Post_Status_Ok: { T_rsc(ctx->status, RTEMS_SUCCESSFUL); break; } - case ClassicTaskIdentification_Post_Status_InvAddr: { + case Directive_Post_Status_InvAddr: { T_rsc(ctx->status, RTEMS_INVALID_ADDRESS); break; } - case ClassicTaskIdentification_Post_Status_InvName: { + case Directive_Post_Status_InvName: { T_rsc(ctx->status, RTEMS_INVALID_NAME); break; } - case ClassicTaskIdentification_Post_Status_InvNode: { + case Directive_Post_Status_InvNode: { T_rsc(ctx->status, RTEMS_INVALID_NODE); break; } - case ClassicTaskIdentification_Post_Status_InvId: { + case Directive_Post_Status_InvId: { T_rsc(ctx->status, RTEMS_INVALID_ID); break; } - case ClassicTaskIdentification_Post_Status_NA: + case Directive_Post_Status_NA: break; } } -static void ClassicTaskIdentification_Post_Id_Check( - ClassicTaskIdentification_Context *ctx, - ClassicTaskIdentification_Post_Id state +static void Directive_Post_Id_Check( + Directive_Context *ctx, + Directive_Post_Id state ) { switch ( state ) { - case ClassicTaskIdentification_Post_Id_Nop: { + case Directive_Post_Id_Nop: { T_eq_ptr(ctx->id, &ctx->id_value); T_eq_u32(ctx->id_value, 0xffffffff); break; } - case ClassicTaskIdentification_Post_Id_NullPtr: { + case Directive_Post_Id_NullPtr: { T_null(ctx->id) break; } - case ClassicTaskIdentification_Post_Id_Self: { + case Directive_Post_Id_Self: { T_eq_ptr(ctx->id, &ctx->id_value); T_eq_u32(ctx->id_value, rtems_task_self()); break; } - case ClassicTaskIdentification_Post_Id_LocalTask: { + case Directive_Post_Id_LocalTask: { T_eq_ptr(ctx->id, &ctx->id_value); T_eq_u32(ctx->id_value, ctx->id_local_task); break; } - case ClassicTaskIdentification_Post_Id_RemoteTask: { + case Directive_Post_Id_RemoteTask: { T_eq_ptr(ctx->id, &ctx->id_value); T_eq_u32(ctx->id_value, ctx->id_remote_task); break; } - case ClassicTaskIdentification_Post_Id_NA: + case Directive_Post_Id_NA: break; } } @@ -449,9 +449,7 @@ static void ClassicTaskIdentification_Post_Id_Check( * * Setup description. */ -static void ClassicTaskIdentification_Setup( - ClassicTaskIdentification_Context *ctx -) +static void Directive_Setup( Directive_Context *ctx ) { rtems_status_code sc; @@ -466,18 +464,16 @@ static void ClassicTaskIdentification_Setup( T_assert_rsc_success( sc ); } -static void ClassicTaskIdentification_Setup_Wrap( void *arg ) +static void Directive_Setup_Wrap( void *arg ) { - ClassicTaskIdentification_Context *ctx; + Directive_Context *ctx; ctx = arg; ctx->in_action_loop = false; - ClassicTaskIdentification_Setup( ctx ); + Directive_Setup( ctx ); } -static void ClassicTaskIdentification_Teardown( - ClassicTaskIdentification_Context *ctx -) +static void Directive_Teardown( Directive_Context *ctx ) { rtems_status_code sc; @@ -487,153 +483,153 @@ static void ClassicTaskIdentification_Teardown( } } -static void ClassicTaskIdentification_Teardown_Wrap( void *arg ) +static void Directive_Teardown_Wrap( void *arg ) { - ClassicTaskIdentification_Context *ctx; + Directive_Context *ctx; ctx = arg; ctx->in_action_loop = false; - ClassicTaskIdentification_Teardown( ctx ); + Directive_Teardown( ctx ); } -static void ClassicTaskIdentification_Scope( void *arg, char *buf, size_t n ) +static void Directive_Scope( void *arg, char *buf, size_t n ) { - ClassicTaskIdentification_Context *ctx; + Directive_Context *ctx; ctx = arg; if ( ctx->in_action_loop ) { - T_get_scope( ClassicTaskIdentification_PreDesc, buf, n, ctx->pcs ); + T_get_scope( Directive_PreDesc, buf, n, ctx->pcs ); } } -static T_fixture ClassicTaskIdentification_Fixture = { - .setup = ClassicTaskIdentification_Setup_Wrap, +static T_fixture Directive_Fixture = { + .setup = Directive_Setup_Wrap, .stop = NULL, - .teardown = ClassicTaskIdentification_Teardown_Wrap, - .scope = ClassicTaskIdentification_Scope, - .initial_context = &ClassicTaskIdentification_Instance + .teardown = Directive_Teardown_Wrap, + .scope = Directive_Scope, + .initial_context = &Directive_Instance }; -static const uint8_t ClassicTaskIdentification_TransitionMap[][ 2 ] = { +static const uint8_t Directive_TransitionMap[][ 2 ] = { { - ClassicTaskIdentification_Post_Status_InvAddr, - ClassicTaskIdentification_Post_Id_NullPtr + Directive_Post_Status_InvAddr, + Directive_Post_Id_NullPtr }, { - ClassicTaskIdentification_Post_Status_InvName, - ClassicTaskIdentification_Post_Id_Nop + Directive_Post_Status_InvName, + Directive_Post_Id_Nop }, { - ClassicTaskIdentification_Post_Status_InvAddr, - ClassicTaskIdentification_Post_Id_NullPtr + Directive_Post_Status_InvAddr, + Directive_Post_Id_NullPtr }, { - ClassicTaskIdentification_Post_Status_InvName, - ClassicTaskIdentification_Post_Id_Nop + Directive_Post_Status_InvName, + Directive_Post_Id_Nop }, { - ClassicTaskIdentification_Post_Status_InvAddr, - ClassicTaskIdentification_Post_Id_NullPtr + Directive_Post_Status_InvAddr, + Directive_Post_Id_NullPtr }, { - ClassicTaskIdentification_Post_Status_InvName, - ClassicTaskIdentification_Post_Id_Nop + Directive_Post_Status_InvName, + Directive_Post_Id_Nop }, { - ClassicTaskIdentification_Post_Status_InvAddr, - ClassicTaskIdentification_Post_Id_NullPtr + Directive_Post_Status_InvAddr, + Directive_Post_Id_NullPtr }, { - ClassicTaskIdentification_Post_Status_InvName, - ClassicTaskIdentification_Post_Id_Nop + Directive_Post_Status_InvName, + Directive_Post_Id_Nop }, { - ClassicTaskIdentification_Post_Status_InvAddr, - ClassicTaskIdentification_Post_Id_NullPtr + Directive_Post_Status_InvAddr, + Directive_Post_Id_NullPtr }, { - ClassicTaskIdentification_Post_Status_InvName, - ClassicTaskIdentification_Post_Id_Nop + Directive_Post_Status_InvName, + Directive_Post_Id_Nop }, { - ClassicTaskIdentification_Post_Status_InvAddr, - ClassicTaskIdentification_Post_Id_NullPtr + Directive_Post_Status_InvAddr, + Directive_Post_Id_NullPtr }, { - ClassicTaskIdentification_Post_Status_InvName, - ClassicTaskIdentification_Post_Id_Nop + Directive_Post_Status_InvName, + Directive_Post_Id_Nop }, { - ClassicTaskIdentification_Post_Status_InvAddr, - ClassicTaskIdentification_Post_Id_NullPtr + Directive_Post_Status_InvAddr, + Directive_Post_Id_NullPtr }, { - ClassicTaskIdentification_Post_Status_Ok, - ClassicTaskIdentification_Post_Id_Self + Directive_Post_Status_Ok, + Directive_Post_Id_Self }, { - ClassicTaskIdentification_Post_Status_InvAddr, - ClassicTaskIdentification_Post_Id_NullPtr + Directive_Post_Status_InvAddr, + Directive_Post_Id_NullPtr }, { - ClassicTaskIdentification_Post_Status_Ok, - ClassicTaskIdentification_Post_Id_Self + Directive_Post_Status_Ok, + Directive_Post_Id_Self }, { - ClassicTaskIdentification_Post_Status_InvAddr, - ClassicTaskIdentification_Post_Id_NullPtr + Directive_Post_Status_InvAddr, + Directive_Post_Id_NullPtr }, { - ClassicTaskIdentification_Post_Status_Ok, - ClassicTaskIdentification_Post_Id_Self + Directive_Post_Status_Ok, + Directive_Post_Id_Self }, { - ClassicTaskIdentification_Post_Status_InvAddr, - ClassicTaskIdentification_Post_Id_NullPtr + Directive_Post_Status_InvAddr, + Directive_Post_Id_NullPtr }, { - ClassicTaskIdentification_Post_Status_Ok, - ClassicTaskIdentification_Post_Id_Self + Directive_Post_Status_Ok, + Directive_Post_Id_Self }, { - ClassicTaskIdentification_Post_Status_InvAddr, - ClassicTaskIdentification_Post_Id_NullPtr + Directive_Post_Status_InvAddr, + Directive_Post_Id_NullPtr }, { - ClassicTaskIdentification_Post_Status_Ok, - ClassicTaskIdentification_Post_Id_Self + Directive_Post_Status_Ok, + Directive_Post_Id_Self }, { - ClassicTaskIdentification_Post_Status_InvAddr, - ClassicTaskIdentification_Post_Id_NullPtr + Directive_Post_Status_InvAddr, + Directive_Post_Id_NullPtr }, { - ClassicTaskIdentification_Post_Status_Ok, - ClassicTaskIdentification_Post_Id_Self + Directive_Post_Status_Ok, + Directive_Post_Id_Self }, { - ClassicTaskIdentification_Post_Status_InvAddr, - ClassicTaskIdentification_Post_Id_NullPtr + Directive_Post_Status_InvAddr, + Directive_Post_Id_NullPtr }, { - ClassicTaskIdentification_Post_Status_Ok, - ClassicTaskIdentification_Post_Id_LocalTask + Directive_Post_Status_Ok, + Directive_Post_Id_LocalTask }, { - ClassicTaskIdentification_Post_Status_InvAddr, - ClassicTaskIdentification_Post_Id_NullPtr + Directive_Post_Status_InvAddr, + Directive_Post_Id_NullPtr }, { #if defined(RTEMS_MULTIPROCESSING) - ClassicTaskIdentification_Post_Status_Ok, - ClassicTaskIdentification_Post_Id_RemoteTask + Directive_Post_Status_Ok, + Directive_Post_Id_RemoteTask #else - ClassicTaskIdentification_Post_Status_InvName, - ClassicTaskIdentification_Post_Id_Nop + Directive_Post_Status_InvName, + Directive_Post_Id_Nop #endif }, { - ClassicTaskIdentification_Post_Status_InvAddr, - ClassicTaskIdentification_Post_Id_NullPtr + Directive_Post_Status_InvAddr, + Directive_Post_Id_NullPtr }, { - ClassicTaskIdentification_Post_Status_InvName, - ClassicTaskIdentification_Post_Id_Nop + Directive_Post_Status_InvName, + Directive_Post_Id_Nop }, { - ClassicTaskIdentification_Post_Status_InvAddr, - ClassicTaskIdentification_Post_Id_NullPtr + Directive_Post_Status_InvAddr, + Directive_Post_Id_NullPtr }, { - ClassicTaskIdentification_Post_Status_Ok, - ClassicTaskIdentification_Post_Id_LocalTask + Directive_Post_Status_Ok, + Directive_Post_Id_LocalTask }, { - ClassicTaskIdentification_Post_Status_InvAddr, - ClassicTaskIdentification_Post_Id_NullPtr + Directive_Post_Status_InvAddr, + Directive_Post_Id_NullPtr }, { #if defined(RTEMS_MULTIPROCESSING) - ClassicTaskIdentification_Post_Status_Ok, - ClassicTaskIdentification_Post_Id_RemoteTask + Directive_Post_Status_Ok, + Directive_Post_Id_RemoteTask #else - ClassicTaskIdentification_Post_Status_InvName, - ClassicTaskIdentification_Post_Id_Nop + Directive_Post_Status_InvName, + Directive_Post_Id_Nop #endif }, { - ClassicTaskIdentification_Post_Status_InvAddr, - ClassicTaskIdentification_Post_Id_NullPtr + Directive_Post_Status_InvAddr, + Directive_Post_Id_NullPtr }, { - ClassicTaskIdentification_Post_Status_Ok, - ClassicTaskIdentification_Post_Id_LocalTask + Directive_Post_Status_Ok, + Directive_Post_Id_LocalTask } }; @@ -642,7 +638,7 @@ static const struct { uint8_t Pre_Name_NA : 1; uint8_t Pre_Node_NA : 1; uint8_t Pre_Id_NA : 1; -} ClassicTaskIdentification_TransitionInfo[] = { +} Directive_TransitionInfo[] = { { 0, 0, 0, 0 }, { @@ -726,26 +722,21 @@ static const struct { } }; -static void ClassicTaskIdentification_Action( - ClassicTaskIdentification_Context *ctx -) +static void Directive_Action( Directive_Context *ctx ) { ctx->status = rtems_task_ident( ctx->name, ctx->node, ctx->id ); } /** - * @fn void T_case_body_ClassicTaskIdentification( void ) + * @fn void T_case_body_Directive( void ) * * @brief Test rtems_task_ident() brief description. * * Test rtems_task_ident() description. */ -T_TEST_CASE_FIXTURE( - ClassicTaskIdentification, - &ClassicTaskIdentification_Fixture -) +T_TEST_CASE_FIXTURE( Directive, &Directive_Fixture ) { - ClassicTaskIdentification_Context *ctx; + Directive_Context *ctx; size_t index; ctx = T_fixture_context(); @@ -753,54 +744,54 @@ T_TEST_CASE_FIXTURE( index = 0; for ( - ctx->pcs[ 0 ] = ClassicTaskIdentification_Pre_Name_Invalid; - ctx->pcs[ 0 ] < ClassicTaskIdentification_Pre_Name_NA; + ctx->pcs[ 0 ] = Directive_Pre_Name_Invalid; + ctx->pcs[ 0 ] < Directive_Pre_Name_NA; ++ctx->pcs[ 0 ] ) { - if ( ClassicTaskIdentification_TransitionInfo[ index ].Pre_Name_NA ) { - ctx->pcs[ 0 ] = ClassicTaskIdentification_Pre_Name_NA; - index += ( ClassicTaskIdentification_Pre_Name_NA - 1 ) - * ClassicTaskIdentification_Pre_Node_NA - * ClassicTaskIdentification_Pre_Id_NA; + if ( Directive_TransitionInfo[ index ].Pre_Name_NA ) { + ctx->pcs[ 0 ] = Directive_Pre_Name_NA; + index += ( Directive_Pre_Name_NA - 1 ) + * Directive_Pre_Node_NA + * Directive_Pre_Id_NA; } for ( - ctx->pcs[ 1 ] = ClassicTaskIdentification_Pre_Node_Local; - ctx->pcs[ 1 ] < ClassicTaskIdentification_Pre_Node_NA; + ctx->pcs[ 1 ] = Directive_Pre_Node_Local; + ctx->pcs[ 1 ] < Directive_Pre_Node_NA; ++ctx->pcs[ 1 ] ) { - if ( ClassicTaskIdentification_TransitionInfo[ index ].Pre_Node_NA ) { - ctx->pcs[ 1 ] = ClassicTaskIdentification_Pre_Node_NA; - index += ( ClassicTaskIdentification_Pre_Node_NA - 1 ) - * ClassicTaskIdentification_Pre_Id_NA; + if ( Directive_TransitionInfo[ index ].Pre_Node_NA ) { + ctx->pcs[ 1 ] = Directive_Pre_Node_NA; + index += ( Directive_Pre_Node_NA - 1 ) + * Directive_Pre_Id_NA; } for ( - ctx->pcs[ 2 ] = ClassicTaskIdentification_Pre_Id_NullPtr; - ctx->pcs[ 2 ] < ClassicTaskIdentification_Pre_Id_NA; + ctx->pcs[ 2 ] = Directive_Pre_Id_NullPtr; + ctx->pcs[ 2 ] < Directive_Pre_Id_NA; ++ctx->pcs[ 2 ] ) { - if ( ClassicTaskIdentification_TransitionInfo[ index ].Pre_Id_NA ) { - ctx->pcs[ 2 ] = ClassicTaskIdentification_Pre_Id_NA; - index += ( ClassicTaskIdentification_Pre_Id_NA - 1 ); + if ( Directive_TransitionInfo[ index ].Pre_Id_NA ) { + ctx->pcs[ 2 ] = Directive_Pre_Id_NA; + index += ( Directive_Pre_Id_NA - 1 ); } - if ( ClassicTaskIdentification_TransitionInfo[ index ].Skip ) { + if ( Directive_TransitionInfo[ index ].Skip ) { ++index; continue; } - ClassicTaskIdentification_Pre_Name_Prepare( ctx, ctx->pcs[ 0 ] ); - ClassicTaskIdentification_Pre_Node_Prepare( ctx, ctx->pcs[ 1 ] ); - ClassicTaskIdentification_Pre_Id_Prepare( ctx, ctx->pcs[ 2 ] ); - ClassicTaskIdentification_Action( ctx ); - ClassicTaskIdentification_Post_Status_Check( + Directive_Pre_Name_Prepare( ctx, ctx->pcs[ 0 ] ); + Directive_Pre_Node_Prepare( ctx, ctx->pcs[ 1 ] ); + Directive_Pre_Id_Prepare( ctx, ctx->pcs[ 2 ] ); + Directive_Action( ctx ); + Directive_Post_Status_Check( ctx, - ClassicTaskIdentification_TransitionMap[ index ][ 0 ] + Directive_TransitionMap[ index ][ 0 ] ); - ClassicTaskIdentification_Post_Id_Check( + Directive_Post_Id_Check( ctx, - ClassicTaskIdentification_TransitionMap[ index ][ 1 ] + Directive_TransitionMap[ index ][ 1 ] ); ++index; } @@ -811,9 +802,9 @@ T_TEST_CASE_FIXTURE( /** @} */ /** - * @defgroup RTEMSTestCaseTestCase Test Case + * @defgroup RTEMSTestCaseTc spec:/tc * - * @ingroup RTEMSTestSuiteBlueGreen + * @ingroup RTEMSTestSuiteTs * * @brief Test Case * @@ -823,7 +814,7 @@ T_TEST_CASE_FIXTURE( /* Test case support code */ /** - * @fn void T_case_body_TestCase( void ) + * @fn void T_case_body_Tc( void ) * * @brief Test case brief description. * @@ -843,7 +834,7 @@ T_TEST_CASE_FIXTURE( * * - Test case action 1 check 1 description. */ -T_TEST_CASE( TestCase ) +T_TEST_CASE( Tc ) { /* Test case prologue code */ @@ -863,9 +854,9 @@ T_TEST_CASE( TestCase ) /** @} */ /** - * @defgroup RTEMSTestCaseTestCase2 Test Case 2 + * @defgroup RTEMSTestCaseTc2 spec:/tc2 * - * @ingroup RTEMSTestSuiteBlueGreen + * @ingroup RTEMSTestSuiteTs * * @brief Test Case * @@ -873,7 +864,7 @@ T_TEST_CASE( TestCase ) */ /** - * @fn void T_case_body_TestCase2( void ) + * @fn void T_case_body_Tc2( void ) * * @brief Test case 2 brief description. * @@ -889,7 +880,7 @@ T_TEST_CASE( TestCase ) * * - Test case 2 action 1 description. */ -T_TEST_CASE_FIXTURE( TestCase2, &test_case_2_fixture ) +T_TEST_CASE_FIXTURE( Tc2, &test_case_2_fixture ) { /* Test case 2 action 0 code */ /* Test case 2 action 0 check 0 code */ @@ -908,8 +899,8 @@ T_TEST_CASE_FIXTURE( TestCase2, &test_case_2_fixture ) /** * @file * - * @ingroup RTEMSTestCaseTestCase3 - * @ingroup RTEMSTestCaseTestCase4 + * @ingroup RTEMSTestCaseTc3 + * @ingroup RTEMSTestCaseTc4 */ /* @@ -948,9 +939,9 @@ T_TEST_CASE_FIXTURE( TestCase2, &test_case_2_fixture ) #include /** - * @defgroup RTEMSTestCaseTestCase3 Test Case 3 + * @defgroup RTEMSTestCaseTc3 spec:/tc3 * - * @ingroup RTEMSTestSuiteBlueGreen + * @ingroup RTEMSTestSuiteTs * * @brief Test Case * @@ -958,7 +949,7 @@ T_TEST_CASE_FIXTURE( TestCase2, &test_case_2_fixture ) */ /** - * @fn void T_case_body_TestCase3( void ) + * @fn void T_case_body_Tc3( void ) * * @brief Test case 3 brief description. * @@ -970,7 +961,7 @@ T_TEST_CASE_FIXTURE( TestCase2, &test_case_2_fixture ) * * - Test case 3 action 0 check 0 description. */ -T_TEST_CASE( TestCase3 ) +T_TEST_CASE( Tc3 ) { T_plan(1); @@ -981,9 +972,9 @@ T_TEST_CASE( TestCase3 ) /** @} */ /** - * @defgroup RTEMSTestCaseTestCase4 Test Case 4 + * @defgroup RTEMSTestCaseTc4 spec:/tc4 * - * @ingroup RTEMSTestSuiteBlueGreen + * @ingroup RTEMSTestSuiteTs * * @brief Test Case * @@ -991,13 +982,13 @@ T_TEST_CASE( TestCase3 ) */ /** - * @fn void T_case_body_TestCase4( void ) + * @fn void T_case_body_Tc4( void ) * * @brief Test case 4 brief description. * * Test case 4 description. */ -T_TEST_CASE( TestCase4 ) +T_TEST_CASE( Tc4 ) { /* Test case 4 epilogue code */ } @@ -1150,9 +1141,9 @@ void Action2_Run( int *a, int b, int *c ); #include /** - * @defgroup RTEMSTestCaseAction2 Action 2 + * @defgroup RTEMSTestCaseAction2 spec:/action2 * - * @ingroup RTEMSTestSuiteBlueGreen + * @ingroup RTEMSTestSuiteTs * * @brief Test Case * @@ -1162,7 +1153,7 @@ void Action2_Run( int *a, int b, int *c ); /* Context support code */ /** - * @brief Test context for Action 2 test case. + * @brief Test context for spec:/action2 test case. */ typedef struct { /** diff --git a/rtemsspec/validation.py b/rtemsspec/validation.py index 6f93b472..467a50b5 100644 --- a/rtemsspec/validation.py +++ b/rtemsspec/validation.py @@ -30,7 +30,7 @@ import os from typing import Any, Dict, List, NamedTuple, Optional, Tuple from rtemsspec.content import CContent, CInclude, enabled_by_to_exp, \ - ExpressionMapper + ExpressionMapper, to_camel_case from rtemsspec.items import Item, ItemCache, ItemGetValueContext, ItemMapper ItemMap = Dict[str, Item] @@ -39,7 +39,7 @@ ItemMap = Dict[str, Item] class _CodeMapper(ItemMapper): def get_value(self, ctx: ItemGetValueContext) -> Any: if ctx.type_path_key == "requirement/functional/action:/test-run": - return f"{ctx.item['test-name'].replace(' ', '')}_Run" + return f"{to_camel_case(ctx.item.uid[1:]).replace(' ', '')}_Run" raise KeyError @@ -73,9 +73,9 @@ class _TestItem: """ A test item with a defaul implementation for test cases. """ def __init__(self, item: Item): self._item = item - self._ident = self.name.replace(" ", "") - self._code_mapper = _CodeMapper(self._item) - self._text_mapper = _TextMapper(self._item) + self._ident = to_camel_case(item.uid[1:]) + self._code_mapper = _CodeMapper(item) + self._text_mapper = _TextMapper(item) def __getitem__(self, key: str): return self._item[key] @@ -98,7 +98,7 @@ class _TestItem: @property def name(self) -> str: """ Returns the name. """ - return self._item["name"] + return f"spec:{self._item.uid}" @property def includes(self) -> List[str]: @@ -264,10 +264,6 @@ class _TestDirectiveItem(_TestItem): (index, condition["name"]) for index, condition in enumerate(item["post-conditions"])) - @property - def name(self) -> str: - return self._item["test-name"] - @property def context(self) -> str: """ Returns the test case context type. """ diff --git a/spec/req/rtems/barrier/val/ident.yml b/spec/req/rtems/barrier/val/ident.yml index 0427764c..62a22eb9 100644 --- a/spec/req/rtems/barrier/val/ident.yml +++ b/spec/req/rtems/barrier/val/ident.yml @@ -23,7 +23,6 @@ links: uid: ../ident local-includes: - support-object-ident-local.h -name: Classic Barrier Ident prologue: | rtems_status_code sc; rtems_id id_local_object; diff --git a/spec/req/rtems/ident-local.yml b/spec/req/rtems/ident-local.yml index 146842e7..ce6923c4 100644 --- a/spec/req/rtems/ident-local.yml +++ b/spec/req/rtems/ident-local.yml @@ -128,7 +128,6 @@ test-header: test-includes: [] test-local-includes: - support-object-ident-local.h -test-name: Classic Object Local Ident test-prepare: null test-setup: null test-stop: null diff --git a/spec/req/rtems/ident.yml b/spec/req/rtems/ident.yml index 0ee60c8f..d612ce3b 100644 --- a/spec/req/rtems/ident.yml +++ b/spec/req/rtems/ident.yml @@ -189,7 +189,6 @@ test-header: test-includes: [] test-local-includes: - support-object-ident.h -test-name: Classic Object Ident test-prepare: null test-setup: null test-stop: null diff --git a/spec/req/rtems/message/val/ident.yml b/spec/req/rtems/message/val/ident.yml index 0390918f..d6fc54a7 100644 --- a/spec/req/rtems/message/val/ident.yml +++ b/spec/req/rtems/message/val/ident.yml @@ -23,7 +23,6 @@ links: uid: ../ident local-includes: - support-object-ident.h -name: Classic Message Ident prologue: | rtems_status_code sc; rtems_id id_local_object; diff --git a/spec/req/rtems/part/val/ident.yml b/spec/req/rtems/part/val/ident.yml index d3aea036..28c31859 100644 --- a/spec/req/rtems/part/val/ident.yml +++ b/spec/req/rtems/part/val/ident.yml @@ -23,7 +23,6 @@ links: uid: ../ident local-includes: - support-object-ident.h -name: Classic Part Ident prologue: | static long area[32]; rtems_status_code sc; diff --git a/spec/req/rtems/ratemon/val/ident.yml b/spec/req/rtems/ratemon/val/ident.yml index 4494ecbd..e8fa2198 100644 --- a/spec/req/rtems/ratemon/val/ident.yml +++ b/spec/req/rtems/ratemon/val/ident.yml @@ -23,7 +23,6 @@ links: uid: ../ident local-includes: - support-object-ident-local.h -name: Classic Ratemon Ident prologue: | rtems_status_code sc; rtems_id id_local_object; diff --git a/spec/req/rtems/sem/val/ident.yml b/spec/req/rtems/sem/val/ident.yml index b2b23584..7f0ded72 100644 --- a/spec/req/rtems/sem/val/ident.yml +++ b/spec/req/rtems/sem/val/ident.yml @@ -23,7 +23,6 @@ links: uid: ../ident local-includes: - support-object-ident.h -name: Classic Sem Ident prologue: | rtems_status_code sc; rtems_id id_local_object; diff --git a/spec/req/rtems/tasks/ident.yml b/spec/req/rtems/tasks/ident.yml index 27b80b60..b70b9e85 100644 --- a/spec/req/rtems/tasks/ident.yml +++ b/spec/req/rtems/tasks/ident.yml @@ -76,7 +76,6 @@ test-header: null test-includes: [] test-local-includes: - support-object-ident.h -test-name: Classic Task Ident test-prepare: null test-setup: brief: null diff --git a/spec/req/rtems/timer/val/ident.yml b/spec/req/rtems/timer/val/ident.yml index 86da8531..5c8264f9 100644 --- a/spec/req/rtems/timer/val/ident.yml +++ b/spec/req/rtems/timer/val/ident.yml @@ -23,7 +23,6 @@ links: uid: ../ident local-includes: - support-object-ident-local.h -name: Classic Timer Ident prologue: | rtems_status_code sc; rtems_id id_local_object; diff --git a/spec/req/rtems/userext/val/ident.yml b/spec/req/rtems/userext/val/ident.yml index 78544f2a..c125ab2f 100644 --- a/spec/req/rtems/userext/val/ident.yml +++ b/spec/req/rtems/userext/val/ident.yml @@ -23,7 +23,6 @@ links: uid: ../ident local-includes: - support-object-ident-local.h -name: Classic UserExt Ident prologue: | static const rtems_extensions_table table; rtems_status_code sc; diff --git a/spec/spec/requirement-action.yml b/spec/spec/requirement-action.yml index 184a7b06..1940ad51 100644 --- a/spec/spec/requirement-action.yml +++ b/spec/spec/requirement-action.yml @@ -98,7 +98,6 @@ spec-example: | test-header: null test-includes: [] test-local-includes: [] - test-name: RedGreenData test-prepare: null test-setup: null test-stop: null @@ -183,9 +182,6 @@ spec-info: description: | It shall be a list of header files included via ``#include "..."``. spec-type: list-str - test-name: - description: null - spec-type: test-name test-prepare: description: | If the value is present, then it shall be the early test preparation diff --git a/spec/spec/test-case.yml b/spec/spec/test-case.yml index 00773055..03260915 100644 --- a/spec/spec/test-case.yml +++ b/spec/spec/test-case.yml @@ -45,9 +45,6 @@ spec-info: description: | It shall be a list of header files included via ``#include "..."``. spec-type: list-str - name: - description: null - spec-type: test-name prologue: description: | If the value is present, then it shall be the test case prologue diff --git a/spec/spec/test-name.yml b/spec/spec/test-name.yml deleted file mode 100644 index e3302266..00000000 --- a/spec/spec/test-name.yml +++ /dev/null @@ -1,20 +0,0 @@ -SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause -copyrights: -- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -enabled-by: true -links: -- role: spec-member - uid: root -spec-description: null -spec-example: null -spec-info: - str: - assert: - - re: ^[A-Z][a-zA-Z0-9 _]+$ - description: | - It shall be the name of a test suite or test case. It shall be formatted - in the style of a caption. If shall form a valid C designator after - removal of all white space characters. -spec-name: Test Name -spec-type: test-name -type: spec diff --git a/spec/spec/test-suite.yml b/spec/spec/test-suite.yml index aed3a55b..35c99ff0 100644 --- a/spec/spec/test-suite.yml +++ b/spec/spec/test-suite.yml @@ -35,9 +35,6 @@ spec-info: description: | It shall be a list of header files included via ``#include "..."``. spec-type: list-str - name: - description: null - spec-type: test-name target: description: | It shall be the path to the generated target test suite source file. diff --git a/spec/testsuites/validation-0.yml b/spec/testsuites/validation-0.yml index 77c02aa4..e6a5d01f 100644 --- a/spec/testsuites/validation-0.yml +++ b/spec/testsuites/validation-0.yml @@ -116,6 +116,5 @@ includes: - rtems/sysinit.h links: [] local-includes: [] -name: Validation 0 target: testsuites/validation/ts-validation-0.c type: test-suite diff --git a/spec/testsuites/validation/c-library.yml b/spec/testsuites/validation/c-library.yml index 704541eb..24312218 100644 --- a/spec/testsuites/validation/c-library.yml +++ b/spec/testsuites/validation/c-library.yml @@ -68,7 +68,6 @@ includes: - rtems/malloc.h links: [] local-includes: [] -name: Space Profile C Library prologue: | void *p; int s; diff --git a/spec/testsuites/validation/classic-barrier.yml b/spec/testsuites/validation/classic-barrier.yml index 477cddeb..f4e5e44e 100644 --- a/spec/testsuites/validation/classic-barrier.yml +++ b/spec/testsuites/validation/classic-barrier.yml @@ -74,7 +74,6 @@ includes: - rtems.h links: [] local-includes: [] -name: Space Profile Classic Barriers prologue: | static const rtems_name name = rtems_build_name('B', 'A', 'R', 'R'); rtems_status_code sc; diff --git a/spec/testsuites/validation/profile.yml b/spec/testsuites/validation/profile.yml index 9967f865..b81556d0 100644 --- a/spec/testsuites/validation/profile.yml +++ b/spec/testsuites/validation/profile.yml @@ -153,6 +153,5 @@ includes: - rtems/score/sysstate.h links: [] local-includes: [] -name: Space Profile target: testsuites/validation/ts-space-profile.c type: test-suite -- cgit v1.2.3