Prechádzať zdrojové kódy

Regenerated test code.

markus.muehlbrandt@gmail.com 12 rokov pred
rodič
commit
d776e07560

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/Choice/Choice.cc

@@ -80,5 +80,5 @@ TEST(StatemachineTest, alwaysTrueTransitionInChoice) {
 	choiceIface_set_c(&handle, true);
 	choiceIface_raise_h(&handle);
 	choice_runCycle(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_B));
+	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_C));
 }

+ 1 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/gtests/ChoiceTest/ChoiceTest.cc

@@ -86,6 +86,6 @@ TEST(StatemachineTest, alwaysTrueTransitionInChoice) {
 	statechart->getSCInterface()->set_c(true);
 	statechart->raise_h();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Choice::Choice_main_region_B));
+	EXPECT_TRUE(statechart->isActive(Choice::Choice_main_region_C));
 	delete statechart;
 }

+ 7 - 2
test-plugins/org.yakindu.sct.generator.java.test/src-gen/org/yakindu/scr/choice/ChoiceStatemachine.java

@@ -201,8 +201,13 @@ public class ChoiceStatemachine implements IChoiceStatemachine {
 						nextStateIndex = 0;
 						stateVector[0] = State.$NullState$;
 
-						nextStateIndex = 0;
-						stateVector[0] = State.main_region_B;
+						if (sCInterface.c) {
+							nextStateIndex = 0;
+							stateVector[0] = State.main_region_C;
+						} else {
+							nextStateIndex = 0;
+							stateVector[0] = State.main_region_B;
+						}
 					}
 				}
 			}

+ 1 - 1
test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/sct/generator/java/test/ChoiceTest.java

@@ -97,6 +97,6 @@ public class ChoiceTest {
 		statemachine.setC(true);
 		statemachine.raiseH();
 		statemachine.runCycle();
-		assertTrue(statemachine.isStateActive(State.main_region_B));
+		assertTrue(statemachine.isStateActive(State.main_region_C));
 	}
 }

+ 1 - 1
test-plugins/org.yakindu.sct.model.sexec.interpreter.test/test-gen/org/yakindu/sct/model/sexec/interpreter/test/ChoiceTest.java

@@ -96,6 +96,6 @@ public class ChoiceTest extends AbstractExecutionFlowTest {
 		setBoolean("c", true);
 		raiseEvent("h");
 		interpreter.runCycle();
-		assertTrue(isActive("B"));
+		assertTrue(isActive("C"));
 	}
 }

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

@@ -84,7 +84,7 @@ testgroup Choice for statechart Choice {
 		raise h
 		
 		cycle		
-		assert active (Choice.main_region.B)
+		assert active (Choice.main_region.C)
 	}