Browse Source

Changed initialisation of event Pool in Test cases

jos.itemis@gmail.com 14 years ago
parent
commit
595f78d5df

+ 3 - 0
TestScenarios/GenModelC.sgen

@@ -1,5 +1,8 @@
 GeneratorModel for yakindu::c {
 GeneratorModel for yakindu::c {
 	statechart InterfaceTest {
 	statechart InterfaceTest {
+		feature Debug {
+			dumpSexec = true
+		}
 		feature	Outlet {
 		feature	Outlet {
 			targetProject = "TestScenarios"
 			targetProject = "TestScenarios"
 			targetFolder = "src-gen-c/InterfaceTest"
 			targetFolder = "src-gen-c/InterfaceTest"

+ 1 - 1
TestScenarios/test-c/InterfaceTest/main.c

@@ -17,7 +17,7 @@ void setupStatemachine(InterfaceTestStatemachine* machine, Timer* dummyTimer, Ev
 	dummyTimer_init(dummyTimer);
 	dummyTimer_init(dummyTimer);
 
 
 	/* Set up Event Pool */
 	/* Set up Event Pool */
-	eventPool_init_heap(eventPool, event_last, MAXEVENTSPERTYPE);
+	interfaceTest_eventPool_init_heap(eventPool, MAXEVENTSPERTYPE);
 
 
 	/* initialize state machine */
 	/* initialize state machine */
 	interfaceTestStatemachine_init(machine, dummyTimer, eventPool);
 	interfaceTestStatemachine_init(machine, dummyTimer, eventPool);

+ 1 - 1
TestScenarios/test-c/Test_Expression/main.c

@@ -19,7 +19,7 @@ void setupStatemachine(Test_ExpressionStatemachine* machine, Timer* dummyTimer,
 	dummyTimer_init(dummyTimer);
 	dummyTimer_init(dummyTimer);
 
 
 	/* Set up Event Pool */
 	/* Set up Event Pool */
-	eventPool_init_heap(eventPool, event_last, MAXEVENTSPERTYPE);
+	test_Expression_eventPool_init_heap(eventPool, MAXEVENTSPERTYPE);
 
 
 	/* initialize state machine */
 	/* initialize state machine */
 	test_ExpressionStatemachine_init(machine, dummyTimer, eventPool);
 	test_ExpressionStatemachine_init(machine, dummyTimer, eventPool);

+ 1 - 1
TestScenarios/test-c/Test_Hierarchy/main.c

@@ -35,7 +35,7 @@ void setupStatemachine(Test_HierarchyStatemachine* machine, Timer* dummyTimer, E
 	dummyTimer_init(dummyTimer);
 	dummyTimer_init(dummyTimer);
 
 
 	/* Set up Event Pool */
 	/* Set up Event Pool */
-	eventPool_init_heap(eventPool, event_last, MAXEVENTSPERTYPE);
+	test_Hierarchy_eventPool_init_heap(eventPool, MAXEVENTSPERTYPE);
 
 
 	/* initialize state machine */
 	/* initialize state machine */
 	test_HierarchyStatemachine_init(machine, dummyTimer, eventPool);
 	test_HierarchyStatemachine_init(machine, dummyTimer, eventPool);

+ 1 - 1
TestScenarios/test-c/Test_LocalActions/main.c

@@ -25,7 +25,7 @@ void setupStatemachine(Test_LocalActionsStatemachine* machine, Timer* dummyTimer
 	dummyTimer_init(dummyTimer);
 	dummyTimer_init(dummyTimer);
 
 
 	/* Set up Event Pool */
 	/* Set up Event Pool */
-	eventPool_init_heap(eventPool, event_last, MAXEVENTSPERTYPE);
+	test_LocalActions_eventPool_init_heap(eventPool, MAXEVENTSPERTYPE);
 
 
 	/* initialize state machine */
 	/* initialize state machine */
 	test_LocalActionsStatemachine_init(machine, dummyTimer, eventPool);
 	test_LocalActionsStatemachine_init(machine, dummyTimer, eventPool);

+ 1 - 1
TestScenarios/test-c/Test_ParallelRegions/main.c

@@ -25,7 +25,7 @@ void setupStatemachine(Test_ParallelRegionsStatemachine* machine, Timer* dummyTi
 	dummyTimer_init(dummyTimer);
 	dummyTimer_init(dummyTimer);
 
 
 	/* Set up Event Pool */
 	/* Set up Event Pool */
-	eventPool_init_heap(eventPool, event_last, MAXEVENTSPERTYPE);
+	test_ParallelRegions_eventPool_init_heap(eventPool, MAXEVENTSPERTYPE);
 
 
 	/* initialize state machine */
 	/* initialize state machine */
 	test_ParallelRegionsStatemachine_init(machine, dummyTimer, eventPool);
 	test_ParallelRegionsStatemachine_init(machine, dummyTimer, eventPool);

+ 1 - 1
TestScenarios/test-c/Test_ShallowHistory/main.c

@@ -25,7 +25,7 @@ void setupStatemachine(Test_ShallowHistoryStatemachine* machine, Timer* dummyTim
 	dummyTimer_init(dummyTimer);
 	dummyTimer_init(dummyTimer);
 
 
 	/* Set up Event Pool */
 	/* Set up Event Pool */
-	eventPool_init_heap(eventPool, event_last, MAXEVENTSPERTYPE);
+	test_ShallowHistory_eventPool_init_heap(eventPool, MAXEVENTSPERTYPE);
 
 
 	/* initialize state machine */
 	/* initialize state machine */
 	test_ShallowHistoryStatemachine_init(machine, dummyTimer, eventPool);
 	test_ShallowHistoryStatemachine_init(machine, dummyTimer, eventPool);

+ 1 - 1
TestScenarios/test-c/Test_Transition/main.c

@@ -25,7 +25,7 @@ void setupStatemachine(Test_TransitionStatemachine* machine, Timer* dummyTimer,
 	dummyTimer_init(dummyTimer);
 	dummyTimer_init(dummyTimer);
 
 
 	/* Set up Event Pool */
 	/* Set up Event Pool */
-	eventPool_init_heap(eventPool, event_last, MAXEVENTSPERTYPE);
+	test_Transition_eventPool_init_heap(eventPool, MAXEVENTSPERTYPE);
 
 
 	/* initialize state machine */
 	/* initialize state machine */
 	test_TransitionStatemachine_init(machine, dummyTimer, eventPool);
 	test_TransitionStatemachine_init(machine, dummyTimer, eventPool);