fixed sequencer tests

test-plugins/org.yakindu.sct.model.sexec.test/src/org/yakindu/sct/model/sexec/transformation/test/Assert.java

@@ -118,13 +118,6 @@ public class Assert {
 		return null;
 	}
 
-	/**
-	 * @deprecated Already Sequence in this case. Assert will never fail
-	 */
-	@Deprecated
-	public static Sequence assertedSequence(Sequence step) {
-		return step;
-	}
 
 	public static Sequence assertedSequence(Step step) {
 

test-plugins/org.yakindu.sct.model.sexec.test/src/org/yakindu/sct/model/sexec/transformation/test/HistoryTest.java

@@ -328,7 +328,8 @@ public class HistoryTest extends ModelSequencerTest {
 				historyEntryStep instanceof HistoryEntry);
 
 		HistoryEntry historyEntry = (HistoryEntry) historyEntryStep;
-		assertCall(historyEntry.getInitialStep(), _s3.getEnterSequences().get(0));
+		Sequence initialStep = (Sequence) historyEntry.getInitialStep();
+		assertCall(initialStep.getSteps().get(0), _s3.getEnterSequences().get(0));
 		ExecutionRegion _r2 = (ExecutionRegion) _s3.getSuperScope();
 		assertCall(historyEntry.getHistoryStep(), _r2.getDeepEnterSequence());
 

test-plugins/org.yakindu.sct.model.sexec.test/src/org/yakindu/sct/model/sexec/transformation/test/ModelSequencerHierarchyTest.java

@@ -34,6 +34,7 @@ public class ModelSequencerHierarchyTest extends ModelSequencerTest {
 	 * The transition sequence must contain all exit actions for parent states
 	 * that will be left by a transition.
 	 */
+	@SuppressWarnings("unused")
 	@Test
 	public void testParentEntryDeep() {
 
@@ -114,6 +115,7 @@ public class ModelSequencerHierarchyTest extends ModelSequencerTest {
 	 * action.
 	 * 
 	 */
+	@SuppressWarnings("unused")
 	@Test
 	public void testParentEntryPartial() {
 
@@ -188,6 +190,7 @@ public class ModelSequencerHierarchyTest extends ModelSequencerTest {
 	/**
 	 * Transitions to sibling state must nut invoke parent exit actions.
 	 */
+	@SuppressWarnings("unused")
 	@Test
 	public void testParentEntryExclusionForSiblingTransitions() {
 
@@ -263,6 +266,7 @@ public class ModelSequencerHierarchyTest extends ModelSequencerTest {
 	 * The transition sequence must contain all exit actions for parent states
 	 * that will be left by a transition.
 	 */
+	@SuppressWarnings("unused")
 	@Test
 	public void testParentExitDeep() {
 
@@ -352,6 +356,7 @@ public class ModelSequencerHierarchyTest extends ModelSequencerTest {
 	 * action.
 	 * 
 	 */
+	@SuppressWarnings("unused")
 	@Test
 	public void testParentExitPartial() {
 
@@ -423,6 +428,7 @@ public class ModelSequencerHierarchyTest extends ModelSequencerTest {
 	/**
 	 * Transitions to sibling state must nut invoke parent exit actions.
 	 */
+	@SuppressWarnings("unused")
 	@Test
 	public void testParentExitExclusionForSiblingTransitions() {
 

test-plugins/org.yakindu.sct.model.sexec.test/src/org/yakindu/sct/model/sexec/transformation/test/ModelSequencerHistoryTest.java

@@ -37,6 +37,7 @@ import com.google.common.collect.Lists;
 
 public class ModelSequencerHistoryTest extends ModelSequencerTest {
 
+	@SuppressWarnings("unused")
 	@Test
 	public void testFlowName() {
 		Statechart sc = _createStatechart("sc");
@@ -91,14 +92,14 @@ public class ModelSequencerHistoryTest extends ModelSequencerTest {
 		HistoryEntry historyStep = (HistoryEntry) reactSequence_history
 				.getSteps().get(0);
 		assertFalse(historyStep.isDeep());
-		assertCall(historyStep.getInitialStep(), _s3.getEnterSequences().get(0));
+		assertCall(((Sequence) historyStep.getInitialStep()).getSteps().get(0), _s3.getEnterSequences().get(0));
 		Reaction reaction_history = _t1.get(0);
 		assertCall(assertedSequence(reaction_history.getEffect()), 1,
 				reactSequence_history);
 
 		Sequence reactSequence_initial = flow.getNodes().get(2)
 				.getReactSequence();
-		assertCall(reactSequence_initial, 0, _s4.getEnterSequences().get(0));
+		assertCall(((Sequence) reactSequence_initial.getSteps().get(0)), 0, _s4.getEnterSequences().get(0));
 		Reaction reaction = _t1.get(1);
 		assertCall(assertedSequence(reaction.getEffect()), 1,
 				_s2.getEnterSequences().get(0));

test-plugins/org.yakindu.sct.model.sexec.test/src/org/yakindu/sct/model/sexec/transformation/test/ModelSequencerOrthogonalityTest.java

@@ -92,6 +92,7 @@ public class ModelSequencerOrthogonalityTest extends ModelSequencerTest {
 	 * The transition to a leaf state with orthogonal siblings must invoke the
 	 * entry sequence of the orthogonal sibling regions.
 	 */
+	@SuppressWarnings("unused")
 	@Test
 	public void testSiblingRegionEntryOnTargetState() {
 
@@ -286,6 +287,7 @@ public class ModelSequencerOrthogonalityTest extends ModelSequencerTest {
 	 * Local transition within a region with orthogonal siblings does not have
 	 * to invoke sibling region entries or exists.
 	 */
+	@SuppressWarnings("unused")
 	@Test
 	public void testSiblingStateTransition() {
 
@@ -392,6 +394,7 @@ public class ModelSequencerOrthogonalityTest extends ModelSequencerTest {
 	 * orthogonal sibling state must exclude the source state sibling entry
 	 * behavior.
 	 */
+	@SuppressWarnings("unused")
 	@Test
 	public void testSourceSiblingEnterExclusion() {
 
@@ -496,15 +499,15 @@ public class ModelSequencerOrthogonalityTest extends ModelSequencerTest {
 		assertCall(_effect, 0, _s3z.getExitSequence());
 		assertCall(_effect, 1, _s3.getEntryAction());
 		assertCall(_effect, 2, _s3a.getSuperScope().getEnterSequences().get(0));
-		assertCall(_s3a.getSuperScope().getEnterSequences().get(0), 0, flow.getNodes()
-				.get(3).getReactSequence());
-		assertCall(flow.getNodes().get(3).getReactSequence(), 0,
+		Sequence r3a_entryReactSequence = flow.getNodes().get(3).getReactSequence();
+		assertCall(_s3a.getSuperScope().getEnterSequences().get(0), 0, r3a_entryReactSequence);
+		assertCall(((Sequence) r3a_entryReactSequence.getSteps().get(0)), 0,
 				_s3a.getEnterSequences().get(0));
 		assertCall(_effect, 3, _s3b2.getEnterSequences().get(0));
 		assertCall(_effect, 4, _s3c.getSuperScope().getEnterSequences().get(0));
-		assertCall(_s3c.getSuperScope().getEnterSequences().get(0), 0, flow.getNodes()
-				.get(5).getReactSequence());
-		assertCall(flow.getNodes().get(5).getReactSequence(), 0,
+		Sequence r3c_entryReactSequence = flow.getNodes().get(5).getReactSequence();
+		assertCall(_s3c.getSuperScope().getEnterSequences().get(0), 0, r3c_entryReactSequence);
+		assertCall(((Sequence) r3c_entryReactSequence.getSteps().get(0)), 0,
 				_s3c.getEnterSequences().get(0));
 		assertTrue(_s3c.getEnterSequences().get(0).getSteps().get(0).getClass()
 				.getSimpleName(),
@@ -522,6 +525,7 @@ public class ModelSequencerOrthogonalityTest extends ModelSequencerTest {
 	 * The transition from a leaf state with orthogonal siblings must invoke the
 	 * exit sequence of the orthogonal sibling regions.
 	 */
+	@SuppressWarnings("unused")
 	@Test
 	public void testSiblingRegionExitFromSourceState() {
 
@@ -741,6 +745,7 @@ public class ModelSequencerOrthogonalityTest extends ModelSequencerTest {
 	 * orthogonal sibling state must exclude the source state sibling exit or
 	 * enter behavior.
 	 */
+	@SuppressWarnings("unused")
 	@Test
 	public void testSourceSiblingExitExclusion() {
 
@@ -1063,6 +1068,7 @@ public class ModelSequencerOrthogonalityTest extends ModelSequencerTest {
 	 * When exiting an orthogonal state exits must be performed in a well
 	 * defined order bottom up with highest priority/order states first.
 	 */
+	@SuppressWarnings("unused")
 	@Test
 	public void testBottomUpExitSequence_ThreeLevels() {
 
@@ -1399,6 +1405,7 @@ public class ModelSequencerOrthogonalityTest extends ModelSequencerTest {
 
 	}
 
+	@SuppressWarnings("unused")
 	private Statechart setUpDeepExitSC() {
 		Statechart sc = _createStatechart("sc");
 		{

test-plugins/org.yakindu.sct.model.sexec.test/src/org/yakindu/sct/model/sexec/transformation/test/ModelSequencerSCTest.java

@@ -60,9 +60,11 @@ public class ModelSequencerSCTest extends ModelSequencerTest {
 		assertCall(flow.getEnterSequences().get(0), 1, flow.getStates().get(0)
 				.getSuperScope().getEnterSequences().get(0));
 
+		Sequence entryReactSequence = flow.getNodes().get(0).getReactSequence();
+		
 		assertCall(flow.getStates().get(0).getSuperScope().getEnterSequences().get(0),
-				0, flow.getNodes().get(0).getReactSequence());
-		assertCall(flow.getNodes().get(0).getReactSequence(), 0, flow
+				0, entryReactSequence);
+		assertCall(((Sequence)entryReactSequence.getSteps().get(0)), 0, flow
 				.getStates().get(0).getEnterSequences().get(0));
 	}
 
@@ -81,16 +83,22 @@ public class ModelSequencerSCTest extends ModelSequencerTest {
 		assertCall(flow.getEnterSequences().get(0), 0, flow.getEntryAction());
 		assertCall(flow.getEnterSequences().get(0), 1, flow.getStates().get(0)
 				.getSuperScope().getEnterSequences().get(0));
+		
+		Sequence r1EntryReactSequence = flow.getNodes().get(0).getReactSequence();
+		
 		assertCall(flow.getStates().get(0).getSuperScope().getEnterSequences().get(0),
-				0, flow.getNodes().get(0).getReactSequence());
-		assertCall(flow.getNodes().get(0).getReactSequence(), 0, flow
+				0, r1EntryReactSequence);
+		assertCall(((Sequence)r1EntryReactSequence.getSteps().get(0)), 0, flow
 				.getStates().get(0).getEnterSequences().get(0));
 
 		assertCall(flow.getEnterSequences().get(0), 2, flow.getStates().get(2)
 				.getSuperScope().getEnterSequences().get(0));
+
+		Sequence r2EntryReactSequence = flow.getNodes().get(1).getReactSequence();
+		
 		assertCall(flow.getStates().get(2).getSuperScope().getEnterSequences().get(0),
-				0, flow.getNodes().get(1).getReactSequence());
-		assertCall(flow.getNodes().get(1).getReactSequence(), 0, flow
+				0, r2EntryReactSequence);
+		assertCall(((Sequence)r2EntryReactSequence.getSteps().get(0)), 0, flow
 				.getStates().get(2).getEnterSequences().get(0));
 
 	}

test-plugins/org.yakindu.sct.model.sexec.test/src/org/yakindu/sct/model/sexec/transformation/test/ModelSequencerStateReactionTest.java

@@ -383,6 +383,7 @@ public class ModelSequencerStateReactionTest extends ModelSequencerTest {
 	 * If a time trigger is defined for a transition then an event must be
 	 * introduced into the execution flow.
 	 */
+	@SuppressWarnings("unused")
 	@Test
 	public void testSingleTransitionTimeTrigger() {
 
@@ -436,6 +437,7 @@ public class ModelSequencerStateReactionTest extends ModelSequencerTest {
 	/**
 	 * 
 	 */
+	@SuppressWarnings("unused")
 	@Test
 	public void testSingleLocalTimeTrigger() {
 
@@ -477,6 +479,7 @@ public class ModelSequencerStateReactionTest extends ModelSequencerTest {
 	/**
 	 * Local reactions must be created for behavior with 'always' trigger
 	 */
+	@SuppressWarnings("unused")
 	@Test
 	public void testAlwaysLocalReaction() {
 

test-plugins/org.yakindu.sct.model.sexec.test/src/org/yakindu/sct/model/sexec/transformation/test/ModelSequencerStateTest.java

@@ -67,7 +67,6 @@ import org.yakindu.sct.model.stext.stext.InterfaceScope;
 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.StextFactory;
 import org.yakindu.sct.model.stext.stext.VariableDefinition;
 
 public class ModelSequencerStateTest extends ModelSequencerTest {
@@ -172,6 +171,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 	 * A leaf state must have a enter sequence. This enter sequence consists of
 	 * an entry action call and a state enter step.
 	 */
+	@SuppressWarnings("unused")
 	@Test
 	public void testFinalStateEnterSequence() {
 		Statechart sc = _createStatechart("cs");
@@ -197,6 +197,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 	 * A leaf state must have a enter sequence. This enter sequence consists of
 	 * an entry action call and a state enter step.
 	 */
+	@SuppressWarnings("unused")
 	@Test
 	public void testLeafStateEnterSequence() {
 		Statechart sc = _createStatechart("cs");
@@ -279,12 +280,14 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 
 		assertCall(_s1.getEnterSequences().get(0), 0, _s1.getEntryAction());
 		assertCall(_s1.getEnterSequences().get(0), 1, _s2.getSuperScope().getEnterSequences().get(0));
-		assertCall(_s2.getSuperScope().getEnterSequences().get(0), 0, flow.getNodes().get(0).getReactSequence());
-		assertCall(flow.getNodes().get(0).getReactSequence(), 0, _s2.getEnterSequences().get(0));
+		Sequence r1EntryReactSequence = flow.getNodes().get(0).getReactSequence();
+		assertCall(_s2.getSuperScope().getEnterSequences().get(0), 0, r1EntryReactSequence);
+		assertCall(((Sequence) r1EntryReactSequence.getSteps().get(0)), 0, _s2.getEnterSequences().get(0));
 
 		assertCall(_s1.getEnterSequences().get(0), 2, _s3.getSuperScope().getEnterSequences().get(0));
-		assertCall(_s3.getSuperScope().getEnterSequences().get(0), 0, flow.getNodes().get(1).getReactSequence());
-		assertCall(flow.getNodes().get(1).getReactSequence(), 0, _s3.getEnterSequences().get(0));
+		Sequence r2EntryReactSequence = flow.getNodes().get(1).getReactSequence();
+		assertCall(_s3.getSuperScope().getEnterSequences().get(0), 0, r2EntryReactSequence);
+		assertCall(((Sequence) r2EntryReactSequence.getSteps().get(0)), 0, _s3.getEnterSequences().get(0));
 	}
 
 	/**
@@ -321,6 +324,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 	 * A final state must have a exit sequence. This exit sequence consists of a
 	 * state exit step.
 	 */
+	@SuppressWarnings("unused")
 	@Test
 	public void testFinalStateExitSequence() {
 		Statechart sc = _createStatechart("cs");
@@ -345,6 +349,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 	 * A composite state must have a exit sequence. This exit sequence consists
 	 * of an exit action call and a state switch for all leaf states.
 	 */
+	@SuppressWarnings("unused")
 	@Test
 	public void testCompositeStateExitSequence() {
 		Statechart sc = _createStatechart("cs");
@@ -402,9 +407,9 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 		assertEquals(3, _s1.getExitSequence().getSteps().size());
 
 		Sequence _r1_s1 = _s2.getSuperScope().getExitSequence();
-		assertCall(assertedSequence(_s1.getExitSequence()), 0, _r1_s1);
+		assertCall(_s1.getExitSequence(), 0, _r1_s1);
 		Sequence _r2_s1 = _s4.getSuperScope().getExitSequence();
-		assertCall(assertedSequence(_s1.getExitSequence()), 1, _r2_s1);
+		assertCall(_s1.getExitSequence(), 1, _r2_s1);
 
 		Step _switch = _r1_s1.getSteps().get(0);
 		assertStateSwitch(_switch, _s2, _s3);
@@ -424,6 +429,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 	 * A composite state must have a exit sequence. This exit sequence consists
 	 * of an exit action call and a state switch for all leaf states.
 	 */
+	@SuppressWarnings("unused")
 	@Test
 	public void testCompositeStateExitSequence_Deep() {
 
@@ -569,6 +575,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 	/**
 	 * The exit action must be part of the reaction effect sequence
 	 */
+	@SuppressWarnings("unused")
 	@Test
 	public void testStateReaction_WithExitAction() {
 		SimpleFlatTSC tsc = new SimpleFlatTSC();
@@ -601,6 +608,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 	/**
 	 * The exit action must be part of the reaction effect sequence
 	 */
+	@SuppressWarnings("unused")
 	@Test
 	public void testStateReaction_WithEntryAction() {
 		SimpleFlatTSC tsc = new SimpleFlatTSC();
@@ -674,6 +682,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 
 	}
 
+	@SuppressWarnings("unused")
 	@Test
 	public void testStateCycle_WithLocalReactions() {
 		SimpleFlatTSC tsc = new SimpleFlatTSC();
@@ -764,6 +773,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 	 * The cycle sequence of a state that only consists of local reactions
 	 * includes sequential processing of the local reactions.
 	 */
+	@SuppressWarnings("unused")
 	@Test
 	public void testStateCycle_WithLocalReactionsOnly() {
 		MinimalTSC tsc = new MinimalTSC();
@@ -844,6 +854,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 	}
 
 	/** Entry action behaviors are not directly part of the states cycle steps */
+	@SuppressWarnings("unused")
 	@Test
 	public void testStateCycle_EntryActionExclusion() {
 		MinimalTSC tsc = new MinimalTSC();
@@ -868,6 +879,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 	}
 
 	/** Exit action behaviors are not directly part of the states cycle steps */
+	@SuppressWarnings("unused")
 	@Test
 	public void testStateCycle_ExitActionExclusion() {
 		MinimalTSC tsc = new MinimalTSC();
@@ -895,6 +907,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 	 * Local reactions that define regular and entry triggers side by side must
 	 * also be part of the cycle steps.
 	 */
+	@SuppressWarnings("unused")
 	@Test
 	public void testStateCycle_LocalReactionWithMixedRegularAndEntryTrigger() {
 		MinimalTSC tsc = new MinimalTSC();
@@ -931,6 +944,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 	/**
 	 * The state cycle must contain all reactions of parent states.
 	 */
+	@SuppressWarnings("unused")
 	@Test
 	public void testStateCycle_WithParent() {
 
@@ -1030,6 +1044,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 	 * A final state must be transformed into a execution state with name
 	 * '_final_'. and must include parent reactions.
 	 */
+	@SuppressWarnings("unused")
 	@Test
 	public void testFinalState() {
 
@@ -1127,6 +1142,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 	/**
 	 * The enter sequence must be called withnin incoming transitions.
 	 */
+	@SuppressWarnings("unused")
 	@Test
 	public void testFinalStateEnterSequenceCall() {
 

test-plugins/org.yakindu.sct.model.sexec.test/src/org/yakindu/sct/model/sexec/transformation/test/ModelSequencertDeclarationsTest.java

@@ -65,6 +65,7 @@ public class ModelSequencertDeclarationsTest extends ModelSequencerTest {
 		assertTrue(_scope instanceof InternalScope);
 	}
 
+	@SuppressWarnings("unused")
 	@Test
 	public void testMapScope() {
 

test-plugins/org.yakindu.sct.model.sexec.test/src/org/yakindu/sct/model/sexec/transformation/test/SelfTransitionTest.java

@@ -26,6 +26,7 @@ import org.yakindu.sct.model.stext.stext.VariableDefinition;
 
 public class SelfTransitionTest extends ModelSequencerTest {
 
+	@SuppressWarnings("unused")
 	@Test
 	public void testFlowName() {
 		Statechart sc = _createStatechart("sc");

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

@@ -37,6 +37,7 @@ public class StatechartEnterExistActionTest extends ModelSequencerTest {
 	 * The transition sequence must contain all exit actions for parent states
 	 * that will be left by a transition.
 	 */
+	@SuppressWarnings("unused")
 	@Test
 	public void testSCLocalReaction() {