Newly generated and updated InterpreterTests (#1457)

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

@@ -21,3 +21,4 @@ Require-Bundle: org.eclipse.core.runtime,
  org.yakindu.sct.domain.generic.simulation
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
+Export-Package: org.yakindu.sct.model.sexec.interpreter.test.util

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/AllTests.java

@@ -0,0 +1,80 @@
+/**
+* Copyright (c) 2017 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.simulation.core.sexec.test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(Suite.class)
+@SuiteClasses({
+	AlwaysOncycle.class,
+	AssignmentAsExpression.class,
+	BitExpressions.class,
+	BooleanExpressions.class,
+	CastExpressions.class,
+	ChoiceTest.class,
+	CKeywords.class,
+	ConditionalExpression.class,
+	ConstantsTests.class,
+	ConstOnlyDefaultScope.class,
+	ConstOnlyInternalScope.class,
+	ConstOnlyNamedScope.class,
+	Declarations.class,
+	DeepEntry.class,
+	DeepHistory.class,
+	DynamicChoice.class,
+	EmptyTransition.class,
+	EnterState.class,
+	EntryChoice.class,
+	EntryExitSelfTransition.class,
+	EntryReactionAction.class,
+	ExitOnSelfTransition.class,
+	ExitState.class,
+	FeatureCalls.class,
+	FinalState.class,
+	Guard.class,
+	GuardedEntry.class,
+	GuardedExit.class,
+	HistoryWithExitPoint.class,
+	HistoryWithoutInitialStep.class,
+	InEventLifeCycle.class,
+	IntegerExpressions.class,
+	InternalEventLifeCycle.class,
+	LocalReactions.class,
+	LogicalAndTests.class,
+	LogicalOrTests.class,
+	NamedInterfaceAccess.class,
+	OutEventLifeCycle.class,
+	Parenthesis.class,
+	PriorityValues.class,
+	RaiseEvent.class,
+	ReadOnlyVariable.class,
+	SameNameDifferentRegion.class,
+	ShallowHistory.class,
+	ShallowHistoryWithDeepEntry.class,
+	SimpleEvent.class,
+	SimpleHierachy.class,
+	StatechartActive.class,
+	StatechartLocalReactions.class,
+	StateIsActive.class,
+	StaticChoice.class,
+	STextKeywordsInStatesAndRegions.class,
+	StringExpressions.class,
+	SyncFork.class,
+	SyncJoin.class,
+	TransitionWithoutCondition.class,
+	TriggerGuardExpressions.class,
+	TriggerExpressionPrecedence.class,
+	ValuedEvents.class,
+	TypeAlias.class
+	})
+public class AllTests {
+}

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/AllTestsTest.java

@@ -1,35 +0,0 @@
-/**
-* Copyright (c) 2016 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.simulation.core.sexec.test;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
-@RunWith(Suite.class)
-@SuiteClasses({AlwaysOncycleTest.class, AssignmentAsExpressionTest.class, BitExpressionsTest.class,
-		BooleanExpressionsTest.class, CastExpressionsTest.class, ChoiceTest.class, CKeywordsTest.class,
-		ConditionalExpressionTest.class, ConstantsTestsTest.class, DeclarationsTest.class, DeepEntryTest.class,
-		DeepHistoryTest.class, DynamicChoiceTest.class, EmptyTransitionTest.class, EnterStateTest.class,
-		EntryChoiceTest.class, EntryExitSelfTransitionTest.class, EntryReactionActionTest.class,
-		ExitOnSelfTransitionTest.class, ExitStateTest.class, FeatureCallsTest.class, FinalStateTest.class,
-		GuardTest.class, GuardedEntryTest.class, GuardedExitTest.class, HistoryWithExitPointTest.class,
-		HistoryWithoutInitialStepTest.class, InEventLifeCycleTest.class, IntegerExpressionsTest.class,
-		InternalEventLifeCycleTest.class, LocalReactionsTest.class, LogicalAndTestsTest.class, LogicalOrTestsTest.class,
-		NamedInterfaceAccessTest.class, OutEventLifeCycleTest.class, ParenthesisTest.class, PriorityValuesTest.class,
-		RaiseEventTest.class, ReadOnlyVariableTest.class, SameNameDifferentRegionTest.class, ShallowHistoryTest.class,
-		ShallowHistoryWithDeepEntryTest.class, SimpleEventTest.class, SimpleHierachyTest.class,
-		StatechartActiveTest.class, StatechartLocalReactionsTest.class, StateIsActiveTest.class, StaticChoiceTest.class,
-		STextKeywordsInStatesAndRegionsTest.class, StringExpressionsTest.class, SyncForkTest.class, SyncJoinTest.class,
-		TransitionWithoutConditionTest.class, TriggerGuardExpressionsTest.class, TriggerExpressionPrecedenceTest.class,
-		ValuedEventsTest.class})
-public class AllTestsTest {
-}

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/AlwaysOncycleTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,28 +21,28 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for AlwaysOncycle
+ * Unit TestCase for AlwaysOncycle
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class AlwaysOncycleTest extends AbstractExecutionFlowTest {
+public class AlwaysOncycle extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("AlwaysOncycle.sct");
 		initInterpreter(flow);
 	}
 	@Test
-	public void alwaysOncycleTest() throws Exception {
+	public void alwaysOnCycleTest() throws Exception {
 		interpreter.enter();
 		assertTrue(isStateActive("StateA"));
-		while (getInteger("value") < 5l) {
+		while(getInteger("value") < 5l) {
 			interpreter.runCycle();
 			assertTrue(isStateActive("StateA"));
 		}
 		interpreter.runCycle();
 		assertTrue(isStateActive("StateB"));
-		while (getInteger("value") < 5l) {
+		while(getInteger("value") < 5l) {
 			interpreter.runCycle();
 			assertTrue(isStateActive("StateB"));
 		}

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/AssignmentAsExpressionTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,14 +21,14 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for AssignmentAsExpression
+ * Unit TestCase for AssignmentAsExpression
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class AssignmentAsExpressionTest extends AbstractExecutionFlowTest {
+public class AssignmentAsExpression extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("AssignmentAsExpression.sct");
 		initInterpreter(flow);
 	}

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/BitExpressionsTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,19 +21,19 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for BitExpressions
+ * Unit TestCase for BitExpressions
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class BitExpressionsTest extends AbstractExecutionFlowTest {
+public class BitExpressions extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("BitExpressions.sct");
 		initInterpreter(flow);
 	}
 	@Test
-	public void BitExpressions() throws Exception {
+	public void bitExpressions() throws Exception {
 		interpreter.enter();
 		assertTrue(isStateActive("StateA"));
 		assertTrue(getInteger("myBit1") == 5l);
@@ -43,7 +43,7 @@ public class BitExpressionsTest extends AbstractExecutionFlowTest {
 		assertTrue(isStateActive("StateB"));
 		assertTrue(getInteger("leftBitshift") == 10l);
 		assertTrue(getInteger("rightBitshift") == 2l);
-		assertTrue(getInteger("complementBitshift") == -6l);
+		assertTrue(getInteger("complementBitshift") == - 6l );
 		assertTrue(getInteger("bitwiseAnd") == 5l);
 		assertTrue(getInteger("bitwiseOr") == 7l);
 		assertTrue(getInteger("bitwiseXor") == 2l);

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/BooleanExpressionsTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,14 +21,14 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for BooleanExpressions
+ * Unit TestCase for BooleanExpressions
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class BooleanExpressionsTest extends AbstractExecutionFlowTest {
+public class BooleanExpressions extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("BooleanExpressions.sct");
 		initInterpreter(flow);
 	}

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/CKeywordsTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,19 +21,19 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for CKeywords
+ * Unit TestCase for CKeywords
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class CKeywordsTest extends AbstractExecutionFlowTest {
+public class CKeywords extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("CKeywords.sct");
 		initInterpreter(flow);
 	}
 	@Test
-	public void CKeywordsTest() throws Exception {
+	public void cKeywordsTest() throws Exception {
 		interpreter.enter();
 		assertTrue(isStateActive("char"));
 		raiseEvent("auto");

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/CastExpressionsTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,19 +21,19 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for CastExpressions
+ * Unit TestCase for CastExpressions
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class CastExpressionsTest extends AbstractExecutionFlowTest {
+public class CastExpressions extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("CastExpressions.sct");
 		initInterpreter(flow);
 	}
 	@Test
-	public void CastExpressionTest() throws Exception {
+	public void castExpressionTest() throws Exception {
 		interpreter.enter();
 		assertTrue(getReal("realValue") == 5l);
 		assertTrue(getInteger("intValue") == 5l);

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/ChoiceTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,78 +21,78 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for Choice
+ * Unit TestCase for Choice
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
 public class ChoiceTest extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("Choice.sct");
 		initInterpreter(flow);
 	}
 	@Test
 	public void elseChoiceUsingNonDefaultTransition() throws Exception {
-		interpreter.enter();
-		assertTrue(isStateActive("A"));
-		setBoolean("c", true);
-		raiseEvent("e");
-		interpreter.runCycle();
+		initForEventE(true);
 		assertTrue(isStateActive("C"));
 	}
 	@Test
 	public void elseChoiceUsingDefaultTransition() throws Exception {
-		interpreter.enter();
-		assertTrue(isStateActive("A"));
-		setBoolean("c", false);
-		raiseEvent("e");
-		interpreter.runCycle();
+		initForEventE(false);
 		assertTrue(isStateActive("B"));
 	}
 	@Test
 	public void defaultChoiceUsingNonDefaultTransition() throws Exception {
-		interpreter.enter();
-		assertTrue(isStateActive("A"));
-		setBoolean("c", true);
-		raiseEvent("g");
-		interpreter.runCycle();
+		initForEventG(true);
 		assertTrue(isStateActive("C"));
 	}
 	@Test
 	public void defaultChoiceUsingDefaultTransition() throws Exception {
-		interpreter.enter();
-		assertTrue(isStateActive("A"));
-		setBoolean("c", false);
-		raiseEvent("g");
-		interpreter.runCycle();
+		initForEventG(false);
 		assertTrue(isStateActive("B"));
 	}
 	@Test
 	public void uncheckedChoiceUsingNonDefaultTransition() throws Exception {
-		interpreter.enter();
-		assertTrue(isStateActive("A"));
-		setBoolean("c", true);
-		raiseEvent("f");
-		interpreter.runCycle();
+		initForEventF(true);
 		assertTrue(isStateActive("C"));
 	}
 	@Test
 	public void uncheckedChoiceUsingDefaultTransition() throws Exception {
+		initForEventF(false);
+		assertTrue(isStateActive("B"));
+	}
+	@Test
+	public void alwaysTrueTransitionInChoice() throws Exception {
+		initForEventH(true);
+		assertTrue(isStateActive("C"));
+	}
+	public void initForEventE(boolean valueForC) throws Exception {
+		interpreter.enter();
+		assertTrue(isStateActive("A"));
+		setBoolean("c", valueForC);
+		raiseEvent("e");
+		interpreter.runCycle();
+	}
+	public void initForEventF(boolean valueForC) throws Exception {
 		interpreter.enter();
 		assertTrue(isStateActive("A"));
-		setBoolean("c", false);
+		setBoolean("c", valueForC);
 		raiseEvent("f");
 		interpreter.runCycle();
-		assertTrue(isStateActive("B"));
 	}
-	@Test
-	public void alwaysTrueTransitionInChoice() throws Exception {
+	public void initForEventG(boolean valueForC) throws Exception {
+		interpreter.enter();
+		assertTrue(isStateActive("A"));
+		setBoolean("c", valueForC);
+		raiseEvent("g");
+		interpreter.runCycle();
+	}
+	public void initForEventH(boolean valueForC) throws Exception {
 		interpreter.enter();
 		assertTrue(isStateActive("A"));
-		setBoolean("c", true);
+		setBoolean("c", valueForC);
 		raiseEvent("h");
 		interpreter.runCycle();
-		assertTrue(isStateActive("C"));
 	}
 }

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/ConditionalExpressionTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,19 +21,19 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for ConditionalExpressions
+ * Unit TestCase for ConditionalExpressions
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class ConditionalExpressionTest extends AbstractExecutionFlowTest {
+public class ConditionalExpression extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("ConditionalExpressions.sct");
 		initInterpreter(flow);
 	}
 	@Test
-	public void ConditionalExpressionTest() throws Exception {
+	public void conditionalExpressionTest() throws Exception {
 		interpreter.enter();
 		assertTrue(isStateActive("A"));
 		assertTrue(getInteger("condition") == 1l);

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/ConstOnlyDefaultScopeTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,14 +21,14 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for ConstOnlyDefaultScope
+ * Unit TestCase for ConstOnlyDefaultScope
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class ConstOnlyDefaultScopeTest extends AbstractExecutionFlowTest {
+public class ConstOnlyDefaultScope extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("declarations/ConstOnlyDefaultScope.sct");
 		initInterpreter(flow);
 	}

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/ConstOnlyInternalScopeTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,14 +21,14 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for ConstOnlyInternalScope
+ * Unit TestCase for ConstOnlyInternalScope
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class ConstOnlyInternalScopeTest extends AbstractExecutionFlowTest {
+public class ConstOnlyInternalScope extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("declarations/ConstOnlyInternalScope.sct");
 		initInterpreter(flow);
 	}

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/ConstOnlyNamedScopeTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,14 +21,14 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for ConstOnlyNamedScope
+ * Unit TestCase for ConstOnlyNamedScope
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class ConstOnlyNamedScopeTest extends AbstractExecutionFlowTest {
+public class ConstOnlyNamedScope extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("declarations/ConstOnlyNamedScope.sct");
 		initInterpreter(flow);
 	}

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/ConstantsTestsTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,14 +21,14 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for Constants
+ * Unit TestCase for Constants
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class ConstantsTestsTest extends AbstractExecutionFlowTest {
+public class ConstantsTests extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("Constants.sct");
 		initInterpreter(flow);
 	}

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/DeclarationsTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,14 +21,14 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for Declarations
+ * Unit TestCase for Declarations
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class DeclarationsTest extends AbstractExecutionFlowTest {
+public class Declarations extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("Declarations.sct");
 		initInterpreter(flow);
 	}

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/DeepEntry.java

@@ -0,0 +1,42 @@
+/**
+* Copyright (c) 2017 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.simulation.core.sexec.test;
+import org.eclipse.xtext.junit4.InjectWith;
+import org.eclipse.xtext.junit4.XtextRunner;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.yakindu.sct.model.sexec.ExecutionFlow;
+import org.yakindu.sct.model.sexec.interpreter.test.util.AbstractExecutionFlowTest;
+import org.yakindu.sct.model.sexec.interpreter.test.util.SExecInjectionProvider;
+import org.yakindu.sct.test.models.SCTUnitTestModels;
+import com.google.inject.Inject;
+import static org.junit.Assert.assertTrue;
+/**
+ * Unit TestCase for DeepEntry
+ */
+@SuppressWarnings("all")
+@RunWith(XtextRunner.class)
+@InjectWith(SExecInjectionProvider.class)
+public class DeepEntry extends AbstractExecutionFlowTest {
+	@Before
+	public void setup() throws Exception{
+		ExecutionFlow flow = models.loadExecutionFlowFromResource("DeepEntry.sct");
+		initInterpreter(flow);
+	}
+	@Test
+	public void enterToSubstate() throws Exception {
+		interpreter.enter();
+		int vergleich = 4;
+		assertTrue(vergleich == 4l);
+		interpreter.exit();
+	}
+}

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/DeepEntryTest.java

@@ -1,55 +0,0 @@
-/**
-* Copyright (c) 2016 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.simulation.core.sexec.test;
-import org.eclipse.xtext.junit4.InjectWith;
-import org.eclipse.xtext.junit4.XtextRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.yakindu.sct.model.sexec.ExecutionFlow;
-import org.yakindu.sct.model.sexec.interpreter.test.util.AbstractExecutionFlowTest;
-import org.yakindu.sct.model.sexec.interpreter.test.util.SExecInjectionProvider;
-import org.yakindu.sct.test.models.SCTUnitTestModels;
-import com.google.inject.Inject;
-import static org.junit.Assert.assertTrue;
-/**
- *  Unit TestCase for DeepEntry
- */
-@SuppressWarnings("all")
-@RunWith(XtextRunner.class)
-@InjectWith(SExecInjectionProvider.class)
-public class DeepEntryTest extends AbstractExecutionFlowTest {
-	@Before
-	public void setup() throws Exception {
-		ExecutionFlow flow = models.loadExecutionFlowFromResource("DeepEntry.sct");
-		initInterpreter(flow);
-	}
-	@Test
-	public void enterToSubstate() throws Exception {
-		assertTrue(getInteger("x") == 0l);
-		assertTrue(getInteger("y") == 0l);
-		assertTrue(getInteger("z") == 0l);
-		interpreter.enter();
-		assertTrue(getInteger("x") == 1l);
-		assertTrue(getInteger("y") == 1l);
-		assertTrue(getInteger("z") == 2l);
-		raiseEvent("e");
-		interpreter.runCycle();
-		assertTrue(isStateActive("BB"));
-		raiseEvent("f");
-		interpreter.runCycle();
-		assertTrue(isStateActive("C"));
-		raiseEvent("f");
-		interpreter.runCycle();
-		assertTrue(isStateActive("BB"));
-		assertTrue(getInteger("y") == 1l);
-	}
-}

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/DeepHistoryTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,14 +21,14 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for DeepHistory
+ * Unit TestCase for DeepHistory
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class DeepHistoryTest extends AbstractExecutionFlowTest {
+public class DeepHistory extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("DeepHistory.sct");
 		initInterpreter(flow);
 	}

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/DynamicChoiceTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,19 +21,19 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for DynamicChoice
+ * Unit TestCase for DynamicChoice
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class DynamicChoiceTest extends AbstractExecutionFlowTest {
+public class DynamicChoice extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("DynamicChoice.sct");
 		initInterpreter(flow);
 	}
 	@Test
-	public void DynamicChoiceTest() throws Exception {
+	public void dynamicChoiceTest() throws Exception {
 		interpreter.enter();
 		assertTrue(isStateActive("Start"));
 		interpreter.runCycle();

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/EmptyTransitionTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,19 +21,19 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for EmptyTransition
+ * Unit TestCase for EmptyTransition
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class EmptyTransitionTest extends AbstractExecutionFlowTest {
+public class EmptyTransition extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("EmptyTransition.sct");
 		initInterpreter(flow);
 	}
 	@Test
-	public void EmptyTransitionTest() throws Exception {
+	public void emptyTransitionTest() throws Exception {
 		interpreter.enter();
 		interpreter.runCycle();
 		assertTrue(!isStateActive("B"));

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/EnterStateTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,14 +21,14 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for EnterState
+ * Unit TestCase for EnterState
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class EnterStateTest extends AbstractExecutionFlowTest {
+public class EnterState extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("EnterState.sct");
 		initInterpreter(flow);
 	}

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/EntryChoiceTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,19 +21,19 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for EntryChoice
+ * Unit TestCase for EntryChoice
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class EntryChoiceTest extends AbstractExecutionFlowTest {
+public class EntryChoice extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("EntryChoice.sct");
 		initInterpreter(flow);
 	}
 	@Test
-	public void EntryChoiceTest() throws Exception {
+	public void entryChoiceTest() throws Exception {
 		interpreter.enter();
 		interpreter.runCycle();
 		interpreter.runCycle();

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/EntryExitSelfTransitionTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,36 +21,30 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for EntryExitSelfTransition
+ * Unit TestCase for EntryExitSelfTransition
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class EntryExitSelfTransitionTest extends AbstractExecutionFlowTest {
+public class EntryExitSelfTransition extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("EntryExitSelfTransition.sct");
 		initInterpreter(flow);
 	}
 	@Test
-	public void SelfTransitionToChildState() throws Exception {
-		interpreter.enter();
-		interpreter.runCycle();
-		assertTrue(getInteger("entries") == 1l);
-		assertTrue(isStateActive("B"));
-		setInteger("entries", 0l);
+	public void selfTransitionToChildState() throws Exception {
+		init();
 		raiseEvent("e");
 		interpreter.runCycle();
 		assertTrue(getInteger("entries") == 1l);
 		assertTrue(getInteger("exits") == 1l);
 		assertTrue(isStateActive("C"));
+		interpreter.exit();
 	}
 	@Test
-	public void SelfTransitionFromChildState() throws Exception {
-		interpreter.enter();
-		interpreter.runCycle();
-		assertTrue(getInteger("entries") == 1l);
-		setInteger("entries", 0l);
+	public void selfTransitionFromChildState() throws Exception {
+		init();
 		raiseEvent("e1");
 		interpreter.runCycle();
 		assertTrue(getInteger("entries") == 0l);
@@ -61,5 +55,13 @@ public class EntryExitSelfTransitionTest extends AbstractExecutionFlowTest {
 		assertTrue(isStateActive("B"));
 		assertTrue(getInteger("entries") == 1l);
 		assertTrue(getInteger("exits") == 1l);
+		interpreter.exit();
+	}
+	public void init() throws Exception {
+		interpreter.enter();
+		interpreter.runCycle();
+		assertTrue(getInteger("entries") == 1l);
+		assertTrue(isStateActive("B"));
+		setInteger("entries", 0l);
 	}
 }

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/EntryReactionActionTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,14 +21,14 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for EntryReactionAction
+ * Unit TestCase for EntryReactionAction
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class EntryReactionActionTest extends AbstractExecutionFlowTest {
+public class EntryReactionAction extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("entries/EntryReactionAction.sct");
 		initInterpreter(flow);
 	}
@@ -42,15 +42,7 @@ public class EntryReactionActionTest extends AbstractExecutionFlowTest {
 	}
 	@Test
 	public void entryOnRTS() throws Exception {
-		interpreter.enter();
-		raiseEvent("b");
-		interpreter.runCycle();
-		raiseEvent("d");
-		interpreter.runCycle();
-		setBoolean("enteredR1", false);
-		setBoolean("enteredR2", false);
-		setBoolean("enteredBdefault", false);
-		setBoolean("enteredBother", false);
+		init();
 		raiseEvent("b");
 		interpreter.runCycle();
 		assertTrue(!getBoolean("enteredR1"));
@@ -60,6 +52,15 @@ public class EntryReactionActionTest extends AbstractExecutionFlowTest {
 	}
 	@Test
 	public void noEntryTransitionActionOnHistory() throws Exception {
+		init();
+		raiseEvent("d");
+		interpreter.runCycle();
+		assertTrue(!getBoolean("enteredR1"));
+		assertTrue(!getBoolean("enteredR2"));
+		assertTrue(!getBoolean("enteredBdefault"));
+		assertTrue(!getBoolean("enteredBother"));
+	}
+	public void init() throws Exception {
 		interpreter.enter();
 		raiseEvent("b");
 		interpreter.runCycle();
@@ -69,11 +70,5 @@ public class EntryReactionActionTest extends AbstractExecutionFlowTest {
 		setBoolean("enteredR2", false);
 		setBoolean("enteredBdefault", false);
 		setBoolean("enteredBother", false);
-		raiseEvent("d");
-		interpreter.runCycle();
-		assertTrue(!getBoolean("enteredR1"));
-		assertTrue(!getBoolean("enteredR2"));
-		assertTrue(!getBoolean("enteredBdefault"));
-		assertTrue(!getBoolean("enteredBother"));
 	}
 }

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/ExitOnSelfTransitionTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,19 +21,19 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for ExitOnSelfTransition
+ * Unit TestCase for ExitOnSelfTransition
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class ExitOnSelfTransitionTest extends AbstractExecutionFlowTest {
+public class ExitOnSelfTransition extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("ExitOnSelfTransition.sct");
 		initInterpreter(flow);
 	}
 	@Test
-	public void ExitOnSelfTransitionTest() throws Exception {
+	public void exitOnSelfTransitionTest() throws Exception {
 		interpreter.enter();
 		assertTrue(isStateActive("A"));
 		assertTrue(getInteger("entryCount") == 1l);

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/ExitStateTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,14 +21,14 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for ExitState
+ * Unit TestCase for ExitState
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class ExitStateTest extends AbstractExecutionFlowTest {
+public class ExitState extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("ExitState.sct");
 		initInterpreter(flow);
 	}

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/FeatureCallsTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,19 +21,19 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for FeatureCalls
+ * Unit TestCase for FeatureCalls
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class FeatureCallsTest extends AbstractExecutionFlowTest {
+public class FeatureCalls extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("FeatureCalls.sct");
 		initInterpreter(flow);
 	}
 	@Test
-	public void FeatureCalls() throws Exception {
+	public void featureCalls() throws Exception {
 		interpreter.enter();
 		assertTrue(isStateActive("A"));
 		interpreter.runCycle();

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/FinalStateTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,19 +21,19 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for FinalState
+ * Unit TestCase for FinalState
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class FinalStateTest extends AbstractExecutionFlowTest {
+public class FinalState extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("FinalState.sct");
 		initInterpreter(flow);
 	}
 	@Test
-	public void StatechartNameTest() throws Exception {
+	public void statechartNameTest() throws Exception {
 		interpreter.enter();
 		interpreter.runCycle();
 		assertTrue(interpreter.isFinal());

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/GuardTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,14 +21,14 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for Guard
+ * Unit TestCase for Guard
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class GuardTest extends AbstractExecutionFlowTest {
+public class Guard extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("Guard.sct");
 		initInterpreter(flow);
 	}

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/GuardedEntryTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,57 +21,51 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for GuardedEntry
+ * Unit TestCase for GuardedEntry
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class GuardedEntryTest extends AbstractExecutionFlowTest {
+public class GuardedEntry extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("GuardedEntry.sct");
 		initInterpreter(flow);
 	}
 	@Test
-	public void EntryNotTakenOnStatechartEnter() throws Exception {
+	public void entryNotTakenOnStatechartEnter() throws Exception {
 		assertTrue(getBoolean("guard") == false);
 		interpreter.enter();
 		assertTrue(isStateActive("A"));
 		assertTrue(getBoolean("done") == false);
 	}
 	@Test
-	public void EntryTakenOnStatechartEnter() throws Exception {
+	public void entryTakenOnStatechartEnter() throws Exception {
 		setBoolean("guard", true);
 		interpreter.enter();
 		assertTrue(isStateActive("A"));
 		assertTrue(getBoolean("done") == true);
 	}
 	@Test
-	public void EntryTakenInTransition() throws Exception {
-		interpreter.enter();
-		assertTrue(isStateActive("A"));
-		raiseEvent("e");
-		interpreter.runCycle();
-		assertTrue(isStateActive("B"));
-		setBoolean("guard", true);
-		setBoolean("done", false);
-		raiseEvent("e");
-		interpreter.runCycle();
-		assertTrue(isStateActive("A"));
+	public void entryTakenInTransition() throws Exception {
+		initEntryInTransition(true,false);
 		assertTrue(getBoolean("done"));
 	}
 	@Test
-	public void EntryNotTakenInTransition() throws Exception {
+	public void entryNotTakenInTransition() throws Exception {
+		initEntryInTransition(false,false);
+		assertTrue(!getBoolean("done"));
+	}
+	public void initEntryInTransition(boolean guardVar, boolean doneVar) throws Exception {
 		interpreter.enter();
 		assertTrue(isStateActive("A"));
 		raiseEvent("e");
 		interpreter.runCycle();
 		assertTrue(isStateActive("B"));
-		setBoolean("guard", false);
-		setBoolean("done", false);
+		setBoolean("guard", guardVar);
+		setBoolean("done", doneVar);
 		raiseEvent("e");
 		interpreter.runCycle();
 		assertTrue(isStateActive("A"));
-		assertTrue(!getBoolean("done"));
 	}
 }

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/GuardedExitTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,35 +21,35 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for GuardedExit
+ * Unit TestCase for GuardedExit
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class GuardedExitTest extends AbstractExecutionFlowTest {
+public class GuardedExit extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("GuardedExit.sct");
 		initInterpreter(flow);
 	}
 	@Test
-	public void ExitTaken() throws Exception {
+	public void exitTaken() throws Exception {
 		interpreter.enter();
 		assertTrue(isStateActive("A"));
 		assertTrue(!getBoolean("guard"));
-		raiseEvent("e");
-		interpreter.runCycle();
-		assertTrue(isStateActive("B"));
-		assertTrue(!getBoolean("done"));
+		checkDone(false);
 	}
 	@Test
-	public void ExitNotTaken() throws Exception {
+	public void exitNotTaken() throws Exception {
 		interpreter.enter();
 		assertTrue(isStateActive("A"));
 		setBoolean("guard", true);
+		checkDone(true);
+	}
+	public void checkDone(boolean shouldBeDone) throws Exception {
 		raiseEvent("e");
 		interpreter.runCycle();
 		assertTrue(isStateActive("B"));
-		assertTrue(getBoolean("done"));
+		assertTrue(shouldBeDone ? getBoolean("done")  : !getBoolean("done"));
 	}
 }

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/HistoryWithExitPointTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,14 +21,14 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for HistoryWithExitPoint
+ * Unit TestCase for HistoryWithExitPoint
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class HistoryWithExitPointTest extends AbstractExecutionFlowTest {
+public class HistoryWithExitPoint extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("HistoryWithExitPoint.sct");
 		initInterpreter(flow);
 	}

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/HistoryWithoutInitialStepTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,23 +21,20 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for HistoryWithoutInitialStep
+ * Unit TestCase for HistoryWithoutInitialStep
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class HistoryWithoutInitialStepTest extends AbstractExecutionFlowTest {
+public class HistoryWithoutInitialStep extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("HistoryWithoutInitialStep.sct");
 		initInterpreter(flow);
 	}
 	@Test
 	public void enterThroughInitialEntry() throws Exception {
-		interpreter.enter();
-		assertTrue(isStateActive("A"));
-		raiseEvent("toB");
-		interpreter.runCycle();
+		init();
 		assertTrue(isStateActive("C"));
 		raiseEvent("next");
 		interpreter.runCycle();
@@ -45,10 +42,7 @@ public class HistoryWithoutInitialStepTest extends AbstractExecutionFlowTest {
 	}
 	@Test
 	public void enterCThroughHistory() throws Exception {
-		interpreter.enter();
-		assertTrue(isStateActive("A"));
-		raiseEvent("toB");
-		interpreter.runCycle();
+		init();
 		assertTrue(isStateActive("C"));
 		raiseEvent("toA");
 		interpreter.runCycle();
@@ -59,10 +53,7 @@ public class HistoryWithoutInitialStepTest extends AbstractExecutionFlowTest {
 	}
 	@Test
 	public void enterDThroughHistory() throws Exception {
-		interpreter.enter();
-		assertTrue(isStateActive("A"));
-		raiseEvent("toB");
-		interpreter.runCycle();
+		init();
 		raiseEvent("next");
 		interpreter.runCycle();
 		assertTrue(isStateActive("D"));
@@ -73,4 +64,10 @@ public class HistoryWithoutInitialStepTest extends AbstractExecutionFlowTest {
 		interpreter.runCycle();
 		assertTrue(isStateActive("D"));
 	}
+	public void init() throws Exception {
+		interpreter.enter();
+		assertTrue(isStateActive("A"));
+		raiseEvent("toB");
+		interpreter.runCycle();
+	}
 }

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/InEventLifeCycleTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,14 +21,14 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for InEventLifeCycle
+ * Unit TestCase for InEventLifeCycle
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class InEventLifeCycleTest extends AbstractExecutionFlowTest {
+public class InEventLifeCycle extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("InEventLifeCycle.sct");
 		initInterpreter(flow);
 	}

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/IntegerExpressionsTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,14 +21,14 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for IntegerExpressions
+ * Unit TestCase for IntegerExpressions
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class IntegerExpressionsTest extends AbstractExecutionFlowTest {
+public class IntegerExpressions extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("IntegerExpressions.sct");
 		initInterpreter(flow);
 	}
@@ -51,11 +51,11 @@ public class IntegerExpressionsTest extends AbstractExecutionFlowTest {
 		assertTrue(getInteger("multiply") == 50l);
 		assertTrue(getInteger("division") == 2l);
 		assertTrue(getInteger("modulo") == 0l);
-		assertTrue(getInteger("negat") == -10l);
+		assertTrue(getInteger("negat") == - 10l );
 		assertTrue(getInteger("multiAssign") == 20l);
 		assertTrue(getInteger("divAssign") == 2l);
 		assertTrue(getInteger("plusAssign") == 12l);
-		assertTrue(getInteger("minusAssign") == -8l);
+		assertTrue(getInteger("minusAssign") == - 8l );
 		assertTrue(getInteger("moduloAssign") == 0l);
 	}
 }

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/InternalEventLifeCycleTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,19 +21,19 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for InternalEventLifeCycle
+ * Unit TestCase for InternalEventLifeCycle
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class InternalEventLifeCycleTest extends AbstractExecutionFlowTest {
+public class InternalEventLifeCycle extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("InternalEventLifeCycle.sct");
 		initInterpreter(flow);
 	}
 	@Test
-	public void InternalEventLifeCycleTest() throws Exception {
+	public void internalEventLifeCycleTest() throws Exception {
 		interpreter.enter();
 		assertTrue(isStateActive("A"));
 		assertTrue(isStateActive("C"));

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/LocalReactionsTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,19 +21,19 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for LocalReactions
+ * Unit TestCase for LocalReactions
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class LocalReactionsTest extends AbstractExecutionFlowTest {
+public class LocalReactions extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("LocalReactions.sct");
 		initInterpreter(flow);
 	}
 	@Test
-	public void LocalReactionsTest() throws Exception {
+	public void localReactionsTest() throws Exception {
 		interpreter.enter();
 		assertTrue(isStateActive("A"));
 		interpreter.runCycle();

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/LogicalAndTestsTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,14 +21,14 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for LogicalAnd
+ * Unit TestCase for LogicalAnd
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class LogicalAndTestsTest extends AbstractExecutionFlowTest {
+public class LogicalAndTests extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("LogicalAnd.sct");
 		initInterpreter(flow);
 	}
@@ -36,6 +36,6 @@ public class LogicalAndTestsTest extends AbstractExecutionFlowTest {
 	public void operandEvaluationOrder() throws Exception {
 		interpreter.enter();
 		interpreter.runCycle();
-		assertTrue("logical and expression was executed in wrong order...", getInteger("x") == 4l && getBoolean("b"));
+		assertTrue("logical and expression was executed in wrong order...",getInteger("x") == 4l && getBoolean("b"));
 	}
 }

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/LogicalOrTestsTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,14 +21,14 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for LogicalOr
+ * Unit TestCase for LogicalOr
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class LogicalOrTestsTest extends AbstractExecutionFlowTest {
+public class LogicalOrTests extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("LogicalOr.sct");
 		initInterpreter(flow);
 	}
@@ -36,6 +36,6 @@ public class LogicalOrTestsTest extends AbstractExecutionFlowTest {
 	public void operandEvaluationOrder() throws Exception {
 		interpreter.enter();
 		interpreter.runCycle();
-		assertTrue("logical or expression was executed in wrong order...", getInteger("x") == 4l && getBoolean("b"));
+		assertTrue("logical or expression was executed in wrong order...",getInteger("x") == 4l && getBoolean("b"));
 	}
 }

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/NamedInterfaceAccessTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,19 +21,19 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for NamedInterfaceAccess
+ * Unit TestCase for NamedInterfaceAccess
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class NamedInterfaceAccessTest extends AbstractExecutionFlowTest {
+public class NamedInterfaceAccess extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("NamedInterfaceAccess.sct");
 		initInterpreter(flow);
 	}
 	@Test
-	public void SafeOpenSuccess() throws Exception {
+	public void safeOpenSuccess() throws Exception {
 		interpreter.enter();
 		interpreter.runCycle();
 		raiseEvent("User.numberPressed", 3l);

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/NullCheckTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,19 +21,19 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for NullCheck
+ * Unit TestCase for NullCheck
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class NullCheckTest extends AbstractExecutionFlowTest {
+public class NullCheck extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("NullCheck.sct");
 		initInterpreter(flow);
 	}
 	@Test
-	public void SimpleNullCheckTest() throws Exception {
+	public void simpleNullCheckTest() throws Exception {
 		interpreter.enter();
 		assertTrue(isStateActive("A"));
 		interpreter.runCycle();

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/OutEventLifeCycleTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,14 +21,14 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for OutEventLifeCycle
+ * Unit TestCase for OutEventLifeCycle
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class OutEventLifeCycleTest extends AbstractExecutionFlowTest {
+public class OutEventLifeCycle extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("OutEventLifeCycle.sct");
 		initInterpreter(flow);
 	}
@@ -41,25 +41,25 @@ public class OutEventLifeCycleTest extends AbstractExecutionFlowTest {
 	}
 	@Test
 	public void availableWithinCycle() throws Exception {
-		interpreter.enter();
-		raiseEvent("e");
-		interpreter.runCycle();
+		init(false);
 		assertTrue(getBoolean("f_available_in_cycle"));
 	}
 	@Test
 	public void unvailableWithin2ndCycle() throws Exception {
-		interpreter.enter();
-		raiseEvent("e");
-		interpreter.runCycle();
-		interpreter.runCycle();
+		init(true);
 		assertTrue(!getBoolean("f_available_in_next_cycle"));
 	}
 	@Test
 	public void unvailableAfter2ndCycle() throws Exception {
+		init(true);
+		assertTrue(!isRaised("f"));
+	}
+	public void init(boolean sndCycle) throws Exception {
 		interpreter.enter();
 		raiseEvent("e");
 		interpreter.runCycle();
-		interpreter.runCycle();
-		assertTrue(!isRaised("f"));
+		if (sndCycle) {
+			interpreter.runCycle();
+		}
 	}
 }

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/ParenthesisTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,14 +21,14 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for Parenthesis
+ * Unit TestCase for Parenthesis
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class ParenthesisTest extends AbstractExecutionFlowTest {
+public class Parenthesis extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("Parenthesis.sct");
 		initInterpreter(flow);
 	}

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/PriorityValuesTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,14 +21,14 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for PriorityValues
+ * Unit TestCase for PriorityValues
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class PriorityValuesTest extends AbstractExecutionFlowTest {
+public class PriorityValues extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("PriorityValues.sct");
 		initInterpreter(flow);
 	}

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/RaiseEventTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,14 +21,14 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for RaiseEvent
+ * Unit TestCase for RaiseEvent
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class RaiseEventTest extends AbstractExecutionFlowTest {
+public class RaiseEvent extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("RaiseEvent.sct");
 		initInterpreter(flow);
 	}

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/ReadOnlyVariableTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,19 +21,19 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for ReadOnlyVariable
+ * Unit TestCase for ReadOnlyVariable
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class ReadOnlyVariableTest extends AbstractExecutionFlowTest {
+public class ReadOnlyVariable extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("ReadOnlyVariable.sct");
 		initInterpreter(flow);
 	}
 	@Test
-	public void ReadOnlyVariableTest() throws Exception {
+	public void readOnlyVariableTest() throws Exception {
 		interpreter.enter();
 		assertTrue(isStateActive("StateA"));
 		assertTrue(getInteger("myInt") == 0l);

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/STextKeywordsInStatesAndRegionsTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,14 +21,14 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for STextKeywordsInStatesAndRegions
+ * Unit TestCase for STextKeywordsInStatesAndRegions
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class STextKeywordsInStatesAndRegionsTest extends AbstractExecutionFlowTest {
+public class STextKeywordsInStatesAndRegions extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("STextKeywordsInStatesAndRegions.sct");
 		initInterpreter(flow);
 	}

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/SameNameDifferentRegionTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,14 +21,14 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for SameNameDifferentRegion
+ * Unit TestCase for SameNameDifferentRegion
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class SameNameDifferentRegionTest extends AbstractExecutionFlowTest {
+public class SameNameDifferentRegion extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("SameNameDifferentRegion.sct");
 		initInterpreter(flow);
 	}

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/ShallowHistoryTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,14 +21,14 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for ShallowHistory
+ * Unit TestCase for ShallowHistory
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class ShallowHistoryTest extends AbstractExecutionFlowTest {
+public class ShallowHistory extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("ShallowHistory.sct");
 		initInterpreter(flow);
 	}

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/ShallowHistoryWithDeepEntryTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,14 +21,14 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for ShallowHistoryWithDeepEntry
+ * Unit TestCase for ShallowHistoryWithDeepEntry
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class ShallowHistoryWithDeepEntryTest extends AbstractExecutionFlowTest {
+public class ShallowHistoryWithDeepEntry extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("ShallowHistoryWithDeepEntry.sct");
 		initInterpreter(flow);
 	}

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/SimpleEventTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,25 +21,25 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for SimpleEvent
+ * Unit TestCase for SimpleEvent
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class SimpleEventTest extends AbstractExecutionFlowTest {
+public class SimpleEvent extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("SimpleEvent.sct");
 		initInterpreter(flow);
 	}
 	@Test
 	public void simpleEventTest() throws Exception {
 		interpreter.enter();
-		assertTrue("Expected A to be active", isStateActive("A"));
+		assertTrue("Expected A to be active",isStateActive("A"));
 		assertTrue(5l == 5l);
 		raiseEvent("Event1");
 		interpreter.runCycle();
-		assertTrue("Expected B to be active", isStateActive("B"));
+		assertTrue("Expected B to be active",isStateActive("B"));
 		interpreter.runCycle();
 		assertTrue(!isStateActive("B"));
 	}

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/SimpleHierachyTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,14 +21,14 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for SimpleHierachy
+ * Unit TestCase for SimpleHierachy
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class SimpleHierachyTest extends AbstractExecutionFlowTest {
+public class SimpleHierachy extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("SimpleHierachy.sct");
 		initInterpreter(flow);
 	}

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/StateIsActiveTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,14 +21,14 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for StateIsActive
+ * Unit TestCase for StateIsActive
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class StateIsActiveTest extends AbstractExecutionFlowTest {
+public class StateIsActive extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("StateIsActive.sct");
 		initInterpreter(flow);
 	}

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/StatechartActiveTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,14 +21,14 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for StatechartActive
+ * Unit TestCase for StatechartActive
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class StatechartActiveTest extends AbstractExecutionFlowTest {
+public class StatechartActive extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("StatechartActive.sct");
 		initInterpreter(flow);
 	}

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/StatechartLocalReactionsTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,14 +21,14 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for StatechartLocalReactions
+ * Unit TestCase for StatechartLocalReactions
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class StatechartLocalReactionsTest extends AbstractExecutionFlowTest {
+public class StatechartLocalReactions extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("StatechartLocalReactions.sct");
 		initInterpreter(flow);
 	}
@@ -37,12 +37,13 @@ public class StatechartLocalReactionsTest extends AbstractExecutionFlowTest {
 		interpreter.enter();
 		assertTrue(isStateActive("S1"));
 		assertTrue(isStateActive("a"));
-		while (getInteger("myInt") < 10l) {
+		while(getInteger("myInt") < 10l) {
 			assertTrue(isStateActive("a"));
-			if (getInteger("myInt") % 2l == 0l) {
-				assertTrue(isStateActive("S1"));;
-			} else {
-				assertTrue(isStateActive("S2"));;
+			if (getInteger("myInt")%2l == 0l) {
+				assertTrue(isStateActive("S1"));
+			}
+			else {
+				assertTrue(isStateActive("S2"));
 			}
 			interpreter.runCycle();
 		}

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/StaticChoiceTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,19 +21,19 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for StaticChoice
+ * Unit TestCase for StaticChoice
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class StaticChoiceTest extends AbstractExecutionFlowTest {
+public class StaticChoice extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("StaticChoice.sct");
 		initInterpreter(flow);
 	}
 	@Test
-	public void StaticChoiceTest() throws Exception {
+	public void staticChoiceTest() throws Exception {
 		interpreter.enter();
 		assertTrue(isStateActive("Start"));
 		interpreter.runCycle();

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/StringExpressionsTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,19 +21,19 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for StringExpressions
+ * Unit TestCase for StringExpressions
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class StringExpressionsTest extends AbstractExecutionFlowTest {
+public class StringExpressions extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("StringExpressions.sct");
 		initInterpreter(flow);
 	}
 	@Test
-	public void StringExpressionsTest() throws Exception {
+	public void stringExpressionsTest() throws Exception {
 		assertTrue(getString("quotedStringX").equals("\"X\""));
 		assertTrue(getString("quotedStringY").equals("\"Y\""));
 		interpreter.enter();

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/SyncForkTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,14 +21,14 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for SyncFork
+ * Unit TestCase for SyncFork
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class SyncForkTest extends AbstractExecutionFlowTest {
+public class SyncFork extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("SyncFork.sct");
 		initInterpreter(flow);
 	}

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/SyncJoinTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,14 +21,14 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for SyncJoin
+ * Unit TestCase for SyncJoin
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class SyncJoinTest extends AbstractExecutionFlowTest {
+public class SyncJoin extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("SyncJoin.sct");
 		initInterpreter(flow);
 	}

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/TimedTransitionsTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,23 +21,21 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for TimedTransitions
+ * Unit TestCase for TimedTransitions
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class TimedTransitionsTest extends AbstractExecutionFlowTest {
+public class TimedTransitions extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("TimedTransitions.sct");
 		initInterpreter(flow);
 	}
 	@Test
-	public void Timer01() throws Exception {
+	public void timer01() throws Exception {
 		interpreter.enter();
 		assertTrue(isStateActive("Start"));
-		Thread.sleep(2030);
-		interpreter.runCycle();
 		assertTrue(isStateActive("End"));
 	}
 }

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/TransitionWithoutConditionTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,19 +21,19 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for TransitionWithoutCondition
+ * Unit TestCase for TransitionWithoutCondition
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class TransitionWithoutConditionTest extends AbstractExecutionFlowTest {
+public class TransitionWithoutCondition extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("TransitionWithoutCondition.sct");
 		initInterpreter(flow);
 	}
 	@Test
-	public void TransitionWithoutConditionTest() throws Exception {
+	public void transitionWithoutConditionTest() throws Exception {
 		interpreter.enter();
 		assertTrue(isStateActive("A"));
 		interpreter.runCycle();

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/TriggerExpressionPrecedenceTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,14 +21,14 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for TriggerExpressionPrecedence
+ * Unit TestCase for TriggerExpressionPrecedence
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class TriggerExpressionPrecedenceTest extends AbstractExecutionFlowTest {
+public class TriggerExpressionPrecedence extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("expressions/TriggerExpressionPrecedence.sct");
 		initInterpreter(flow);
 	}

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/TriggerGuardExpressionsTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,14 +21,14 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for TriggerGuardExpressions
+ * Unit TestCase for TriggerGuardExpressions
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class TriggerGuardExpressionsTest extends AbstractExecutionFlowTest {
+public class TriggerGuardExpressions extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("TriggerGuardExpressions.sct");
 		initInterpreter(flow);
 	}

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/TypeAliasTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,19 +21,19 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for TypeAlias
+ * Unit TestCase for TypeAlias
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class TypeAliasTest extends AbstractExecutionFlowTest {
+public class TypeAlias extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("TypeAlias.sct");
 		initInterpreter(flow);
 	}
 	@Test
-	public void TypeAliasTest() throws Exception {
+	public void typeAliasTest() throws Exception {
 		interpreter.enter();
 		assertTrue(isStateActive("Start"));
 		assertTrue(getInteger("myVar") == 1l);

test-plugins/org.yakindu.sct.simulation.core.sexec.test/test-gen/org/yakindu/sct/simulation/core/sexec/test/ValuedEventsTest.java

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2016 committers of YAKINDU and others.
+* Copyright (c) 2017 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
@@ -21,14 +21,14 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 import com.google.inject.Inject;
 import static org.junit.Assert.assertTrue;
 /**
- *  Unit TestCase for ValuedEvents
+ * Unit TestCase for ValuedEvents
  */
 @SuppressWarnings("all")
 @RunWith(XtextRunner.class)
 @InjectWith(SExecInjectionProvider.class)
-public class ValuedEventsTest extends AbstractExecutionFlowTest {
+public class ValuedEvents extends AbstractExecutionFlowTest {
 	@Before
-	public void setup() throws Exception {
+	public void setup() throws Exception{
 		ExecutionFlow flow = models.loadExecutionFlowFromResource("ValuedEvents.sct");
 		initInterpreter(flow);
 	}