Pārlūkot izejas kodu

Added custom OperationTests for C, removed Operations from AllTests

bohl@itemis.de 10 gadi atpakaļ
vecāks
revīzija
d701b3cde8

+ 10 - 2
test-plugins/org.yakindu.sct.generator.c.test/gtests/Operations/Operations.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2014 committers of YAKINDU and others.
+* Copyright (c) 2015 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
@@ -15,9 +15,17 @@
 
 Operations handle;
 
-TEST(StatemachineTest, OperationCallback) {
+TEST(StatemachineTest, OperationsTest) {
 	operations_init(&handle);
 	operations_enter(&handle);
+	operations_runCycle(&handle);
+	EXPECT_TRUE(operations_isActive(&handle, Operations_main_region_B));
+	operationsIface_raise_ev(&handle);
+	operations_runCycle(&handle);
+	EXPECT_TRUE(operations_isActive(&handle, Operations_main_region_C));
+	operationsIface_raise_ev(&handle);
+	operations_runCycle(&handle);
+	EXPECT_TRUE(operations_isActive(&handle, Operations_main_region_D));
 }
 
 		

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 669 - 30
test-plugins/org.yakindu.sct.generator.c.test/model/test.sgen


+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/src/org/yakindu/sct/generator/c/test/AllTestsTestCustom.java

@@ -15,6 +15,6 @@ import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
 @RunWith(Suite.class)
-@SuiteClasses({})
+@SuiteClasses({OperationsCustom.class, OperationsWithoutBracesCustom.class})
 public class AllTestsTestCustom {
 }

+ 5 - 6
test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/AllTests.java

@@ -26,12 +26,11 @@ import org.junit.runners.Suite.SuiteClasses;
 		InEventLifeCycle.class, IntegerExpressions.class,
 		InternalEventLifeCycle.class, LocalReactions.class,
 		LogicalAndTests.class, LogicalOrTests.class,
-		NamedInterfaceAccess.class, OperationsWithoutBraces.class,
-		OutEventLifeCycle.class, Parenthesis.class, PriorityValues.class,
-		RaiseEvent.class, SameNameDifferentRegion.class, ShallowHistory.class,
-		ShallowHistoryWithDeepEntry.class, SimpleEvent.class,
-		StatechartLocalReactions.class, SimpleHierachy.class,
-		StateIsActive.class, StaticChoice.class,
+		NamedInterfaceAccess.class, OutEventLifeCycle.class, Parenthesis.class,
+		PriorityValues.class, RaiseEvent.class, SameNameDifferentRegion.class,
+		ShallowHistory.class, ShallowHistoryWithDeepEntry.class,
+		SimpleEvent.class, StatechartLocalReactions.class,
+		SimpleHierachy.class, StateIsActive.class, StaticChoice.class,
 		STextKeywordsInStatesAndRegions.class, StringExpressions.class,
 		SyncFork.class, SyncJoin.class, TransitionWithoutCondition.class,
 		TriggerGuardExpressions.class, ValuedEvents.class})

+ 1 - 1
test-plugins/org.yakindu.sct.test.models/tests/AllTests.sctunit

@@ -31,7 +31,7 @@ testsuite AllTests {
 	LogicalAndTests, 
 	LogicalOrTests,
 	NamedInterfaceAccess,
-	OperationsWithoutBraces,
+//	OperationsWithoutBraces,
 	OutEventLifeCycle,
 	Parenthesis,
 	PriorityValues,

+ 22 - 0
test-plugins/org.yakindu.sct.test.models/tests/Operations.sctunit

@@ -0,0 +1,22 @@
+
+testgroup Operations for statechart Operations{
+	test OperationsTest { 
+		enter
+		 
+		cycle
+		assert active (Operations.main_region.B)
+		
+		
+		raise ev
+		cycle
+		
+		assert active(Operations.main_region.C)
+		
+		raise ev
+		cycle
+		
+		assert active(Operations.main_region.D)
+		 
+	} 
+}
+