Browse Source

fixed failed tests

terfloth@itemis.de 12 years ago
parent
commit
2bd2b7ca22

+ 13 - 5
test-plugins/org.yakindu.sct.model.sexec.test/src/org/yakindu/sct/model/sexec/transformation/test/AllTests.java

@@ -5,13 +5,21 @@ import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
 @RunWith(Suite.class)
-@SuiteClasses({ FlowOptimizer_ExecutionEntryTest.class, HistoryTest.class,
-		ModelSequencerSCTest.class, ModelSequencertDeclarationsTest.class,
-		ModelSequencerStateTest.class, ModelSequencerStateReactionTest.class,
+@SuiteClasses({ 
+		FlowOptimizer_ExecutionEntryTest.class, 
+		HistoryTest.class,
+		LocalReactionTest.class,
+		ModelSequencerSCTest.class, 
+		ModelSequencertDeclarationsTest.class,
+		ModelSequencerStateTest.class, 
+		ModelSequencerStateReactionTest.class,
 		ModelSequencerHierarchyTest.class,
 		ModelSequencerOrthogonalityTest.class,
-		ModelSequencerStateVectorTest.class, ModelSequencerHistoryTest.class,
-		SelfTransitionTest.class })
+		ModelSequencerStateVectorTest.class, 
+		ModelSequencerHistoryTest.class,
+		SelfTransitionTest.class,
+		StatechartEnterExistActionTest.class 
+		})
 public class AllTests {
 
 }

+ 7 - 5
test-plugins/org.yakindu.sct.model.sexec.test/src/org/yakindu/sct/model/sexec/transformation/test/LocalReactionTest.java

@@ -1,8 +1,6 @@
 package org.yakindu.sct.model.sexec.transformation.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 import static org.yakindu.sct.model.sexec.transformation.test.SCTTestUtil.TYPE_INTEGER;
 import static org.yakindu.sct.model.sexec.transformation.test.SCTTestUtil.findState;
 import static org.yakindu.sct.model.sexec.transformation.test.SCTTestUtil.flattenSequenceStepsAsList;
@@ -23,9 +21,11 @@ import org.yakindu.sct.model.sexec.Step;
 import org.yakindu.sct.model.sgraph.Region;
 import org.yakindu.sct.model.sgraph.State;
 import org.yakindu.sct.model.sgraph.Statechart;
+import org.yakindu.sct.model.sgraph.Transition;
 import org.yakindu.sct.model.stext.stext.AssignmentOperator;
 import org.yakindu.sct.model.stext.stext.LocalReaction;
 import org.yakindu.sct.model.stext.stext.ReactionEffect;
+import org.yakindu.sct.model.stext.stext.ReactionTrigger;
 import org.yakindu.sct.model.stext.stext.VariableDefinition;
 
 public class LocalReactionTest extends ModelSequencerTest {
@@ -72,7 +72,9 @@ public class LocalReactionTest extends ModelSequencerTest {
 			}
 		}
 
-		_createTransition(findState(sc, "s3"), findState(sc, "s6"));
+		Transition t = _createTransition(findState(sc, "s3"), findState(sc, "s6"));
+		ReactionTrigger tr = _createReactionTrigger(t);
+		tr.setGuardExpression(_createValue(true));
 
 		ExecutionFlow flow = sequencer.transform(sc);
 
@@ -118,7 +120,7 @@ public class LocalReactionTest extends ModelSequencerTest {
 				assertClass(CheckRef.class, _if.getCheck()).getCheck());
 
 		_if = assertClass(If.class, steps.get(2));
-		assertNull(assertClass(CheckRef.class, _if.getCheck()).getCheck());
+		assertNotNull(assertClass(CheckRef.class, _if.getCheck()).getCheck());
 		assertCall(_if.getThenStep(), _effect);
 	}
 

+ 7 - 1
test-plugins/org.yakindu.sct.model.sexec.test/src/org/yakindu/sct/model/sexec/transformation/test/StatechartEnterExistActionTest.java

@@ -22,9 +22,12 @@ import org.yakindu.sct.model.sexec.Sequence;
 import org.yakindu.sct.model.sexec.StateSwitch;
 import org.yakindu.sct.model.sexec.Step;
 import org.yakindu.sct.model.sexec.transformation.test.Assert.StepLeaf;
+import org.yakindu.sct.model.sgraph.Entry;
+import org.yakindu.sct.model.sgraph.EntryKind;
 import org.yakindu.sct.model.sgraph.Region;
 import org.yakindu.sct.model.sgraph.State;
 import org.yakindu.sct.model.sgraph.Statechart;
+import org.yakindu.sct.model.sgraph.Transition;
 import org.yakindu.sct.model.stext.stext.AssignmentOperator;
 import org.yakindu.sct.model.stext.stext.LocalReaction;
 import org.yakindu.sct.model.stext.stext.ReactionEffect;
@@ -56,7 +59,10 @@ public class StatechartEnterExistActionTest extends ModelSequencerTest {
 
 			Region r = _createRegion("r", sc);
 			{
-				_createState("s1", r);
+				Entry e = _createEntry(EntryKind.INITIAL, null, r);
+				State s1 = _createState("s1", r);
+				
+				Transition t = _createTransition(e, s1); 
 			}
 		}