Moved validation test models to org.yakindu.sct.test.models project.

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

@@ -9,7 +9,8 @@ Require-Bundle: org.yakindu.sct.model.sgraph;bundle-version="1.0.0",
  org.eclipse.ui,
  org.eclipse.core.runtime,
  org.yakindu.sct.model.stext;bundle-version="1.0.0",
- org.eclipse.xtext.junit4;bundle-version="2.3.0"
+ org.eclipse.xtext.junit4;bundle-version="2.3.0",
+ org.yakindu.sct.test.models;bundle-version="2.1.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: yakindu.org

test-plugins/org.yakindu.sct.model.sgraph.test/src/org/yakindu/sct/model/sgraph/test/util/SGraphTestModelUtil.java

@@ -1,33 +1,17 @@
 package org.yakindu.sct.model.sgraph.test.util;
 
 import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.yakindu.sct.model.sgraph.SGraphPackage;
 import org.yakindu.sct.model.sgraph.Statechart;
+import org.yakindu.sct.test.models.AbstractTestModelsUtil;
 
 public final class SGraphTestModelUtil {
 
-	private static final String TESTMODEL_DIR = "org.yakindu.sct.model.sgraph.test/testmodels/";
+	private static final String TESTMODEL_DIR = "org.yakindu.sct.test.models/testmodels/validation/";
 
 	private SGraphTestModelUtil() {
 	}
 
-	public static final Statechart loadStatechart(URI uri) {
-		// Initialize the model
-		SGraphPackage.eINSTANCE.eClass();
-		// Obtain a new resource set
-		ResourceSet resSet = new ResourceSetImpl();
-
-		// Get the resource
-		Resource resource = resSet.getResource(uri, true);
-		// Get the first model element and cast it to the right type
-		Statechart statechart = (Statechart) resource.getContents().get(0);
-		return statechart;
-	}
-
 	public static final Statechart loadStatechart(String filename) {
-		return loadStatechart(URI.createPlatformPluginURI(TESTMODEL_DIR + filename, true));
+		return AbstractTestModelsUtil.loadStatechart(URI.createPlatformPluginURI(TESTMODEL_DIR + filename, true));
 	}
 }

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

@@ -15,6 +15,7 @@ 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.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
@@ -29,7 +30,7 @@ import com.google.inject.Inject;
  * @author andreas muelder - Initial contribution and API
  * 
  */
-public abstract class BaseTestModels {
+public abstract class AbstractTestModelsUtil {
 
 	@Inject
 	private IModelSequencer sequencer;
@@ -39,12 +40,7 @@ public abstract class BaseTestModels {
 	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;
+		return loadStatechart(uri);
 	}
 
 	/**
@@ -61,4 +57,20 @@ public abstract class BaseTestModels {
 		final ExecutionFlow flow = sequencer.transform(statechart);
 		return flow;
 	}
+
+	/**
+	 * Helper method - loads a testmodel from the given {@link URI}
+	 * 
+	 * @param uri 
+	 * 			the {@link URI} of the model file
+	 * @return the {@link Statechart}
+	 */
+	public static final Statechart loadStatechart(URI uri) {
+		ResourceSet resSet = new ResourceSetImpl();
+		Resource resource = resSet.getResource(uri, true);
+		Assert.isTrue(resource instanceof AbstractSCTResource);
+		Statechart statechart = (Statechart) EcoreUtil.getObjectByType(
+				resource.getContents(), SGraphPackage.Literals.STATECHART);
+		return statechart;
+	}
 }

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

@@ -16,7 +16,7 @@ package org.yakindu.sct.test.models;
  * @author andreas muelder - Initial contribution and API
  * 
  */
-public class SCTUnitTestModels extends BaseTestModels {
+public class SCTUnitTestModels extends AbstractTestModelsUtil {
 
 	private static final String TESTMODEL_DIR = "org.yakindu.sct.test.models/testmodels/SCTUnit/";