Moved static reference to validation testmodel path from utility method.

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

@@ -29,6 +29,7 @@ import static org.yakindu.sct.model.sgraph.validation.SGraphJavaValidator.ISSUE_
 import static org.yakindu.sct.model.sgraph.validation.SGraphJavaValidator.ISSUE_SYNCHRONIZATION_TARGET_STATES_NOT_ORTHOGONAL;
 import static org.yakindu.sct.model.sgraph.validation.SGraphJavaValidator.ISSUE_SYNCHRONIZATION_TARGET_STATES_NOT_WITHIN_SAME_PARENTSTATE;
 import static org.yakindu.sct.model.sgraph.validation.SGraphJavaValidator.ISSUE_SYNCHRONIZATION_TRANSITION_COUNT;
+import static org.yakindu.sct.test.models.AbstractTestModelsUtil.VALIDATION_TESTMODEL_DIR;
 
 import java.lang.reflect.Method;
 import java.util.HashMap;
@@ -505,7 +506,7 @@ public class SGraphJavaValidationTest {
 	@Test
 	public void synchronizationTransitionCount() {
 		statechart = AbstractTestModelsUtil
-				.loadStatechart("SynchronizationTransitionCount.sct");
+				.loadStatechart(VALIDATION_TESTMODEL_DIR + "SynchronizationTransitionCount.sct");
 		Iterator<EObject> iter = statechart.eAllContents();
 		while (iter.hasNext()) {
 			EObject element = iter.next();
@@ -522,7 +523,7 @@ public class SGraphJavaValidationTest {
 	@Test
 	public void orthogonalStates() {
 		statechart = AbstractTestModelsUtil
-				.loadStatechart("NotOrthogonalRegion01.sct");
+				.loadStatechart(VALIDATION_TESTMODEL_DIR + "NotOrthogonalRegion01.sct");
 		Iterator<EObject> iter = statechart.eAllContents();
 		while (iter.hasNext()) {
 			EObject element = iter.next();
@@ -540,7 +541,7 @@ public class SGraphJavaValidationTest {
 
 		diagnostics = new BasicDiagnostic();
 		statechart = AbstractTestModelsUtil
-				.loadStatechart("NotOrthogonalRegion02.sct");
+				.loadStatechart(VALIDATION_TESTMODEL_DIR + "NotOrthogonalRegion02.sct");
 		iter = statechart.eAllContents();
 		while (iter.hasNext()) {
 			EObject element = iter.next();
@@ -558,7 +559,7 @@ public class SGraphJavaValidationTest {
 
 		diagnostics = new BasicDiagnostic();
 		statechart = AbstractTestModelsUtil
-				.loadStatechart("NotOrthogonalRegion03.sct");
+				.loadStatechart(VALIDATION_TESTMODEL_DIR + "NotOrthogonalRegion03.sct");
 		iter = statechart.eAllContents();
 		while (iter.hasNext()) {
 			EObject element = iter.next();
@@ -578,7 +579,7 @@ public class SGraphJavaValidationTest {
 	@Test
 	public void orthogonalStatesValid() {
 		statechart = AbstractTestModelsUtil
-				.loadStatechart("OrthogonalRegion01.sct");
+				.loadStatechart(VALIDATION_TESTMODEL_DIR + "OrthogonalRegion01.sct");
 		Iterator<EObject> iter = statechart.eAllContents();
 		while (iter.hasNext()) {
 			EObject element = iter.next();

test-plugins/org.yakindu.sct.model.stext.test/src/org/yakindu/sct/model/stext/test/STextJavaValidatorTest.java

@@ -31,6 +31,8 @@ import static org.yakindu.sct.model.stext.validation.STextJavaValidator.TRANSITI
 import static org.yakindu.sct.model.stext.validation.STextJavaValidator.TRANSITION_NOT_EXISTING_NAMED_EXIT_POINT;
 import static org.yakindu.sct.model.stext.validation.STextJavaValidator.TRANSITION_UNBOUND_DEFAULT_ENTRY_POINT;
 
+import static org.yakindu.sct.test.models.AbstractTestModelsUtil.VALIDATION_TESTMODEL_DIR;
+
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -389,7 +391,7 @@ public class STextJavaValidatorTest extends AbstractSTextTest {
 	public void checkUnusedEntry() {
 		BasicDiagnostic diagnostics = new BasicDiagnostic();
 		Statechart statechart = AbstractTestModelsUtil
-				.loadStatechart("UnusedEntryPoint.sct");
+				.loadStatechart(VALIDATION_TESTMODEL_DIR + "UnusedEntryPoint.sct");
 		Iterator<EObject> iter = statechart.eAllContents();
 		while (iter.hasNext()) {
 			EObject element = iter.next();
@@ -407,7 +409,7 @@ public class STextJavaValidatorTest extends AbstractSTextTest {
 	public void checkUnusedExit() {
 		BasicDiagnostic diagnostics = new BasicDiagnostic();
 		Statechart statechart = AbstractTestModelsUtil
-				.loadStatechart("UnusedExitPoint.sct");
+				.loadStatechart(VALIDATION_TESTMODEL_DIR + "UnusedExitPoint.sct");
 		Iterator<EObject> iter = statechart.eAllContents();
 		while (iter.hasNext()) {
 			EObject element = iter.next();
@@ -422,7 +424,7 @@ public class STextJavaValidatorTest extends AbstractSTextTest {
 
 		diagnostics = new BasicDiagnostic();
 		statechart = AbstractTestModelsUtil
-				.loadStatechart("UnusedDefaultExitPoint.sct");
+				.loadStatechart(VALIDATION_TESTMODEL_DIR + "UnusedDefaultExitPoint.sct");
 		iter = statechart.eAllContents();
 		while (iter.hasNext()) {
 			EObject element = iter.next();
@@ -441,7 +443,7 @@ public class STextJavaValidatorTest extends AbstractSTextTest {
 		// Test source state isn't composite
 		BasicDiagnostic diagnostics = new BasicDiagnostic();
 		Statechart statechart = AbstractTestModelsUtil
-				.loadStatechart("TransitionEntrySpecNotComposite.sct");
+				.loadStatechart(VALIDATION_TESTMODEL_DIR + "TransitionEntrySpecNotComposite.sct");
 		Iterator<EObject> iter = statechart.eAllContents();
 		while (iter.hasNext()) {
 			EObject element = iter.next();
@@ -456,7 +458,7 @@ public class STextJavaValidatorTest extends AbstractSTextTest {
 
 		diagnostics = new BasicDiagnostic();
 		statechart = AbstractTestModelsUtil
-				.loadStatechart("TransitionExitSpecNotComposite.sct");
+				.loadStatechart(VALIDATION_TESTMODEL_DIR + "TransitionExitSpecNotComposite.sct");
 		iter = statechart.eAllContents();
 		while (iter.hasNext()) {
 			EObject element = iter.next();
@@ -472,7 +474,7 @@ public class STextJavaValidatorTest extends AbstractSTextTest {
 		// Test exit spec is used on multiple transition siblings.
 		diagnostics = new BasicDiagnostic();
 		statechart = AbstractTestModelsUtil
-				.loadStatechart("TransitionExitSpecOnMultipleSiblings.sct");
+				.loadStatechart(VALIDATION_TESTMODEL_DIR + "TransitionExitSpecOnMultipleSiblings.sct");
 		iter = statechart.eAllContents();
 		while (iter.hasNext()) {
 			EObject element = iter.next();
@@ -488,7 +490,7 @@ public class STextJavaValidatorTest extends AbstractSTextTest {
 		// Test transition unbound named exit point spec.
 		diagnostics = new BasicDiagnostic();
 		statechart = AbstractTestModelsUtil
-				.loadStatechart("TransitionNotExistingNamedExitPoint.sct");
+				.loadStatechart(VALIDATION_TESTMODEL_DIR + "TransitionNotExistingNamedExitPoint.sct");
 		iter = statechart.eAllContents();
 		while (iter.hasNext()) {
 			EObject element = iter.next();
@@ -506,7 +508,7 @@ public class STextJavaValidatorTest extends AbstractSTextTest {
 	public void checkUnboundEntryPoints() {
 		BasicDiagnostic diagnostics = new BasicDiagnostic();
 		Statechart statechart = AbstractTestModelsUtil
-				.loadStatechart("UnboundDefaultEntryPoints.sct");
+				.loadStatechart(VALIDATION_TESTMODEL_DIR + "UnboundDefaultEntryPoints.sct");
 		Iterator<EObject> iter = statechart.eAllContents();
 		while (iter.hasNext()) {
 			EObject element = iter.next();
@@ -526,7 +528,7 @@ public class STextJavaValidatorTest extends AbstractSTextTest {
 
 		diagnostics = new BasicDiagnostic();
 		statechart = AbstractTestModelsUtil
-				.loadStatechart("UnboundEntryPoints02.sct");
+				.loadStatechart(VALIDATION_TESTMODEL_DIR + "UnboundEntryPoints02.sct");
 		iter = statechart.eAllContents();
 
 		while (iter.hasNext()) {

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

@@ -12,7 +12,6 @@ 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.ResourceSet;
@@ -22,7 +21,6 @@ import org.yakindu.sct.model.sexec.ExecutionFlow;
 import org.yakindu.sct.model.sexec.transformation.IModelSequencer;
 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;
 
@@ -32,7 +30,7 @@ import com.google.inject.Inject;
  */
 public abstract class AbstractTestModelsUtil {
 
-	private static final String VALIDATION_TESTMODEL_DIR = "org.yakindu.sct.test.models/testmodels/validation/";
+	public static final String VALIDATION_TESTMODEL_DIR = "org.yakindu.sct.test.models/testmodels/validation/";
 
 	@Inject
 	private IModelSequencer sequencer;
@@ -74,7 +72,7 @@ public abstract class AbstractTestModelsUtil {
 				resource.getContents(), SGraphPackage.Literals.STATECHART);
 		return statechart;
 	}
-	
+
 	/**
 	 * Helper method - loads a testmodel from the given filename.
 	 * 
@@ -84,7 +82,6 @@ public abstract class AbstractTestModelsUtil {
 	 */
 	public static final Statechart loadStatechart(String filename) {
 		return AbstractTestModelsUtil.loadStatechart(URI
-				.createPlatformPluginURI(VALIDATION_TESTMODEL_DIR + filename,
-						true));
+				.createPlatformPluginURI(filename, true));
 	}
 }