initial step of histories now contain an extra sequence

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

@@ -339,7 +339,7 @@ public class HistoryTest extends ModelSequencerTest {
 
 		HistoryEntry historyEntry = (HistoryEntry) historyEntryStep;
 		Sequence initialStep = (Sequence) historyEntry.getInitialStep();
-		assertCall(initialStep.getSteps().get(0), _s3.getEnterSequences()
+		assertCall(((Sequence)initialStep.getSteps().get(0)).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/ModelSequencerHistoryTest.java

@@ -102,7 +102,7 @@ public class ModelSequencerHistoryTest extends ModelSequencerTest {
 		HistoryEntry historyStep = (HistoryEntry) reactSequence_history
 				.getSteps().get(0);
 		assertFalse(historyStep.isDeep());
-		assertCall(((Sequence) historyStep.getInitialStep()).getSteps().get(0),
+		assertCall(firstStep(firstStep(historyStep.getInitialStep())),
 				_s3.getEnterSequences().get(0));
 		Reaction reaction_history = _t1.get(0);
 		assertCall(assertedSequence(reaction_history.getEffect()), 1,
@@ -110,7 +110,7 @@ public class ModelSequencerHistoryTest extends ModelSequencerTest {
 
 		Sequence reactSequence_initial = flow.getNodes().get(2)
 				.getReactSequence();
-		assertCall(((Sequence) reactSequence_initial.getSteps().get(0)), 0, _s4
+		assertCall(((Sequence) firstStep(firstStep(reactSequence_initial))), 0, _s4
 				.getEnterSequences().get(0));
 		Reaction reaction = _t1.get(1);
 		assertCall(assertedSequence(reaction.getEffect()), 1, _s2

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

@@ -511,13 +511,13 @@ public class ModelSequencerOrthogonalityTest extends ModelSequencerTest {
 		assertCall(_effect, 2, _s3a.getSuperScope().getEnterSequences().get(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,
+		assertCall(((Sequence) firstStep(firstStep(r3a_entryReactSequence))), 0,
 				_s3a.getEnterSequences().get(0));
 		assertCall(_effect, 3, _s3b2.getEnterSequences().get(0));
 		assertCall(_effect, 4, _s3c.getSuperScope().getEnterSequences().get(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,
+		assertCall(((Sequence) firstStep(firstStep(r3c_entryReactSequence))), 0,
 				_s3c.getEnterSequences().get(0));
 		assertTrue(_s3c.getEnterSequences().get(0).getSteps().get(0).getClass()
 				.getSimpleName(),

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

@@ -74,7 +74,7 @@ public class ModelSequencerSCTest extends ModelSequencerTest {
 		
 		assertCall(flow.getStates().get(0).getSuperScope().getEnterSequences().get(0),
 				0, entryReactSequence);
-		assertCall(((Sequence)entryReactSequence.getSteps().get(0)), 0, flow
+		assertCall(((Sequence) firstStep(firstStep(entryReactSequence))), 0, flow
 				.getStates().get(0).getEnterSequences().get(0));
 	}
 
@@ -98,7 +98,7 @@ public class ModelSequencerSCTest extends ModelSequencerTest {
 		
 		assertCall(flow.getStates().get(0).getSuperScope().getEnterSequences().get(0),
 				0, r1EntryReactSequence);
-		assertCall(((Sequence)r1EntryReactSequence.getSteps().get(0)), 0, flow
+		assertCall(((Sequence) firstStep(firstStep(r1EntryReactSequence))), 0, flow
 				.getStates().get(0).getEnterSequences().get(0));
 
 		assertCall(flow.getEnterSequences().get(0), 2, flow.getStates().get(2)
@@ -108,7 +108,7 @@ public class ModelSequencerSCTest extends ModelSequencerTest {
 		
 		assertCall(flow.getStates().get(2).getSuperScope().getEnterSequences().get(0),
 				0, r2EntryReactSequence);
-		assertCall(((Sequence)r2EntryReactSequence.getSteps().get(0)), 0, flow
+		assertCall(((Sequence) firstStep(firstStep(r2EntryReactSequence))), 0, flow
 				.getStates().get(2).getEnterSequences().get(0));
 
 	}

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

@@ -292,12 +292,12 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 		assertCall(_s1.getEnterSequences().get(0), 1, _s2.getSuperScope().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(((Sequence) firstStep(firstStep(r1EntryReactSequence))), 0, _s2.getEnterSequences().get(0));
 
 		assertCall(_s1.getEnterSequences().get(0), 2, _s3.getSuperScope().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));
+		assertCall(((Sequence) firstStep(firstStep(r2EntryReactSequence))), 0, _s3.getEnterSequences().get(0));
 	}
 
 	/**

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

@@ -12,6 +12,8 @@ package org.yakindu.sct.model.sexec.transformation.test;
 
 import org.junit.Before;
 import org.yakindu.sct.domain.generic.modules.GenericSequencerModule;
+import org.yakindu.sct.model.sexec.Sequence;
+import org.yakindu.sct.model.sexec.Step;
 import org.yakindu.sct.model.sexec.naming.DefaultNamingService;
 import org.yakindu.sct.model.sexec.naming.INamingService;
 import org.yakindu.sct.model.sexec.transformation.BehaviorMapping;
@@ -52,5 +54,13 @@ public class ModelSequencerTest extends Assert {
 		Injector injector = Guice.createInjector(m);
 		injector.injectMembers(this);
 	}
+	
+	
+	protected Step firstStep(Step seq){
+		org.junit.Assert.assertNotNull(seq);
+		assert (seq instanceof Sequence);
+		
+		return ((Sequence)seq).getSteps().get(0);
+	}
 
 }