modellib and runtime.c updates for testing

Change-Id: Id4c29fa47b0f3c931f66e8521c1647ea9d113bbb

28 files changed, 116 insertions, 336 deletions

diff --git a/runtime/org.eclipse.etrice.modellib.c/model/Tests.room b/runtime/org.eclipse.etrice.modellib.c/model/Tests.room
index 387b3b477..d39ab3f3f 100644
--- a/runtime/org.eclipse.etrice.modellib.c/model/Tests.room
+++ b/runtime/org.eclipse.etrice.modellib.c/model/Tests.room
@@ -1,4 +1,4 @@
-RoomModel room.basic.etunit {
+RoomModel room.basic.test {
 	
 	import room.basic.service.timing.* from "TimingService.room"
 	import room.basic.types.* from "Types.room"	
@@ -14,169 +14,65 @@ RoomModel room.basic.etunit {
 		target = { SubSystemClass, ActorClass }
 	}
 
-	/**
-	 * Creates an etUnit test suite. Test cases can be added by creating added ActorRefs of type <i>TestSuiteActor</i>.
-	 */
-	abstract ActorClass TestSuiteActor {
+	ActorClass SequentialTestExecutor {
 		Interface {
-			SPP timer : PTimer
-			SPP tcLifecycle : PTestLifecycle
+			conjugated Port control[*]: PTestControl
+			
 		}
 		Structure {
-			LayerConnection relay_sap timer satisfied_by timingService.timer
-			LayerConnection relay_sap tcLifecycle satisfied_by lifecycleActor.fct
-			ActorRef timingService: ATimingService
-			ActorRef lifecycleActor : TestLifecycleActor
-		}
-		Behavior {
-			ctor {
-				"etUnit_open(\"log/testlog\", getTestSuiteName());"
-				"etUnit_openTestSuite(getTestSuiteName());"
-			}
-			dtor {
-				"etUnit_closeTestSuite();"
-				"etUnit_close();"
-			}
-			Operation getTestSuiteName() : string {
-				"return \"unnamedTestSuite\";"
+			usercode3 {
+				"#include \"etUnit/etUnit.h\""
 			}
-		}
-	}
-	
-	abstract async ActorClass TestCaseActor {
-		Structure {
-			Attribute tcTimeoutIgnore : boolean
-			Attribute tcCaseId : int32
-			SAP tcLifecycle : PTestLifecycle
-			SAP tcTimer : PTimer
+			external Port control	
+			Attribute next : int16
 		}
 		Behavior {
-			Operation getTestCaseName() : string {
-				"return \"unnamedTestCase\";"
-			}
-			Operation startTimeout(timeMs: uint32){
-				"tcTimeoutIgnore = ET_FALSE;"
-				"tcTimer.startTimeout(timeMs);"
-			}
-			Operation invalidateTimeout(){
-				"tcTimeoutIgnore = ET_TRUE;"
-			}
 			StateMachine {
-				Transition init: initial -> wait4Start {
-					action {
-						"invalidateTimeout();"
+				State execute {
+					entry 
+				
+				{
+						"if(next < self->constData->control.size){"
+						"\tcontrol[next++].start();"
+						"} else {"
+						"\tetUnit_testFinished(0);"
+						"}"
 					}
 				}
-				Transition trFinish: tpFinish of testing -> finish
-				Transition trTimeout: testing -> timeout {
-					triggers {
-						<timeout: tcTimer guard {
-							"!tcTimeoutIgnore"
-						}>
-					}
-					action {
-						"invalidateTimeout();"
+				Transition init0: initial -> execute
+			{
 					}
-				}
-				Transition tr0: wait4Start -> testing {
+				Transition tr0: execute -> execute {
 					triggers {
-						<startTestCase: tcLifecycle>
-					}
-				}
-				State testing {
-					subgraph {
-						ExitPoint tpFinish
-					}
-				}
-				State timeout {
-					entry {
-						"EXPECT_FALSE(tcCaseId, \"timeout\", ET_TRUE);"
-						"etUnit_closeTestCase(tcCaseId);"
-						"tcLifecycle.finishedTestCase();"
-					}
-				}
-				State finish {
-					entry {
-						"etUnit_closeTestCase(tcCaseId);"
-						"tcLifecycle.finishedTestCase();"
-					}
-				}
-				State wait4Start {
-					exit {
-						"tcCaseId = etUnit_openTestCase(getTestCaseName());"
+						<done: control>
 					}
 				}
 			}
 		}
 	}
 	
-	ActorClass TestLifecycleActor {
-		Interface {
-			SPP fct: PTestLifecycle
-		}
-		Structure {
-			ServiceImplementation of fct
-			Attribute entireTestTimeout : int32 = "5000"
-			Attribute sequentialExecution : boolean = "true"
-			Attribute tcCurrentIdx : int32 = "0"
-			SAP timer : PTimer
-		}
-		Behavior {
-			StateMachine {
-				Transition init: initial -> idle {
-					action {
-						"//printf(\"TestLifecycleActor (%s) starting with %d test cases\\n\", self->constData->instName, self->constData->fct.size);"
-						"if(self->constData->fct.size == 0)"
-						"\tetUnit_testFinished(-1);"
-						"else"
-						"\ttimer.startTimeout(entireTestTimeout);"
-						""
-						"if(!sequentialExecution)"
-						"\tfct.startTestCase();"
-					}
-				}
-				Transition tr1: idle -> cp cp0 {
-					triggers {
-						<finishedTestCase: fct>
-					}
-					action {
-						"tcCurrentIdx++;"
-					}
-				}
-				Transition tr2: idle -> terminate {
-					triggers {
-						<timeout: timer>
-					}
-				}
-				Transition tr3: cp cp0 -> idle
-				Transition tr4: cp cp0 -> terminate {
-					cond {
-						"tcCurrentIdx >= self->constData->fct.size"
-					}
-				}
-				ChoicePoint cp0
-				State idle {
-					entry {
-						"if(sequentialExecution)"
-						"\tfct[tcCurrentIdx].startTestCase();"
-					}
-				}
-				State terminate {
-					entry {
-						"etUnit_testFinished(-1);"
-					}
-				}
-			}
-		}
-	}
-
-	ProtocolClass PTestLifecycle {
+	ProtocolClass PTestControl {
 		incoming {
-			Message finishedTestCase()
+			/**
+			 *  Start test execution.
+			 */
+			Message start()
+			
+			/**
+			 *  Abort test execution.
+			 */
+			Message abort()
 		}
 		outgoing {
-			Message startTestCase()
+			/**
+			 *  Test execution finished or aborted.
+			 */
+			Message done(success : boolean)
 		}
+//		semantics {
+//			in:start -> out:done
+//			in:abort -> out:done
+//		}
 	}
 
 }
\ No newline at end of file
diff --git a/runtime/org.eclipse.etrice.modellib.cpp/model/Tests.room b/runtime/org.eclipse.etrice.modellib.cpp/model/Tests.room
index 48e49e03d..097b72e5e 100644
--- a/runtime/org.eclipse.etrice.modellib.cpp/model/Tests.room
+++ b/runtime/org.eclipse.etrice.modellib.cpp/model/Tests.room
@@ -1,10 +1,11 @@
-RoomModel room.basic.etunit {
-
-	import room.basic.types.* from "Types.room"
+RoomModel room.basic.test {
+	
+	import room.basic.service.timing.* from "TimingService.room"
+	import room.basic.types.* from "Types.room"	
 
 	/**
 	 * A SubSystemClass or ActorClass having this annotation is construed as an instance.<br>
-	 * During generation the necessary instantiation (LogicalSystem, SubSystemRef etc.) and mapping will be created.
+	 * During generation the necessary instantiation (LogicalSystem, SubSystemRef etc.) and mapping will be created. 
 	 * <p>
 	 * Must not have LogicalThreads. Globally only once allowed. Runtime execution on DefaultThread of given PhysicalSystem.
 	 * </p>
diff --git a/runtime/org.eclipse.etrice.modellib.java/model/Tests.room b/runtime/org.eclipse.etrice.modellib.java/model/Tests.room
index cb2097af7..097b72e5e 100644
--- a/runtime/org.eclipse.etrice.modellib.java/model/Tests.room
+++ b/runtime/org.eclipse.etrice.modellib.java/model/Tests.room
@@ -1,4 +1,4 @@
-RoomModel room.basic.etunit {
+RoomModel room.basic.test {
 	
 	import room.basic.service.timing.* from "TimingService.room"
 	import room.basic.types.* from "Types.room"	
@@ -14,169 +14,4 @@ RoomModel room.basic.etunit {
 		target = { SubSystemClass, ActorClass }
 	}
 
-	/**
-	 * Creates an etUnit test suite. Test cases can be added by creating instances of ActorClass <i>TestSuiteActor</i>.
-	 */
-	abstract ActorClass TestSuiteActor {
-		Interface {
-			SPP timer : PTimer
-			SPP tcLifecycle : PTestLifecycle
-		}
-		Structure {
-			LayerConnection relay_sap timer satisfied_by timingService.timer
-			LayerConnection relay_sap tcLifecycle satisfied_by lifecycleActor.fct
-			ActorRef timingService: ATimingService
-			ActorRef lifecycleActor : TestLifecycleActor
-		}
-		Behavior {
-			Operation getTestSuiteName() : string {
-				"return getName();"
-			}
-			ctor {
-				"etUnit_open(\"log/testlog\", getTestSuiteName());"
-				"etUnit_openTestSuite(getTestSuiteName());"
-			}
-			dtor {
-				"etUnit_closeTestSuite();"
-				"etUnit_close();"
-			}
-		}
-	}
-	
-	abstract async ActorClass TestCaseActor {
-		Structure {
-			Attribute tcTimeoutIgnore : boolean
-			Attribute tcCaseId : int32
-			SAP tcLifecycle : PTestLifecycle
-			SAP tcTimer : PTimer
-		}
-		Behavior {
-			Operation getTestCaseName() : string {
-				"return getName();"
-			}
-			Operation startTimeout(timeMs: int32){
-				"tcTimeoutIgnore = false;"
-				"tcTimer.startTimeout(timeMs);"
-			}
-			Operation invalidateTimeout(){
-				"tcTimeoutIgnore = true;"
-			}
-			StateMachine {
-				Transition init: initial -> wait4Start {
-					action {
-						"invalidateTimeout();"
-					}
-				}
-				Transition trFinish: tpFinish of testing -> finish
-				Transition trTimeout: testing -> timeout {
-					triggers {
-						<timeout: tcTimer guard {
-							"!tcTimeoutIgnore"
-						}>
-					}
-					action {
-						"invalidateTimeout();"
-					}
-				}
-				Transition tr0: wait4Start -> testing {
-					triggers {
-						<startTestCase: tcLifecycle>
-					}
-				}
-				State testing {
-					subgraph {
-						ExitPoint tpFinish
-					}
-				}
-				State timeout {
-					entry {
-						"EXPECT_FALSE(tcCaseId, \"timeout\", true);"
-						"etUnit_closeTestCase(tcCaseId);"
-						"tcLifecycle.finishedTestCase();"
-					}
-				}
-				State finish {
-					entry {
-						"etUnit_closeTestCase(tcCaseId);"
-						"tcLifecycle.finishedTestCase();"
-					}
-				}
-				State wait4Start {
-					exit {
-						"tcCaseId = etUnit_openTestCase(getTestCaseName());"
-					}
-				}
-			}
-		}
-	}
-	
-	ActorClass TestLifecycleActor {
-		Interface {
-			SPP fct: PTestLifecycle
-		}
-		Structure {
-			ServiceImplementation of fct
-			Attribute entireTestTimeout : int32 = "5000"
-			Attribute sequentialExecution : boolean = "true"
-			Attribute tcCurrentIdx : int32 = "0"
-			SAP timer : PTimer
-		}
-		Behavior {
-			StateMachine {
-				Transition init: initial -> idle {
-					action {
-						"//printf(\"TestLifecycleActor (%s) starting with %d test cases\\n\", getName(), fct.getReplication());"
-						"if(fct.getReplication() == 0)"
-						"\tetUnit_testFinished(-1);"
-						"else"
-						"\ttimer.startTimeout(entireTestTimeout);"
-						""
-						"if(!sequentialExecution)"
-						"\tfct.startTestCase();"
-					}
-				}
-				Transition tr1: idle -> cp cp0 {
-					triggers {
-						<finishedTestCase: fct>
-					}
-					action {
-						"tcCurrentIdx++;"
-					}
-				}
-				Transition tr2: idle -> terminate {
-					triggers {
-						<timeout: timer>
-					}
-				}
-				Transition tr3: cp cp0 -> idle
-				Transition tr4: cp cp0 -> terminate {
-					cond {
-						"tcCurrentIdx >= fct.getReplication()"
-					}
-				}
-				ChoicePoint cp0
-				State idle {
-					entry {
-						"if(sequentialExecution)"
-						"\tfct[tcCurrentIdx].startTestCase();"
-					}
-				}
-				State terminate {
-					entry {
-						"etUnit_testFinished(-1);"
-					}
-				}
-			}
-		}
-	}
-
-	ProtocolClass PTestLifecycle {
-		incoming {
-			Message finishedTestCase()
-		}
-		outgoing {
-			Message startTestCase()
-		}
-	}
-
 }
\ No newline at end of file
diff --git a/runtime/org.eclipse.etrice.runtime.c/src/common/etUnit/etUnit.c b/runtime/org.eclipse.etrice.runtime.c/src/common/etUnit/etUnit.c
index b90ac2af4..2dd752a55 100644
--- a/runtime/org.eclipse.etrice.runtime.c/src/common/etUnit/etUnit.c
+++ b/runtime/org.eclipse.etrice.runtime.c/src/common/etUnit/etUnit.c
@@ -21,6 +21,8 @@
 
 /*** member variables */
 
+static etInt16 etUnit_failedSuites = 0;
+
 /* file handling */
 static FILE* etUnit_reportfile = NULL;
 
@@ -131,6 +133,8 @@ void etUnit_close(void) {
 	else
 		etLogger_logErrorF("Error Counter: %ld", etUnit_errorCounter);
 	etLogger_logInfoF("************* TEST END **************");
+
+	etUnit_errorCounter = 0;
 }
 
 void etUnit_openTestSuite(const char* testSuiteName) {
@@ -140,6 +144,7 @@ void etUnit_openTestSuite(const char* testSuiteName) {
 }
 
 void etUnit_closeTestSuite(void) {
+	etUnit_failedSuites += (etUnit_isSuccessSuite()) ? 0 : 1;
 }
 
 etInt16 etUnit_openTestCase(const char* testCaseName) {
@@ -250,6 +255,16 @@ void expect_equal_void_ptr(etInt16 id, const char* message, const void* expected
 	}
 }
 
+void expectEqualStr(etInt16 id, const char* message, const char* expected, const char* actual, const char* file, int line) {
+	if (!(expected || actual || strcmp(expected, actual) == 0)) {
+		char testresult[ETUNIT_FAILURE_TEXT_LEN];
+		sprintf(testresult, "%s: expected=%s, actual=%s", message, expected, actual);
+		etUnit_handleExpect(id, ET_FALSE, testresult, expected, actual, file, line);
+	} else {
+		etUnit_handleExpect(id, ET_TRUE, "", NULL, NULL, file, line);
+	}
+}
+
 #ifdef ET_FLOAT32
 void expectEqualFloat32(etInt16 id, const char* message, etFloat32 expected, etFloat32 actual, etFloat32 precision, const char* file, int line) {
 	expect_equal_float(id, message, expected, actual, precision, file, line);
@@ -321,6 +336,14 @@ etBool etUnit_isSuccess(etInt16 id) {
 	return etUnit_testcaseSuccess[id];
 }
 
+etBool etUnit_isSuccessSuite() {
+	return etUnit_errorCounter == 0;
+}
+
+etBool etUnit_isSuccessAll() {
+	return etUnit_failedSuites == 0;
+}
+
 /* private functions */
 
 static void expect_equal_int(etInt16 id, const char* message, etInt32 expected, etInt32 actual, const char* file, int line) {
diff --git a/runtime/org.eclipse.etrice.runtime.c/src/common/etUnit/etUnit.h b/runtime/org.eclipse.etrice.runtime.c/src/common/etUnit/etUnit.h
index f891c37a5..b29080445 100644
--- a/runtime/org.eclipse.etrice.runtime.c/src/common/etUnit/etUnit.h
+++ b/runtime/org.eclipse.etrice.runtime.c/src/common/etUnit/etUnit.h
@@ -72,6 +72,14 @@ void etUnit_closeTestCase(etInt16 id);
  */
 etBool etUnit_isSuccess(etInt16 id);
 /**
+ * indicate success of current test suite
+ */
+etBool etUnit_isSuccessSuite();
+/**
+ * indicate success of all test suites
+ */
+etBool etUnit_isSuccessAll();
+/**
  * releases the \ref etRuntime_getTerminateSemaphore() and thus makes the program terminate
  *
  * \param id (unused)
@@ -153,6 +161,10 @@ void etUnit_closeAll(etInt16 id);
 #define EXPECT_EQUAL_PTR(id, msg, expected, actual) \
 	expect_equal_void_ptr(id, msg, (const void*) expected, (const void*) actual, __FILE__, __LINE__)
 
+/*
+ *  Strings
+ */
+#define EXPECT_EQUAL_STR(id, msg, expected, actual) expectEqualStr(id, msg, expected, actual, __FILE__, __LINE__)
 
 /*
  * more specialized functions
@@ -358,6 +370,19 @@ void expectRangeFloat64(etInt16 id, const char* message, etFloat64 min, etFloat6
  * \param line the line
  */
 void expect_equal_void_ptr(etInt16 id, const char* msg, const void* expected, const void* actual, const char* file, int line);
+
+/**
+ * reports an error if two strings aren't equal
+ *
+ * \param id the test case id
+ * \param msg the result message
+ * \param expected the expected value
+ * \param actual the actual value
+ * \param file the file name with the test case
+ * \param line the line
+ */
+void expectEqualStr(etInt16 id, const char* msg, const char* expected, const char* actual, const char* file, int line);
+
 /**
  * start of a comparison of an expected order. Initially with this method
  * a list of integers is passed. Later calls of \ref expectOrder(etInt16, const char* msg, etInt16, const char* int)
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/ActorCommunicationTest.room b/tests/org.eclipse.etrice.generator.common.tests/models/ActorCommunicationTest.room
index b0a6fd772..ff81f30e0 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/ActorCommunicationTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/ActorCommunicationTest.room
@@ -1,7 +1,7 @@
 RoomModel ActorCommunicationTest {
 
 	import room.basic.types.* from "Types.room"
-	import room.basic.etunit.* from "Tests.room"
+	import room.basic.test.* from "Tests.room"
 	import room.basic.service.timing.* from "TimingService.room"
 
 	SubSystemClass SubSystem_ActorCommunicationTest {
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTest.room b/tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTest.room
index 2e15cb4a6..3274047fe 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTest.room
@@ -1,6 +1,6 @@
 RoomModel ChoicePointTest {
 
-	import room.basic.etunit.* from "Tests.room"
+	import room.basic.test.* from "Tests.room"
 	import room.basic.types.* from "Types.room"
 
 	ActorClass CPTest_Top {
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTestExtended.room b/tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTestExtended.room
index 79cee74ab..fd23b8bde 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTestExtended.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTestExtended.room
@@ -1,6 +1,6 @@
 RoomModel ChoicePointTestExtended {
 
-	import room.basic.etunit.* from "Tests.room"
+	import room.basic.test.* from "Tests.room"
 	import room.basic.types.* from "Types.room"
 
 	SubSystemClass SubSystem_CPTestExtended {
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/CompileTests.room b/tests/org.eclipse.etrice.generator.common.tests/models/CompileTests.room
index 4c2c13dde..fe6547c4c 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/CompileTests.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/CompileTests.room
@@ -1,7 +1,7 @@
 RoomModel CompileTestsModel {
 
 	import room.basic.types.* from "Types.room"
-	import room.basic.etunit.* from "Tests.room"
+	import room.basic.test.* from "Tests.room"
 	import DetailExpressionTestModel.DetailExpressionTest from "DetailExpressionTest.room"
 	import StatemachineInterfaceTestModel.StatemachineInterfaceTest from "StatemachineInterfaceTest.room"
 	import StatemachineInterfaceTestInheritedModel.StatemachineInterfaceInheritedTest from "StatemachineInterfaceInheritedTest.room"
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/ContinuationTransitionTest.room b/tests/org.eclipse.etrice.generator.common.tests/models/ContinuationTransitionTest.room
index e8d4530e5..1b720c1be 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/ContinuationTransitionTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/ContinuationTransitionTest.room
@@ -1,7 +1,7 @@
 RoomModel ContinuationTransitionTest {
 	
 	import room.basic.types.* from "Types.room"
-	import room.basic.etunit.* from "Tests.room"
+	import room.basic.test.* from "Tests.room"
 	
 	ActorClass ContinuationTransitionTest {
 		Structure {
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/DataDrivenTest.room b/tests/org.eclipse.etrice.generator.common.tests/models/DataDrivenTest.room
index c72809a4c..2cd9b1aba 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/DataDrivenTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/DataDrivenTest.room
@@ -1,6 +1,6 @@
 RoomModel DataDrivenTest {
 	
-	import room.basic.etunit.* from "Tests.room"
+	import room.basic.test.* from "Tests.room"
 	import room.basic.types.* from "Types.room"
 	import room.basic.service.timing.* from "TimingService.room"
 	
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/DetailExpressionTest.room b/tests/org.eclipse.etrice.generator.common.tests/models/DetailExpressionTest.room
index 0330485c1..ad1887cd4 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/DetailExpressionTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/DetailExpressionTest.room
@@ -1,7 +1,7 @@
 RoomModel DetailExpressionTestModel {
 
 	import room.basic.types.* from "Types.room"
-	import room.basic.etunit.* from "Tests.room"
+	import room.basic.test.* from "Tests.room"
 	import room.basic.service.timing.* from "TimingService.room"
 
 	async ActorClass DetailExpressionTest {
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/EnumTest.room b/tests/org.eclipse.etrice.generator.common.tests/models/EnumTest.room
index cf2182da4..f8d9f6b22 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/EnumTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/EnumTest.room
@@ -1,6 +1,6 @@
 RoomModel EnumTest {
 
-	import room.basic.etunit.* from "Tests.room"
+	import room.basic.test.* from "Tests.room"
 	import room.basic.types.* from "Types.room"
 
 	ActorClass EnumTest_Top {
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/HandlerTest.room b/tests/org.eclipse.etrice.generator.common.tests/models/HandlerTest.room
index 9504063fc..3c4601bcd 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/HandlerTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/HandlerTest.room
@@ -1,7 +1,7 @@
 RoomModel HandlerTest {
 
 	import room.basic.types.* from "Types.room"
-	import room.basic.etunit.* from "Tests.room"
+	import room.basic.test.* from "Tests.room"
 
 
 	ActorClass HandlerTest_Top {
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/OperationInheritanceTest.room b/tests/org.eclipse.etrice.generator.common.tests/models/OperationInheritanceTest.room
index fc16aff7a..d59508a84 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/OperationInheritanceTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/OperationInheritanceTest.room
@@ -2,7 +2,7 @@ RoomModel OperationInheritanceTest {
 
 	import room.basic.types.* from "Types.room"
 
-	import room.basic.etunit.* from "Tests.room"
+	import room.basic.test.* from "Tests.room"
 
 	async ActorClass OperationInheritanceTest extends BaseActor {
 		@TestInstance
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/sendingData/SendingDataTestC.room b/tests/org.eclipse.etrice.generator.common.tests/models/sendingData/SendingDataTestC.room
index 82319d012..a44f54c1d 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/sendingData/SendingDataTestC.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/sendingData/SendingDataTestC.room
@@ -1,6 +1,6 @@
 RoomModel SendingDataTestC {
 
-	import room.basic.etunit.* from "../Tests.room"
+	import room.basic.test.* from "../Tests.room"
 	import room.basic.types.* from "../Types.room"
 	import room.basic.language.* from "../Language.room"
 
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/sendingData/SendingDataTestCpp.room b/tests/org.eclipse.etrice.generator.common.tests/models/sendingData/SendingDataTestCpp.room
index 28bd4cbdb..a7e4a9a12 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/sendingData/SendingDataTestCpp.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/sendingData/SendingDataTestCpp.room
@@ -1,6 +1,6 @@
 RoomModel SendingDataTestCpp {
 
-	import room.basic.etunit.* from "../Tests.room"
+	import room.basic.test.* from "../Tests.room"
 	import room.basic.types.* from "../Types.room"
 	import room.basic.language.* from "../Language.room"
 
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/sendingData/SendingDataTestJava.room b/tests/org.eclipse.etrice.generator.common.tests/models/sendingData/SendingDataTestJava.room
index c167289d1..aafe3bb69 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/sendingData/SendingDataTestJava.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/sendingData/SendingDataTestJava.room
@@ -1,6 +1,6 @@
 RoomModel SendingDataTestJava {
 
-	import room.basic.etunit.* from "../Tests.room"
+	import room.basic.test.* from "../Tests.room"
 	import room.basic.types.* from "../Types.room"
 	import room.basic.language.* from "../Language.room"
 
diff --git a/tests/org.eclipse.etrice.generator.cpp.tests/targetModels/InitializationTest.room b/tests/org.eclipse.etrice.generator.cpp.tests/targetModels/InitializationTest.room
index 5c4e8c8fa..05a85ba8f 100644
--- a/tests/org.eclipse.etrice.generator.cpp.tests/targetModels/InitializationTest.room
+++ b/tests/org.eclipse.etrice.generator.cpp.tests/targetModels/InitializationTest.room
@@ -2,7 +2,7 @@ RoomModel InitializationTest {
 
 	import room.basic.types.* from "Types.room"
 
-	import room.basic.etunit.* from "Tests.room"
+	import room.basic.test.* from "Tests.room"
 
 	async ActorClass InitializationTest {
 		@TestInstance
diff --git a/tests/org.eclipse.etrice.generator.java.tests/targetModels/DynamicActorTest1.room b/tests/org.eclipse.etrice.generator.java.tests/targetModels/DynamicActorTest1.room
index d9e35a4a9..65fccd5ca 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/targetModels/DynamicActorTest1.room
+++ b/tests/org.eclipse.etrice.generator.java.tests/targetModels/DynamicActorTest1.room
@@ -1,6 +1,6 @@
 RoomModel DynamicActorTest1 {
 	
-	import room.basic.etunit.* from "Tests.room"
+	import room.basic.test.* from "Tests.room"
 	import room.basic.types.* from "Types.room"
 	
 	LogicalSystem JavaGenTests {
diff --git a/tests/org.eclipse.etrice.generator.java.tests/targetModels/DynamicActorTest2.room b/tests/org.eclipse.etrice.generator.java.tests/targetModels/DynamicActorTest2.room
index 8534d3bba..e4c9a709c 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/targetModels/DynamicActorTest2.room
+++ b/tests/org.eclipse.etrice.generator.java.tests/targetModels/DynamicActorTest2.room
@@ -1,6 +1,6 @@
 RoomModel DynamicActorTest2 {
 	
-	import room.basic.etunit.* from "Tests.room"
+	import room.basic.test.* from "Tests.room"
 	import room.basic.types.* from "Types.room"
 	
 	LogicalSystem JavaGenTests {
diff --git a/tests/org.eclipse.etrice.generator.java.tests/targetModels/DynamicActorTest3.room b/tests/org.eclipse.etrice.generator.java.tests/targetModels/DynamicActorTest3.room
index 378289f7b..985383f18 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/targetModels/DynamicActorTest3.room
+++ b/tests/org.eclipse.etrice.generator.java.tests/targetModels/DynamicActorTest3.room
@@ -1,6 +1,6 @@
 RoomModel DynamicActorTest3 {
 	
-	import room.basic.etunit.* from "Tests.room"
+	import room.basic.test.* from "Tests.room"
 	import room.basic.types.* from "Types.room"
 	
 	ActorClass Appl {
diff --git a/tests/org.eclipse.etrice.generator.java.tests/targetModels/DynamicActorTest4.room b/tests/org.eclipse.etrice.generator.java.tests/targetModels/DynamicActorTest4.room
index 2026be062..c26a065a0 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/targetModels/DynamicActorTest4.room
+++ b/tests/org.eclipse.etrice.generator.java.tests/targetModels/DynamicActorTest4.room
@@ -1,6 +1,6 @@
 RoomModel DynamicActorTest4 {
 	
-	import room.basic.etunit.* from "Tests.room"
+	import room.basic.test.* from "Tests.room"
 	import room.basic.types.* from "Types.room"
 	
 	ActorClass Appl {
diff --git a/tests/org.eclipse.etrice.generator.java.tests/targetModels/DynamicActorTest5.room b/tests/org.eclipse.etrice.generator.java.tests/targetModels/DynamicActorTest5.room
index 023f3cf58..e2d22dbe6 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/targetModels/DynamicActorTest5.room
+++ b/tests/org.eclipse.etrice.generator.java.tests/targetModels/DynamicActorTest5.room
@@ -1,6 +1,6 @@
 RoomModel DynamicActorTest5 {
 	
-	import room.basic.etunit.* from "Tests.room"
+	import room.basic.test.* from "Tests.room"
 	import room.basic.types.* from "Types.room"
 	
 	ActorClass Appl {
diff --git a/tests/org.eclipse.etrice.generator.java.tests/targetModels/DynamicActorTest6.room b/tests/org.eclipse.etrice.generator.java.tests/targetModels/DynamicActorTest6.room
index 60e6b1088..2b4d94f18 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/targetModels/DynamicActorTest6.room
+++ b/tests/org.eclipse.etrice.generator.java.tests/targetModels/DynamicActorTest6.room
@@ -1,6 +1,6 @@
 RoomModel DynamicActorTest6 {
 	
-	import room.basic.etunit.* from "Tests.room"
+	import room.basic.test.* from "Tests.room"
 	import room.basic.types.* from "Types.room"
 	
 	ActorClass Appl {
diff --git a/tests/org.eclipse.etrice.generator.java.tests/targetModels/DynamicActorTest7.room b/tests/org.eclipse.etrice.generator.java.tests/targetModels/DynamicActorTest7.room
index 719bd8fd5..15630c617 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/targetModels/DynamicActorTest7.room
+++ b/tests/org.eclipse.etrice.generator.java.tests/targetModels/DynamicActorTest7.room
@@ -1,6 +1,6 @@
 RoomModel DynamicActorTest7 {
 
-	import room.basic.etunit.* from "Tests.room"
+	import room.basic.test.* from "Tests.room"
 	import room.basic.types.* from "Types.room"
 
 	LogicalSystem JavaGenTests {
diff --git a/tests/org.eclipse.etrice.generator.java.tests/targetModels/StoreRestore.room b/tests/org.eclipse.etrice.generator.java.tests/targetModels/StoreRestore.room
index d2bfb2c59..6c5a11105 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/targetModels/StoreRestore.room
+++ b/tests/org.eclipse.etrice.generator.java.tests/targetModels/StoreRestore.room
@@ -1,6 +1,6 @@
 RoomModel StoreRestore {
 
-	import room.basic.etunit.* from "Tests.room"
+	import room.basic.test.* from "Tests.room"
 
 	ActorClass StoreRestore_Top {
 		@TestInstance
diff --git a/tests/org.eclipse.etrice.generator.java.tests/targetModels/TCPTest.room b/tests/org.eclipse.etrice.generator.java.tests/targetModels/TCPTest.room
index 79e5c4a6a..d234bfe2b 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/targetModels/TCPTest.room
+++ b/tests/org.eclipse.etrice.generator.java.tests/targetModels/TCPTest.room
@@ -1,6 +1,6 @@
 RoomModel TCPTest {
 
-	import room.basic.etunit.* from "Tests.room"
+	import room.basic.test.* from "Tests.room"
 	import room.basic.types.* from "Types.room"
 	import room.basic.service.tcp.* from "TcpService.room"