1 files changed, 70 insertions, 4 deletions
diff --git a/testsuites/validation/tc-model-events-mgr.c b/testsuites/validation/tc-model-events-mgr.c
index a58ec6e8c8..08097467db 100755..100644
--- a/testsuites/validation/tc-model-events-mgr.c
+++ b/testsuites/validation/tc-model-events-mgr.c
@@ -104,9 +104,42 @@ static rtems_event_set GetPendingEvents( Thread_Control *thread )
 /**
  * @fn void T_case_body_RtemsEventValSendReceive( void )
  */
-T_TEST_CASE( RtemsModelEventsMgr )
+T_TEST_CASE( RtemsModelEventsMgr0 )
 {
-  RtemsModelEventsMgr_Run(
+  RtemsModelEventsMgr0_Run(
+    EventSend,
+    EventReceive,
+    GetPendingEvents,
+    THREAD_WAIT_CLASS_EVENT,
+    STATES_WAITING_FOR_EVENT
+  );
+}
+
+T_TEST_CASE( RtemsModelEventsMgr1 )
+{
+  RtemsModelEventsMgr1_Run(
+    EventSend,
+    EventReceive,
+    GetPendingEvents,
+    THREAD_WAIT_CLASS_EVENT,
+    STATES_WAITING_FOR_EVENT
+  );
+}
+
+T_TEST_CASE( RtemsModelEventsMgr2 )
+{
+  RtemsModelEventsMgr2_Run(
+    EventSend,
+    EventReceive,
+    GetPendingEvents,
+    THREAD_WAIT_CLASS_EVENT,
+    STATES_WAITING_FOR_EVENT
+  );
+}
+
+T_TEST_CASE( RtemsModelEventsMgr3 )
+{
+  RtemsModelEventsMgr3_Run(
     EventSend,
     EventReceive,
     GetPendingEvents,
@@ -168,9 +201,42 @@ static rtems_event_set GetPendingSystemEvents( Thread_Control *thread )
 /**
  * @fn void T_case_body_RtemsEventValSystemSendReceive( void )
  */
-T_TEST_CASE( RtemsModelSystemEventsMgr )
+T_TEST_CASE( RtemsModelSystemEventsMgr0 )
+{
+  RtemsModelEventsMgr0_Run(
+    EventSystemSend,
+    EventSystemReceive,
+    GetPendingSystemEvents,
+    THREAD_WAIT_CLASS_SYSTEM_EVENT,
+    STATES_WAITING_FOR_SYSTEM_EVENT
+  );
+}
+
+T_TEST_CASE( RtemsModelSystemEventsMgr1 )
+{
+  RtemsModelEventsMgr1_Run(
+    EventSystemSend,
+    EventSystemReceive,
+    GetPendingSystemEvents,
+    THREAD_WAIT_CLASS_SYSTEM_EVENT,
+    STATES_WAITING_FOR_SYSTEM_EVENT
+  );
+}
+
+T_TEST_CASE( RtemsModelSystemEventsMgr2 )
+{
+  RtemsModelEventsMgr2_Run(
+    EventSystemSend,
+    EventSystemReceive,
+    GetPendingSystemEvents,
+    THREAD_WAIT_CLASS_SYSTEM_EVENT,
+    STATES_WAITING_FOR_SYSTEM_EVENT
+  );
+}
+
+T_TEST_CASE( RtemsModelSystemEventsMgr3 )
 {
-  RtemsModelEventsMgr_Run(
+  RtemsModelEventsMgr3_Run(
     EventSystemSend,
     EventSystemReceive,
     GetPendingSystemEvents,