Changed ExectionFlowInterpreterTests startup

test-plugins/org.yakindu.sct.model.sexec.interpreter.test/build.properties

@@ -1,5 +1,4 @@
-source.. = src/,\
-           testmodels/
+source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\

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

@@ -12,15 +12,21 @@ package org.yakindu.sct.model.sexec.interpreter.test;
 
 import java.io.IOException;
 
+import org.eclipse.xtext.junit4.InjectWith;
+import org.eclipse.xtext.junit4.XtextRunner;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import util.AbstractExecutionFlowTest;
+import util.SExecInjectionProvider;
 
 /**
  * 
  * @author andreas muelder - Initial contribution and API
  * 
  */
+@RunWith(XtextRunner.class)
+@InjectWith(SExecInjectionProvider.class)
 public class ExecutionFlowInterpreterTest extends AbstractExecutionFlowTest {
 
 	@Test
@@ -71,12 +77,11 @@ public class ExecutionFlowInterpreterTest extends AbstractExecutionFlowTest {
 		interpreter.runCycle();
 		interpreter.runCycle();
 		interpreter.runCycle();
-		//Now, the deep history states should be active
+		// Now, the deep history states should be active
 		assertIsActive("State2");
 		assertIsActive("State4");
 		assertIsActive("State6");
-		
-		
+
 	}
 
 }

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

@@ -31,7 +31,11 @@ import org.yakindu.sct.simulation.core.runtime.impl.ExecutionVariable;
 
 import com.google.inject.Inject;
 
-
+/**
+ * 
+ * @author andreas muelder - Initial contribution and API
+ * 
+ */
 @RunWith(XtextRunner.class)
 @InjectWith(STextInjectorProvider.class)
 public class STextInterpreterTest extends AbstractSTextTest {
@@ -143,6 +147,7 @@ public class STextInterpreterTest extends AbstractSTextTest {
 		executeWithDefaultScope("myBool = 1.0f == 1.0f");
 		assertEquals(true, getBoolValue());
 	}
+
 	@Test
 	public void testStringEqual() {
 		executeWithDefaultScope("myBool = 'string' == 'string'");
@@ -166,6 +171,7 @@ public class STextInterpreterTest extends AbstractSTextTest {
 		executeWithDefaultScope("myBool = 1.0f != 2.0f");
 		assertEquals(true, getBoolValue());
 	}
+
 	@Test
 	public void testStringNotEqual() {
 		executeWithDefaultScope("myBool = 'string' != 'string2'");
@@ -647,8 +653,8 @@ public class STextInterpreterTest extends AbstractSTextTest {
 		ExecutionVariable myBool = new ExecutionVariable("myBool",
 				Boolean.class, false);
 		context.declareVariable(myBool);
-		ExecutionVariable myReal = new ExecutionVariable("myReal",
-				Float.class, 0.0f);
+		ExecutionVariable myReal = new ExecutionVariable("myReal", Float.class,
+				0.0f);
 		context.declareVariable(myReal);
 		ExecutionVariable myString = new ExecutionVariable("myString",
 				String.class, "");

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

@@ -18,15 +18,11 @@ import java.util.Set;
 
 import org.yakindu.sct.model.sexec.ExecutionFlow;
 import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter;
-import org.yakindu.sct.model.sexec.interpreter.InterpreterModule;
-import org.yakindu.sct.model.sexec.transformation.SequencerModule;
 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 com.google.inject.Guice;
 import com.google.inject.Inject;
-import com.google.inject.util.Modules;
 
 /**
  * 
@@ -39,12 +35,6 @@ public abstract class AbstractExecutionFlowTest {
 	@Inject
 	protected TestModels models;
 
-	public AbstractExecutionFlowTest() {
-		Guice.createInjector(
-				Modules.override(new SequencerModule()).with(
-						new InterpreterModule())).injectMembers(this);
-	}
-
 	protected IExecutionContext context() {
 		return interpreter.getExecutionContext();
 	}
@@ -54,10 +44,7 @@ public abstract class AbstractExecutionFlowTest {
 		interpreter.enter();
 	}
 
-	//
 	// -> Assertion methods...
-	//
-
 	protected void assertVarValue(String variableName, Object value) {
 		ExecutionVariable variable = context().getVariable(variableName);
 		assertNotNull("Variable '" + variableName + "' is not defined",

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

@@ -0,0 +1,33 @@
+/**
+ * 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 org.eclipse.xtext.junit4.IInjectorProvider;
+import org.yakindu.sct.model.sexec.interpreter.InterpreterModule;
+import org.yakindu.sct.model.sexec.transformation.SequencerModule;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.util.Modules;
+
+/**
+ * 
+ * @author andreas muelder - Initial contribution and API
+ * 
+ */
+public class SExecInjectionProvider implements IInjectorProvider {
+
+	public Injector getInjector() {
+		return Guice.createInjector(Modules.override(new SequencerModule())
+				.with(new InterpreterModule()));
+	}
+
+}