Fixed test to be copatible with new type system

test-plugins/org.yakindu.sct.model.sexec.test/META-INF/MANIFEST.MF

@@ -17,5 +17,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.yakindu.sct.model.sexec;bundle-version="1.0.0",
  org.eclipse.xtext.xtend2;bundle-version="2.0.0",
  org.eclipse.xtext.xbase.lib;bundle-version="2.0.0",
- org.eclipse.xtext.xtend2.lib;bundle-version="2.0.0"
+ org.eclipse.xtext.xtend2.lib;bundle-version="2.0.0",
+ org.yakindu.base.types;bundle-version="1.0.0"
 Export-Package: org.yakindu.sct.model.sexec.transformation.test

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

@@ -12,7 +12,6 @@ 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.stext.stext.InterfaceScope;
-import org.yakindu.sct.model.stext.stext.Type;
 import org.yakindu.sct.model.stext.stext.VariableDefinition;
 
  
@@ -27,7 +26,7 @@ public class ModelSequencerHierarchyTest extends ModelSequencerTest {
 		Statechart sc = _createStatechart("sc"); {  
 			
 			InterfaceScope s_scope = _createInterfaceScope("Interface", sc);
-			VariableDefinition v1 = _createVariableDefinition("v1", Type.INTEGER, s_scope);
+			VariableDefinition v1 = _createVariableDefinition("v1", TYPE_INTEGER, s_scope);
 			
 
 			Region r = _createRegion("r", sc); {
@@ -99,7 +98,7 @@ public class ModelSequencerHierarchyTest extends ModelSequencerTest {
 		Statechart sc = _createStatechart("sc"); {  
 			
 			InterfaceScope s_scope = _createInterfaceScope("Interface", sc);
-			VariableDefinition v1 = _createVariableDefinition("v1", Type.INTEGER, s_scope);
+			VariableDefinition v1 = _createVariableDefinition("v1", TYPE_INTEGER, s_scope);
 			
 
 			Region r = _createRegion("r", sc); {
@@ -167,7 +166,7 @@ public class ModelSequencerHierarchyTest extends ModelSequencerTest {
 		Statechart sc = _createStatechart("sc"); {  
 			
 			InterfaceScope s_scope = _createInterfaceScope("Interface", sc);
-			VariableDefinition v1 = _createVariableDefinition("v1", Type.INTEGER, s_scope);
+			VariableDefinition v1 = _createVariableDefinition("v1", TYPE_INTEGER, s_scope);
 			
 
 			Region r = _createRegion("r", sc); {
@@ -237,7 +236,7 @@ public class ModelSequencerHierarchyTest extends ModelSequencerTest {
 		Statechart sc = _createStatechart("sc"); {  
 			
 			InterfaceScope s_scope = _createInterfaceScope("Interface", sc);
-			VariableDefinition v1 = _createVariableDefinition("v1", Type.INTEGER, s_scope);
+			VariableDefinition v1 = _createVariableDefinition("v1", TYPE_INTEGER, s_scope);
 			
 
 			Region r = _createRegion("r", sc); {
@@ -304,7 +303,7 @@ public class ModelSequencerHierarchyTest extends ModelSequencerTest {
 		Statechart sc = _createStatechart("sc"); {  
 			
 			InterfaceScope s_scope = _createInterfaceScope("Interface", sc);
-			VariableDefinition v1 = _createVariableDefinition("v1", Type.INTEGER, s_scope);
+			VariableDefinition v1 = _createVariableDefinition("v1", TYPE_INTEGER, s_scope);
 			
 
 			Region r = _createRegion("r", sc); {
@@ -368,7 +367,7 @@ public class ModelSequencerHierarchyTest extends ModelSequencerTest {
 		Statechart sc = _createStatechart("sc"); {  
 			
 			InterfaceScope s_scope = _createInterfaceScope("Interface", sc);
-			VariableDefinition v1 = _createVariableDefinition("v1", Type.INTEGER, s_scope);
+			VariableDefinition v1 = _createVariableDefinition("v1", TYPE_INTEGER, s_scope);
 			
 
 			Region r = _createRegion("r", sc); {

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

@@ -40,7 +40,6 @@ import org.yakindu.sct.model.stext.stext.ReactionTrigger;
 import org.yakindu.sct.model.stext.stext.StextFactory;
 import org.yakindu.sct.model.stext.stext.TimeEventType;
 import org.yakindu.sct.model.stext.stext.TimeUnit;
-import org.yakindu.sct.model.stext.stext.Type;
 import org.yakindu.sct.model.stext.stext.VariableDefinition;
 
 public class ModelSequencerStateReactionTest extends ModelSequencerTest {
@@ -219,7 +218,7 @@ public class ModelSequencerStateReactionTest extends ModelSequencerTest {
 		
 		Statechart sc = _createStatechart("test");
 		Scope scope = _createInterfaceScope("interface", sc);
-		VariableDefinition v1 = _createVariableDefinition("v1", Type.INTEGER, scope);
+		VariableDefinition v1 = _createVariableDefinition("v1", TYPE_INTEGER, scope);
 		Region r = _createRegion("main", sc);
 		State s= _createState("s", r);
 
@@ -270,7 +269,7 @@ public class ModelSequencerStateReactionTest extends ModelSequencerTest {
 		
 		Statechart sc = _createStatechart("test");
 		Scope scope = _createInterfaceScope("interface", sc);
-		VariableDefinition v1 = _createVariableDefinition("v1", Type.INTEGER, scope);
+		VariableDefinition v1 = _createVariableDefinition("v1", TYPE_INTEGER, scope);
 		Region r = _createRegion("main", sc);
 		State s= _createState("s", r);
 
@@ -309,7 +308,7 @@ public class ModelSequencerStateReactionTest extends ModelSequencerTest {
 		
 		Statechart sc = _createStatechart("test");
 		Scope scope = _createInterfaceScope("interface", sc);
-		VariableDefinition v1 = _createVariableDefinition("v1", Type.INTEGER, scope);
+		VariableDefinition v1 = _createVariableDefinition("v1", TYPE_INTEGER, scope);
 		Region r = _createRegion("main", sc);
 		State s= _createState("s", r);
 
@@ -337,7 +336,7 @@ public class ModelSequencerStateReactionTest extends ModelSequencerTest {
 		
 		Statechart sc = _createStatechart("test");
 		Scope scope = _createInterfaceScope("interface", sc);
-		VariableDefinition v1 = _createVariableDefinition("v1", Type.INTEGER, scope);
+		VariableDefinition v1 = _createVariableDefinition("v1", TYPE_INTEGER, scope);
 		Region r = _createRegion("main", sc);
 		State s= _createState("s", r);
 

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

@@ -38,7 +38,6 @@ import org.yakindu.sct.model.stext.stext.ReactionEffect;
 import org.yakindu.sct.model.stext.stext.ReactionTrigger;
 import org.yakindu.sct.model.stext.stext.RelationalOperator;
 import org.yakindu.sct.model.stext.stext.StextFactory;
-import org.yakindu.sct.model.stext.stext.Type;
 import org.yakindu.sct.model.stext.stext.VariableDefinition;
 
 
@@ -51,7 +50,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 	@Test public void testStateEntryAction() {
 		Statechart sc = _createStatechart("test");
 		Scope scope = _createInterfaceScope("interface", sc);
-		VariableDefinition v1 = _createVariableDefinition("v1", Type.INTEGER, scope);
+		VariableDefinition v1 = _createVariableDefinition("v1", TYPE_INTEGER, scope);
 		Region r = _createRegion("main", sc);
 		Entry e = _createEntry(EntryKind.INITIAL, null, r);
 		State s1 = _createState("s1", r);
@@ -79,7 +78,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 	@Test public void testSubStateEntryActionExclusion() {
 		Statechart sc = _createStatechart("test");
 		Scope scope = _createInterfaceScope("interface", sc);
-		VariableDefinition v1 = _createVariableDefinition("v1", Type.INTEGER, scope);
+		VariableDefinition v1 = _createVariableDefinition("v1", TYPE_INTEGER, scope);
 		Region r = _createRegion("main", sc);
 //		Entry e = _createEntry(EntryKind.INITIAL, null, r);
 		State s2 = _createState("s2", r);
@@ -112,7 +111,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 	@Test public void testStateExitAction() {
 		Statechart sc = _createStatechart("test");
 		Scope scope = _createInterfaceScope("interface", sc);
-		VariableDefinition v1 = _createVariableDefinition("v1", Type.INTEGER, scope);
+		VariableDefinition v1 = _createVariableDefinition("v1", TYPE_INTEGER, scope);
 		Region r = _createRegion("main", sc);
 		Entry e = _createEntry(EntryKind.INITIAL, null, r);
 		State s1 = _createState("s1", r);
@@ -142,7 +141,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 	@Test public void testFinalStateEnterSequence() {
 		Statechart sc = _createStatechart("cs");
 		Scope scope = _createInterfaceScope("interface", sc);
-		VariableDefinition v1 = _createVariableDefinition("v1", Type.INTEGER, scope);
+		VariableDefinition v1 = _createVariableDefinition("v1", TYPE_INTEGER, scope);
 		Region r = _createRegion("r", sc);
 		FinalState fs = _createFinalState(r);
 		
@@ -167,7 +166,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 	@Test public void testLeafStateEnterSequence() {
 		Statechart sc = _createStatechart("cs");
 		Scope scope = _createInterfaceScope("interface", sc);
-		VariableDefinition v1 = _createVariableDefinition("v1", Type.INTEGER, scope);
+		VariableDefinition v1 = _createVariableDefinition("v1", TYPE_INTEGER, scope);
 		Region r = _createRegion("r", sc);
 		State s1 = _createState("s1", r);
 		LocalReaction entryAction = _createEntryAction(s1);
@@ -195,7 +194,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 	@Test public void testCompositeStateEnterSequence() {
 		Statechart sc = _createStatechart("cs"); {
 			Scope scope = _createInterfaceScope("interface", sc);
-			VariableDefinition v1 = _createVariableDefinition("v1", Type.INTEGER, scope);
+			VariableDefinition v1 = _createVariableDefinition("v1", TYPE_INTEGER, scope);
 
 			Region r = _createRegion("r", sc); {
 				State s1 = _createState("s1", r); {
@@ -245,7 +244,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 	@Test public void testLeafStateExitSequence() {
 		Statechart sc = _createStatechart("cs");
 		Scope scope = _createInterfaceScope("interface", sc);
-		VariableDefinition v1 = _createVariableDefinition("v1", Type.INTEGER, scope);
+		VariableDefinition v1 = _createVariableDefinition("v1", TYPE_INTEGER, scope);
 		Region r = _createRegion("r", sc);
 		State s1 = _createState("s1", r);
 		LocalReaction entryAction = _createExitAction(s1);
@@ -298,7 +297,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 	@Test public void testCompositeStateExitSequence() {
 		Statechart sc = _createStatechart("cs"); {
 			Scope scope = _createInterfaceScope("interface", sc);
-			VariableDefinition v1 = _createVariableDefinition("v1", Type.INTEGER, scope);
+			VariableDefinition v1 = _createVariableDefinition("v1", TYPE_INTEGER, scope);
 
 			Region r = _createRegion("r", sc); {
 				State s1 = _createState("s1", r); {
@@ -369,7 +368,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 		Statechart sc = _createStatechart("sc"); {  
 			
 			InterfaceScope s_scope = _createInterfaceScope("Interface", sc);
-			VariableDefinition v1 = _createVariableDefinition("v1", Type.INTEGER, s_scope);
+			VariableDefinition v1 = _createVariableDefinition("v1", TYPE_INTEGER, s_scope);
 			EventDefinition e1 = _createEventDefinition("e1", s_scope);
 			
 
@@ -466,7 +465,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 	 */
 	@Test public void testStateReaction_WithTransitionAction() {
 		SimpleFlatTSC tsc = new SimpleFlatTSC();
-		VariableDefinition v1 = _createVariableDefinition("v1", Type.INTEGER, tsc.s_scope);
+		VariableDefinition v1 = _createVariableDefinition("v1", TYPE_INTEGER, tsc.s_scope);
 		ReactionEffect effect = _createReactionEffect(tsc.t1);
 		Assignment assign = _createVariableAssignment(v1, AssignmentOperator.ASSIGN, _createValue(42), effect); 
 		
@@ -506,7 +505,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 	@Test public void testStateReaction_WithExitAction() {
 		SimpleFlatTSC tsc = new SimpleFlatTSC();
 
-		VariableDefinition v1 = _createVariableDefinition("v1", Type.INTEGER, tsc.s_scope);
+		VariableDefinition v1 = _createVariableDefinition("v1", TYPE_INTEGER, tsc.s_scope);
 		LocalReaction exitAction = _createExitAction(tsc.s1);
 		Assignment assign = _createVariableAssignment(v1, AssignmentOperator.ASSIGN, _createValue(21), (ReactionEffect) exitAction.getEffect());
 
@@ -538,7 +537,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 	@Test public void testStateReaction_WithEntryAction() {
 		SimpleFlatTSC tsc = new SimpleFlatTSC();
 
-		VariableDefinition v1 = _createVariableDefinition("v1", Type.INTEGER, tsc.s_scope);
+		VariableDefinition v1 = _createVariableDefinition("v1", TYPE_INTEGER, tsc.s_scope);
 		LocalReaction entryAction = _createEntryAction(tsc.s2);
 		Assignment assign = _createVariableAssignment(v1, AssignmentOperator.ASSIGN, _createValue(21), (ReactionEffect) entryAction.getEffect());
 
@@ -612,7 +611,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 	@Test public void testStateCycle_WithLocalReactions() {
 		SimpleFlatTSC tsc = new SimpleFlatTSC();
 
-		VariableDefinition v1 = _createVariableDefinition("v1", Type.INTEGER, tsc.s_scope);
+		VariableDefinition v1 = _createVariableDefinition("v1", TYPE_INTEGER, tsc.s_scope);
 
 		// the first local reaction conforms to "e1 / x=42;" 
 		LocalReaction lr1 = _createLocalReaction(tsc.s1, null);
@@ -699,7 +698,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 	@Test public void testStateCycle_WithLocalReactionsOnly() {
 		MinimalTSC tsc = new MinimalTSC();
 
-		VariableDefinition v1 = _createVariableDefinition("v1", Type.INTEGER, tsc.s_scope);
+		VariableDefinition v1 = _createVariableDefinition("v1", TYPE_INTEGER, tsc.s_scope);
 
 		// the first local reaction conforms to "e1 / x=42;" 
 		LocalReaction lr1 = _createLocalReaction(tsc.s1, null);
@@ -777,7 +776,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 	@Test public void testStateCycle_EntryActionExclusion() {
 		MinimalTSC tsc = new MinimalTSC();
 
-		VariableDefinition v1 = _createVariableDefinition("v1", Type.INTEGER, tsc.s_scope);
+		VariableDefinition v1 = _createVariableDefinition("v1", TYPE_INTEGER, tsc.s_scope);
 
 		// add a simple entry action: "entry / x=42;" 
 		LocalReaction lr = _createEntryAction(tsc.s1);
@@ -802,7 +801,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 	@Test public void testStateCycle_ExitActionExclusion() {
 		MinimalTSC tsc = new MinimalTSC();
 
-		VariableDefinition v1 = _createVariableDefinition("v1", Type.INTEGER, tsc.s_scope);
+		VariableDefinition v1 = _createVariableDefinition("v1", TYPE_INTEGER, tsc.s_scope);
 
 		// add a simple entry action: "entry / x=42;" 
 		LocalReaction lr = _createExitAction(tsc.s1);
@@ -827,7 +826,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 	@Test public void testStateCycle_LocalReactionWithMixedRegularAndEntryTrigger() {
 		MinimalTSC tsc = new MinimalTSC();
 
-		VariableDefinition v1 = _createVariableDefinition("v1", Type.INTEGER, tsc.s_scope);
+		VariableDefinition v1 = _createVariableDefinition("v1", TYPE_INTEGER, tsc.s_scope);
 
 		// add a simple entry action: "entry / x=42;" 
 		LocalReaction lr = _createEntryAction(tsc.s1);
@@ -866,7 +865,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 		Statechart sc = _createStatechart("sc"); {  
 			
 			InterfaceScope s_scope = _createInterfaceScope("Interface", sc);
-			VariableDefinition v1 = _createVariableDefinition("v1", Type.INTEGER, s_scope);
+			VariableDefinition v1 = _createVariableDefinition("v1", TYPE_INTEGER, s_scope);
 			EventDefinition e1 = _createEventDefinition("e1", s_scope);
 			
 
@@ -959,7 +958,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 		Statechart sc = _createStatechart("sc"); {  
 			
 			InterfaceScope s_scope = _createInterfaceScope("Interface", sc);
-			VariableDefinition v1 = _createVariableDefinition("v1", Type.INTEGER, s_scope);
+			VariableDefinition v1 = _createVariableDefinition("v1", TYPE_INTEGER, s_scope);
 			EventDefinition e1 = _createEventDefinition("e1", s_scope);
 			
 
@@ -1051,7 +1050,7 @@ public class ModelSequencerStateTest extends ModelSequencerTest {
 		Statechart sc = _createStatechart("sc"); {  
 			
 			InterfaceScope s_scope = _createInterfaceScope("Interface", sc);
-			VariableDefinition v1 = _createVariableDefinition("v1", Type.INTEGER, s_scope);
+			VariableDefinition v1 = _createVariableDefinition("v1", TYPE_INTEGER, s_scope);
 			EventDefinition e1 = _createEventDefinition("e1", s_scope);
 			
 

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

@@ -74,7 +74,6 @@ import org.yakindu.sct.model.stext.stext.RelationalOperator;
 import org.yakindu.sct.model.stext.stext.StextFactory;
 import org.yakindu.sct.model.stext.stext.TimeEventType;
 import org.yakindu.sct.model.stext.stext.TimeUnit;
-import org.yakindu.sct.model.stext.stext.Type;
 import org.yakindu.sct.model.stext.stext.VariableDefinition;
 
 import com.google.inject.Guice;

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

@@ -4,16 +4,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
-import static org.yakindu.sct.model.sexec.transformation.test.SCTTestUtil._createEventDefinition;
-import static org.yakindu.sct.model.sexec.transformation.test.SCTTestUtil._createInterfaceScope;
-import static org.yakindu.sct.model.sexec.transformation.test.SCTTestUtil._createInternalScope;
-import static org.yakindu.sct.model.sexec.transformation.test.SCTTestUtil._createReactionTrigger;
-import static org.yakindu.sct.model.sexec.transformation.test.SCTTestUtil._createRegion;
-import static org.yakindu.sct.model.sexec.transformation.test.SCTTestUtil._createRegularEventSpec;
-import static org.yakindu.sct.model.sexec.transformation.test.SCTTestUtil._createState;
-import static org.yakindu.sct.model.sexec.transformation.test.SCTTestUtil._createStatechart;
-import static org.yakindu.sct.model.sexec.transformation.test.SCTTestUtil._createTransition;
-import static org.yakindu.sct.model.sexec.transformation.test.SCTTestUtil._createVariableDefinition;
+import static org.yakindu.sct.model.sexec.transformation.test.SCTTestUtil.*;
 
 import org.junit.Test;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
@@ -29,7 +20,6 @@ import org.yakindu.sct.model.stext.stext.EventDefinition;
 import org.yakindu.sct.model.stext.stext.InterfaceScope;
 import org.yakindu.sct.model.stext.stext.InternalScope;
 import org.yakindu.sct.model.stext.stext.ReactionTrigger;
-import org.yakindu.sct.model.stext.stext.Type;
 import org.yakindu.sct.model.stext.stext.VariableDefinition;
 
 public class ModelSequencertDeclarationsTest extends ModelSequencerTest {
@@ -61,7 +51,7 @@ public class ModelSequencertDeclarationsTest extends ModelSequencerTest {
 		InterfaceScope scope = _createInterfaceScope(null, null);
 		EventDefinition e1 = _createEventDefinition("e1", scope);
 		EventDefinition e2 = _createEventDefinition("e2", scope);
-		VariableDefinition v1 = _createVariableDefinition("v1", Type.INTEGER, scope);
+		VariableDefinition v1 = _createVariableDefinition("v1", TYPE_INTEGER, scope);
 		
 		Scope _scope = sequencer.map(scope);
 

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

@@ -4,6 +4,8 @@ import java.util.Collection;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.EcoreUtil2;
+import org.yakindu.base.types.Type;
+import org.yakindu.base.types.TypesFactory;
 import org.yakindu.sct.model.sgraph.Entry;
 import org.yakindu.sct.model.sgraph.EntryKind;
 import org.yakindu.sct.model.sgraph.FinalState;
@@ -36,7 +38,6 @@ import org.yakindu.sct.model.stext.stext.StextFactory;
 import org.yakindu.sct.model.stext.stext.TimeEventSpec;
 import org.yakindu.sct.model.stext.stext.TimeEventType;
 import org.yakindu.sct.model.stext.stext.TimeUnit;
-import org.yakindu.sct.model.stext.stext.Type;
 import org.yakindu.sct.model.stext.stext.VariableDefinition;
 
 import com.google.common.base.Predicate;
@@ -44,6 +45,8 @@ import com.google.common.collect.Collections2;
 
 public class SCTTestUtil {
 
+	public static Type TYPE_INTEGER = _createType("integer");
+	
 	public static EventDefinition _createEventDefinition(String name, Scope scope) {
 		EventDefinition e = StextFactory.eINSTANCE.createEventDefinition();
 		e.setName(name);
@@ -61,6 +64,13 @@ public class SCTTestUtil {
 	}
 
 	
+	public static Type _createType(String name) {
+		Type t = TypesFactory.eINSTANCE.createType();
+		t.setName(name);
+		
+		return t;
+	}
+	
 	public static RegularEventSpec _createRegularEventSpec(EventDefinition e1, ReactionTrigger rt) {
 		RegularEventSpec e1Spec = StextFactory.eINSTANCE.createRegularEventSpec();
 		e1Spec.setEvent(e1);