bug: windows name mangling solved

TestScenarios/CMakeLists.txt

@@ -58,8 +58,12 @@ add_subdirectory(test-c/Test_Transition)
 add_subdirectory(test-c/Test_ShallowHistory)
 add_subdirectory(test-c/Test_LocalActions)
 
-#add_subdirectory(test-c/TimingTest_ParallelRegions)
-add_subdirectory(test-cppwrapper/InterfaceTest)
+if (CMAKE_COMPILER_IS_GNUCC)
+
+add_subdirectory(test-c/TimingTest_ParallelRegions)
 
+endif (CMAKE_COMPILER_IS_GNUCC)
+
+add_subdirectory(test-cppwrapper/InterfaceTest)
 
 endif (COMPILE_SINGLETON)

TestScenarios/test-c/InterfaceTest/main.c

@@ -59,7 +59,7 @@ int test_default_interface_good()
 	assert( strcmp(stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)], "State1") == 0);
 
 	/*@Desc: raise event1 on default interface */
-	interfaceTest_if_raise_event1(&machine.interface);
+	interfaceTest_if_raise_event1(&machine.iface);
 
 	/*@DescInfo: Initial value for the guard is 2.3, which is bigger than 0, so the transition should be taken */
 
@@ -71,13 +71,13 @@ int test_default_interface_good()
 	assert( strcmp(stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)], "State2") == 0);
 
 	/*@Desc: check if the entry event2 is raised */
-	assert( interfaceTest_if_is_event2_raised(&machine.interface, &retval) == bool_true );
+	assert( interfaceTest_if_is_event2_raised(&machine.iface, &retval) == bool_true );
 
 	/*@Desc: check if the return value of event2 is set to 22 */
 	assert( retval == 22 );
 
 	/*@Desc: raise event1 on default interface */
-	interfaceTest_if_raise_event1(&machine.interface);
+	interfaceTest_if_raise_event1(&machine.iface);
 
 	/*@Desc: run an explicit cycle */
 	interfaceTestStatemachine_runCycle(&machine);
@@ -87,7 +87,7 @@ int test_default_interface_good()
 	assert( strcmp(stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)], "State1") == 0);
 
 	/*@Desc: check whether event2 is not raised any more */
-	assert( interfaceTest_if_is_event2_raised(&machine.interface, &retval) == bool_false );
+	assert( interfaceTest_if_is_event2_raised(&machine.iface, &retval) == bool_false );
 
 	/*@Desc: teardown statemachine */
 	teardownStatemachine(&machine, &dummyTimer, &eventPool);
@@ -112,10 +112,10 @@ int test_default_interface_bad()
 	assert( strcmp(stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)], "State1") == 0);
 
 	/*@Desc: set variable var2 to -12.6 */
-	interfaceTest_if_set_var2(&machine.interface, -12.6);
+	interfaceTest_if_set_var2(&machine.iface, -12.6);
 
 	/*@Desc: raise event1 on default interface */
-	interfaceTest_if_raise_event1(&machine.interface);
+	interfaceTest_if_raise_event1(&machine.iface);
 
 	/*@DescInfo: Transition should not be taken, as guard with var2 is less than 0 */
 
@@ -127,16 +127,16 @@ int test_default_interface_bad()
 	assert( strcmp(stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)], "State1") == 0);
 
 	/*@Desc: check if the entry event2 is NOT raised */
-	assert( interfaceTest_if_is_event2_raised(&machine.interface, &retval) == bool_false );
+	assert( interfaceTest_if_is_event2_raised(&machine.iface, &retval) == bool_false );
 
 	/*@Desc: check if the original retval has not been changed */
 	assert( retval == 55 );
 
 	/*@Desc: raise event1 on default interface */
-	interfaceTest_if_raise_event1(&machine.interface);
+	interfaceTest_if_raise_event1(&machine.iface);
 
 	/*@Desc: set variable var2 to 213.55 (>0) */
-	interfaceTest_if_set_var2(&machine.interface, 213.55);
+	interfaceTest_if_set_var2(&machine.iface, 213.55);
 
 	/*@Desc: run an explicit cycle */
 	interfaceTestStatemachine_runCycle(&machine);
@@ -146,7 +146,7 @@ int test_default_interface_bad()
 	assert( strcmp(stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)], "State2") == 0);
 
 	/*@Desc: check whether event2 is raised */
-	assert( interfaceTest_if_is_event2_raised(&machine.interface, &retval) == bool_true );
+	assert( interfaceTest_if_is_event2_raised(&machine.iface, &retval) == bool_true );
 
 	/*@Desc: teardown statemachine */
 	teardownStatemachine(&machine, &dummyTimer, &eventPool);
@@ -169,7 +169,7 @@ int test_other_interface_good()
 	assert( strcmp(stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)], "State1") == 0);
 
 	/*@Desc: raise event3 on other interface */
-	interfaceTest_if_other_raise_event3(&machine.interfaceOther);
+	interfaceTest_if_other_raise_event3(&machine.ifaceOther);
 
 	/*@DescInfo: Initial value for the guard is var3 == 1, which is the initial value, so the transition should be taken */
 
@@ -181,10 +181,10 @@ int test_other_interface_good()
 	assert( strcmp(stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)], "State3") == 0);
 
 	/*@Desc: check if the entry event4 is raised */
-	assert( interfaceTest_if_other_is_event4_raised(&machine.interfaceOther) == bool_true );
+	assert( interfaceTest_if_other_is_event4_raised(&machine.ifaceOther) == bool_true );
 
 	/*@Desc: raise event3 on other interface */
-	interfaceTest_if_other_raise_event3(&machine.interfaceOther);
+	interfaceTest_if_other_raise_event3(&machine.ifaceOther);
 
 	/*@Desc: run an explicit cycle */
 	interfaceTestStatemachine_runCycle(&machine);
@@ -194,7 +194,7 @@ int test_other_interface_good()
 	assert( strcmp(stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)], "State1") == 0);
 
 	/*@Desc: check whether event4 is not raised any more */
-	assert( interfaceTest_if_other_is_event4_raised(&machine.interfaceOther) == bool_false );
+	assert( interfaceTest_if_other_is_event4_raised(&machine.ifaceOther) == bool_false );
 
 	/*@Desc: teardown statemachine */
 	teardownStatemachine(&machine, &dummyTimer, &eventPool);
@@ -218,10 +218,10 @@ int test_other_interface_bad()
 	assert( strcmp(stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)], "State1") == 0);
 
 	/*@Desc: set variable var3 to 2 in default interface */
-	interfaceTest_if_set_var3(&machine.interface, 2);
+	interfaceTest_if_set_var3(&machine.iface, 2);
 
 	/*@Desc: raise event1 on other interface */
-	interfaceTest_if_other_raise_event3(&machine.interfaceOther);
+	interfaceTest_if_other_raise_event3(&machine.ifaceOther);
 
 	/*@DescInfo: Transition should not be taken, as guard with var3 is not equal 1 */
 
@@ -233,13 +233,13 @@ int test_other_interface_bad()
 	assert( strcmp(stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)], "State1") == 0);
 
 	/*@Desc: check if the entry event2 is NOT raised */
-	assert( interfaceTest_if_other_is_event4_raised(&machine.interfaceOther) == bool_false );
+	assert( interfaceTest_if_other_is_event4_raised(&machine.ifaceOther) == bool_false );
 
 	/*@Desc: raise event1 on other interface */
-	interfaceTest_if_other_raise_event3(&machine.interfaceOther);
+	interfaceTest_if_other_raise_event3(&machine.ifaceOther);
 
 	/*@Desc: set variable var3 to 1 */
-	interfaceTest_if_set_var3(&machine.interface, 1);
+	interfaceTest_if_set_var3(&machine.iface, 1);
 
 	/*@Desc: run an explicit cycle */
 	interfaceTestStatemachine_runCycle(&machine);
@@ -249,7 +249,7 @@ int test_other_interface_bad()
 	assert( strcmp(stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)], "State3") == 0);
 
 	/*@Desc: check whether event2 is raised */
-	assert( interfaceTest_if_other_is_event4_raised(&machine.interfaceOther) == bool_true );
+	assert( interfaceTest_if_other_is_event4_raised(&machine.ifaceOther) == bool_true );
 
 	/*@Desc: teardown statemachine */
 	teardownStatemachine(&machine, &dummyTimer, &eventPool);
@@ -263,7 +263,7 @@ int test_third_interface_good()
 	InterfaceTestStatemachine machine;
 	Timer dummyTimer;
 	EventPool eventPool;
-	boolean retVal = bool_false;
+	sc_boolean retVal = bool_false;
 
 	/*@Desc: setup initial statemachine */
 	setupStatemachine(&machine, &dummyTimer, &eventPool);
@@ -273,10 +273,10 @@ int test_third_interface_good()
 	assert( strcmp(stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)], "State1") == 0);
 
 	/*@Desc: raise event5 on other interface */
-	interfaceTest_if_third_raise_event5(&machine.interfaceThird);
+	interfaceTest_if_third_raise_event5(&machine.ifaceThird);
 
 	/*@Desc: set var1 to true */
-	interfaceTest_if_set_var1(&machine.interface, bool_true);
+	interfaceTest_if_set_var1(&machine.iface, bool_true);
 
 	/*@Desc: run an explicit cycle */
 	interfaceTestStatemachine_runCycle(&machine);
@@ -286,13 +286,13 @@ int test_third_interface_good()
 	assert( strcmp(stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)], "State4") == 0);
 
 	/*@Desc: check if the entry event4 is raised */
-	assert( interfaceTest_if_third_is_event6_raised(&machine.interfaceThird, &retVal) == bool_true );
+	assert( interfaceTest_if_third_is_event6_raised(&machine.ifaceThird, &retVal) == bool_true );
 
 	/*@Desc: check whether returned event6 value is set to true */
 	assert( retVal == bool_true );
 
 	/*@Desc: raise event5 on other interface */
-	interfaceTest_if_third_raise_event5(&machine.interfaceThird);
+	interfaceTest_if_third_raise_event5(&machine.ifaceThird);
 
 	/*@Desc: set retValue to false */
 	retVal = bool_false;
@@ -305,7 +305,7 @@ int test_third_interface_good()
 	assert( strcmp(stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)], "State1") == 0);
 
 	/*@Desc: check whether event4 is not raised any more */
-	assert( interfaceTest_if_third_is_event6_raised(&machine.interfaceThird, &retVal) == bool_false );
+	assert( interfaceTest_if_third_is_event6_raised(&machine.ifaceThird, &retVal) == bool_false );
 
 	/*@Desc: check whether returned event6 value is set to false */
 	assert( retVal == bool_false );
@@ -323,7 +323,7 @@ int test_third_interface_bad()
 	Timer dummyTimer;
 	EventPool eventPool;
 
-	boolean retVal = bool_false;
+	sc_boolean retVal = bool_false;
 
 	/*@Desc: setup initial statemachine */
 	setupStatemachine(&machine, &dummyTimer, &eventPool);
@@ -333,10 +333,10 @@ int test_third_interface_bad()
 	assert( strcmp(stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)], "State1") == 0);
 
 	/*@Desc: set variable var1 to false in default interface */
-	interfaceTest_if_set_var1(&machine.interface, bool_false);
+	interfaceTest_if_set_var1(&machine.iface, bool_false);
 
 	/*@Desc: raise event1 on third interface */
-	interfaceTest_if_third_raise_event5(&machine.interfaceThird);
+	interfaceTest_if_third_raise_event5(&machine.ifaceThird);
 
 	/*@DescInfo: Transition should not be taken, as guard with var3 is not equal 1 */
 
@@ -348,13 +348,13 @@ int test_third_interface_bad()
 	assert( strcmp(stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)], "State1") == 0);
 
 	/*@Desc: check if the entry event2 is NOT raised */
-	assert( interfaceTest_if_third_is_event6_raised(&machine.interfaceThird, &retVal) == bool_false );
+	assert( interfaceTest_if_third_is_event6_raised(&machine.ifaceThird, &retVal) == bool_false );
 
 	/*@Desc: raise event5 on third interface */
-	interfaceTest_if_third_raise_event5(&machine.interfaceThird);
+	interfaceTest_if_third_raise_event5(&machine.ifaceThird);
 
 	/*@Desc: set variable var1 to true on default interface */
-	interfaceTest_if_set_var1(&machine.interface, bool_true);
+	interfaceTest_if_set_var1(&machine.iface, bool_true);
 
 	/*@Desc: run an explicit cycle */
 	interfaceTestStatemachine_runCycle(&machine);
@@ -364,7 +364,7 @@ int test_third_interface_bad()
 	assert( strcmp(stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)], "State4") == 0);
 
 	/*@Desc: check whether event2 is raised */
-	assert( interfaceTest_if_third_is_event6_raised(&machine.interfaceThird, &retVal) == bool_true );
+	assert( interfaceTest_if_third_is_event6_raised(&machine.ifaceThird, &retVal) == bool_true );
 
 	/*@Desc: check whether returned event6 value is set to true */
 	assert( retVal == bool_true );
@@ -389,63 +389,63 @@ int test_namespaces()
 	assert( strcmp(stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)], "State1") == 0);
 
 	/*@Desc: check correct initialization of variable v1 */
-	assert( interfaceTest_if_other_get_v1(&machine.interfaceOther) == 5 );
+	assert( interfaceTest_if_other_get_v1(&machine.ifaceOther) == 5 );
 
 	/*@Desc: set third interface variable v1 to 52.83 */
-	interfaceTest_if_third_set_v1( &machine.interfaceThird, 52.83 );
+	interfaceTest_if_third_set_v1( &machine.ifaceThird, 52.83 );
 
 	/*@Desc: set other interface variable to 8877 */
-	interfaceTest_if_other_set_v1( &machine.interfaceOther, 8877 );
+	interfaceTest_if_other_set_v1( &machine.ifaceOther, 8877 );
 
 	/*@DescInfo: toogle through all states */
 
 	/*@Desc: raise event1 on default event */
-	interfaceTest_if_raise_event1( &machine.interface);
+	interfaceTest_if_raise_event1( &machine.iface);
 
 	/*@Desc: run an explicit cycle */
 	interfaceTestStatemachine_runCycle(&machine);
 
 	/*@Desc: raise event1 on default event */
-	interfaceTest_if_raise_event1( &machine.interface);
+	interfaceTest_if_raise_event1( &machine.iface);
 
 	/*@Desc: run an explicit cycle */
 	interfaceTestStatemachine_runCycle(&machine);
 
 	/*@Desc: raise event3 on default event */
-	interfaceTest_if_other_raise_event3( &machine.interfaceOther);
+	interfaceTest_if_other_raise_event3( &machine.ifaceOther);
 
 	/*@Desc: run an explicit cycle */
 	interfaceTestStatemachine_runCycle(&machine);
 
 	/*@Desc: raise event3 on default event */
-	interfaceTest_if_other_raise_event3( &machine.interfaceOther);
+	interfaceTest_if_other_raise_event3( &machine.ifaceOther);
 
 	/*@Desc: run an explicit cycle */
 	interfaceTestStatemachine_runCycle(&machine);
 
 	/*@Desc: set var1 of default interface to true */
-	interfaceTest_if_set_var1( &machine.interface, bool_true);
+	interfaceTest_if_set_var1( &machine.iface, bool_true);
 
 	/*@Desc: raise event5 on default event */
-	interfaceTest_if_third_raise_event5( &machine.interfaceThird);
+	interfaceTest_if_third_raise_event5( &machine.ifaceThird);
 
 	/*@Desc: run an explicit cycle */
 	interfaceTestStatemachine_runCycle(&machine);
 
 	/*@Desc: raise event5 on default event */
-	interfaceTest_if_third_raise_event5( &machine.interfaceThird);
+	interfaceTest_if_third_raise_event5( &machine.ifaceThird);
 
 	/*@Desc: run an explicit cycle */
 	interfaceTestStatemachine_runCycle(&machine);
 
-	printf ("%f", interfaceTest_if_third_get_v1(&machine.interfaceThird));
+	printf ("%f", interfaceTest_if_third_get_v1(&machine.ifaceThird));
 
 	/*@Desc: check if v1 of third interface is still 52.83 */
-	assert( interfaceTest_if_third_get_v1(&machine.interfaceThird) > 52.82 &&
-			interfaceTest_if_third_get_v1(&machine.interfaceThird) < 52.84 );
+	assert( interfaceTest_if_third_get_v1(&machine.ifaceThird) > 52.82 &&
+			interfaceTest_if_third_get_v1(&machine.ifaceThird) < 52.84 );
 
 	/*@Desc: check if v1 of other interface is still 8877 */
-	assert( interfaceTest_if_other_get_v1(&machine.interfaceOther) == 8877 );
+	assert( interfaceTest_if_other_get_v1(&machine.ifaceOther) == 8877 );
 
 	/*@Desc: teardown statemachine */
 	teardownStatemachine(&machine, &dummyTimer, &eventPool);

TestScenarios/test-c/Test_Expression/main.c

@@ -61,23 +61,23 @@ int test_initialization_and_first_entry()
 	setupStatemachine(&machine, &dummyTimer, &eventPool);
 
 	/*@Desc: check whether var1 from default interface is initially set to 6 */
-	assert( test_Expression_if_get_var1(&machine.interface) == 6);
+	assert( test_Expression_if_get_var1(&machine.iface) == 6);
 
 	/*@Desc: check whether var2 from default is initially set to 123 */
-	assert( test_Expression_if_get_var2(&machine.interface) == 123);
+	assert( test_Expression_if_get_var2(&machine.iface) == 123);
 
 	/*@Desc: check, wether var3 from default interface is set correct after state1 entry */
-	printf("Var3 is set to %f\n", test_Expression_if_get_var3(&machine.interface));
-	assert( (test_Expression_if_get_var3(&machine.interface) > testvalue1l) &&
-			(test_Expression_if_get_var3(&machine.interface) < testvalue1u) );
+	printf("Var3 is set to %f\n", test_Expression_if_get_var3(&machine.iface));
+	assert( (test_Expression_if_get_var3(&machine.iface) > testvalue1l) &&
+			(test_Expression_if_get_var3(&machine.iface) < testvalue1u) );
 
 	/*@Desc: check, whether var4 from default interface is between 43.3 and 43.5 */
-	printf("Var4 is set to %f\n", test_Expression_if_get_var4(&machine.interface));
-	assert( (test_Expression_if_get_var4(&machine.interface) > 43.2) &&
-			(test_Expression_if_get_var4(&machine.interface) < 43.4) );
+	printf("Var4 is set to %f\n", test_Expression_if_get_var4(&machine.iface));
+	assert( (test_Expression_if_get_var4(&machine.iface) > 43.2) &&
+			(test_Expression_if_get_var4(&machine.iface) < 43.4) );
 
 	/*@Desc: check whether var5 from default interface is initially set to false */
-	assert( test_Expression_if_get_var5(&machine.interface) == bool_false);
+	assert( test_Expression_if_get_var5(&machine.iface) == bool_false);
 
 	/*@Desc: teardown statemachine */
 	teardownStatemachine(&machine, &dummyTimer, &eventPool);
@@ -102,7 +102,7 @@ int test_default_other_var1()
 	setupStatemachine(&machine, &dummyTimer, &eventPool);
 
 	/*@Desc: check initial value for var1 ( == 6) */
-	assert( test_Expression_if_get_var1(&machine.interface) == 6 );
+	assert( test_Expression_if_get_var1(&machine.iface) == 6 );
 
 	/*@Desc: run an explicit cycle - without any waiting event */
 	test_ExpressionStatemachine_runCycle(&machine);
@@ -112,13 +112,13 @@ int test_default_other_var1()
 	assert( strcmp(stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)], "State1") == 0);
 
 	/*@Desc: check value for var1 after state1 entry / var1 is not changed during entry into state1 */
-	assert( test_Expression_if_get_var1(&machine.interface) == 6 );
+	assert( test_Expression_if_get_var1(&machine.iface) == 6 );
 
 	/*@Desc: raise event1 on default interface with value 5 (actually unused) */
-	test_Expression_if_raise_event1(&machine.interface, 5);
+	test_Expression_if_raise_event1(&machine.iface, 5);
 
 	/*@Desc: set other.var1 to "true" to let transition take place */
-	test_Expression_if_other_set_var1(&machine.interfaceOther, bool_true);
+	test_Expression_if_other_set_var1(&machine.ifaceOther, bool_true);
 
 	/*@Desc: run an explicit cycle */
 	test_ExpressionStatemachine_runCycle(&machine);
@@ -128,10 +128,10 @@ int test_default_other_var1()
 	assert( strcmp(stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)], "State2") == 0);
 
 	/*@Desc: check whether the transition action was executed */
-	assert( test_Expression_if_other_get_var1(&machine.interfaceOther) == bool_false);
+	assert( test_Expression_if_other_get_var1(&machine.ifaceOther) == bool_false);
 
 	/*@Desc: check whether var1 has been increased by 1 (==7) */
-	assert( test_Expression_if_get_var1(&machine.interface) == 7 );
+	assert( test_Expression_if_get_var1(&machine.iface) == 7 );
 
 	/*@Desc: run an explicit cycle */
 	test_ExpressionStatemachine_runCycle(&machine);
@@ -162,12 +162,12 @@ int test_default_other_var2_var3()
 	setupStatemachine(&machine, &dummyTimer, &eventPool);
 
 	/*@Desc: check initial value for var2 ( == 123) */
-	assert( test_Expression_if_get_var2(&machine.interface) == 123 );
+	assert( test_Expression_if_get_var2(&machine.iface) == 123 );
 
 	/*@Desc: check initial value for var3 (19.4) */
-	printf("Var3 is set to %f\n", test_Expression_if_get_var3(&machine.interface));
-	assert( (test_Expression_if_get_var3(&machine.interface) > testvalue1l) &&
-			(test_Expression_if_get_var3(&machine.interface) < testvalue1u));
+	printf("Var3 is set to %f\n", test_Expression_if_get_var3(&machine.iface));
+	assert( (test_Expression_if_get_var3(&machine.iface) > testvalue1l) &&
+			(test_Expression_if_get_var3(&machine.iface) < testvalue1u));
 
 	/*@Desc: run an explicit cycle - without any waiting event */
 	test_ExpressionStatemachine_runCycle(&machine);
@@ -177,7 +177,7 @@ int test_default_other_var2_var3()
 	assert( strcmp(stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)], "State1") == 0);
 
 	/*@Desc: raise event1 on default interface with value 5 (actually unused) */
-	test_Expression_if_raise_event1(&machine.interface, 5);
+	test_Expression_if_raise_event1(&machine.iface, 5);
 
 	/*@Desc: run an explicit cycle - without any waiting event */
 	test_ExpressionStatemachine_runCycle(&machine);
@@ -188,25 +188,25 @@ int test_default_other_var2_var3()
 
 
 	/*@Desc: check, wether var3 on default interface is set correct after state1 entry */
-	assert( test_Expression_if_get_var2(&machine.interface) == 1 );
+	assert( test_Expression_if_get_var2(&machine.iface) == 1 );
 
 	/*@Desc: set var5 to "false" to let transition take place */
-	test_Expression_if_set_var5(&machine.interface, bool_false);
+	test_Expression_if_set_var5(&machine.iface, bool_false);
 
 	/*@Desc: raise event1 on default interface with value 5 (actually unused) */
-	test_Expression_if_raise_event1(&machine.interface, 5);
+	test_Expression_if_raise_event1(&machine.iface, 5);
 
 	/*@Desc: check the initial state */
 	printf("%s\n", stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)]);
 	assert( strcmp(stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)], "State2") == 0);
 
 	/*@Desc: check, wether var3 on default interface is set correct after entry */
-	printf("Var3 is set to %f\n", test_Expression_if_get_var3(&machine.interface));
-	assert( (test_Expression_if_get_var3(&machine.interface) > testvalue2l) &&
-			(test_Expression_if_get_var3(&machine.interface) < testvalue2u) );
+	printf("Var3 is set to %f\n", test_Expression_if_get_var3(&machine.iface));
+	assert( (test_Expression_if_get_var3(&machine.iface) > testvalue2l) &&
+			(test_Expression_if_get_var3(&machine.iface) < testvalue2u) );
 
 	/*@Desc: set event1 with variable 5 (acutally unused) */
-	test_Expression_if_raise_event1(&machine.interface, 5);
+	test_Expression_if_raise_event1(&machine.iface, 5);
 
 	/*@Desc: run an explicit cycle */
 	test_ExpressionStatemachine_runCycle(&machine);
@@ -236,28 +236,28 @@ int test_onCycle()
 	test_ExpressionStatemachine_runCycle(&machine);
 
 	/*@Desc: raise event1 on default interface with value 5 (actually unused) */
-	test_Expression_if_raise_event1(&machine.interface, 5);
+	test_Expression_if_raise_event1(&machine.iface, 5);
 
 	/*@Desc: set other.var1 to "true" to let transition take place */
-	test_Expression_if_other_set_var1(&machine.interfaceOther, bool_true);
+	test_Expression_if_other_set_var1(&machine.ifaceOther, bool_true);
 
 	/*@Desc: run an explicit cycle */
 	test_ExpressionStatemachine_runCycle(&machine);
 
 	/*@Desc: check whether var1 has been increased by one (==7) */
-	assert( test_Expression_if_get_var1(&machine.interface) == 7 );
+	assert( test_Expression_if_get_var1(&machine.iface) == 7 );
 
 	/*@Desc: run an explicit cycle - without any change */
 	test_ExpressionStatemachine_runCycle(&machine);
 
 	/*@Desc: check whether var1 has been increased by 1 on onCycle (==8) */
-	assert( test_Expression_if_get_var1(&machine.interface) == 8 );
+	assert( test_Expression_if_get_var1(&machine.iface) == 8 );
 
 	/*@Desc: run an explicit cycle - without any change */
 	test_ExpressionStatemachine_runCycle(&machine);
 
 	/*@Desc: check whether var1 has been increased by 1 on onCycle (==9) */
-	assert( test_Expression_if_get_var1(&machine.interface) == 9 );
+	assert( test_Expression_if_get_var1(&machine.iface) == 9 );
 
 	/*@Desc: teardown statemachine */
 	teardownStatemachine(&machine, &dummyTimer, &eventPool);

TestScenarios/test-c/Test_Hierarchy/main.c

@@ -84,7 +84,7 @@ int test_state9_state10_transition()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State9") == 0);
 
 	/*@Desc: check whether s1 is set to 2 as State 9 is in second hierarchy level */
-	assert( test_Hierarchy_if_get_s1(&machine.interface) == 2 );
+	assert( test_Hierarchy_if_get_s1(&machine.iface) == 2 );
 
 	/*@Desc: run the statechart for the first time (just as dummy) */
 	test_HierarchyStatemachine_runCycle(&machine);
@@ -94,10 +94,10 @@ int test_state9_state10_transition()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State9") == 0);
 
 	/*@Desc: check whether s1 is set to 2 as State 9 is in second hierarchy level */
-	assert( test_Hierarchy_if_get_s1(&machine.interface) == 2 );
+	assert( test_Hierarchy_if_get_s1(&machine.iface) == 2 );
 
 	/*@Desc: raise event9 on default interface */
-	test_Hierarchy_if_raise_event9(&machine.interface);
+	test_Hierarchy_if_raise_event9(&machine.iface);
 
 	/*@Desc: run the statechart to trigger state change */
 	test_HierarchyStatemachine_runCycle(&machine);
@@ -107,10 +107,10 @@ int test_state9_state10_transition()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State10") == 0);
 
 	/*@Desc: check whether s1 is set to 2 as State 9 is in second hierarchy level */
-	assert( test_Hierarchy_if_get_s1(&machine.interface) == 2 );
+	assert( test_Hierarchy_if_get_s1(&machine.iface) == 2 );
 
 	/*@Desc: raise event10 on default interface */
-	test_Hierarchy_if_raise_event10(&machine.interface);
+	test_Hierarchy_if_raise_event10(&machine.iface);
 
 	/*@Desc: run the statechart to trigger state change */
 	test_HierarchyStatemachine_runCycle(&machine);
@@ -120,7 +120,7 @@ int test_state9_state10_transition()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State9") == 0);
 
 	/*@Desc: check whether s1 is set to 2 as State 9 is in second hierarchy level */
-	assert( test_Hierarchy_if_get_s1(&machine.interface) == 2 );
+	assert( test_Hierarchy_if_get_s1(&machine.iface) == 2 );
 
 	/*@Desc: teardown statemachine */
 	teardownStatemachine(&machine, &dummyTimer, &eventPool);
@@ -143,10 +143,10 @@ int test_state1_state2_back_transition()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State9") == 0);
 
 	/*@Desc: check whether s1 is set to 2 as State 9 is in second hierarchy level */
-	assert( test_Hierarchy_if_get_s1(&machine.interface) == 2 );
+	assert( test_Hierarchy_if_get_s1(&machine.iface) == 2 );
 
 	/*@Desc: raise event1 on default interface */
-	test_Hierarchy_if_raise_event1(&machine.interface);
+	test_Hierarchy_if_raise_event1(&machine.iface);
 
 	/*@Desc: run the statechart for the first time (just as dummy) */
 	test_HierarchyStatemachine_runCycle(&machine);
@@ -156,14 +156,14 @@ int test_state1_state2_back_transition()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State3") == 0);
 
 	/*@Desc: check whether s2 is set to 2 as State 3 is in second hierarchy level */
-	assert( test_Hierarchy_if_get_s2(&machine.interface) == 2 );
+	assert( test_Hierarchy_if_get_s2(&machine.iface) == 2 );
 
 	/*@Desc: check whether s1 is set to 0 as State 1 has been left */
-	printf( " s1 = %d\n", test_Hierarchy_if_get_s1(&machine.interface));
-	assert( test_Hierarchy_if_get_s1(&machine.interface) == 0 );
+	printf( " s1 = %d\n", test_Hierarchy_if_get_s1(&machine.iface));
+	assert( test_Hierarchy_if_get_s1(&machine.iface) == 0 );
 
 	/*@Desc: raise event6 on default interface */
-	test_Hierarchy_if_raise_event6(&machine.interface);
+	test_Hierarchy_if_raise_event6(&machine.iface);
 
 	/*@Desc: run the statechart for the first time (just as dummy) */
 	test_HierarchyStatemachine_runCycle(&machine);
@@ -173,11 +173,11 @@ int test_state1_state2_back_transition()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State9") == 0);
 
 	/*@Desc: check whether s2 is set to 2 as State 3 is in second hierarchy level */
-	assert( test_Hierarchy_if_get_s2(&machine.interface) == 0 );
+	assert( test_Hierarchy_if_get_s2(&machine.iface) == 0 );
 
 	/*@Desc: check whether s1 is set to 0 as State 1 has been left */
-	printf( " s1 = %d\n", test_Hierarchy_if_get_s1(&machine.interface));
-	assert( test_Hierarchy_if_get_s1(&machine.interface) == 2 );
+	printf( " s1 = %d\n", test_Hierarchy_if_get_s1(&machine.iface));
+	assert( test_Hierarchy_if_get_s1(&machine.iface) == 2 );
 
 
 	/*@Desc: teardown statemachine */
@@ -201,10 +201,10 @@ int test_state1_state2_back_with_event14_transition()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State9") == 0);
 
 	/*@Desc: check whether s1 is set to 2 as State 9 is in second hierarchy level */
-	assert( test_Hierarchy_if_get_s1(&machine.interface) == 2 );
+	assert( test_Hierarchy_if_get_s1(&machine.iface) == 2 );
 
 	/*@Desc: raise event1 on default interface */
-	test_Hierarchy_if_raise_event1(&machine.interface);
+	test_Hierarchy_if_raise_event1(&machine.iface);
 
 	/*@Desc: run the statechart for the first time (just as dummy) */
 	test_HierarchyStatemachine_runCycle(&machine);
@@ -214,14 +214,14 @@ int test_state1_state2_back_with_event14_transition()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State3") == 0);
 
 	/*@Desc: check whether s2 is set to 2 as State 3 is in second hierarchy level */
-	assert( test_Hierarchy_if_get_s2(&machine.interface) == 2 );
+	assert( test_Hierarchy_if_get_s2(&machine.iface) == 2 );
 
 	/*@Desc: check whether s1 is set to 0 as State 1 has been left */
-	printf( " s1 = %d\n", test_Hierarchy_if_get_s1(&machine.interface));
-	assert( test_Hierarchy_if_get_s1(&machine.interface) == 0 );
+	printf( " s1 = %d\n", test_Hierarchy_if_get_s1(&machine.iface));
+	assert( test_Hierarchy_if_get_s1(&machine.iface) == 0 );
 
 	/*@Desc: raise event6 on default interface */
-	test_Hierarchy_if_raise_event14(&machine.interface);
+	test_Hierarchy_if_raise_event14(&machine.iface);
 
 	/*@Desc: run the statechart for the first time (just as dummy) */
 	test_HierarchyStatemachine_runCycle(&machine);
@@ -231,11 +231,11 @@ int test_state1_state2_back_with_event14_transition()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State9") == 0);
 
 	/*@Desc: check whether s2 is set to 2 as State 3 is in second hierarchy level */
-	assert( test_Hierarchy_if_get_s2(&machine.interface) == 0 );
+	assert( test_Hierarchy_if_get_s2(&machine.iface) == 0 );
 
 	/*@Desc: check whether s1 is set to 0 as State 1 has been left */
-	printf( " s1 = %d\n", test_Hierarchy_if_get_s1(&machine.interface));
-	assert( test_Hierarchy_if_get_s1(&machine.interface) == 2 );
+	printf( " s1 = %d\n", test_Hierarchy_if_get_s1(&machine.iface));
+	assert( test_Hierarchy_if_get_s1(&machine.iface) == 2 );
 
 
 	/*@Desc: teardown statemachine */
@@ -260,10 +260,10 @@ int test_traverse_to_State5_back_with_event6_transition()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State9") == 0);
 
 	/*@Desc: check whether s1 is set to 2 as State 9 is in second hierarchy level */
-	assert( test_Hierarchy_if_get_s1(&machine.interface) == 2 );
+	assert( test_Hierarchy_if_get_s1(&machine.iface) == 2 );
 
 	/*@Desc: raise event1 on default interface */
-	test_Hierarchy_if_raise_event1(&machine.interface);
+	test_Hierarchy_if_raise_event1(&machine.iface);
 
 	/*@Desc: run the statechart cycle */
 	test_HierarchyStatemachine_runCycle(&machine);
@@ -273,7 +273,7 @@ int test_traverse_to_State5_back_with_event6_transition()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State3") == 0);
 
 	/*@Desc: raise event2 on default interface */
-	test_Hierarchy_if_raise_event2(&machine.interface);
+	test_Hierarchy_if_raise_event2(&machine.iface);
 
 	/*@Desc: run the statechart cycle */
 	test_HierarchyStatemachine_runCycle(&machine);
@@ -284,14 +284,14 @@ int test_traverse_to_State5_back_with_event6_transition()
 
 
 	/*@Desc: check whether s2 is set to 3 as State 5 is in third hierarchy level */
-	assert( test_Hierarchy_if_get_s2(&machine.interface) == 3 );
+	assert( test_Hierarchy_if_get_s2(&machine.iface) == 3 );
 
 	/*@Desc: check whether s1 is set to 0 as State 1 has been left */
-	printf( " s1 = %d\n", test_Hierarchy_if_get_s1(&machine.interface));
-	assert( test_Hierarchy_if_get_s1(&machine.interface) == 0 );
+	printf( " s1 = %d\n", test_Hierarchy_if_get_s1(&machine.iface));
+	assert( test_Hierarchy_if_get_s1(&machine.iface) == 0 );
 
 	/*@Desc: raise event6 on default interface */
-	test_Hierarchy_if_raise_event6(&machine.interface);
+	test_Hierarchy_if_raise_event6(&machine.iface);
 
 	/*@Desc: run the statechart for the first time (just as dummy) */
 	test_HierarchyStatemachine_runCycle(&machine);
@@ -301,12 +301,12 @@ int test_traverse_to_State5_back_with_event6_transition()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State9") == 0);
 
 	/*@Desc: check whether s2 is set to 2 as State 3 is in second hierarchy level */
-	printf( " s2 = %d\n", test_Hierarchy_if_get_s2(&machine.interface));
-	assert( test_Hierarchy_if_get_s2(&machine.interface) == 0 );
+	printf( " s2 = %d\n", test_Hierarchy_if_get_s2(&machine.iface));
+	assert( test_Hierarchy_if_get_s2(&machine.iface) == 0 );
 
 	/*@Desc: check whether s1 is set to 0 as State 1 has been left */
-	printf( " s1 = %d\n", test_Hierarchy_if_get_s1(&machine.interface));
-	assert( test_Hierarchy_if_get_s1(&machine.interface) == 2 );
+	printf( " s1 = %d\n", test_Hierarchy_if_get_s1(&machine.iface));
+	assert( test_Hierarchy_if_get_s1(&machine.iface) == 2 );
 
 
 	/*@Desc: teardown statemachine */
@@ -331,10 +331,10 @@ int test_traverse_to_State5_back_with_event15_transition()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State9") == 0);
 
 	/*@Desc: check whether s1 is set to 2 as State 9 is in second hierarchy level */
-	assert( test_Hierarchy_if_get_s1(&machine.interface) == 2 );
+	assert( test_Hierarchy_if_get_s1(&machine.iface) == 2 );
 
 	/*@Desc: raise event1 on default interface */
-	test_Hierarchy_if_raise_event1(&machine.interface);
+	test_Hierarchy_if_raise_event1(&machine.iface);
 
 	/*@Desc: run the statechart cycle */
 	test_HierarchyStatemachine_runCycle(&machine);
@@ -344,7 +344,7 @@ int test_traverse_to_State5_back_with_event15_transition()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State3") == 0);
 
 	/*@Desc: raise event2 on default interface */
-	test_Hierarchy_if_raise_event2(&machine.interface);
+	test_Hierarchy_if_raise_event2(&machine.iface);
 
 	/*@Desc: run the statechart cycle */
 	test_HierarchyStatemachine_runCycle(&machine);
@@ -355,14 +355,14 @@ int test_traverse_to_State5_back_with_event15_transition()
 
 
 	/*@Desc: check whether s2 is set to 3 as State 5 is in third hierarchy level */
-	assert( test_Hierarchy_if_get_s2(&machine.interface) == 3 );
+	assert( test_Hierarchy_if_get_s2(&machine.iface) == 3 );
 
 	/*@Desc: check whether s1 is set to 0 as State 1 has been left */
-	printf( " s1 = %d\n", test_Hierarchy_if_get_s1(&machine.interface));
-	assert( test_Hierarchy_if_get_s1(&machine.interface) == 0 );
+	printf( " s1 = %d\n", test_Hierarchy_if_get_s1(&machine.iface));
+	assert( test_Hierarchy_if_get_s1(&machine.iface) == 0 );
 
 	/*@Desc: raise event6 on default interface */
-	test_Hierarchy_if_raise_event15(&machine.interface);
+	test_Hierarchy_if_raise_event15(&machine.iface);
 
 	/*@Desc: run the statechart for the first time (just as dummy) */
 	test_HierarchyStatemachine_runCycle(&machine);
@@ -372,12 +372,12 @@ int test_traverse_to_State5_back_with_event15_transition()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State10") == 0);
 
 	/*@Desc: check whether s2 is set to 2 as State 3 is in second hierarchy level */
-	printf( " s2 = %d\n", test_Hierarchy_if_get_s2(&machine.interface));
-	assert( test_Hierarchy_if_get_s2(&machine.interface) == 0 );
+	printf( " s2 = %d\n", test_Hierarchy_if_get_s2(&machine.iface));
+	assert( test_Hierarchy_if_get_s2(&machine.iface) == 0 );
 
 	/*@Desc: check whether s1 is set to 0 as State 1 has been left */
-	printf( " s1 = %d\n", test_Hierarchy_if_get_s1(&machine.interface));
-	assert( test_Hierarchy_if_get_s1(&machine.interface) == 2 );
+	printf( " s1 = %d\n", test_Hierarchy_if_get_s1(&machine.iface));
+	assert( test_Hierarchy_if_get_s1(&machine.iface) == 2 );
 
 
 	/*@Desc: teardown statemachine */
@@ -401,10 +401,10 @@ int test_traverse_to_State7_back_with_event6_transition()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State9") == 0);
 
 	/*@Desc: check whether s1 is set to 2 as State 9 is in second hierarchy level */
-	assert( test_Hierarchy_if_get_s1(&machine.interface) == 2 );
+	assert( test_Hierarchy_if_get_s1(&machine.iface) == 2 );
 
 	/*@Desc: raise event1 on default interface */
-	test_Hierarchy_if_raise_event1(&machine.interface);
+	test_Hierarchy_if_raise_event1(&machine.iface);
 
 	/*@Desc: run the statechart cycle */
 	test_HierarchyStatemachine_runCycle(&machine);
@@ -414,7 +414,7 @@ int test_traverse_to_State7_back_with_event6_transition()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State3") == 0);
 
 	/*@Desc: raise event2 on default interface */
-	test_Hierarchy_if_raise_event2(&machine.interface);
+	test_Hierarchy_if_raise_event2(&machine.iface);
 
 	/*@Desc: run the statechart cycle */
 	test_HierarchyStatemachine_runCycle(&machine);
@@ -424,7 +424,7 @@ int test_traverse_to_State7_back_with_event6_transition()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State5") == 0);
 
 	/*@Desc: raise event2 on default interface */
-	test_Hierarchy_if_raise_event3(&machine.interface);
+	test_Hierarchy_if_raise_event3(&machine.iface);
 
 	/*@Desc: run the statechart cycle */
 	test_HierarchyStatemachine_runCycle(&machine);
@@ -434,14 +434,14 @@ int test_traverse_to_State7_back_with_event6_transition()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State7") == 0);
 
 	/*@Desc: check whether s2 is set to 3 as State 7 is in 4th hierarchy level */
-	assert( test_Hierarchy_if_get_s2(&machine.interface) == 4 );
+	assert( test_Hierarchy_if_get_s2(&machine.iface) == 4 );
 
 	/*@Desc: check whether s1 is set to 0 as State 1 has been left */
-	printf( " s1 = %d\n", test_Hierarchy_if_get_s1(&machine.interface));
-	assert( test_Hierarchy_if_get_s1(&machine.interface) == 0 );
+	printf( " s1 = %d\n", test_Hierarchy_if_get_s1(&machine.iface));
+	assert( test_Hierarchy_if_get_s1(&machine.iface) == 0 );
 
 	/*@Desc: raise event6 on default interface */
-	test_Hierarchy_if_raise_event6(&machine.interface);
+	test_Hierarchy_if_raise_event6(&machine.iface);
 
 	/*@Desc: run the statechart for the first time (just as dummy) */
 	test_HierarchyStatemachine_runCycle(&machine);
@@ -451,12 +451,12 @@ int test_traverse_to_State7_back_with_event6_transition()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State9") == 0);
 
 	/*@Desc: check whether s2 is set to 2 as State 3 is in second hierarchy level */
-	printf( " s2 = %d\n", test_Hierarchy_if_get_s2(&machine.interface));
-	assert( test_Hierarchy_if_get_s2(&machine.interface) == 0 );
+	printf( " s2 = %d\n", test_Hierarchy_if_get_s2(&machine.iface));
+	assert( test_Hierarchy_if_get_s2(&machine.iface) == 0 );
 
 	/*@Desc: check whether s1 is set to 0 as State 1 has been left */
-	printf( " s1 = %d\n", test_Hierarchy_if_get_s1(&machine.interface));
-	assert( test_Hierarchy_if_get_s1(&machine.interface) == 2 );
+	printf( " s1 = %d\n", test_Hierarchy_if_get_s1(&machine.iface));
+	assert( test_Hierarchy_if_get_s1(&machine.iface) == 2 );
 
 
 	/*@Desc: teardown statemachine */
@@ -480,10 +480,10 @@ int test_traverse_to_State8_back_with_event6_transition()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State9") == 0);
 
 	/*@Desc: check whether s1 is set to 2 as State 9 is in second hierarchy level */
-	assert( test_Hierarchy_if_get_s1(&machine.interface) == 2 );
+	assert( test_Hierarchy_if_get_s1(&machine.iface) == 2 );
 
 	/*@Desc: raise event1 on default interface */
-	test_Hierarchy_if_raise_event1(&machine.interface);
+	test_Hierarchy_if_raise_event1(&machine.iface);
 
 	/*@Desc: run the statechart cycle */
 	test_HierarchyStatemachine_runCycle(&machine);
@@ -493,7 +493,7 @@ int test_traverse_to_State8_back_with_event6_transition()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State3") == 0);
 
 	/*@Desc: raise event2 on default interface */
-	test_Hierarchy_if_raise_event2(&machine.interface);
+	test_Hierarchy_if_raise_event2(&machine.iface);
 
 	/*@Desc: run the statechart cycle */
 	test_HierarchyStatemachine_runCycle(&machine);
@@ -503,7 +503,7 @@ int test_traverse_to_State8_back_with_event6_transition()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State5") == 0);
 
 	/*@Desc: raise event3 on default interface */
-	test_Hierarchy_if_raise_event3(&machine.interface);
+	test_Hierarchy_if_raise_event3(&machine.iface);
 
 	/*@Desc: run the statechart cycle */
 	test_HierarchyStatemachine_runCycle(&machine);
@@ -513,7 +513,7 @@ int test_traverse_to_State8_back_with_event6_transition()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State7") == 0);
 
 	/*@Desc: raise event4 on default interface */
-	test_Hierarchy_if_raise_event4(&machine.interface);
+	test_Hierarchy_if_raise_event4(&machine.iface);
 
 	/*@Desc: run the statechart cycle */
 	test_HierarchyStatemachine_runCycle(&machine);
@@ -523,14 +523,14 @@ int test_traverse_to_State8_back_with_event6_transition()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State8") == 0);
 
 	/*@Desc: check whether s2 is set to 3 as State 7 is in 4th hierarchy level */
-	assert( test_Hierarchy_if_get_s2(&machine.interface) == 4 );
+	assert( test_Hierarchy_if_get_s2(&machine.iface) == 4 );
 
 	/*@Desc: check whether s1 is set to 0 as State 1 has been left */
-	printf( " s1 = %d\n", test_Hierarchy_if_get_s1(&machine.interface));
-	assert( test_Hierarchy_if_get_s1(&machine.interface) == 0 );
+	printf( " s1 = %d\n", test_Hierarchy_if_get_s1(&machine.iface));
+	assert( test_Hierarchy_if_get_s1(&machine.iface) == 0 );
 
 	/*@Desc: raise event6 on default interface */
-	test_Hierarchy_if_raise_event6(&machine.interface);
+	test_Hierarchy_if_raise_event6(&machine.iface);
 
 	/*@Desc: run the statechart for the first time (just as dummy) */
 	test_HierarchyStatemachine_runCycle(&machine);
@@ -540,12 +540,12 @@ int test_traverse_to_State8_back_with_event6_transition()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State9") == 0);
 
 	/*@Desc: check whether s2 is set to 2 as State 3 is in second hierarchy level */
-	printf( " s2 = %d\n", test_Hierarchy_if_get_s2(&machine.interface));
-	assert( test_Hierarchy_if_get_s2(&machine.interface) == 0 );
+	printf( " s2 = %d\n", test_Hierarchy_if_get_s2(&machine.iface));
+	assert( test_Hierarchy_if_get_s2(&machine.iface) == 0 );
 
 	/*@Desc: check whether s1 is set to 0 as State 1 has been left */
-	printf( " s1 = %d\n", test_Hierarchy_if_get_s1(&machine.interface));
-	assert( test_Hierarchy_if_get_s1(&machine.interface) == 2 );
+	printf( " s1 = %d\n", test_Hierarchy_if_get_s1(&machine.iface));
+	assert( test_Hierarchy_if_get_s1(&machine.iface) == 2 );
 
 
 	/*@Desc: teardown statemachine */
@@ -569,10 +569,10 @@ int test_traverse_to_State8_back_with_event16_transition()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State9") == 0);
 
 	/*@Desc: check whether s1 is set to 2 as State 9 is in second hierarchy level */
-	assert( test_Hierarchy_if_get_s1(&machine.interface) == 2 );
+	assert( test_Hierarchy_if_get_s1(&machine.iface) == 2 );
 
 	/*@Desc: raise event1 on default interface */
-	test_Hierarchy_if_raise_event1(&machine.interface);
+	test_Hierarchy_if_raise_event1(&machine.iface);
 
 	/*@Desc: run the statechart cycle */
 	test_HierarchyStatemachine_runCycle(&machine);
@@ -582,7 +582,7 @@ int test_traverse_to_State8_back_with_event16_transition()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State3") == 0);
 
 	/*@Desc: raise event2 on default interface */
-	test_Hierarchy_if_raise_event2(&machine.interface);
+	test_Hierarchy_if_raise_event2(&machine.iface);
 
 	/*@Desc: run the statechart cycle */
 	test_HierarchyStatemachine_runCycle(&machine);
@@ -592,7 +592,7 @@ int test_traverse_to_State8_back_with_event16_transition()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State5") == 0);
 
 	/*@Desc: raise event3 on default interface */
-	test_Hierarchy_if_raise_event3(&machine.interface);
+	test_Hierarchy_if_raise_event3(&machine.iface);
 
 	/*@Desc: run the statechart cycle */
 	test_HierarchyStatemachine_runCycle(&machine);
@@ -602,7 +602,7 @@ int test_traverse_to_State8_back_with_event16_transition()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State7") == 0);
 
 	/*@Desc: raise event4 on default interface */
-	test_Hierarchy_if_raise_event4(&machine.interface);
+	test_Hierarchy_if_raise_event4(&machine.iface);
 
 	/*@Desc: run the statechart cycle */
 	test_HierarchyStatemachine_runCycle(&machine);
@@ -612,14 +612,14 @@ int test_traverse_to_State8_back_with_event16_transition()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State8") == 0);
 
 	/*@Desc: check whether s2 is set to 3 as State 7 is in 4th hierarchy level */
-	assert( test_Hierarchy_if_get_s2(&machine.interface) == 4 );
+	assert( test_Hierarchy_if_get_s2(&machine.iface) == 4 );
 
 	/*@Desc: check whether s1 is set to 0 as State 1 has been left */
-	printf( " s1 = %d\n", test_Hierarchy_if_get_s1(&machine.interface));
-	assert( test_Hierarchy_if_get_s1(&machine.interface) == 0 );
+	printf( " s1 = %d\n", test_Hierarchy_if_get_s1(&machine.iface));
+	assert( test_Hierarchy_if_get_s1(&machine.iface) == 0 );
 
 	/*@Desc: raise event16 on default interface */
-	test_Hierarchy_if_raise_event16(&machine.interface);
+	test_Hierarchy_if_raise_event16(&machine.iface);
 
 	/*@Desc: run the statechart for the first time (just as dummy) */
 	test_HierarchyStatemachine_runCycle(&machine);
@@ -629,12 +629,12 @@ int test_traverse_to_State8_back_with_event16_transition()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State10") == 0);
 
 	/*@Desc: check whether s2 is set to 2 as State 3 is in second hierarchy level */
-	printf( " s2 = %d\n", test_Hierarchy_if_get_s2(&machine.interface));
-	assert( test_Hierarchy_if_get_s2(&machine.interface) == 0 );
+	printf( " s2 = %d\n", test_Hierarchy_if_get_s2(&machine.iface));
+	assert( test_Hierarchy_if_get_s2(&machine.iface) == 0 );
 
 	/*@Desc: check whether s1 is set to 0 as State 1 has been left */
-	printf( " s1 = %d\n", test_Hierarchy_if_get_s1(&machine.interface));
-	assert( test_Hierarchy_if_get_s1(&machine.interface) == 2 );
+	printf( " s1 = %d\n", test_Hierarchy_if_get_s1(&machine.iface));
+	assert( test_Hierarchy_if_get_s1(&machine.iface) == 2 );
 
 
 	/*@Desc: teardown statemachine */

TestScenarios/test-c/Test_LocalActions/main.c

@@ -33,9 +33,9 @@ const char* getStateString(uint32_t index)
 
 int myTimerSet = 0;
 uint32_t timerValue;
-boolean timerPeriodic;
+sc_boolean timerPeriodic;
 
-void setMyTimer(const uint32_t evid, const uint32_t time_ms, boolean periodic)
+void setMyTimer(const uint32_t evid, const uint32_t time_ms, sc_boolean periodic)
 {
 	myTimerSet = 1;
 	timerValue = time_ms;
@@ -117,7 +117,7 @@ int localActions_check_initial_entry()
 	setupStatemachine(&machine, &dummyTimer, &eventPool);
 
 	/*@Desc: check whether entry works on initialisation*/
-	assert(test_LocalActions_if_get_i(test_LocalActionsStatemachine_get_interface(&machine)) == 1);
+	assert(test_LocalActions_if_get_i(test_LocalActionsStatemachine_get_iface(&machine)) == 1);
 
 	/*@Desc: teardown statemachine */
 	teardownStatemachine(&machine, &dummyTimer, &eventPool);
@@ -136,13 +136,13 @@ int localActions_check_transition_entry()
 	setupStatemachine(&machine, &dummyTimer, &eventPool);
 
 	/*@Desc: raise event1 on default Interface */
-	test_LocalActions_if_raise_Event1(test_LocalActionsStatemachine_get_interface(&machine));
+	test_LocalActions_if_raise_Event1(test_LocalActionsStatemachine_get_iface(&machine));
 
 	/*@Desc: run an explicit cycle */
 	test_LocalActionsStatemachine_runCycle(&machine);
 
 	/*@Desc: check whether entry works on initialisation*/
-	assert(test_LocalActions_if_get_j(test_LocalActionsStatemachine_get_interface(&machine)) == 1);
+	assert(test_LocalActions_if_get_j(test_LocalActionsStatemachine_get_iface(&machine)) == 1);
 
 	/*@Desc: teardown statemachine */
 	teardownStatemachine(&machine, &dummyTimer, &eventPool);
@@ -161,22 +161,22 @@ int localActions_check_transition_exit()
 	setupStatemachine(&machine, &dummyTimer, &eventPool);
 
 	/*@Desc: raise event1 on default Interface */
-	test_LocalActions_if_raise_Event1(test_LocalActionsStatemachine_get_interface(&machine));
+	test_LocalActions_if_raise_Event1(test_LocalActionsStatemachine_get_iface(&machine));
 
 	/*@Desc: run an explicit cycle */
 	test_LocalActionsStatemachine_runCycle(&machine);
 
 	/*@Desc: check whether entry works on initialisation*/
-	assert(test_LocalActions_if_get_i(test_LocalActionsStatemachine_get_interface(&machine)) == 0);
+	assert(test_LocalActions_if_get_i(test_LocalActionsStatemachine_get_iface(&machine)) == 0);
 
 	/*@Desc: raise event1 on default Interface */
-	test_LocalActions_if_raise_Event3(test_LocalActionsStatemachine_get_interface(&machine));
+	test_LocalActions_if_raise_Event3(test_LocalActionsStatemachine_get_iface(&machine));
 
 	/*@Desc: run an explicit cycle */
 	test_LocalActionsStatemachine_runCycle(&machine);
 
 	/*@Desc: check whether entry works on initialisation*/
-	assert(test_LocalActions_if_get_j(test_LocalActionsStatemachine_get_interface(&machine)) == 0);
+	assert(test_LocalActions_if_get_j(test_LocalActionsStatemachine_get_iface(&machine)) == 0);
 
 	/*@Desc: teardown statemachine */
 	teardownStatemachine(&machine, &dummyTimer, &eventPool);

TestScenarios/test-c/Test_ParallelRegions/main.c

@@ -106,7 +106,7 @@ int test_state1_transition_event1()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State1") == 0);
 
 	/*@Desc: raise event1 on default interface */
-	test_ParallelRegions_if_raise_event1(&machine.interface);
+	test_ParallelRegions_if_raise_event1(&machine.iface);
 
 	/*@Desc: run an explicit cycle */
 	test_ParallelRegionsStatemachine_runCycle(&machine);
@@ -144,7 +144,7 @@ int test_state1_transition_and_back()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State1") == 0);
 
 	/*@Desc: raise event1 on default interface */
-	test_ParallelRegions_if_raise_event1(&machine.interface);
+	test_ParallelRegions_if_raise_event1(&machine.iface);
 
 	/*@Desc: run an explicit cycle */
 	test_ParallelRegionsStatemachine_runCycle(&machine);
@@ -158,7 +158,7 @@ int test_state1_transition_and_back()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 2)), "State7") == 0);
 
 	/*@Desc: raise event10 on default interface */
-	test_ParallelRegions_if_raise_event10(&machine.interface);
+	test_ParallelRegions_if_raise_event10(&machine.iface);
 
 	printf("run Cycle ..\n");
 
@@ -198,7 +198,7 @@ int test_state1_transition_and_back_from_state3()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State1") == 0);
 
 	/*@Desc: raise event1 on default interface */
-	test_ParallelRegions_if_raise_event1(&machine.interface);
+	test_ParallelRegions_if_raise_event1(&machine.iface);
 
 	/*@Desc: run an explicit cycle */
 	test_ParallelRegionsStatemachine_runCycle(&machine);
@@ -212,7 +212,7 @@ int test_state1_transition_and_back_from_state3()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 2)), "State7") == 0);
 
 	/*@Desc: raise event9 on default interface */
-	test_ParallelRegions_if_raise_event9(&machine.interface);
+	test_ParallelRegions_if_raise_event9(&machine.iface);
 
 	/*@Desc: run an explicit cycle */
 	test_ParallelRegionsStatemachine_runCycle(&machine);
@@ -250,7 +250,7 @@ int test_state1_transition_and_back_from_state7()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State1") == 0);
 
 	/*@Desc: raise event1 on default interface */
-	test_ParallelRegions_if_raise_event1(&machine.interface);
+	test_ParallelRegions_if_raise_event1(&machine.iface);
 
 	/*@Desc: run an explicit cycle */
 	test_ParallelRegionsStatemachine_runCycle(&machine);
@@ -264,7 +264,7 @@ int test_state1_transition_and_back_from_state7()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 2)), "State7") == 0);
 
 	/*@Desc: raise event9 on default interface */
-	test_ParallelRegions_if_raise_event7(&machine.interface);
+	test_ParallelRegions_if_raise_event7(&machine.iface);
 
 	/*@Desc: run an explicit cycle */
 	test_ParallelRegionsStatemachine_runCycle(&machine);
@@ -302,13 +302,13 @@ int test_state1_transition_to_State4()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State1") == 0);
 
 	/*@Desc: raise event1 on default interface */
-	test_ParallelRegions_if_raise_event1(&machine.interface);
+	test_ParallelRegions_if_raise_event1(&machine.iface);
 
 	/*@Desc: run an explicit cycle */
 	test_ParallelRegionsStatemachine_runCycle(&machine);
 
 	/*@Desc: raise event2 on default interface */
-	test_ParallelRegions_if_raise_event2(&machine.interface);
+	test_ParallelRegions_if_raise_event2(&machine.iface);
 
 	/*@Desc: run an explicit cycle */
 	test_ParallelRegionsStatemachine_runCycle(&machine);
@@ -346,19 +346,19 @@ int test_parallel_event3_handling_state5_state7()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State1") == 0);
 
 	/*@Desc: raise event1 on default interface */
-	test_ParallelRegions_if_raise_event1(&machine.interface);
+	test_ParallelRegions_if_raise_event1(&machine.iface);
 
 	/*@Desc: run an explicit cycle */
 	test_ParallelRegionsStatemachine_runCycle(&machine);
 
 	/*@Desc: raise event2 on default interface */
-	test_ParallelRegions_if_raise_event2(&machine.interface);
+	test_ParallelRegions_if_raise_event2(&machine.iface);
 
 	/*@Desc: run an explicit cycle */
 	test_ParallelRegionsStatemachine_runCycle(&machine);
 
 	/*@Desc: raise event3 on default interface */
-	test_ParallelRegions_if_raise_event3(&machine.interface);
+	test_ParallelRegions_if_raise_event3(&machine.iface);
 
 	/*@Desc: run an explicit cycle */
 	test_ParallelRegionsStatemachine_runCycle(&machine);
@@ -396,13 +396,13 @@ int test_preference_event3_leaving_state3_and_state7()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State1") == 0);
 
 	/*@Desc: raise event1 on default interface */
-	test_ParallelRegions_if_raise_event1(&machine.interface);
+	test_ParallelRegions_if_raise_event1(&machine.iface);
 
 	/*@Desc: run an explicit cycle */
 	test_ParallelRegionsStatemachine_runCycle(&machine);
 
 	/*@Desc: check whether reg3 is set correctly to 7 */
-	assert( test_ParallelRegions_if_get_reg3(&machine.interface) == 7);
+	assert( test_ParallelRegions_if_get_reg3(&machine.iface) == 7);
 
 	/*@Desc: check the initial state at position 0 to be State3 */
 	printf("%s\n", getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)));
@@ -413,7 +413,7 @@ int test_preference_event3_leaving_state3_and_state7()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 2)), "State7") == 0);
 
 	/*@Desc: raise event3 on default interface */
-	test_ParallelRegions_if_raise_event3(&machine.interface);
+	test_ParallelRegions_if_raise_event3(&machine.iface);
 
 	/*@Desc: run an explicit cycle */
 	test_ParallelRegionsStatemachine_runCycle(&machine);
@@ -431,7 +431,7 @@ int test_preference_event3_leaving_state3_and_state7()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 2)), "noState") == 0);
 
 	/*@Desc: check whether reg3 is set correctly to -1 */
-	assert( test_ParallelRegions_if_get_reg3(&machine.interface) == -1);
+	assert( test_ParallelRegions_if_get_reg3(&machine.iface) == -1);
 
 	/*@Desc: teardown statemachine */
 	teardownStatemachine(&machine, &dummyTimer, &eventPool);
@@ -454,7 +454,7 @@ int test_state1_transition_directly_to_state8()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State1") == 0);
 
 	/*@Desc: raise event12 on default interface */
-	test_ParallelRegions_if_raise_event12(&machine.interface);
+	test_ParallelRegions_if_raise_event12(&machine.iface);
 
 	/*@Desc: run an explicit cycle */
 	test_ParallelRegionsStatemachine_runCycle(&machine);
@@ -472,7 +472,7 @@ int test_state1_transition_directly_to_state8()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 2)), "State8") == 0);
 
 	/*@Desc: check whether reg3 is set correctly to 8 */
-	assert( test_ParallelRegions_if_get_reg3(&machine.interface) == 8);
+	assert( test_ParallelRegions_if_get_reg3(&machine.iface) == 8);
 
 	/*@Desc: teardown statemachine */
 	teardownStatemachine(&machine, &dummyTimer, &eventPool);
@@ -495,7 +495,7 @@ int test_state1_transition_directly_to_state6()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State1") == 0);
 
 	/*@Desc: raise event12 on default interface */
-	test_ParallelRegions_if_raise_event11(&machine.interface);
+	test_ParallelRegions_if_raise_event11(&machine.iface);
 
 	/*@Desc: run an explicit cycle */
 	test_ParallelRegionsStatemachine_runCycle(&machine);
@@ -513,7 +513,7 @@ int test_state1_transition_directly_to_state6()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 2)), "State7") == 0);
 
 	/*@Desc: check whether reg3 is set correctly to 7 */
-	assert( test_ParallelRegions_if_get_reg3(&machine.interface) == 7);
+	assert( test_ParallelRegions_if_get_reg3(&machine.iface) == 7);
 
 	/*@Desc: teardown statemachine */
 	teardownStatemachine(&machine, &dummyTimer, &eventPool);
@@ -536,7 +536,7 @@ int test_state1_transition_directly_to_state4()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State1") == 0);
 
 	/*@Desc: raise event13 on default interface */
-	test_ParallelRegions_if_raise_event13(&machine.interface);
+	test_ParallelRegions_if_raise_event13(&machine.iface);
 
 	/*@Desc: run an explicit cycle */
 	test_ParallelRegionsStatemachine_runCycle(&machine);
@@ -554,7 +554,7 @@ int test_state1_transition_directly_to_state4()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 2)), "State7") == 0);
 
 	/*@Desc: check whether reg3 is set correctly to 7 */
-	assert( test_ParallelRegions_if_get_reg3(&machine.interface) == 7);
+	assert( test_ParallelRegions_if_get_reg3(&machine.iface) == 7);
 
 	/*@Desc: teardown statemachine */
 	teardownStatemachine(&machine, &dummyTimer, &eventPool);
@@ -577,29 +577,29 @@ int test_hierarchy_traversal_event12_event2_event8()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State1") == 0);
 
 	/*@Desc: raise event12 on default interface */
-	test_ParallelRegions_if_raise_event12(&machine.interface);
+	test_ParallelRegions_if_raise_event12(&machine.iface);
 
 	/*@Desc: run an explicit cycle */
 	test_ParallelRegionsStatemachine_runCycle(&machine);
 
 	/*@Desc: check whether hierarchy is set correctly to 5 */
-	assert( test_ParallelRegions_if_get_hierarchy(&machine.interface) == 2+3);
+	assert( test_ParallelRegions_if_get_hierarchy(&machine.iface) == 2+3);
 
 	/*@Desc: raise event2 on default interface */
-	test_ParallelRegions_if_raise_event2(&machine.interface);
+	test_ParallelRegions_if_raise_event2(&machine.iface);
 
 	/*@Desc: run an explicit cycle */
 	test_ParallelRegionsStatemachine_runCycle(&machine);
 
 	/*@Desc: check whether hierarchy value is set correctly to 35 */
-	printf( "Hierarchy has value %d, should be 35\n", test_ParallelRegions_if_get_hierarchy(&machine.interface) );
-	assert( test_ParallelRegions_if_get_hierarchy(&machine.interface) == (((2+3)*4)+5)+10);
+	printf( "Hierarchy has value %d, should be 35\n", test_ParallelRegions_if_get_hierarchy(&machine.iface) );
+	assert( test_ParallelRegions_if_get_hierarchy(&machine.iface) == (((2+3)*4)+5)+10);
 
 	/*@Desc: check whether reg3 is set correctly to 8 */
-	assert( test_ParallelRegions_if_get_reg3(&machine.interface) == 8);
+	assert( test_ParallelRegions_if_get_reg3(&machine.iface) == 8);
 
 	/*@Desc: raise event8 on default interface */
-	test_ParallelRegions_if_raise_event8(&machine.interface);
+	test_ParallelRegions_if_raise_event8(&machine.iface);
 
 	/*@Desc: run an explicit cycle */
 	test_ParallelRegionsStatemachine_runCycle(&machine);
@@ -617,10 +617,10 @@ int test_hierarchy_traversal_event12_event2_event8()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 2)), "noState") == 0);
 
 	/*@Desc: check whether reg3 is set correctly to 2 */
-	assert( test_ParallelRegions_if_get_hierarchy(&machine.interface) == 2);
+	assert( test_ParallelRegions_if_get_hierarchy(&machine.iface) == 2);
 
 	/*@Desc: check whether reg3 is set correctly to -1 */
-	assert( test_ParallelRegions_if_get_reg3(&machine.interface) == -1);
+	assert( test_ParallelRegions_if_get_reg3(&machine.iface) == -1);
 
 	/*@Desc: teardown statemachine */
 	teardownStatemachine(&machine, &dummyTimer, &eventPool);
@@ -643,7 +643,7 @@ int test_hierarchy_traversal_event11_event10()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State1") == 0);
 
 	/*@Desc: raise event11 on default interface */
-	test_ParallelRegions_if_raise_event11(&machine.interface);
+	test_ParallelRegions_if_raise_event11(&machine.iface);
 
 	/*@Desc: run an explicit cycle */
 	test_ParallelRegionsStatemachine_runCycle(&machine);
@@ -661,13 +661,13 @@ int test_hierarchy_traversal_event11_event10()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 2)), "State7") == 0);
 
 	/*@Desc: check whether hierarchy is set correctly to 36 */
-	assert( test_ParallelRegions_if_get_hierarchy(&machine.interface) == (((2+3)*4)+6)+10);
+	assert( test_ParallelRegions_if_get_hierarchy(&machine.iface) == (((2+3)*4)+6)+10);
 
 	/*@Desc: check whether reg3 is set correctly to 7 */
-	assert( test_ParallelRegions_if_get_reg3(&machine.interface) == 7);
+	assert( test_ParallelRegions_if_get_reg3(&machine.iface) == 7);
 
 	/*@Desc: raise event2 on default interface */
-	test_ParallelRegions_if_raise_event10(&machine.interface);
+	test_ParallelRegions_if_raise_event10(&machine.iface);
 
 	/*@Desc: run an explicit cycle */
 	test_ParallelRegionsStatemachine_runCycle(&machine);
@@ -685,10 +685,10 @@ int test_hierarchy_traversal_event11_event10()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 2)), "noState") == 0);
 
 	/*@Desc: check whether reg3 is set correctly to 2 */
-	assert( test_ParallelRegions_if_get_hierarchy(&machine.interface) == 2);
+	assert( test_ParallelRegions_if_get_hierarchy(&machine.iface) == 2);
 
 	/*@Desc: check whether reg3 is set correctly to -1 */
-	assert( test_ParallelRegions_if_get_reg3(&machine.interface) == -1);
+	assert( test_ParallelRegions_if_get_reg3(&machine.iface) == -1);
 
 	/*@Desc: teardown statemachine */
 	teardownStatemachine(&machine, &dummyTimer, &eventPool);
@@ -711,7 +711,7 @@ int test_hierarchy_traversal_event13_event14()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)), "State1") == 0);
 
 	/*@Desc: raise event11 on default interface */
-	test_ParallelRegions_if_raise_event13(&machine.interface);
+	test_ParallelRegions_if_raise_event13(&machine.iface);
 
 	/*@Desc: run an explicit cycle */
 	test_ParallelRegionsStatemachine_runCycle(&machine);
@@ -729,13 +729,13 @@ int test_hierarchy_traversal_event13_event14()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 2)), "State7") == 0);
 
 	/*@Desc: check whether hierarchy is set correctly to 36 */
-	assert( test_ParallelRegions_if_get_hierarchy(&machine.interface) == (((2+3)*4)+5)+10);
+	assert( test_ParallelRegions_if_get_hierarchy(&machine.iface) == (((2+3)*4)+5)+10);
 
 	/*@Desc: check whether reg3 is set correctly to 7 */
-	assert( test_ParallelRegions_if_get_reg3(&machine.interface) == 7);
+	assert( test_ParallelRegions_if_get_reg3(&machine.iface) == 7);
 
 	/*@Desc: raise event2 on default interface */
-	test_ParallelRegions_if_raise_event14(&machine.interface);
+	test_ParallelRegions_if_raise_event14(&machine.iface);
 
 	/*@Desc: run an explicit cycle */
 	test_ParallelRegionsStatemachine_runCycle(&machine);
@@ -753,11 +753,11 @@ int test_hierarchy_traversal_event13_event14()
 	assert( strcmp(getStateString(statemachineBase_getState((StatemachineBase*)&machine, 2)), "noState") == 0);
 
 	/*@Desc: check whether reg3 is set correctly to 2 */
-	printf ("The hierarchy value is set to %d\n",test_ParallelRegions_if_get_hierarchy(&machine.interface));
-	assert( test_ParallelRegions_if_get_hierarchy(&machine.interface) == 2);
+	printf ("The hierarchy value is set to %d\n",test_ParallelRegions_if_get_hierarchy(&machine.iface));
+	assert( test_ParallelRegions_if_get_hierarchy(&machine.iface) == 2);
 
 	/*@Desc: check whether reg3 is set correctly to -1 */
-	assert( test_ParallelRegions_if_get_reg3(&machine.interface) == -1);
+	assert( test_ParallelRegions_if_get_reg3(&machine.iface) == -1);
 
 	/*@Desc: teardown statemachine */
 	teardownStatemachine(&machine, &dummyTimer, &eventPool);

TestScenarios/test-c/Test_Transition/main.c

@@ -33,9 +33,9 @@ const char* getStateString(uint32_t index)
 
 int myTimerSet = 0;
 uint32_t timerValue;
-boolean timerPeriodic;
+sc_boolean timerPeriodic;
 
-void setMyTimer(const uint32_t evid, const uint32_t time_ms, boolean periodic)
+void setMyTimer(const uint32_t evid, const uint32_t time_ms, sc_boolean periodic)
 {
 	myTimerSet = 1;
 	timerValue = time_ms;
@@ -127,10 +127,10 @@ int test_transition_with_AEvent1_value_gt5()
 	setupStatemachine(&machine, &dummyTimer, &eventPool);
 
 	/*@Desc: receive interface for scope A */
-	ifaceA = test_TransitionStatemachine_get_interfaceA(&machine);
+	ifaceA = test_TransitionStatemachine_get_ifaceA(&machine);
 
 	/*@Desc: receive interface for default scope */
-	iface = test_TransitionStatemachine_get_interface(&machine);
+	iface = test_TransitionStatemachine_get_iface(&machine);
 
 	/*@Desc: check the initial state at position 0 */
 	printf("%s\n", getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)));
@@ -168,10 +168,10 @@ int test_transition_with_AEvent1_value_is_0()
 	setupStatemachine(&machine, &dummyTimer, &eventPool);
 
 	/*@Desc: receive interface for scope A */
-	ifaceA = test_TransitionStatemachine_get_interfaceA(&machine);
+	ifaceA = test_TransitionStatemachine_get_ifaceA(&machine);
 
 	/*@Desc: receive interface for default scope */
-	iface = test_TransitionStatemachine_get_interface(&machine);
+	iface = test_TransitionStatemachine_get_iface(&machine);
 
 	/*@Desc: check the initial state at position 0 */
 	printf("%s\n", getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)));
@@ -209,10 +209,10 @@ int test_transition_with_AEvent1_value_lt0()
 	setupStatemachine(&machine, &dummyTimer, &eventPool);
 
 	/*@Desc: receive interface for scope A */
-	ifaceA = test_TransitionStatemachine_get_interfaceA(&machine);
+	ifaceA = test_TransitionStatemachine_get_ifaceA(&machine);
 
 	/*@Desc: receive interface for default scope */
-	iface = test_TransitionStatemachine_get_interface(&machine);
+	iface = test_TransitionStatemachine_get_iface(&machine);
 
 	/*@Desc: check the initial state at position 0 */
 	printf("%s\n", getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)));
@@ -249,7 +249,7 @@ int test_transition_with_no_event_and_i_eq_5()
 	setupStatemachine(&machine, &dummyTimer, &eventPool);
 
 	/*@Desc: receive interface for scope A */
-	iface = test_TransitionStatemachine_get_interface(&machine);
+	iface = test_TransitionStatemachine_get_iface(&machine);
 
 	/*@Desc: check the initial state at position 0 */
 	printf("%s\n", getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)));
@@ -283,7 +283,7 @@ int test_transition_event2_set_with_event1_unconditioned()
 	setupStatemachine(&machine, &dummyTimer, &eventPool);
 
 	/*@Desc: receive interface for scope A */
-	ifaceA = test_TransitionStatemachine_get_interfaceA(&machine);
+	ifaceA = test_TransitionStatemachine_get_ifaceA(&machine);
 
 	/*@Desc: check the initial state at position 0 */
 	printf("%s\n", getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)));
@@ -319,10 +319,10 @@ int test_transition_event2_set_with_event1_value_set_before()
 	setupStatemachine(&machine, &dummyTimer, &eventPool);
 
 	/*@Desc: receive interface for scope A */
-	ifaceA = test_TransitionStatemachine_get_interfaceA(&machine);
+	ifaceA = test_TransitionStatemachine_get_ifaceA(&machine);
 
 	/*@Desc: receive interface for default scope */
-	iface = test_TransitionStatemachine_get_interface(&machine);
+	iface = test_TransitionStatemachine_get_iface(&machine);
 
 	/*@Desc: check the initial state at position 0 */
 	printf("%s\n", getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)));
@@ -377,10 +377,10 @@ int test_transition_with_Event3_j_lt_20()
 	setupStatemachine(&machine, &dummyTimer, &eventPool);
 
 	/*@Desc: receive interface for scope A */
-	ifaceA = test_TransitionStatemachine_get_interfaceA(&machine);
+	ifaceA = test_TransitionStatemachine_get_ifaceA(&machine);
 
 	/*@Desc: receive interface for default scope */
-	iface = test_TransitionStatemachine_get_interface(&machine);
+	iface = test_TransitionStatemachine_get_iface(&machine);
 
 	/*@Desc: check the initial state at position 0 */
 	printf("%s\n", getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)));
@@ -417,10 +417,10 @@ int test_transition_with_Event3_j_gt_30()
 	setupStatemachine(&machine, &dummyTimer, &eventPool);
 
 	/*@Desc: receive interface for scope A */
-	ifaceA = test_TransitionStatemachine_get_interfaceA(&machine);
+	ifaceA = test_TransitionStatemachine_get_ifaceA(&machine);
 
 	/*@Desc: receive interface for default scope */
-	iface = test_TransitionStatemachine_get_interface(&machine);
+	iface = test_TransitionStatemachine_get_iface(&machine);
 
 	/*@Desc: check the initial state at position 0 */
 	printf("%s\n", getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)));
@@ -457,10 +457,10 @@ int test_transition_with_Event3_j_eq_25()
 	setupStatemachine(&machine, &dummyTimer, &eventPool);
 
 	/*@Desc: receive interface for scope A */
-	ifaceA = test_TransitionStatemachine_get_interfaceA(&machine);
+	ifaceA = test_TransitionStatemachine_get_ifaceA(&machine);
 
 	/*@Desc: receive interface for default scope */
-	iface = test_TransitionStatemachine_get_interface(&machine);
+	iface = test_TransitionStatemachine_get_iface(&machine);
 
 	/*@Desc: check the initial state at position 0 */
 	printf("%s\n", getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)));
@@ -497,10 +497,10 @@ int test_transition_with_Event4_j_gt_30()
 	setupStatemachine(&machine, &dummyTimer, &eventPool);
 
 	/*@Desc: receive interface for scope A */
-	ifaceA = test_TransitionStatemachine_get_interfaceA(&machine);
+	ifaceA = test_TransitionStatemachine_get_ifaceA(&machine);
 
 	/*@Desc: receive interface for default scope */
-	iface = test_TransitionStatemachine_get_interface(&machine);
+	iface = test_TransitionStatemachine_get_iface(&machine);
 
 	/*@Desc: check the initial state at position 0 */
 	printf("%s\n", getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)));
@@ -537,10 +537,10 @@ int test_transition_with_Event4_j_lt_30()
 	setupStatemachine(&machine, &dummyTimer, &eventPool);
 
 	/*@Desc: receive interface for scope A */
-	ifaceA = test_TransitionStatemachine_get_interfaceA(&machine);
+	ifaceA = test_TransitionStatemachine_get_ifaceA(&machine);
 
 	/*@Desc: receive interface for default scope */
-	iface = test_TransitionStatemachine_get_interface(&machine);
+	iface = test_TransitionStatemachine_get_iface(&machine);
 
 	/*@Desc: check the initial state at position 0 */
 	printf("%s\n", getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)));
@@ -577,10 +577,10 @@ int test_after_transition_at_100_ms()
 	setupStatemachineMyTimer(&machine, &myTimer, &eventPool);
 
 	/*@Desc: receive interface for scope A */
-	ifaceA = test_TransitionStatemachine_get_interfaceA(&machine);
+	ifaceA = test_TransitionStatemachine_get_ifaceA(&machine);
 
 	/*@Desc: receive interface for default scope */
-	iface = test_TransitionStatemachine_get_interface(&machine);
+	iface = test_TransitionStatemachine_get_iface(&machine);
 
 	/*@Desc: check the initial state at position 0 */
 	printf("%s\n", getStateString(statemachineBase_getState((StatemachineBase*)&machine, 0)));
@@ -620,6 +620,7 @@ int test_after_transition_eventHandling_100ms()
 	EventPool eventPool;
 	Test_TransitionIfA* ifaceA = 0;
 	Test_TransitionIf* iface = 0;
+	_Event* time_100ms;
 
 	/*@Desc: setup initial statemachine */
 	setupStatemachineMyTimer(&machine, &myTimer, &eventPool);
@@ -633,7 +634,7 @@ int test_after_transition_eventHandling_100ms()
 	assert (timerPeriodic == bool_false);
 
 	/*@Desc: create timer event */
-	_Event* time_100ms = eventPool_createEvent(machine.base.eventPool, ev_state1_time_event_0);
+	time_100ms = eventPool_createEvent(machine.base.eventPool, ev_state1_time_event_0);
 
 	/*@Desc: set event1 on interface A with value 0 */
 	statemachine_cy_setEvent((Statemachine_cy*)&machine, time_100ms);
@@ -662,6 +663,7 @@ int test_after_transition_eventHandling_10s()
 	EventPool eventPool;
 	Test_TransitionIfA* ifaceA = 0;
 	Test_TransitionIf* iface = 0;
+	_Event* time_100ms;
 
 	/*@Desc: setup initial statemachine */
 	setupStatemachineMyTimer(&machine, &myTimer, &eventPool);
@@ -675,7 +677,7 @@ int test_after_transition_eventHandling_10s()
 	assert (timerPeriodic == bool_false);
 
 	/*@Desc: create timer event */
-	_Event* time_100ms = eventPool_createEvent(machine.base.eventPool, ev_state1_time_event_1);
+	time_100ms = eventPool_createEvent(machine.base.eventPool, ev_state1_time_event_1);
 
 	/*@Desc: set event1 on interface A with value 0 */
 	statemachine_cy_setEvent((Statemachine_cy*)&machine, time_100ms);