Added Refactoring Tests to testmodels

test-plugins/org.yakindu.sct.generator.c.test/src/org/yakindu/sct/generator/c/gtest/GTestHelper.java

@@ -40,8 +40,8 @@ import org.osgi.framework.FrameworkUtil;
 import org.yakindu.sct.generator.core.GeneratorExecutor;
 import org.yakindu.sct.model.sgen.GeneratorModel;
 import org.yakindu.sct.model.sgraph.Statechart;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
 
-import util.TestModels;
 
 /**
  * @author Andreas Unger - Initial contribution and API
@@ -150,7 +150,7 @@ public class GTestHelper {
 	}
 
 	protected Bundle getModelBundle() {
-		return FrameworkUtil.getBundle(TestModels.class);
+		return FrameworkUtil.getBundle(SCTUnitTestModels.class);
 	}
 
 	private void copyFilesFromBundleToFolder() {

test-plugins/org.yakindu.sct.generator.java.test/src/org/yakindu/sct/generator/java/JavaSCTGeneratorTest.java

@@ -10,32 +10,32 @@
  */
 package org.yakindu.sct.generator.java;
 
-import static util.TestModels.ALWAYS_ONCYCLE;
-import static util.TestModels.BIT_EXPRESSIONS;
-import static util.TestModels.BOOLEAN_EXPRESSIONS;
-import static util.TestModels.CHOICE;
-import static util.TestModels.C_KEYWORDS_M;
-import static util.TestModels.DEEP_HISTORY;
-import static util.TestModels.FEATURE_CALLS;
-import static util.TestModels.GUARD;
-import static util.TestModels.INTEGER_EXPRESSIONS;
-import static util.TestModels.JAVA_KEYWORDS_M;
-import static util.TestModels.OPERATIONS;
-import static util.TestModels.PARENTHESIS;
-import static util.TestModels.PRIORITY_VALUES;
-import static util.TestModels.RAISE_EVENTS;
-import static util.TestModels.REAL_EXPRESSIONS;
-import static util.TestModels.SAME_NAME_DIFFERENT_REGION;
-import static util.TestModels.SHALLOW_HISTORY;
-import static util.TestModels.SIMPLE_EVENT;
-import static util.TestModels.SIMPLE_HIERACHY;
-import static util.TestModels.STATECHART_LOCAL_REACTIONS;
-import static util.TestModels.STATE_ACTIVE;
-import static util.TestModels.STATE_WITH_EMPTY_REGION;
-import static util.TestModels.STRING_EXPRESSIONS;
-import static util.TestModels.SYNC_FORK;
-import static util.TestModels.SYNC_JOIN;
-import static util.TestModels.VALUED_EVENTS;
+import static org.yakindu.sct.test.models.SCTUnitTestModels.ALWAYS_ONCYCLE;
+import static org.yakindu.sct.test.models.SCTUnitTestModels.BIT_EXPRESSIONS;
+import static org.yakindu.sct.test.models.SCTUnitTestModels.BOOLEAN_EXPRESSIONS;
+import static org.yakindu.sct.test.models.SCTUnitTestModels.CHOICE;
+import static org.yakindu.sct.test.models.SCTUnitTestModels.C_KEYWORDS_M;
+import static org.yakindu.sct.test.models.SCTUnitTestModels.DEEP_HISTORY;
+import static org.yakindu.sct.test.models.SCTUnitTestModels.FEATURE_CALLS;
+import static org.yakindu.sct.test.models.SCTUnitTestModels.GUARD;
+import static org.yakindu.sct.test.models.SCTUnitTestModels.INTEGER_EXPRESSIONS;
+import static org.yakindu.sct.test.models.SCTUnitTestModels.JAVA_KEYWORDS_M;
+import static org.yakindu.sct.test.models.SCTUnitTestModels.OPERATIONS;
+import static org.yakindu.sct.test.models.SCTUnitTestModels.PARENTHESIS;
+import static org.yakindu.sct.test.models.SCTUnitTestModels.PRIORITY_VALUES;
+import static org.yakindu.sct.test.models.SCTUnitTestModels.RAISE_EVENTS;
+import static org.yakindu.sct.test.models.SCTUnitTestModels.REAL_EXPRESSIONS;
+import static org.yakindu.sct.test.models.SCTUnitTestModels.SAME_NAME_DIFFERENT_REGION;
+import static org.yakindu.sct.test.models.SCTUnitTestModels.SHALLOW_HISTORY;
+import static org.yakindu.sct.test.models.SCTUnitTestModels.SIMPLE_EVENT;
+import static org.yakindu.sct.test.models.SCTUnitTestModels.SIMPLE_HIERACHY;
+import static org.yakindu.sct.test.models.SCTUnitTestModels.STATECHART_LOCAL_REACTIONS;
+import static org.yakindu.sct.test.models.SCTUnitTestModels.STATE_ACTIVE;
+import static org.yakindu.sct.test.models.SCTUnitTestModels.STATE_WITH_EMPTY_REGION;
+import static org.yakindu.sct.test.models.SCTUnitTestModels.STRING_EXPRESSIONS;
+import static org.yakindu.sct.test.models.SCTUnitTestModels.SYNC_FORK;
+import static org.yakindu.sct.test.models.SCTUnitTestModels.SYNC_JOIN;
+import static org.yakindu.sct.test.models.SCTUnitTestModels.VALUED_EVENTS;
 
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.runtime.CoreException;
@@ -45,10 +45,10 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.yakindu.sct.generator.java.util.AbstractJavaGeneratorTest;
-import org.yakindu.sct.generator.java.util.JavaGeneratorInjectionProvider;
 import org.yakindu.sct.model.sgraph.Statechart;
+import org.yakindu.sct.test.models.TestModelInjectorProvider;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
 
-import util.TestModels;
 
 import com.google.inject.Inject;
 
@@ -60,11 +60,11 @@ import com.google.inject.Inject;
  * 
  */
 @RunWith(XtextRunner.class)
-@InjectWith(JavaGeneratorInjectionProvider.class)
+@InjectWith(TestModelInjectorProvider.class)
 public class JavaSCTGeneratorTest extends AbstractJavaGeneratorTest {
 
 	@Inject
-	private TestModels models;
+	private SCTUnitTestModels models;
 
 	private void failOnError(IMarker[] diagnostics) throws CoreException {
 		for (IMarker diagnostic : diagnostics) {

test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src-gen/org/yakindu/sct/model/sexec/interpreter/test/AlwaysOncycleTest.java

@@ -19,7 +19,8 @@ import com.google.inject.Inject;
 import org.junit.Before;
 import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
-import util.TestModels;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
+
 import static junit.framework.Assert.*;
 /**
  *  Unit TestCase for AlwaysOncycle
@@ -30,7 +31,7 @@ import static junit.framework.Assert.*;
 public class AlwaysOncycleTest extends AbstractExecutionFlowTest {
 
 	@Inject
-	private TestModels models;
+	private SCTUnitTestModels models;
 
 	@Before
 	public void setup() throws Exception {

test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src-gen/org/yakindu/sct/model/sexec/interpreter/test/AssignmentAsExpressionTest.java

@@ -19,7 +19,8 @@ import com.google.inject.Inject;
 import org.junit.Before;
 import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
-import util.TestModels;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
+
 import static junit.framework.Assert.*;
 /**
  *  Unit TestCase for AssignmentAsExpression
@@ -30,7 +31,7 @@ import static junit.framework.Assert.*;
 public class AssignmentAsExpressionTest extends AbstractExecutionFlowTest {
 
 	@Inject
-	private TestModels models;
+	private SCTUnitTestModels models;
 
 	@Before
 	public void setup() throws Exception {

test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src-gen/org/yakindu/sct/model/sexec/interpreter/test/BitExpressionsTest.java

@@ -19,7 +19,8 @@ import com.google.inject.Inject;
 import org.junit.Before;
 import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
-import util.TestModels;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
+
 import static junit.framework.Assert.*;
 /**
  *  Unit TestCase for BitExpressions
@@ -30,7 +31,7 @@ import static junit.framework.Assert.*;
 public class BitExpressionsTest extends AbstractExecutionFlowTest {
 
 	@Inject
-	private TestModels models;
+	private SCTUnitTestModels models;
 
 	@Before
 	public void setup() throws Exception {

test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src-gen/org/yakindu/sct/model/sexec/interpreter/test/BooleanExpressionsTest.java

@@ -19,7 +19,8 @@ import com.google.inject.Inject;
 import org.junit.Before;
 import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
-import util.TestModels;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
+
 import static junit.framework.Assert.*;
 /**
  *  Unit TestCase for BooleanExpressions
@@ -30,7 +31,7 @@ import static junit.framework.Assert.*;
 public class BooleanExpressionsTest extends AbstractExecutionFlowTest {
 
 	@Inject
-	private TestModels models;
+	private SCTUnitTestModels models;
 
 	@Before
 	public void setup() throws Exception {

test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src-gen/org/yakindu/sct/model/sexec/interpreter/test/CKeywordsTest.java

@@ -19,7 +19,8 @@ import com.google.inject.Inject;
 import org.junit.Before;
 import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
-import util.TestModels;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
+
 import static junit.framework.Assert.*;
 /**
  *  Unit TestCase for CKeywords
@@ -30,7 +31,7 @@ import static junit.framework.Assert.*;
 public class CKeywordsTest extends AbstractExecutionFlowTest {
 
 	@Inject
-	private TestModels models;
+	private SCTUnitTestModels models;
 
 	@Before
 	public void setup() throws Exception {

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

@@ -19,7 +19,8 @@ import com.google.inject.Inject;
 import org.junit.Before;
 import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
-import util.TestModels;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
+
 import static junit.framework.Assert.*;
 /**
  *  Unit TestCase for Choice
@@ -30,7 +31,7 @@ import static junit.framework.Assert.*;
 public class ChoiceTest extends AbstractExecutionFlowTest {
 
 	@Inject
-	private TestModels models;
+	private SCTUnitTestModels models;
 
 	@Before
 	public void setup() throws Exception {

test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src-gen/org/yakindu/sct/model/sexec/interpreter/test/DeclarationsTest.java

@@ -19,7 +19,8 @@ import com.google.inject.Inject;
 import org.junit.Before;
 import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
-import util.TestModels;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
+
 import static junit.framework.Assert.*;
 /**
  *  Unit TestCase for Declarations
@@ -30,7 +31,7 @@ import static junit.framework.Assert.*;
 public class DeclarationsTest extends AbstractExecutionFlowTest {
 
 	@Inject
-	private TestModels models;
+	private SCTUnitTestModels models;
 
 	@Before
 	public void setup() throws Exception {

test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src-gen/org/yakindu/sct/model/sexec/interpreter/test/DeepHistoryTest.java

@@ -19,7 +19,8 @@ import com.google.inject.Inject;
 import org.junit.Before;
 import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
-import util.TestModels;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
+
 import static junit.framework.Assert.*;
 /**
  *  Unit TestCase for DeepHistory
@@ -30,7 +31,7 @@ import static junit.framework.Assert.*;
 public class DeepHistoryTest extends AbstractExecutionFlowTest {
 
 	@Inject
-	private TestModels models;
+	private SCTUnitTestModels models;
 
 	@Before
 	public void setup() throws Exception {

test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src-gen/org/yakindu/sct/model/sexec/interpreter/test/ExitOnSelfTransitionTest.java

@@ -19,7 +19,8 @@ import com.google.inject.Inject;
 import org.junit.Before;
 import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
-import util.TestModels;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
+
 import static junit.framework.Assert.*;
 /**
  *  Unit TestCase for ExitOnSelfTransition
@@ -30,7 +31,7 @@ import static junit.framework.Assert.*;
 public class ExitOnSelfTransitionTest extends AbstractExecutionFlowTest {
 
 	@Inject
-	private TestModels models;
+	private SCTUnitTestModels models;
 
 	@Before
 	public void setup() throws Exception {

test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src-gen/org/yakindu/sct/model/sexec/interpreter/test/FeatureCallsTest.java

@@ -19,7 +19,8 @@ import com.google.inject.Inject;
 import org.junit.Before;
 import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
-import util.TestModels;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
+
 import static junit.framework.Assert.*;
 /**
  *  Unit TestCase for FeatureCalls
@@ -30,7 +31,7 @@ import static junit.framework.Assert.*;
 public class FeatureCallsTest extends AbstractExecutionFlowTest {
 
 	@Inject
-	private TestModels models;
+	private SCTUnitTestModels models;
 
 	@Before
 	public void setup() throws Exception {

test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src-gen/org/yakindu/sct/model/sexec/interpreter/test/GuardTest.java

@@ -19,7 +19,8 @@ import com.google.inject.Inject;
 import org.junit.Before;
 import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
-import util.TestModels;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
+
 import static junit.framework.Assert.*;
 /**
  *  Unit TestCase for Guard
@@ -30,7 +31,7 @@ import static junit.framework.Assert.*;
 public class GuardTest extends AbstractExecutionFlowTest {
 
 	@Inject
-	private TestModels models;
+	private SCTUnitTestModels models;
 
 	@Before
 	public void setup() throws Exception {

test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src-gen/org/yakindu/sct/model/sexec/interpreter/test/GuardedEntryTest.java

@@ -19,7 +19,8 @@ import com.google.inject.Inject;
 import org.junit.Before;
 import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
-import util.TestModels;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
+
 import static junit.framework.Assert.*;
 /**
  *  Unit TestCase for GuardedEntry
@@ -30,7 +31,7 @@ import static junit.framework.Assert.*;
 public class GuardedEntryTest extends AbstractExecutionFlowTest {
 
 	@Inject
-	private TestModels models;
+	private SCTUnitTestModels models;
 
 	@Before
 	public void setup() throws Exception {

test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src-gen/org/yakindu/sct/model/sexec/interpreter/test/GuardedExitTest.java

@@ -19,7 +19,8 @@ import com.google.inject.Inject;
 import org.junit.Before;
 import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
-import util.TestModels;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
+
 import static junit.framework.Assert.*;
 /**
  *  Unit TestCase for GuardedExit
@@ -30,7 +31,7 @@ import static junit.framework.Assert.*;
 public class GuardedExitTest extends AbstractExecutionFlowTest {
 
 	@Inject
-	private TestModels models;
+	private SCTUnitTestModels models;
 
 	@Before
 	public void setup() throws Exception {

test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src-gen/org/yakindu/sct/model/sexec/interpreter/test/HistoryWithoutInitialStepTest.java

@@ -19,7 +19,8 @@ import com.google.inject.Inject;
 import org.junit.Before;
 import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
-import util.TestModels;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
+
 import static junit.framework.Assert.*;
 /**
  *  Unit TestCase for HistoryWithoutInitialStep
@@ -30,7 +31,7 @@ import static junit.framework.Assert.*;
 public class HistoryWithoutInitialStepTest extends AbstractExecutionFlowTest {
 
 	@Inject
-	private TestModels models;
+	private SCTUnitTestModels models;
 
 	@Before
 	public void setup() throws Exception {

test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src-gen/org/yakindu/sct/model/sexec/interpreter/test/InEventLifeCycleTest.java

@@ -19,7 +19,8 @@ import com.google.inject.Inject;
 import org.junit.Before;
 import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
-import util.TestModels;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
+
 import static junit.framework.Assert.*;
 /**
  *  Unit TestCase for InEventLifeCycle
@@ -30,7 +31,7 @@ import static junit.framework.Assert.*;
 public class InEventLifeCycleTest extends AbstractExecutionFlowTest {
 
 	@Inject
-	private TestModels models;
+	private SCTUnitTestModels models;
 
 	@Before
 	public void setup() throws Exception {

test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src-gen/org/yakindu/sct/model/sexec/interpreter/test/IntegerExpressionsTest.java

@@ -19,7 +19,8 @@ import com.google.inject.Inject;
 import org.junit.Before;
 import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
-import util.TestModels;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
+
 import static junit.framework.Assert.*;
 /**
  *  Unit TestCase for IntegerExpressions
@@ -30,7 +31,7 @@ import static junit.framework.Assert.*;
 public class IntegerExpressionsTest extends AbstractExecutionFlowTest {
 
 	@Inject
-	private TestModels models;
+	private SCTUnitTestModels models;
 
 	@Before
 	public void setup() throws Exception {

test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src-gen/org/yakindu/sct/model/sexec/interpreter/test/InternalEventLifeCycleTest.java

@@ -19,7 +19,8 @@ import com.google.inject.Inject;
 import org.junit.Before;
 import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
-import util.TestModels;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
+
 import static junit.framework.Assert.*;
 /**
  *  Unit TestCase for InternalEventLifeCycle
@@ -30,7 +31,7 @@ import static junit.framework.Assert.*;
 public class InternalEventLifeCycleTest extends AbstractExecutionFlowTest {
 
 	@Inject
-	private TestModels models;
+	private SCTUnitTestModels models;
 
 	@Before
 	public void setup() throws Exception {

test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src-gen/org/yakindu/sct/model/sexec/interpreter/test/OutEventLifeCycleTest.java

@@ -19,7 +19,8 @@ import com.google.inject.Inject;
 import org.junit.Before;
 import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
-import util.TestModels;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
+
 import static junit.framework.Assert.*;
 /**
  *  Unit TestCase for OutEventLifeCycle
@@ -30,7 +31,7 @@ import static junit.framework.Assert.*;
 public class OutEventLifeCycleTest extends AbstractExecutionFlowTest {
 
 	@Inject
-	private TestModels models;
+	private SCTUnitTestModels models;
 
 	@Before
 	public void setup() throws Exception {

test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src-gen/org/yakindu/sct/model/sexec/interpreter/test/ParenthesisTest.java

@@ -19,7 +19,8 @@ import com.google.inject.Inject;
 import org.junit.Before;
 import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
-import util.TestModels;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
+
 import static junit.framework.Assert.*;
 /**
  *  Unit TestCase for Parenthesis
@@ -30,7 +31,7 @@ import static junit.framework.Assert.*;
 public class ParenthesisTest extends AbstractExecutionFlowTest {
 
 	@Inject
-	private TestModels models;
+	private SCTUnitTestModels models;
 
 	@Before
 	public void setup() throws Exception {

test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src-gen/org/yakindu/sct/model/sexec/interpreter/test/PerformanceTestTest.java

@@ -19,7 +19,8 @@ import com.google.inject.Inject;
 import org.junit.Before;
 import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
-import util.TestModels;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
+
 import static junit.framework.Assert.*;
 /**
  *  Unit TestCase for PerformanceTest
@@ -30,7 +31,7 @@ import static junit.framework.Assert.*;
 public class PerformanceTestTest extends AbstractExecutionFlowTest {
 
 	@Inject
-	private TestModels models;
+	private SCTUnitTestModels models;
 
 	@Before
 	public void setup() throws Exception {

test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src-gen/org/yakindu/sct/model/sexec/interpreter/test/PriorityValuesTest.java

@@ -19,7 +19,8 @@ import com.google.inject.Inject;
 import org.junit.Before;
 import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
-import util.TestModels;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
+
 import static junit.framework.Assert.*;
 /**
  *  Unit TestCase for PriorityValues
@@ -30,7 +31,7 @@ import static junit.framework.Assert.*;
 public class PriorityValuesTest extends AbstractExecutionFlowTest {
 
 	@Inject
-	private TestModels models;
+	private SCTUnitTestModels models;
 
 	@Before
 	public void setup() throws Exception {

test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src-gen/org/yakindu/sct/model/sexec/interpreter/test/RaiseEventTest.java

@@ -19,7 +19,8 @@ import com.google.inject.Inject;
 import org.junit.Before;
 import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
-import util.TestModels;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
+
 import static junit.framework.Assert.*;
 /**
  *  Unit TestCase for RaiseEvent
@@ -30,7 +31,7 @@ import static junit.framework.Assert.*;
 public class RaiseEventTest extends AbstractExecutionFlowTest {
 
 	@Inject
-	private TestModels models;
+	private SCTUnitTestModels models;
 
 	@Before
 	public void setup() throws Exception {

test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src-gen/org/yakindu/sct/model/sexec/interpreter/test/STextKeywordsInStatesAndRegionsTest.java

@@ -19,7 +19,8 @@ import com.google.inject.Inject;
 import org.junit.Before;
 import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
-import util.TestModels;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
+
 import static junit.framework.Assert.*;
 /**
  *  Unit TestCase for STextKeywordsInStatesAndRegions
@@ -32,7 +33,7 @@ public class STextKeywordsInStatesAndRegionsTest
 			AbstractExecutionFlowTest {
 
 	@Inject
-	private TestModels models;
+	private SCTUnitTestModels models;
 
 	@Before
 	public void setup() throws Exception {

test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src-gen/org/yakindu/sct/model/sexec/interpreter/test/SameNameDifferentRegionTest.java

@@ -19,7 +19,8 @@ import com.google.inject.Inject;
 import org.junit.Before;
 import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
-import util.TestModels;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
+
 import static junit.framework.Assert.*;
 /**
  *  Unit TestCase for SameNameDifferentRegion
@@ -30,7 +31,7 @@ import static junit.framework.Assert.*;
 public class SameNameDifferentRegionTest extends AbstractExecutionFlowTest {
 
 	@Inject
-	private TestModels models;
+	private SCTUnitTestModels models;
 
 	@Before
 	public void setup() throws Exception {

test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src-gen/org/yakindu/sct/model/sexec/interpreter/test/ShallowHistoryTest.java

@@ -19,7 +19,8 @@ import com.google.inject.Inject;
 import org.junit.Before;
 import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
-import util.TestModels;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
+
 import static junit.framework.Assert.*;
 /**
  *  Unit TestCase for ShallowHistory
@@ -30,7 +31,7 @@ import static junit.framework.Assert.*;
 public class ShallowHistoryTest extends AbstractExecutionFlowTest {
 
 	@Inject
-	private TestModels models;
+	private SCTUnitTestModels models;
 
 	@Before
 	public void setup() throws Exception {

test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src-gen/org/yakindu/sct/model/sexec/interpreter/test/SimpleEventTest.java

@@ -19,7 +19,8 @@ import com.google.inject.Inject;
 import org.junit.Before;
 import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
-import util.TestModels;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
+
 import static junit.framework.Assert.*;
 /**
  *  Unit TestCase for SimpleEvent
@@ -30,7 +31,7 @@ import static junit.framework.Assert.*;
 public class SimpleEventTest extends AbstractExecutionFlowTest {
 
 	@Inject
-	private TestModels models;
+	private SCTUnitTestModels models;
 
 	@Before
 	public void setup() throws Exception {

test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src-gen/org/yakindu/sct/model/sexec/interpreter/test/SimpleHierachyTest.java

@@ -19,7 +19,8 @@ import com.google.inject.Inject;
 import org.junit.Before;
 import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
-import util.TestModels;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
+
 import static junit.framework.Assert.*;
 /**
  *  Unit TestCase for SimpleHierachy
@@ -30,7 +31,7 @@ import static junit.framework.Assert.*;
 public class SimpleHierachyTest extends AbstractExecutionFlowTest {
 
 	@Inject
-	private TestModels models;
+	private SCTUnitTestModels models;
 
 	@Before
 	public void setup() throws Exception {

test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src-gen/org/yakindu/sct/model/sexec/interpreter/test/StateIsActiveTest.java

@@ -19,7 +19,8 @@ import com.google.inject.Inject;
 import org.junit.Before;
 import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
-import util.TestModels;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
+
 import static junit.framework.Assert.*;
 /**
  *  Unit TestCase for StateIsActive
@@ -30,7 +31,7 @@ import static junit.framework.Assert.*;
 public class StateIsActiveTest extends AbstractExecutionFlowTest {
 
 	@Inject
-	private TestModels models;
+	private SCTUnitTestModels models;
 
 	@Before
 	public void setup() throws Exception {

test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src-gen/org/yakindu/sct/model/sexec/interpreter/test/StatechartLocalReactionsTest.java

@@ -19,7 +19,8 @@ import com.google.inject.Inject;
 import org.junit.Before;
 import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
-import util.TestModels;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
+
 import static junit.framework.Assert.*;
 /**
  *  Unit TestCase for StatechartLocalReactions
@@ -30,7 +31,7 @@ import static junit.framework.Assert.*;
 public class StatechartLocalReactionsTest extends AbstractExecutionFlowTest {
 
 	@Inject
-	private TestModels models;
+	private SCTUnitTestModels models;
 
 	@Before
 	public void setup() throws Exception {

test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src-gen/org/yakindu/sct/model/sexec/interpreter/test/StringExpressionsTest.java

@@ -19,7 +19,8 @@ import com.google.inject.Inject;
 import org.junit.Before;
 import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
-import util.TestModels;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
+
 import static junit.framework.Assert.*;
 /**
  *  Unit TestCase for StringExpressions
@@ -30,7 +31,7 @@ import static junit.framework.Assert.*;
 public class StringExpressionsTest extends AbstractExecutionFlowTest {
 
 	@Inject
-	private TestModels models;
+	private SCTUnitTestModels models;
 
 	@Before
 	public void setup() throws Exception {

test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src-gen/org/yakindu/sct/model/sexec/interpreter/test/SyncForkTest.java

@@ -19,7 +19,8 @@ import com.google.inject.Inject;
 import org.junit.Before;
 import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
-import util.TestModels;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
+
 import static junit.framework.Assert.*;
 /**
  *  Unit TestCase for SyncFork
@@ -30,7 +31,7 @@ import static junit.framework.Assert.*;
 public class SyncForkTest extends AbstractExecutionFlowTest {
 
 	@Inject
-	private TestModels models;
+	private SCTUnitTestModels models;
 
 	@Before
 	public void setup() throws Exception {

test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src-gen/org/yakindu/sct/model/sexec/interpreter/test/SyncJoinTest.java

@@ -19,7 +19,8 @@ import com.google.inject.Inject;
 import org.junit.Before;
 import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
-import util.TestModels;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
+
 import static junit.framework.Assert.*;
 /**
  *  Unit TestCase for SyncJoin
@@ -30,7 +31,7 @@ import static junit.framework.Assert.*;
 public class SyncJoinTest extends AbstractExecutionFlowTest {
 
 	@Inject
-	private TestModels models;
+	private SCTUnitTestModels models;
 
 	@Before
 	public void setup() throws Exception {

test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src-gen/org/yakindu/sct/model/sexec/interpreter/test/ValuedEventsTest.java

@@ -19,7 +19,8 @@ import com.google.inject.Inject;
 import org.junit.Before;
 import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
-import util.TestModels;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
+
 import static junit.framework.Assert.*;
 /**
  *  Unit TestCase for ValuedEvents
@@ -30,7 +31,7 @@ import static junit.framework.Assert.*;
 public class ValuedEventsTest extends AbstractExecutionFlowTest {
 
 	@Inject
-	private TestModels models;
+	private SCTUnitTestModels models;
 
 	@Before
 	public void setup() throws Exception {

test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src/org/yakindu/sct/model/sexec/interpreter/test/util/AbstractExecutionFlowTest.java

@@ -20,8 +20,7 @@ import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
 import org.yakindu.sct.model.sgraph.RegularState;
 import org.yakindu.sct.simulation.core.runtime.IExecutionContext;
 import org.yakindu.sct.simulation.core.runtime.impl.ExecutionVariable;
-
-import util.TestModels;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
 
 import com.google.inject.Inject;
 
@@ -34,7 +33,7 @@ public abstract class AbstractExecutionFlowTest {
 	@Inject
 	protected IExecutionFlowInterpreter interpreter;
 	@Inject
-	protected TestModels models;
+	protected SCTUnitTestModels models;
 
 	protected IExecutionContext context() {
 		return interpreter.getExecutionContext();

test-plugins/org.yakindu.sct.refactoring.tests/META-INF/MANIFEST.MF

@@ -8,7 +8,8 @@ Fragment-Host: org.yakindu.sct.refactoring
 Require-Bundle: org.eclipse.core.runtime,
  org.junit,
  org.eclipse.xtext.junit4;bundle-version="2.3.0",
- org.yakindu.sct.model.sexec;bundle-version="1.0.0"
+ org.yakindu.sct.model.sexec;bundle-version="1.0.0",
+ org.yakindu.sct.test.models;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 

test-plugins/org.yakindu.sct.refactoring.tests/src/org/yakindu/sct/refactoring/refactor/FoldIncomingActionsRefactoringTest.java

@@ -10,13 +10,16 @@
  */
 package org.yakindu.sct.refactoring.refactor;
 
+import static org.yakindu.sct.test.models.RefactoringTestModels.EXPECTED_STATECHART;
+import static org.yakindu.sct.test.models.RefactoringTestModels.FOLD_INCOMING_ACTIONS;
+import static org.yakindu.sct.test.models.RefactoringTestModels.INITIAL_STATECHART;
+
 import org.junit.Test;
 import org.yakindu.sct.model.sgraph.State;
-import org.yakindu.sct.refactoring.refactor.AbstractRefactoring;
 import org.yakindu.sct.refactoring.refactor.impl.FoldIncomingActionsRefactoring;
-import org.yakindu.sct.refactoring.refactor.util.TestModels;
 
 import com.google.common.collect.Lists;
+
 /**
  * 
  * @author thomas kutz - Initial contribution and API
@@ -28,18 +31,14 @@ public class FoldIncomingActionsRefactoringTest extends
 	@Test
 	public void testFoldIncomingActions() {
 
-		testRefactoringOnState(TestModels.FOLD_INCOMING_ACTIONS
-				+ TestModels.INITIAL_STATECHART,
-				TestModels.FOLD_INCOMING_ACTIONS
-						+ TestModels.EXPECTED_STATECHART, "B");
-
-		// TODO check if executionFlow is modified after refactoring?? May not
-		// be possible for all refactorings
+		testRefactoringOnState(FOLD_INCOMING_ACTIONS + INITIAL_STATECHART,
+				FOLD_INCOMING_ACTIONS + EXPECTED_STATECHART, "B");
 	}
 
 	protected AbstractRefactoring<?> getRefactoring(State state) {
 		FoldIncomingActionsRefactoring foldIncomingActionsRefactoring = new FoldIncomingActionsRefactoring();
-		foldIncomingActionsRefactoring.setContextObjects(Lists.newArrayList(state));
+		foldIncomingActionsRefactoring.setContextObjects(Lists
+				.newArrayList(state));
 		return foldIncomingActionsRefactoring;
 	}
 

test-plugins/org.yakindu.sct.refactoring.tests/src/org/yakindu/sct/refactoring/refactor/FoldOutgoingActionsRefactoringTest.java

@@ -10,13 +10,16 @@
  */
 package org.yakindu.sct.refactoring.refactor;
 
+import static org.yakindu.sct.test.models.RefactoringTestModels.EXPECTED_STATECHART;
+import static org.yakindu.sct.test.models.RefactoringTestModels.FOLD_OUTGOING_ACTIONS;
+import static org.yakindu.sct.test.models.RefactoringTestModels.INITIAL_STATECHART;
+
 import org.junit.Test;
 import org.yakindu.sct.model.sgraph.State;
-import org.yakindu.sct.refactoring.refactor.AbstractRefactoring;
 import org.yakindu.sct.refactoring.refactor.impl.FoldOutgoingActionsRefactoring;
-import org.yakindu.sct.refactoring.refactor.util.TestModels;
 
 import com.google.common.collect.Lists;
+
 /**
  * 
  * @author thomas kutz - Initial contribution and API
@@ -27,20 +30,15 @@ public class FoldOutgoingActionsRefactoringTest extends
 
 	@Test
 	public void testFoldOutgoingActions() {
-
-		testRefactoringOnState(TestModels.FOLD_OUTGOING_ACTIONS
-				+ TestModels.INITIAL_STATECHART,
-				TestModels.FOLD_OUTGOING_ACTIONS
-						+ TestModels.EXPECTED_STATECHART, "A");
-
-		// TODO check if executionFlow is modified after refactoring?? May not
-		// be possible for all refactorings
+		testRefactoringOnState(FOLD_OUTGOING_ACTIONS + INITIAL_STATECHART,
+				FOLD_OUTGOING_ACTIONS + EXPECTED_STATECHART, "A");
 	}
 
 	@Override
 	protected AbstractRefactoring<?> getRefactoring(State state) {
 		FoldOutgoingActionsRefactoring foldOutgoingActionsRefactoring = new FoldOutgoingActionsRefactoring();
-		foldOutgoingActionsRefactoring.setContextObjects(Lists.newArrayList(state));
+		foldOutgoingActionsRefactoring.setContextObjects(Lists
+				.newArrayList(state));
 		return foldOutgoingActionsRefactoring;
 
 	}

test-plugins/org.yakindu.sct.refactoring.tests/src/org/yakindu/sct/refactoring/refactor/RefactoringTest.java

@@ -19,10 +19,9 @@ import org.junit.runner.RunWith;
 import org.yakindu.sct.model.sgraph.State;
 import org.yakindu.sct.model.sgraph.Statechart;
 import org.yakindu.sct.model.sgraph.resource.AbstractSCTResource;
-import org.yakindu.sct.refactoring.refactor.AbstractRefactoring;
 import org.yakindu.sct.refactoring.refactor.util.TestHelper;
 import org.yakindu.sct.refactoring.refactor.util.TestInjectorProvider;
-import org.yakindu.sct.refactoring.refactor.util.TestModels;
+import org.yakindu.sct.test.models.RefactoringTestModels;
 
 import com.google.inject.Inject;
 
@@ -36,31 +35,32 @@ import com.google.inject.Inject;
 public abstract class RefactoringTest {
 
 	@Inject
-	protected TestModels models;
-	
+	protected RefactoringTestModels models;
+
 	protected TestHelper helper = new TestHelper();
-	
+
 	protected void compareStatecharts(Statechart initial, Statechart expected) {
 		if (!EcoreUtil.equals(initial, expected)) {
 			Assert.fail("Equality check on statecharts failed!");
 		}
 	}
-	
-	protected void testRefactoringOnState(String pathToInitialSct, String pathToExpectedSct, String stateName) {
-		Statechart initial = models.loadStatechartFromResource(pathToInitialSct);
+
+	protected void testRefactoringOnState(String pathToInitialSct,
+			String pathToExpectedSct, String stateName) {
+		Statechart initial = models
+				.loadStatechartFromResource(pathToInitialSct);
 		State stateB = helper.getStateByName(initial, stateName);
-		
-		
+
 		AbstractRefactoring<?> refactoring = getRefactoring(stateB);
-		((AbstractSCTResource)initial.eResource()).setSerializerEnabled(true);
+		((AbstractSCTResource) initial.eResource()).setSerializerEnabled(true);
 		refactoring.internalExecute();
-		((AbstractSCTResource)initial.eResource()).setSerializerEnabled(false);
-		
-		Statechart expected = models.loadStatechartFromResource(pathToExpectedSct);
-		
+		((AbstractSCTResource) initial.eResource()).setSerializerEnabled(false);
+
+		Statechart expected = models
+				.loadStatechartFromResource(pathToExpectedSct);
+
 		compareStatecharts(initial, expected);
 	}
-	
-	
+
 	protected abstract AbstractRefactoring<?> getRefactoring(State state);
 }

test-plugins/org.yakindu.sct.refactoring.tests/src/org/yakindu/sct/refactoring/refactor/RenameRefactoringTest.java

@@ -11,6 +11,8 @@
 package org.yakindu.sct.refactoring.refactor;
 
 import static org.junit.Assert.fail;
+import static org.yakindu.sct.test.models.RefactoringTestModels.INITIAL_STATECHART;
+import static org.yakindu.sct.test.models.RefactoringTestModels.RENAMING;
 import junit.framework.Assert;
 
 import org.eclipse.emf.common.util.EList;
@@ -26,13 +28,13 @@ import org.yakindu.sct.model.sgraph.Statechart;
 import org.yakindu.sct.model.sgraph.Variable;
 import org.yakindu.sct.model.sgraph.resource.AbstractSCTResource;
 import org.yakindu.sct.model.stext.stext.InterfaceScope;
-import org.yakindu.sct.refactoring.refactor.AbstractRefactoring;
 import org.yakindu.sct.refactoring.refactor.impl.RenameRefactoring;
 import org.yakindu.sct.refactoring.refactor.util.TestHelper;
 import org.yakindu.sct.refactoring.refactor.util.TestInjectorProvider;
-import org.yakindu.sct.refactoring.refactor.util.TestModels;
+import org.yakindu.sct.test.models.RefactoringTestModels;
 
 import com.google.inject.Inject;
+
 /**
  * 
  * @author thomas kutz - Initial contribution and API
@@ -44,22 +46,23 @@ public class RenameRefactoringTest {
 
 	@Inject
 	protected IParser parser;
-	
+
 	@Inject
-	protected TestModels models;
-	
+	protected RefactoringTestModels models;
+
 	protected TestHelper helper = new TestHelper();
-	
+
 	protected void compareStatecharts(Statechart initial, Statechart expected) {
 		if (!EcoreUtil.equals(initial, expected)) {
 			Assert.fail("Equality check on statecharts failed!");
 		}
 	}
-	
+
 	@Test
 	public void testRenameVariable() {
-		Statechart initial = models.loadStatechartFromResource(TestModels.RENAMING+TestModels.INITIAL_STATECHART);
-		
+		Statechart initial = models.loadStatechartFromResource(RENAMING
+				+ INITIAL_STATECHART);
+
 		// get element to rename
 		Variable someVariable = null;
 		EList<Scope> scopes = initial.getScopes();
@@ -69,22 +72,25 @@ public class RenameRefactoringTest {
 				someVariable = iScope.getVariables().get(0);
 			}
 		}
-		
-		AbstractRefactoring<?> refactoring = new RenameRefactoring(someVariable, "someNewVariableName");
-		
-		((AbstractSCTResource)initial.eResource()).setSerializerEnabled(true);
+
+		AbstractRefactoring<?> refactoring = new RenameRefactoring(
+				someVariable, "someNewVariableName");
+
+		((AbstractSCTResource) initial.eResource()).setSerializerEnabled(true);
 		refactoring.internalExecute();
-		((AbstractSCTResource)initial.eResource()).setSerializerEnabled(false);
-		
-		Statechart expected = models.loadStatechartFromResource(TestModels.RENAMING+"AfterRenamingVariable.sct");
-		
+		((AbstractSCTResource) initial.eResource()).setSerializerEnabled(false);
+
+		Statechart expected = models.loadStatechartFromResource(RENAMING
+				+ "AfterRenamingVariable.sct");
+
 		compareStatecharts(initial, expected);
 	}
-	
+
 	@Test
 	public void testRenameEvent() {
-		Statechart initial = models.loadStatechartFromResource(TestModels.RENAMING+TestModels.INITIAL_STATECHART);
-		
+		Statechart initial = models.loadStatechartFromResource(RENAMING
+				+ INITIAL_STATECHART);
+
 		// get element to rename
 		Event someEvent1 = null;
 		EList<Scope> scopes = initial.getScopes();
@@ -98,46 +104,50 @@ public class RenameRefactoringTest {
 				}
 			}
 		}
-		
-		AbstractRefactoring refactoring = new RenameRefactoring(someEvent1, "someNewEventName");
-		
-		((AbstractSCTResource)initial.eResource()).setSerializerEnabled(true);
+
+		AbstractRefactoring<?> refactoring = new RenameRefactoring(someEvent1,
+				"someNewEventName");
+
+		((AbstractSCTResource) initial.eResource()).setSerializerEnabled(true);
 		refactoring.internalExecute();
-		((AbstractSCTResource)initial.eResource()).setSerializerEnabled(false);
-		
-		Statechart expected = models.loadStatechartFromResource(TestModels.RENAMING+"AfterRenamingEvent.sct");
-		
+		((AbstractSCTResource) initial.eResource()).setSerializerEnabled(false);
+
+		Statechart expected = models.loadStatechartFromResource(RENAMING
+				+ "AfterRenamingEvent.sct");
+
 		compareStatecharts(initial, expected);
 	}
-	
+
 	@Test
 	public void testRenameInterface() {
-		Statechart initial = models.loadStatechartFromResource(TestModels.RENAMING+TestModels.INITIAL_STATECHART);
-		
+		Statechart initial = models.loadStatechartFromResource(RENAMING
+				+ INITIAL_STATECHART);
+
 		// get element to rename
 		InterfaceScope someInterface = null;
 		EList<Scope> scopes = initial.getScopes();
 		for (Scope scope : scopes) {
 			if (scope instanceof InterfaceScope) {
-				someInterface = (InterfaceScope)scope;
+				someInterface = (InterfaceScope) scope;
 			}
 		}
-		
-		AbstractRefactoring refactoring = new RenameRefactoring(someInterface, "someNewInterfaceName");
-		
-		((AbstractSCTResource)initial.eResource()).setSerializerEnabled(true);
+
+		AbstractRefactoring<?> refactoring = new RenameRefactoring(
+				someInterface, "someNewInterfaceName");
+
+		((AbstractSCTResource) initial.eResource()).setSerializerEnabled(true);
 		refactoring.internalExecute();
-		((AbstractSCTResource)initial.eResource()).setSerializerEnabled(false);
-		
-		Statechart expected = models.loadStatechartFromResource(TestModels.RENAMING+"AfterRenamingInterface.sct");
-		
+		((AbstractSCTResource) initial.eResource()).setSerializerEnabled(false);
+
+		Statechart expected = models.loadStatechartFromResource(RENAMING
+				+ "AfterRenamingInterface.sct");
+
 		compareStatecharts(initial, expected);
 	}
-	
+
 	@Test
 	public void testNoRenamingIntoExistingName() {
 		fail("Not yet implemented.");
 	}
 
-
 }

test-plugins/org.yakindu.sct.refactoring.tests/src/org/yakindu/sct/refactoring/refactor/StateBasedRefactoringTest.java

@@ -20,10 +20,9 @@ import org.junit.runner.RunWith;
 import org.yakindu.sct.model.sgraph.State;
 import org.yakindu.sct.model.sgraph.Statechart;
 import org.yakindu.sct.model.sgraph.resource.AbstractSCTResource;
-import org.yakindu.sct.refactoring.refactor.AbstractRefactoring;
 import org.yakindu.sct.refactoring.refactor.util.TestHelper;
 import org.yakindu.sct.refactoring.refactor.util.TestInjectorProvider;
-import org.yakindu.sct.refactoring.refactor.util.TestModels;
+import org.yakindu.sct.test.models.RefactoringTestModels;
 
 import com.google.inject.Inject;
 
@@ -38,32 +37,34 @@ public abstract class StateBasedRefactoringTest {
 
 	@Inject
 	protected IParser parser;
-	
+
 	@Inject
-	protected TestModels models;
-	
+	protected RefactoringTestModels models;
+
 	protected TestHelper helper = new TestHelper();
-	
+
 	protected void compareStatecharts(Statechart initial, Statechart expected) {
 		if (!EcoreUtil.equals(initial, expected)) {
 			Assert.fail("Equality check on statecharts failed!");
 		}
 	}
-	
-	protected void testRefactoringOnState(String pathToInitialSct, String pathToExpectedSct, String stateName) {
-		Statechart initial = models.loadStatechartFromResource(pathToInitialSct);
+
+	protected void testRefactoringOnState(String pathToInitialSct,
+			String pathToExpectedSct, String stateName) {
+		Statechart initial = models
+				.loadStatechartFromResource(pathToInitialSct);
 		State stateB = helper.getStateByName(initial, stateName);
-		
+
 		AbstractRefactoring<?> refactoring = getRefactoring(stateB);
-		((AbstractSCTResource)initial.eResource()).setSerializerEnabled(true);
+		((AbstractSCTResource) initial.eResource()).setSerializerEnabled(true);
 		refactoring.internalExecute();
-		((AbstractSCTResource)initial.eResource()).setSerializerEnabled(false);
-		
-		Statechart expected = models.loadStatechartFromResource(pathToExpectedSct);
-		
+		((AbstractSCTResource) initial.eResource()).setSerializerEnabled(false);
+
+		Statechart expected = models
+				.loadStatechartFromResource(pathToExpectedSct);
+
 		compareStatecharts(initial, expected);
 	}
-	
-	
+
 	protected abstract AbstractRefactoring<?> getRefactoring(State state);
 }

test-plugins/org.yakindu.sct.refactoring.tests/src/org/yakindu/sct/refactoring/refactor/UnfoldEntryActionsRefactoringTest.java

@@ -10,11 +10,13 @@
  */
 package org.yakindu.sct.refactoring.refactor;
 
+import static org.yakindu.sct.test.models.RefactoringTestModels.EXPECTED_STATECHART;
+import static org.yakindu.sct.test.models.RefactoringTestModels.INITIAL_STATECHART;
+import static org.yakindu.sct.test.models.RefactoringTestModels.UNFOLD_ENTRY_ACTIONS;
+
 import org.junit.Test;
 import org.yakindu.sct.model.sgraph.State;
-import org.yakindu.sct.refactoring.refactor.AbstractRefactoring;
 import org.yakindu.sct.refactoring.refactor.impl.UnfoldEntryActionsRefactoring;
-import org.yakindu.sct.refactoring.refactor.util.TestModels;
 
 import com.google.common.collect.Lists;
 /**
@@ -28,13 +30,10 @@ public class UnfoldEntryActionsRefactoringTest extends
 	@Test
 	public void testUnfoldEntryActions() {
 
-		testRefactoringOnState(TestModels.UNFOLD_ENTRY_ACTIONS
-				+ TestModels.INITIAL_STATECHART,
-				TestModels.UNFOLD_ENTRY_ACTIONS
-						+ TestModels.EXPECTED_STATECHART, "B");
-
-		// TODO check if executionFlow is modified after refactoring?? May not
-		// be possible for all refactorings
+		testRefactoringOnState(UNFOLD_ENTRY_ACTIONS
+				+ INITIAL_STATECHART,
+				UNFOLD_ENTRY_ACTIONS
+						+ EXPECTED_STATECHART, "B");
 	}
 
 	@Override

test-plugins/org.yakindu.sct.refactoring.tests/src/org/yakindu/sct/refactoring/refactor/UnfoldExitActionsRefactoringTest.java

@@ -10,13 +10,16 @@
  */
 package org.yakindu.sct.refactoring.refactor;
 
+import static org.yakindu.sct.test.models.RefactoringTestModels.EXPECTED_STATECHART;
+import static org.yakindu.sct.test.models.RefactoringTestModels.INITIAL_STATECHART;
+import static org.yakindu.sct.test.models.RefactoringTestModels.UNFOLD_EXIT_ACTIONS;
+
 import org.junit.Test;
 import org.yakindu.sct.model.sgraph.State;
-import org.yakindu.sct.refactoring.refactor.AbstractRefactoring;
 import org.yakindu.sct.refactoring.refactor.impl.UnfoldExitActionsRefactoring;
-import org.yakindu.sct.refactoring.refactor.util.TestModels;
 
 import com.google.common.collect.Lists;
+
 /**
  * 
  * @author thomas kutz - Initial contribution and API
@@ -27,12 +30,8 @@ public class UnfoldExitActionsRefactoringTest extends StateBasedRefactoringTest
 	@Test
 	public void testUnfoldExitActions() {
 
-		testRefactoringOnState(TestModels.UNFOLD_EXIT_ACTIONS
-				+ TestModels.INITIAL_STATECHART, TestModels.UNFOLD_EXIT_ACTIONS
-				+ TestModels.EXPECTED_STATECHART, "A");
-
-		// TODO check if executionFlow is modified after refactoring?? May not
-		// be possible for all refactorings
+		testRefactoringOnState(UNFOLD_EXIT_ACTIONS + INITIAL_STATECHART,
+				UNFOLD_EXIT_ACTIONS + EXPECTED_STATECHART, "A");
 	}
 
 	@Override

test-plugins/org.yakindu.sct.test.models/.settings/org.eclipse.core.resources.prefs

@@ -1,16 +1,16 @@
-eclipse.preferences.version=1
-encoding//testmodels/AlwaysOncycle.sct=UTF-8
-encoding//testmodels/AssignmentAsExpression.sct=UTF-8
-encoding//testmodels/Declarations.sct=UTF-8
-encoding//testmodels/Exit.sct=UTF-8
-encoding//testmodels/ExitOnSelfTransition.sct=UTF-8
-encoding//testmodels/GuardedEntry.sct=UTF-8
-encoding//testmodels/GuardedExit.sct=UTF-8
-encoding//testmodels/HistoryWithoutInitialStep.sct=UTF-8
-encoding//testmodels/InEventLifeCycle.sct=UTF-8
-encoding//testmodels/InternalEventLifeCycle.sct=UTF-8
-encoding//testmodels/OutEventLifeCycle.sct=UTF-8
-encoding//testmodels/PerformanceTest.sct=UTF-8
-encoding//testmodels/STextKeywordsInStatesAndRegions.sct=UTF-8
-encoding//testmodels/SyncJoin.sct=UTF-8
-encoding//testmodels/VariableInitialization.sct=UTF-8
+eclipse.preferences.version=1
+encoding//testmodels/SCTUnit/AlwaysOncycle.sct=UTF-8
+encoding//testmodels/SCTUnit/AssignmentAsExpression.sct=UTF-8
+encoding//testmodels/SCTUnit/Declarations.sct=UTF-8
+encoding//testmodels/SCTUnit/Exit.sct=UTF-8
+encoding//testmodels/SCTUnit/ExitOnSelfTransition.sct=UTF-8
+encoding//testmodels/SCTUnit/GuardedEntry.sct=UTF-8
+encoding//testmodels/SCTUnit/GuardedExit.sct=UTF-8
+encoding//testmodels/SCTUnit/HistoryWithoutInitialStep.sct=UTF-8
+encoding//testmodels/SCTUnit/InEventLifeCycle.sct=UTF-8
+encoding//testmodels/SCTUnit/InternalEventLifeCycle.sct=UTF-8
+encoding//testmodels/SCTUnit/OutEventLifeCycle.sct=UTF-8
+encoding//testmodels/SCTUnit/PerformanceTest.sct=UTF-8
+encoding//testmodels/SCTUnit/STextKeywordsInStatesAndRegions.sct=UTF-8
+encoding//testmodels/SCTUnit/SyncJoin.sct=UTF-8
+encoding//testmodels/SCTUnit/VariableInitialization.sct=UTF-8

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

@@ -9,5 +9,6 @@ Require-Bundle: org.yakindu.sct.model.sexec;bundle-version="1.0.0",
  com.google.inject;bundle-version="2.0.0",
  de.itemis.xtext.utils.gmf;bundle-version="1.0.0",
  org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.gmf.runtime.emf.core;bundle-version="1.4.1"
-Export-Package: util
+ org.eclipse.gmf.runtime.emf.core;bundle-version="1.4.1",
+ org.eclipse.xtext.junit4;bundle-version="2.3.0"
+Export-Package: org.yakindu.sct.test.models

test-plugins/org.yakindu.sct.refactoring.tests/src/org/yakindu/sct/refactoring/refactor/util/TestModels.java

@@ -1,72 +1,64 @@
-/**
- * Copyright (c) 2013 committers of YAKINDU and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * Contributors:
- * 	committers of YAKINDU - initial API and implementation
- * 
- */
-package org.yakindu.sct.refactoring.refactor.util;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.yakindu.sct.model.sexec.ExecutionFlow;
-import org.yakindu.sct.model.sexec.transformation.ModelSequencer;
-import org.yakindu.sct.model.sgraph.SGraphPackage;
-import org.yakindu.sct.model.sgraph.Statechart;
-import org.yakindu.sct.model.sgraph.resource.AbstractSCTResource;
-
-import com.google.inject.Inject;
-
-@Deprecated
-// Use sct.examples TestModels
-public class TestModels {
-
-	public static final String INITIAL_STATECHART = "before.sct";
-	public static final String EXPECTED_STATECHART = "after.sct";
-
-	public static final String FOLD_INCOMING_ACTIONS = "fold_inc_action/";
-	public static final String FOLD_OUTGOING_ACTIONS = "fold_out_action/";
-	public static final String UNFOLD_ENTRY_ACTIONS = "unfold_entry_action/";
-	public static final String UNFOLD_EXIT_ACTIONS = "unfold_exit_action/";
-	public static final String GROUPING_STATES = "grouping_states/";
-	public static final String RENAMING = "renaming/";
-	public static final String CREATE_SUBMACHINE = "create_submachine/";
-
-	public static final String TESTMODEL_DIR = "com.yakindu.sct.refactoring.tests/testmodels/";
-
-	@Inject
-	private ModelSequencer sequencer;
-
-	/**
-	 * Helper method - loads a testmodel from the Testmodel directory
-	 * 
-	 * @param fileName
-	 *            the filename of the testmodel
-	 * @return the {@link ExecutionFlow}
-	 * @throws IOException
-	 */
-	public ExecutionFlow loadExecutionFlowFromResource(String fileName)
-			throws IOException {
-		Statechart statechart = loadStatechartFromResource(fileName);
-		final ExecutionFlow flow = sequencer.transform(statechart);
-		return flow;
-	}
-
-	public Statechart loadStatechartFromResource(String fileName) {
-		URI uri = URI.createPlatformPluginURI(TESTMODEL_DIR + fileName, true);
-		ResourceSetImpl impl = new ResourceSetImpl();
-		Resource resource = impl.getResource(uri, true);
-		Assert.isTrue(resource instanceof AbstractSCTResource);
-		Statechart statechart = (Statechart) EcoreUtil.getObjectByType(
-				resource.getContents(), SGraphPackage.Literals.STATECHART);
-		return statechart;
-	}
-}
+/**
+ * Copyright (c) 2013 committers of YAKINDU and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     committers of YAKINDU - initial API and implementation
+ */
+package org.yakindu.sct.test.models;
+
+import java.io.IOException;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.yakindu.sct.model.sexec.ExecutionFlow;
+import org.yakindu.sct.model.sexec.transformation.ModelSequencer;
+import org.yakindu.sct.model.sgraph.SGraphPackage;
+import org.yakindu.sct.model.sgraph.Statechart;
+import org.yakindu.sct.model.sgraph.resource.AbstractSCTResource;
+
+import com.google.inject.Inject;
+
+/**
+ * @author andreas muelder - Initial contribution and API
+ * 
+ */
+public abstract class BaseTestModels {
+
+	@Inject
+	private ModelSequencer sequencer;
+
+	public abstract String getModelDirectory();
+
+	public Statechart loadStatechartFromResource(String fileName) {
+		URI uri = URI.createPlatformPluginURI(getModelDirectory() + fileName,
+				true);
+		ResourceSetImpl impl = new ResourceSetImpl();
+		Resource resource = impl.getResource(uri, true);
+		Assert.isTrue(resource instanceof AbstractSCTResource);
+		Statechart statechart = (Statechart) EcoreUtil.getObjectByType(
+				resource.getContents(), SGraphPackage.Literals.STATECHART);
+		return statechart;
+	}
+
+	/**
+	 * Helper method - loads a testmodel from the Testmodel directory
+	 * 
+	 * @param fileName
+	 *            the filename of the testmodel
+	 * @return the {@link ExecutionFlow}
+	 * @throws IOException
+	 */
+	public ExecutionFlow loadExecutionFlowFromResource(String fileName)
+			throws IOException {
+		Statechart statechart = loadStatechartFromResource(fileName);
+		final ExecutionFlow flow = sequencer.transform(statechart);
+		return flow;
+	}
+}

test-plugins/org.yakindu.sct.test.models/src/org/yakindu/sct/test/models/RefactoringTestModels.java

@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) 2013 committers of YAKINDU and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     committers of YAKINDU - initial API and implementation
+ */
+package org.yakindu.sct.test.models;
+
+/**
+ * @author andreas muelder - Initial contribution and API
+ * 
+ */
+public class RefactoringTestModels extends BaseTestModels {
+
+	private static final String TESTMODEL_DIR = "org.yakindu.sct.test.models/testmodels/refactoring/";
+
+	public static final String INITIAL_STATECHART = "before.sct";
+	public static final String EXPECTED_STATECHART = "after.sct";
+	public static final String FOLD_INCOMING_ACTIONS = "fold_inc_action/";
+	public static final String FOLD_OUTGOING_ACTIONS = "fold_out_action/";
+	public static final String UNFOLD_ENTRY_ACTIONS = "unfold_entry_action/";
+	public static final String UNFOLD_EXIT_ACTIONS = "unfold_exit_action/";
+	public static final String GROUPING_STATES = "grouping_states/";
+	public static final String RENAMING = "renaming/";
+	public static final String CREATE_SUBMACHINE = "create_submachine/";
+
+	@Override
+	public String getModelDirectory() {
+		return TESTMODEL_DIR;
+	}
+
+}

test-plugins/org.yakindu.sct.test.models/src/org/yakindu/sct/test/models/SCTUnitTestModels.java

@@ -0,0 +1,57 @@
+/**
+ * Copyright (c) 2012 committers of YAKINDU and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     committers of YAKINDU - initial API and implementation
+ */
+package org.yakindu.sct.test.models;
+
+
+/**
+ * 
+ * @author andreas muelder - Initial contribution and API
+ * 
+ */
+public class SCTUnitTestModels extends BaseTestModels {
+
+	private static final String TESTMODEL_DIR = "org.yakindu.sct.test.models/testmodels/SCTUnit/";
+
+	public static final String ALWAYS_ONCYCLE = "AlwaysOncycle.sct";
+	public static final String BIT_EXPRESSIONS = "BitExpressions.sct";
+	public static final String BOOLEAN_EXPRESSIONS = "BooleanExpressions.sct";
+	public static final String C_KEYWORDS_M = "CKeywords.sct";
+	public static final String DECLARATIONS = "Declarations.sct";
+	public static final String CHOICE = "Choice.sct";
+	public static final String DEEP_HISTORY = "DeepHistory.sct";
+	public static final String FEATURE_CALLS = "FeatureCalls.sct";
+	public static final String GUARD = "Guard.sct";
+	public static final String INTEGER_EXPRESSIONS = "IntegerExpressions.sct";
+	public static final String JAVA_KEYWORDS_M = "JavaKeywords.sct";
+	public static final String PARENTHESIS = "Parenthesis.sct";
+	public static final String PRIORITY_VALUES = "PriorityValues.sct";
+	public static final String RAISE_EVENTS = "RaiseEvent.sct";
+	public static final String REAL_EXPRESSIONS = "RealExpressions.sct";
+	public static final String SAME_NAME_DIFFERENT_REGION = "SameNameDifferentRegion.sct";
+	public static final String SHALLOW_HISTORY = "ShallowHistory.sct";
+	public static final String SIMPLE_EVENT = "SimpleEvent.sct";
+	public static final String SIMPLE_HIERACHY = "SimpleHierachy.sct";
+	public static final String STATE_ACTIVE = "StateIsActive.sct";
+	public static final String STATE_WITH_EMPTY_REGION = "StateWithEmptyRegion.sct";
+	public static final String STATECHART_LOCAL_REACTIONS = "StatechartLocalReactions.sct";
+	public static final String STRING_EXPRESSIONS = "StringExpressions.sct";
+	public static final String SYNC_JOIN = "SyncJoin.sct";
+	public static final String SYNC_FORK = "SyncFork.sct";
+	public static final String TIME_TRIGGER = "TimeTrigger.sct";
+	public static final String VALUED_EVENTS = "ValuedEvents.sct";
+	public static final String OPERATIONS = "Operations.sct";
+
+	@Override
+	public String getModelDirectory() {
+		return TESTMODEL_DIR;
+	}
+
+}

test-plugins/org.yakindu.sct.generator.java.test/src/org/yakindu/sct/generator/java/util/JavaGeneratorInjectionProvider.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     committers of YAKINDU - initial API and implementation
  */
-package org.yakindu.sct.generator.java.util;
+package org.yakindu.sct.test.models;
 
 import org.eclipse.xtext.junit4.IInjectorProvider;
 import org.yakindu.sct.model.sexec.transformation.SequencerModule;
@@ -21,7 +21,7 @@ import com.google.inject.Injector;
  * @author andreas muelder - Initial contribution and API
  * 
  */
-public class JavaGeneratorInjectionProvider implements IInjectorProvider {
+public class TestModelInjectorProvider implements IInjectorProvider {
 
 	public Injector getInjector() {
 		return Guice.createInjector(new SequencerModule());

test-plugins/org.yakindu.sct.test.models/src/util/TestModels.java

@@ -1,376 +0,0 @@
-/**
- * Copyright (c) 2012 committers of YAKINDU and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     committers of YAKINDU - initial API and implementation
- */
-package util;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.yakindu.sct.model.sexec.ExecutionFlow;
-import org.yakindu.sct.model.sexec.transformation.ModelSequencer;
-import org.yakindu.sct.model.sgraph.SGraphPackage;
-import org.yakindu.sct.model.sgraph.Statechart;
-import org.yakindu.sct.model.sgraph.resource.AbstractSCTResource;
-
-import com.google.inject.Inject;
-
-/**
- * Provides access to the testmodels.
- * 
- * @author andreas muelder - Initial contribution and API
- * 
- */
-public class TestModels {
-
-	public static final String ALWAYS_ONCYCLE = "AlwaysOncycle.sct";
-	public static final String BIT_EXPRESSIONS = "BitExpressions.sct";
-	public static final String BOOLEAN_EXPRESSIONS = "BooleanExpressions.sct";
-	public static final String C_KEYWORDS_M = "CKeywords.sct";
-	public static final String DECLARATIONS = "Declarations.sct";
-	public static final String CHOICE = "Choice.sct";
-	public static final String DEEP_HISTORY = "DeepHistory.sct";
-	public static final String FEATURE_CALLS = "FeatureCalls.sct";
-	public static final String GUARD = "Guard.sct";
-	public static final String INTEGER_EXPRESSIONS = "IntegerExpressions.sct";
-	public static final String JAVA_KEYWORDS_M = "JavaKeywords.sct";
-	public static final String PARENTHESIS = "Parenthesis.sct";
-	public static final String PRIORITY_VALUES = "PriorityValues.sct";
-	public static final String RAISE_EVENTS = "RaiseEvent.sct";
-	public static final String REAL_EXPRESSIONS = "RealExpressions.sct";
-	public static final String SAME_NAME_DIFFERENT_REGION = "SameNameDifferentRegion.sct";
-	public static final String SHALLOW_HISTORY = "ShallowHistory.sct";
-	public static final String SIMPLE_EVENT = "SimpleEvent.sct";
-	public static final String SIMPLE_HIERACHY = "SimpleHierachy.sct";
-	public static final String STATE_ACTIVE = "StateIsActive.sct";
-	public static final String STATE_WITH_EMPTY_REGION = "StateWithEmptyRegion.sct";	
-	public static final String STATECHART_LOCAL_REACTIONS = "StatechartLocalReactions.sct";
-	public static final String STRING_EXPRESSIONS = "StringExpressions.sct";
-	public static final String SYNC_FORK = "SyncFork.sct";
-	public static final String SYNC_JOIN = "SyncJoin.sct";
-	private static final String TESTMODEL_DIR = "org.yakindu.sct.test.models/testmodels/";
-	public static final String TIME_TRIGGER = "TimeTrigger.sct";
-	public static final String VALUED_EVENTS = "ValuedEvents.sct";
-	public static final String OPERATIONS = "Operations.sct";
-
-	@Inject
-	private ModelSequencer sequencer;
-
-	/**
-	 * <img src="../../images/AlwaysOncycle.png" /> <br />
-	 * 
-	 * @return the {@link ExecutionFlow}
-	 * @throws IOException
-	 */
-	public ExecutionFlow createAlwaysOncycleModel() throws IOException {
-		return loadExecutionFlowFromResource(ALWAYS_ONCYCLE);
-	}
-
-	/**
-	 * <img src="../../images/SimpleEvent.png" /> <br />
-	 * 
-	 * @return the {@link ExecutionFlow}
-	 * @throws IOException
-	 */
-	public ExecutionFlow createBitExpressionsModel() throws IOException {
-		return loadExecutionFlowFromResource(BIT_EXPRESSIONS);
-	}
-
-	/**
-	 * <img src="../../images/BooleanExpressions.png" /> <br />
-	 * 
-	 * @return the {@link ExecutionFlow}
-	 * @throws IOException
-	 */
-
-	public ExecutionFlow createBooleanExpressionsModel() throws IOException {
-		return loadExecutionFlowFromResource(BOOLEAN_EXPRESSIONS);
-	}
-
-	/**
-	 * <img src="../../images/Choice.png" /> <br />
-	 * 
-	 * @return the {@link ExecutionFlow}
-	 * @throws IOException
-	 */
-	public ExecutionFlow createChoiceJunctionModel() throws IOException {
-		return loadExecutionFlowFromResource(CHOICE);
-	}
-
-	/**
-	 * <img src="../../images/CKeywords.png" /> <br />
-	 * 
-	 * @return the {@link ExecutionFlow}
-	 * @throws IOException
-	 */
-	public ExecutionFlow createCKeywordModel() throws IOException {
-		return loadExecutionFlowFromResource(C_KEYWORDS_M);
-	}
-
-	/**
-	 * <img src="../../images/Declarations.png" /> <br />
-	 * 
-	 * @return the {@link ExecutionFlow}
-	 * @throws IOException
-	 */
-	public ExecutionFlow createDeclarationsModel() throws IOException {
-		return loadExecutionFlowFromResource(DECLARATIONS);
-	}
-
-	/**
-	 * <img src="../../images/DeepHistory.png" /> <br />
-	 * 
-	 * @return the {@link ExecutionFlow}
-	 * @throws IOException
-	 */
-	public ExecutionFlow createDeepHistoryModel() throws IOException {
-		return loadExecutionFlowFromResource(DEEP_HISTORY);
-	}
-
-	/**
-	 * <img src="../../images/FeatureCalls.png" /> <br />
-	 * 
-	 * @return the {@link ExecutionFlow}
-	 * @throws IOException
-	 */
-	public ExecutionFlow createFeatureCallModel() throws IOException {
-		return loadExecutionFlowFromResource(FEATURE_CALLS);
-	}
-
-	/**
-	 * <img src="../../images/Guard.png" /> <br />
-	 * 
-	 * @return the {@link ExecutionFlow}
-	 * @throws IOException
-	 */
-	public ExecutionFlow createGuardModel() throws IOException {
-		return loadExecutionFlowFromResource(GUARD);
-	}
-
-	/**
-	 * <img src="../../images/IntegerExpressions.png" /> <br />
-	 * 
-	 * @return the {@link ExecutionFlow}
-	 * @throws IOException
-	 */
-	public ExecutionFlow createIntegerExpressionsModel() throws IOException {
-		return loadExecutionFlowFromResource(INTEGER_EXPRESSIONS);
-	}
-
-	/**
-	 * <img src="../../images/JavaKeywords.png" /> <br />
-	 * 
-	 * @return the {@link ExecutionFlow}
-	 * @throws IOException
-	 */
-	public ExecutionFlow createJavaKeywordsModel() throws IOException {
-		return loadExecutionFlowFromResource(JAVA_KEYWORDS_M);
-	}
-
-	/**
-	 * <img src="../../images/Parenthesis.png" /> <br />
-	 * 
-	 * @return the {@link ExecutionFlow}
-	 * @throws IOException
-	 */
-	public ExecutionFlow createParenthesisModel() throws IOException {
-		return loadExecutionFlowFromResource(PARENTHESIS);
-	}
-
-	/**
-	 * <img src="../../images/PriorityValues.png" /> <br />
-	 * 
-	 * @return the {@link ExecutionFlow}
-	 * @throws IOException
-	 */
-	public ExecutionFlow createPriorityValueModel() throws IOException {
-		return loadExecutionFlowFromResource(PRIORITY_VALUES);
-	}
-
-	/**
-	 * <img src="../../images/RaisEvent.png" /> <br />
-	 * 
-	 * @return the {@link ExecutionFlow}
-	 * @throws IOException
-	 */
-	public ExecutionFlow createRaisEventModel() throws IOException {
-		return loadExecutionFlowFromResource(RAISE_EVENTS);
-	}
-
-	/**
-	 * <img src="../../images/RealExpressions.png" /> <br />
-	 * 
-	 * @return the {@link ExecutionFlow}
-	 * @throws IOException
-	 */
-	public ExecutionFlow createRealExpressionsModel() throws IOException {
-		return loadExecutionFlowFromResource(REAL_EXPRESSIONS);
-	}
-
-	/**
-	 * <img src="../../images/SameNameDifferentRegion.png" /> <br />
-	 * 
-	 * @return the {@link ExecutionFlow}
-	 * @throws IOException
-	 */
-	public ExecutionFlow createSameNameDifferentRegionModel()
-			throws IOException {
-		return loadExecutionFlowFromResource(SAME_NAME_DIFFERENT_REGION);
-	}
-
-	/**
-	 * <img src="../../images/ShallowHistory.png" /> <br />
-	 * 
-	 * @return the {@link ExecutionFlow}
-	 * @throws IOException
-	 */
-	public ExecutionFlow createShallowHistoryModel() throws IOException {
-		return loadExecutionFlowFromResource(SHALLOW_HISTORY);
-	}
-
-	/**
-	 * <img src="../../images/BitExpressions.png" /> <br />
-	 * 
-	 * @return the {@link ExecutionFlow}
-	 * @throws IOException
-	 */
-	public ExecutionFlow createSimpleEventModel() throws IOException {
-		return loadExecutionFlowFromResource(SIMPLE_EVENT);
-	}
-
-	/**
-	 * <img src="../../images/SimpleHierachy.png" /> <br />
-	 * 
-	 * @return the {@link ExecutionFlow}
-	 * @throws IOException
-	 */
-	public ExecutionFlow createSimpleHierachyModel() throws IOException {
-		return loadExecutionFlowFromResource(SIMPLE_HIERACHY);
-	}
-
-	/**
-	 * <img src="../../images/StatechartLocalReactions.png" /> <br />
-	 * 
-	 * @return the {@link ExecutionFlow}
-	 * @throws IOException
-	 */ 
-	public ExecutionFlow createStatechartLocalReactionsModel()
-			throws IOException {
-		return loadExecutionFlowFromResource(STATECHART_LOCAL_REACTIONS);
-	}
-
-	/**
-	 * <img src="../../images/StateIsActive.png" /> <br />
-	 * 
-	 * @return the {@link ExecutionFlow}
-	 * @throws IOException
-	 */
-	public ExecutionFlow createStateIsActiveModel() throws IOException {
-		return loadExecutionFlowFromResource(STATE_ACTIVE);
-	}
- 
-	/**
-	 * <img src="../../images/StateWithEmptyRegion.png" /> <br />
-	 * 
-	 * @return the {@link ExecutionFlow}
-	 * @throws IOException
-	 */
-	public ExecutionFlow createStateWithEmptyRegionModel() throws IOException {
-		return loadExecutionFlowFromResource(STATE_WITH_EMPTY_REGION);
-	}
-
-	/**
-	 * <img src="../../images/StringExpressions.png" /> <br />
-	 * 
-	 * @return the {@link ExecutionFlow}
-	 * @throws IOException
-	 */
-	public ExecutionFlow createStringExpressionsModel() throws IOException {
-		return loadExecutionFlowFromResource(STRING_EXPRESSIONS);
-	}
-
-	/**
-	 * <img src="../../images/SyncFork.png" /> <br />
-	 * 
-	 * @return the {@link ExecutionFlow}
-	 * @throws IOException
-	 */
-	public ExecutionFlow createSyncForkModel() throws IOException {
-		return loadExecutionFlowFromResource(SYNC_FORK);
-	}
-
-	/**
-	 * <img src="../../images/SyncJoin.png" /> <br />
-	 * 
-	 * @return the {@link ExecutionFlow}
-	 * @throws IOException
-	 */
-	public ExecutionFlow createSyncJoinModel() throws IOException {
-		return loadExecutionFlowFromResource(SYNC_JOIN);
-	}
-
-	/**
-	 * <img src="../../images/TimeTrigger.png" /> <br />
-	 * 
-	 * @return the {@link ExecutionFlow}
-	 * @throws IOException
-	 */
-	public ExecutionFlow createTimeTriggerModel() throws IOException {
-		return loadExecutionFlowFromResource(TIME_TRIGGER);
-	}
-
-	/**
-	 * <img src="../../images/ValuedEvents.png" /> <br />
-	 * 
-	 * @return the {@link ExecutionFlow}
-	 * @throws IOException
-	 */
-	public ExecutionFlow createValuedEventsModel() throws IOException {
-		return loadExecutionFlowFromResource(VALUED_EVENTS);
-	}
-
-	/**
-	 * <img src="../../images/Operations.png" /> <br />
-	 * 
-	 * @return the {@link ExecutionFlow}
-	 * @throws IOException
-	 */
-	public ExecutionFlow createOperationsModel() throws IOException {
-		return loadExecutionFlowFromResource(OPERATIONS);
-	}
-
-	/**
-	 * Helper method - loads a testmodel from the Testmodel directory
-	 * 
-	 * @param fileName
-	 *            the filename of the testmodel
-	 * @return the {@link ExecutionFlow}
-	 * @throws IOException
-	 */
-	public ExecutionFlow loadExecutionFlowFromResource(String fileName)
-			throws IOException {
-		Statechart statechart = loadStatechartFromResource(fileName);
-		final ExecutionFlow flow = sequencer.transform(statechart);
-		return flow;
-	}
-
-	public Statechart loadStatechartFromResource(String fileName) {
-		URI uri = URI.createPlatformPluginURI(TESTMODEL_DIR + fileName, true);
-		ResourceSetImpl impl = new ResourceSetImpl();
-		Resource resource = impl.getResource(uri, true);
-		Assert.isTrue(resource instanceof AbstractSCTResource);
-		Statechart statechart = (Statechart) EcoreUtil.getObjectByType(
-				resource.getContents(), SGraphPackage.Literals.STATECHART);
-		return statechart;
-	}
-}