Merge pull request #1317 from Yakindu/adpation_of_sctunitmodels_and_javatests

trivial: Adapted the testmodels to the new SCTUnit syntax

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/AlwaysOncycleTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.alwaysoncycle.AlwaysOncycleStatemachine;
 import org.yakindu.scr.alwaysoncycle.AlwaysOncycleStatemachine.State;
@@ -37,7 +35,7 @@ public class AlwaysOncycleTest {
 	}
 	
 	@Test
-	public void testalwaysOncycleTest() {
+	public void testAlwaysOncycleTest() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.main_region_StateA));
 		 

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/AssignmentAsExpressionTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.assignmentasexpression.AssignmentAsExpressionStatemachine;
 import org.yakindu.scr.assignmentasexpression.AssignmentAsExpressionStatemachine.State;
@@ -37,7 +35,7 @@ public class AssignmentAsExpressionTest {
 	}
 	
 	@Test
-	public void testsimpleAssignment() {
+	public void testSimpleAssignment() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.main_region_Add));
 		 

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/BitExpressionsTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.bitexpressions.BitExpressionsStatemachine;
 import org.yakindu.scr.bitexpressions.BitExpressionsStatemachine.State;

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/BooleanExpressionsTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.booleanexpressions.BooleanExpressionsStatemachine;
 import org.yakindu.scr.booleanexpressions.BooleanExpressionsStatemachine.State;
@@ -37,7 +35,7 @@ public class BooleanExpressionsTest {
 	}
 	
 	@Test
-	public void testbooleanExpressions() {
+	public void testBooleanExpressions() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.main_region_StateA));
 		 

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/CKeywordsTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.ckeywords.CKeywordsStatemachine;
 import org.yakindu.scr.ckeywords.CKeywordsStatemachine.State;

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/CastExpressionsTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.castexpressions.CastExpressionsStatemachine;
 import org.yakindu.scr.castexpressions.CastExpressionsStatemachine.State;

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/ChoiceTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.choice.ChoiceStatemachine;
 import org.yakindu.scr.choice.ChoiceStatemachine.State;
@@ -37,7 +35,7 @@ public class ChoiceTest {
 	}
 	
 	@Test
-	public void testelseChoiceUsingNonDefaultTransition() {
+	public void testElseChoiceUsingNonDefaultTransition() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.main_region_A));
 		 
@@ -48,7 +46,7 @@ public class ChoiceTest {
 		 
 	}
 	@Test
-	public void testelseChoiceUsingDefaultTransition() {
+	public void testElseChoiceUsingDefaultTransition() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.main_region_A));
 		 
@@ -59,7 +57,7 @@ public class ChoiceTest {
 		 
 	}
 	@Test
-	public void testdefaultChoiceUsingNonDefaultTransition() {
+	public void testDefaultChoiceUsingNonDefaultTransition() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.main_region_A));
 		 
@@ -70,7 +68,7 @@ public class ChoiceTest {
 		 
 	}
 	@Test
-	public void testdefaultChoiceUsingDefaultTransition() {
+	public void testDefaultChoiceUsingDefaultTransition() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.main_region_A));
 		 
@@ -81,7 +79,7 @@ public class ChoiceTest {
 		 
 	}
 	@Test
-	public void testuncheckedChoiceUsingNonDefaultTransition() {
+	public void testUncheckedChoiceUsingNonDefaultTransition() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.main_region_A));
 		 
@@ -92,7 +90,7 @@ public class ChoiceTest {
 		 
 	}
 	@Test
-	public void testuncheckedChoiceUsingDefaultTransition() {
+	public void testUncheckedChoiceUsingDefaultTransition() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.main_region_A));
 		 
@@ -103,7 +101,7 @@ public class ChoiceTest {
 		 
 	}
 	@Test
-	public void testalwaysTrueTransitionInChoice() {
+	public void testAlwaysTrueTransitionInChoice() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.main_region_A));
 		 

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/ConditionalExpressionTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.conditionalexpressions.ConditionalExpressionsStatemachine;
 import org.yakindu.scr.conditionalexpressions.ConditionalExpressionsStatemachine.State;

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/ConstOnlyDefaultScopeTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.constonlydefaultscope.ConstOnlyDefaultScopeStatemachine;
 import org.yakindu.scr.constonlydefaultscope.ConstOnlyDefaultScopeStatemachine.State;
@@ -37,13 +35,13 @@ public class ConstOnlyDefaultScopeTest {
 	}
 	
 	@Test
-	public void teststatechartEntry() {
+	public void testStatechartEntry() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.constOnlyDefaultScope_main_region_A));
 		 
 	}
 	@Test
-	public void teststateTransition() {
+	public void testStateTransition() {
 		statemachine.enter();
 		statemachine.getSCIA().raiseE(1l);
 		statemachine.runCycle();

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/ConstOnlyInternalScopeTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.constonlyinternalscope.ConstOnlyInternalScopeStatemachine;
 import org.yakindu.scr.constonlyinternalscope.ConstOnlyInternalScopeStatemachine.State;
@@ -37,13 +35,13 @@ public class ConstOnlyInternalScopeTest {
 	}
 	
 	@Test
-	public void teststatechartEntry() {
+	public void testStatechartEntry() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.constOnlyInternalScope_main_region_A));
 		 
 	}
 	@Test
-	public void teststateTransition() {
+	public void testStateTransition() {
 		statemachine.enter();
 		statemachine.raiseE(1l);
 		statemachine.runCycle();

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/ConstOnlyNamedScopeTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.constonlynamedscope.ConstOnlyNamedScopeStatemachine;
 import org.yakindu.scr.constonlynamedscope.ConstOnlyNamedScopeStatemachine.State;
@@ -37,13 +35,13 @@ public class ConstOnlyNamedScopeTest {
 	}
 	
 	@Test
-	public void teststatechartEntry() {
+	public void testStatechartEntry() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.constOnlyNamedScope_main_region_A));
 		 
 	}
 	@Test
-	public void teststateTransition() {
+	public void testStateTransition() {
 		statemachine.enter();
 		statemachine.raiseE(1l);
 		statemachine.runCycle();

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/ConstantsTestsTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.constants.ConstantsStatemachine;
 import org.yakindu.scr.constants.ConstantsStatemachine.State;
@@ -37,7 +35,7 @@ public class ConstantsTestsTest {
 	}
 	
 	@Test
-	public void testconstantDefinition() {
+	public void testConstantDefinition() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.main_region_A));
 		 

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/DeclarationsTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.declarations.DeclarationsStatemachine;
 import org.yakindu.scr.declarations.DeclarationsStatemachine.State;
@@ -37,7 +35,7 @@ public class DeclarationsTest {
 	}
 	
 	@Test
-	public void testdeclarationsTest() {
+	public void testDeclarationsTest() {
 		statemachine.enter();
 	}
 }

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/DeepEntryTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.deepentry.DeepEntryStatemachine;
 import org.yakindu.scr.deepentry.DeepEntryStatemachine.State;
@@ -37,7 +35,7 @@ public class DeepEntryTest {
 	}
 	
 	@Test
-	public void testenterToSubstate() {
+	public void testEnterToSubstate() {
 		assertTrue(statemachine.getX() == 0l);
 		 
 		assertTrue(statemachine.getY() == 0l);

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/DeepHistoryTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.deephistory.DeepHistoryStatemachine;
 import org.yakindu.scr.deephistory.DeepHistoryStatemachine.State;
@@ -37,7 +35,7 @@ public class DeepHistoryTest {
 	}
 	
 	@Test
-	public void testdeepHistoryTest() {
+	public void testDeepHistoryTest() {
 		statemachine.enter();
 		statemachine.raiseEvent1();
 		statemachine.runCycle();

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/DynamicChoiceTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.dynamicchoice.DynamicChoiceStatemachine;
 import org.yakindu.scr.dynamicchoice.DynamicChoiceStatemachine.State;

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/EmptyTransitionTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.emptytransition.EmptyTransitionStatemachine;
 import org.yakindu.scr.emptytransition.EmptyTransitionStatemachine.State;

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/EnterStateTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.enterstate.EnterStateStatemachine;
 import org.yakindu.scr.enterstate.EnterStateStatemachine.State;
@@ -37,7 +35,7 @@ public class EnterStateTest {
 	}
 	
 	@Test
-	public void testdefaultEntry() {
+	public void testDefaultEntry() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.r_A));
 		 
@@ -47,7 +45,7 @@ public class EnterStateTest {
 		 
 	}
 	@Test
-	public void testnamedEntryThroughNamedTransition() {
+	public void testNamedEntryThroughNamedTransition() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.r_A));
 		 
@@ -57,7 +55,7 @@ public class EnterStateTest {
 		 
 	}
 	@Test
-	public void testnamedEntryThroughDefaultTransition() {
+	public void testNamedEntryThroughDefaultTransition() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.r_A));
 		 

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/EntryChoiceTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.entrychoice.EntryChoiceStatemachine;
 import org.yakindu.scr.entrychoice.EntryChoiceStatemachine.State;

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/EntryExitSelfTransitionTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.entryexitselftransition.EntryExitSelfTransitionStatemachine;
 import org.yakindu.scr.entryexitselftransition.EntryExitSelfTransitionStatemachine.State;

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/EntryReactionActionTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.entryreactionaction.EntryReactionActionStatemachine;
 import org.yakindu.scr.entryreactionaction.EntryReactionActionStatemachine.State;
@@ -37,7 +35,7 @@ public class EntryReactionActionTest {
 	}
 	
 	@Test
-	public void testentryTransitionActionOnStatechartEnter() {
+	public void testEntryTransitionActionOnStatechartEnter() {
 		statemachine.enter();
 		assertTrue(statemachine.getEnteredR1());
 		 
@@ -49,7 +47,7 @@ public class EntryReactionActionTest {
 		 
 	}
 	@Test
-	public void testentryOnRTS() {
+	public void testEntryOnRTS() {
 		statemachine.enter();
 		statemachine.raiseB();
 		statemachine.runCycle();
@@ -71,7 +69,7 @@ public class EntryReactionActionTest {
 		 
 	}
 	@Test
-	public void testnoEntryTransitionActionOnHistory() {
+	public void testNoEntryTransitionActionOnHistory() {
 		statemachine.enter();
 		statemachine.raiseB();
 		statemachine.runCycle();

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/ExitOnSelfTransitionTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.exitonselftransition.ExitOnSelfTransitionStatemachine;
 import org.yakindu.scr.exitonselftransition.ExitOnSelfTransitionStatemachine.State;

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/ExitStateTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.exitstate.ExitStateStatemachine;
 import org.yakindu.scr.exitstate.ExitStateStatemachine.State;
@@ -37,7 +35,7 @@ public class ExitStateTest {
 	}
 	
 	@Test
-	public void testdefaultExit() {
+	public void testDefaultExit() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.r_A));
 		 
@@ -47,7 +45,7 @@ public class ExitStateTest {
 		 
 	}
 	@Test
-	public void testnamedExitThroughNamedTransition() {
+	public void testNamedExitThroughNamedTransition() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.r_A));
 		 
@@ -57,7 +55,7 @@ public class ExitStateTest {
 		 
 	}
 	@Test
-	public void testnamedExitThroughDefaultTransition() {
+	public void testNamedExitThroughDefaultTransition() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.r_A));
 		 
@@ -67,7 +65,7 @@ public class ExitStateTest {
 		 
 	}
 	@Test
-	public void testremainInA() {
+	public void testRemainInA() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.r_A));
 		 

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/FeatureCallsTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.featurecalls.FeatureCallsStatemachine;
 import org.yakindu.scr.featurecalls.FeatureCallsStatemachine.State;

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/FinalStateTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.finalstate.FinalStateStatemachine;
 import org.yakindu.scr.finalstate.FinalStateStatemachine.State;

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/GuardTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.guard.GuardStatemachine;
 import org.yakindu.scr.guard.GuardStatemachine.State;
@@ -37,7 +35,7 @@ public class GuardTest {
 	}
 	
 	@Test
-	public void testguardTest() {
+	public void testGuardTest() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.main_region_A));
 		 

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/GuardedEntryTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.guardedentry.GuardedEntryStatemachine;
 import org.yakindu.scr.guardedentry.GuardedEntryStatemachine.State;

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/GuardedExitTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.guardedexit.GuardedExitStatemachine;
 import org.yakindu.scr.guardedexit.GuardedExitStatemachine.State;

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/HistoryWithExitPointTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.historywithexitpoint.HistoryWithExitPointStatemachine;
 import org.yakindu.scr.historywithexitpoint.HistoryWithExitPointStatemachine.State;
@@ -37,7 +35,7 @@ public class HistoryWithExitPointTest {
 	}
 	
 	@Test
-	public void testhistoryEntryAfterExit() {
+	public void testHistoryEntryAfterExit() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.mr_A_r_X1));
 		 

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/HistoryWithoutInitialStepTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.historywithoutinitialstep.HistoryWithoutInitialStepStatemachine;
 import org.yakindu.scr.historywithoutinitialstep.HistoryWithoutInitialStepStatemachine.State;
@@ -37,7 +35,7 @@ public class HistoryWithoutInitialStepTest {
 	}
 	
 	@Test
-	public void testenterThroughInitialEntry() {
+	public void testEnterThroughInitialEntry() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.main_region_A));
 		 
@@ -51,7 +49,7 @@ public class HistoryWithoutInitialStepTest {
 		 
 	}
 	@Test
-	public void testenterCThroughHistory() {
+	public void testEnterCThroughHistory() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.main_region_A));
 		 
@@ -69,7 +67,7 @@ public class HistoryWithoutInitialStepTest {
 		 
 	}
 	@Test
-	public void testenterDThroughHistory() {
+	public void testEnterDThroughHistory() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.main_region_A));
 		 

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/InEventLifeCycleTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.ineventlifecycle.InEventLifeCycleStatemachine;
 import org.yakindu.scr.ineventlifecycle.InEventLifeCycleStatemachine.State;
@@ -37,7 +35,7 @@ public class InEventLifeCycleTest {
 	}
 	
 	@Test
-	public void testeventLifeCycle() {
+	public void testEventLifeCycle() {
 		statemachine.enter();
 		statemachine.raiseE();
 		assertTrue(statemachine.getI() == 0l);

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/IntegerExpressionsTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.integerexpressions.IntegerExpressionsStatemachine;
 import org.yakindu.scr.integerexpressions.IntegerExpressionsStatemachine.State;
@@ -37,7 +35,7 @@ public class IntegerExpressionsTest {
 	}
 	
 	@Test
-	public void testintegerExpressions() {
+	public void testIntegerExpressions() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.main_region_StateA));
 		 

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/InternalEventLifeCycleTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.internaleventlifecycle.InternalEventLifeCycleStatemachine;
 import org.yakindu.scr.internaleventlifecycle.InternalEventLifeCycleStatemachine.State;

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/LocalReactionsTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.localreactions.LocalReactionsStatemachine;
 import org.yakindu.scr.localreactions.LocalReactionsStatemachine.State;

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/LogicalAndTestsTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.logicaland.LogicalAndStatemachine;
 import org.yakindu.scr.logicaland.LogicalAndStatemachine.State;
@@ -37,7 +35,7 @@ public class LogicalAndTestsTest {
 	}
 	
 	@Test
-	public void testoperandEvaluationOrder() {
+	public void testOperandEvaluationOrder() {
 		statemachine.enter();
 		statemachine.runCycle();
 		assertTrue("logical and expression was executed in wrong order...",statemachine.getX() == 4l && statemachine.getB());

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/LogicalOrTestsTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.logicalor.LogicalOrStatemachine;
 import org.yakindu.scr.logicalor.LogicalOrStatemachine.State;
@@ -37,7 +35,7 @@ public class LogicalOrTestsTest {
 	}
 	
 	@Test
-	public void testoperandEvaluationOrder() {
+	public void testOperandEvaluationOrder() {
 		statemachine.enter();
 		statemachine.runCycle();
 		assertTrue("logical or expression was executed in wrong order...",statemachine.getX() == 4l && statemachine.getB());

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/NamedInterfaceAccessTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.namedinterfaceaccess.NamedInterfaceAccessStatemachine;
 import org.yakindu.scr.namedinterfaceaccess.NamedInterfaceAccessStatemachine.State;

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/NullCheckTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.nullcheck.NullCheckStatemachine;
 import org.yakindu.scr.nullcheck.NullCheckStatemachine.State;

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/OperationsTest.java

@@ -19,9 +19,7 @@ import org.mockito.ArgumentCaptor;
 import static org.mockito.ArgumentCaptor.forClass;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.operations.OperationsStatemachine;
 import org.yakindu.scr.operations.OperationsStatemachine.State;
@@ -57,7 +55,7 @@ public class OperationsTest {
 	}
 	
 	@Test
-	public void testoperationsCalled() {
+	public void testOperationsCalled() {
 		when(defaultMock.alwaysTrue()).thenReturn(true);
 		 
 		when(internalMock.internalOperation3a(anyDouble())).thenAnswer(new Answer<Double>() {

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/OperationsWithoutBracesTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.operationswithoutbraces.OperationsWithoutBracesStatemachine;
 import org.yakindu.scr.operationswithoutbraces.OperationsWithoutBracesStatemachine.State;

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/OutEventLifeCycleTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.outeventlifecycle.OutEventLifeCycleStatemachine;
 import org.yakindu.scr.outeventlifecycle.OutEventLifeCycleStatemachine.State;
@@ -37,7 +35,7 @@ public class OutEventLifeCycleTest {
 	}
 	
 	@Test
-	public void testavailableAfterCycle() {
+	public void testAvailableAfterCycle() {
 		statemachine.enter();
 		statemachine.raiseE();
 		statemachine.runCycle();
@@ -45,7 +43,7 @@ public class OutEventLifeCycleTest {
 		 
 	}
 	@Test
-	public void testavailableWithinCycle() {
+	public void testAvailableWithinCycle() {
 		statemachine.enter();
 		statemachine.raiseE();
 		statemachine.runCycle();
@@ -53,7 +51,7 @@ public class OutEventLifeCycleTest {
 		 
 	}
 	@Test
-	public void testunvailableWithin2ndCycle() {
+	public void testUnvailableWithin2ndCycle() {
 		statemachine.enter();
 		statemachine.raiseE();
 		statemachine.runCycle();
@@ -62,7 +60,7 @@ public class OutEventLifeCycleTest {
 		 
 	}
 	@Test
-	public void testunvailableAfter2ndCycle() {
+	public void testUnvailableAfter2ndCycle() {
 		statemachine.enter();
 		statemachine.raiseE();
 		statemachine.runCycle();

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/ParenthesisTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.parenthesis.ParenthesisStatemachine;
 import org.yakindu.scr.parenthesis.ParenthesisStatemachine.State;
@@ -37,7 +35,7 @@ public class ParenthesisTest {
 	}
 	
 	@Test
-	public void testsimple() {
+	public void testSimple() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.mainRegion_A));
 		 

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/PerformanceTestsTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.performancetest.PerformanceTestStatemachine;
 import org.yakindu.scr.performancetest.PerformanceTestStatemachine.State;
@@ -39,69 +37,66 @@ public class PerformanceTestsTest {
 	}
 	
 	@Test
-	public void testtest_100_000() {
+	public void testTest_100_000() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.mr_A));
 		 
 		while (statemachine.getC() < 100000l) {
 			if (statemachine.isStateActive(State.mr_A)) {
-						statemachine.raiseE1();;
-					  }
-					else {
-						if (statemachine.getC()%2l == 0l) {
-									statemachine.raiseE2();;
-								  }
-								else {
-									statemachine.raiseE3();;
-								}
-						;
-					}
+				statemachine.raiseE1();
+			}
+			else {
+				if (statemachine.getC()%2l == 0l) {
+					statemachine.raiseE2();
+				}
+				else {
+					statemachine.raiseE3();
+				}
+			}
 			statemachine.runCycle();
 		}
 		assertTrue(statemachine.getA() > 2l);
 		 
 	}
 	@Test
-	public void testtest_1_000_000() {
+	public void testTest_1_000_000() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.mr_A));
 		 
 		while (statemachine.getC() < 1000000l) {
 			if (statemachine.isStateActive(State.mr_A)) {
-						statemachine.raiseE1();;
-					  }
-					else {
-						if (statemachine.getC()%2l == 0l) {
-									statemachine.raiseE2();;
-								  }
-								else {
-									statemachine.raiseE3();;
-								}
-						;
-					}
+				statemachine.raiseE1();
+			}
+			else {
+				if (statemachine.getC()%2l == 0l) {
+					statemachine.raiseE2();
+				}
+				else {
+					statemachine.raiseE3();
+				}
+			}
 			statemachine.runCycle();
 		}
 		assertTrue(statemachine.getA() > 2l);
 		 
 	}
 	@Test
-	public void testtest_10_000_000() {
+	public void testTest_10_000_000() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.mr_A));
 		 
 		while (statemachine.getC() < 10000000l) {
 			if (statemachine.isStateActive(State.mr_A)) {
-						statemachine.raiseE1();;
-					  }
-					else {
-						if (statemachine.getC()%2l == 0l) {
-									statemachine.raiseE2();;
-								  }
-								else {
-									statemachine.raiseE3();;
-								}
-						;
-					}
+				statemachine.raiseE1();
+			}
+			else {
+				if (statemachine.getC()%2l == 0l) {
+					statemachine.raiseE2();
+				}
+				else {
+					statemachine.raiseE3();
+				}
+			}
 			statemachine.runCycle();
 		}
 		assertTrue(statemachine.getA() > 2l);

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/PriorityValuesTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.priorityvalues.PriorityValuesStatemachine;
 import org.yakindu.scr.priorityvalues.PriorityValuesStatemachine.State;
@@ -37,7 +35,7 @@ public class PriorityValuesTest {
 	}
 	
 	@Test
-	public void testtransitionPriority() {
+	public void testTransitionPriority() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.main_region_A));
 		 
@@ -47,7 +45,7 @@ public class PriorityValuesTest {
 		 
 	}
 	@Test
-	public void testregionPriority() {
+	public void testRegionPriority() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.someRegion_A));
 		 

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/RaiseEventTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.raiseevent.RaiseEventStatemachine;
 import org.yakindu.scr.raiseevent.RaiseEventStatemachine.State;
@@ -37,7 +35,7 @@ public class RaiseEventTest {
 	}
 	
 	@Test
-	public void testraiseEvent() {
+	public void testRaiseEvent() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.second_region_SateA));
 		 

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/ReadOnlyVariableTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.readonlyvariable.ReadOnlyVariableStatemachine;
 import org.yakindu.scr.readonlyvariable.ReadOnlyVariableStatemachine.State;

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/STextKeywordsInStatesAndRegionsTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.stextkeywordsinstatesandregions.STextKeywordsInStatesAndRegionsStatemachine;
 import org.yakindu.scr.stextkeywordsinstatesandregions.STextKeywordsInStatesAndRegionsStatemachine.State;
@@ -37,7 +35,7 @@ public class STextKeywordsInStatesAndRegionsTest {
 	}
 	
 	@Test
-	public void testactiveCheckWithSTextNamedStates() {
+	public void testActiveCheckWithSTextNamedStates() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.default_namespace));
 		 

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/SameNameDifferentRegionTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.samenamedifferentregion.SameNameDifferentRegionStatemachine;
 import org.yakindu.scr.samenamedifferentregion.SameNameDifferentRegionStatemachine.State;
@@ -37,7 +35,7 @@ public class SameNameDifferentRegionTest {
 	}
 	
 	@Test
-	public void testsameNameDifferenRegionTest() {
+	public void testSameNameDifferenRegionTest() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.main_region_StateA));
 		 

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/ShallowHistoryTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.shallowhistory.ShallowHistoryStatemachine;
 import org.yakindu.scr.shallowhistory.ShallowHistoryStatemachine.State;
@@ -37,7 +35,7 @@ public class ShallowHistoryTest {
 	}
 	
 	@Test
-	public void testshallowHistoryTest() {
+	public void testShallowHistoryTest() {
 		statemachine.enter();
 		statemachine.raiseEvent1();
 		statemachine.runCycle();

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/ShallowHistoryWithDeepEntryTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.shallowhistorywithdeepentry.ShallowHistoryWithDeepEntryStatemachine;
 import org.yakindu.scr.shallowhistorywithdeepentry.ShallowHistoryWithDeepEntryStatemachine.State;
@@ -37,7 +35,7 @@ public class ShallowHistoryWithDeepEntryTest {
 	}
 	
 	@Test
-	public void testnoDeepEntryWithinHistory() {
+	public void testNoDeepEntryWithinHistory() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.main_region_Y));
 		 
@@ -55,7 +53,7 @@ public class ShallowHistoryWithDeepEntryTest {
 		 
 	}
 	@Test
-	public void testdeepEntryWithinHistory() {
+	public void testDeepEntryWithinHistory() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.main_region_Y));
 		 
@@ -81,7 +79,7 @@ public class ShallowHistoryWithDeepEntryTest {
 		 
 	}
 	@Test
-	public void testdirectDeepEntryIntoHistory() {
+	public void testDirectDeepEntryIntoHistory() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.main_region_Y));
 		 

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/SimpleEventTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.simpleevent.SimpleEventStatemachine;
 import org.yakindu.scr.simpleevent.SimpleEventStatemachine.State;
@@ -37,7 +35,7 @@ public class SimpleEventTest {
 	}
 	
 	@Test
-	public void testsimpleEventTest() {
+	public void testSimpleEventTest() {
 		statemachine.enter();
 		assertTrue("Expected A to be active",statemachine.isStateActive(State.main_region_A));
 		 

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/SimpleHierachyTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.simplehierachy.SimpleHierachyStatemachine;
 import org.yakindu.scr.simplehierachy.SimpleHierachyStatemachine.State;
@@ -37,7 +35,7 @@ public class SimpleHierachyTest {
 	}
 	
 	@Test
-	public void testsimpleHierachyTest() {
+	public void testSimpleHierachyTest() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.main_region_A));
 		 

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/StateIsActiveTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.stateisactive.StateIsActiveStatemachine;
 import org.yakindu.scr.stateisactive.StateIsActiveStatemachine.State;
@@ -37,7 +35,7 @@ public class StateIsActiveTest {
 	}
 	
 	@Test
-	public void teststateIsActive() {
+	public void testStateIsActive() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.r1_R1A));
 		 

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/StatechartActiveTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.statechartactive.StatechartActiveStatemachine;
 import org.yakindu.scr.statechartactive.StatechartActiveStatemachine.State;
@@ -37,25 +35,25 @@ public class StatechartActiveTest {
 	}
 	
 	@Test
-	public void testinactiveBeforeEnter() {
+	public void testInactiveBeforeEnter() {
 		assertTrue(!statemachine.isActive());
 		 
 	}
 	@Test
-	public void testactiveAfterEnter() {
+	public void testActiveAfterEnter() {
 		statemachine.enter();
 		assertTrue(statemachine.isActive());
 		 
 	}
 	@Test
-	public void testinactiveAfterExit() {
+	public void testInactiveAfterExit() {
 		statemachine.enter();
 		statemachine.exit();
 		assertTrue(!statemachine.isActive());
 		 
 	}
 	@Test
-	public void testactiveAfterReenter() {
+	public void testActiveAfterReenter() {
 		statemachine.enter();
 		statemachine.exit();
 		statemachine.enter();

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/StatechartLocalReactionsTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.statechartlocalreactions.StatechartLocalReactionsStatemachine;
 import org.yakindu.scr.statechartlocalreactions.StatechartLocalReactionsStatemachine.State;
@@ -37,7 +35,7 @@ public class StatechartLocalReactionsTest {
 	}
 	
 	@Test
-	public void teststatechartLocalReactionsTest() {
+	public void testStatechartLocalReactionsTest() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.main_region_S1));
 		 
@@ -47,15 +45,13 @@ public class StatechartLocalReactionsTest {
 			assertTrue(statemachine.isStateActive(State.region2_a));
 			 
 			if (statemachine.getMyInt()%2l == 0l) {
-						assertTrue(statemachine.isStateActive(State.main_region_S1));
-						 
-						;
-					  }
-					else {
-						assertTrue(statemachine.isStateActive(State.main_region_S2));
-						 
-						;
-					}
+				assertTrue(statemachine.isStateActive(State.main_region_S1));
+				 
+			}
+			else {
+				assertTrue(statemachine.isStateActive(State.main_region_S2));
+				 
+			}
 			statemachine.runCycle();
 		}
 	}

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/StatemachineKeywordsTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.statechartkeywords.StatechartKeywordsStatemachine;
 import org.yakindu.scr.statechartkeywords.StatechartKeywordsStatemachine.State;
@@ -39,7 +37,7 @@ public class StatemachineKeywordsTest {
 	}
 	
 	@Test
-	public void teststatemachineKeywords() {
+	public void testStatemachineKeywords() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.main_region_Timer));
 		 

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/StaticChoiceTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.staticchoice.StaticChoiceStatemachine;
 import org.yakindu.scr.staticchoice.StaticChoiceStatemachine.State;

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/StringExpressionsTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.stringexpressions.StringExpressionsStatemachine;
 import org.yakindu.scr.stringexpressions.StringExpressionsStatemachine.State;

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/SyncForkTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.syncfork.SyncForkStatemachine;
 import org.yakindu.scr.syncfork.SyncForkStatemachine.State;
@@ -37,7 +35,7 @@ public class SyncForkTest {
 	}
 	
 	@Test
-	public void testsyncForkTest() {
+	public void testSyncForkTest() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.main_region_A));
 		 

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/SyncJoinTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.syncjoin.SyncJoinStatemachine;
 import org.yakindu.scr.syncjoin.SyncJoinStatemachine.State;
@@ -37,7 +35,7 @@ public class SyncJoinTest {
 	}
 	
 	@Test
-	public void testsyncJoin_C2_Waits() {
+	public void testSyncJoin_C2_Waits() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.main_region_B));
 		 
@@ -95,7 +93,7 @@ public class SyncJoinTest {
 		 
 	}
 	@Test
-	public void testsyncJoin_D2_Waits() {
+	public void testSyncJoin_D2_Waits() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.main_region_B));
 		 
@@ -136,7 +134,7 @@ public class SyncJoinTest {
 		 
 	}
 	@Test
-	public void testdoubleEntryActionBug() {
+	public void testDoubleEntryActionBug() {
 		statemachine.enter();
 		statemachine.raiseE();
 		statemachine.raiseF();

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/TimedTransitionsTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.timedtransitions.TimedTransitionsStatemachine;
 import org.yakindu.scr.timedtransitions.TimedTransitionsStatemachine.State;

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/TransitionWithoutConditionTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.transitionwithoutcondition.TransitionWithoutConditionStatemachine;
 import org.yakindu.scr.transitionwithoutcondition.TransitionWithoutConditionStatemachine.State;

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/TriggerExpressionPrecedenceTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.triggerexpressionprecedence.TriggerExpressionPrecedenceStatemachine;
 import org.yakindu.scr.triggerexpressionprecedence.TriggerExpressionPrecedenceStatemachine.State;
@@ -37,7 +35,7 @@ public class TriggerExpressionPrecedenceTest {
 	}
 	
 	@Test
-	public void testunsatisfiedTriggerAndFGuardFalseOrFalse() {
+	public void testUnsatisfiedTriggerAndFGuardFalseOrFalse() {
 		statemachine.enter();
 		statemachine.setC1(false);
 		statemachine.setC2(false);
@@ -46,7 +44,7 @@ public class TriggerExpressionPrecedenceTest {
 		 
 	}
 	@Test
-	public void testunsatisfiedTriggerAndFGuardTrueOrFalse() {
+	public void testUnsatisfiedTriggerAndFGuardTrueOrFalse() {
 		statemachine.enter();
 		statemachine.setC1(true);
 		statemachine.setC2(false);
@@ -55,7 +53,7 @@ public class TriggerExpressionPrecedenceTest {
 		 
 	}
 	@Test
-	public void testunsatisfiedTriggerAndFGuardFalseOrTrue() {
+	public void testUnsatisfiedTriggerAndFGuardFalseOrTrue() {
 		statemachine.enter();
 		statemachine.setC1(false);
 		statemachine.setC2(true);
@@ -64,7 +62,7 @@ public class TriggerExpressionPrecedenceTest {
 		 
 	}
 	@Test
-	public void testunsatisfiedTriggerAndFGuardTrueOrTrue() {
+	public void testUnsatisfiedTriggerAndFGuardTrueOrTrue() {
 		statemachine.enter();
 		statemachine.setC1(true);
 		statemachine.setC2(true);

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/TriggerGuardExpressionsTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.triggerguardexpressions.TriggerGuardExpressionsStatemachine;
 import org.yakindu.scr.triggerguardexpressions.TriggerGuardExpressionsStatemachine.State;
@@ -37,7 +35,7 @@ public class TriggerGuardExpressionsTest {
 	}
 	
 	@Test
-	public void testtrueGuard() {
+	public void testTrueGuard() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.main_region_A));
 		 
@@ -63,7 +61,7 @@ public class TriggerGuardExpressionsTest {
 		 
 	}
 	@Test
-	public void testfalseGuard() {
+	public void testFalseGuard() {
 		statemachine.enter();
 		assertTrue(statemachine.isStateActive(State.main_region_A));
 		 

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/TypeAliasTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.typealias.TypeAliasStatemachine;
 import org.yakindu.scr.typealias.TypeAliasStatemachine.State;

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/scttests/ValuedEventsTest.java

@@ -11,9 +11,7 @@
 
 package org.yakindu.scttests;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import static org.junit.Assert.*;
 import org.yakindu.scr.valuedevents.ValuedEventsStatemachine;
 import org.yakindu.scr.valuedevents.ValuedEventsStatemachine.State;
@@ -37,7 +35,7 @@ public class ValuedEventsTest {
 	}
 	
 	@Test
-	public void testvaluedEventsTest() {
+	public void testValuedEventsTest() {
 		statemachine.enter();
 		statemachine.runCycle();
 		assertTrue(statemachine.getMyString().equals("sct"));

test-plugins/org.yakindu.sct.test.models/tests/AlwaysOncycle.sctunit

@@ -1,8 +1,8 @@
 package tests
 testclass AlwaysOncycle for statechart AlwaysOncycle {
-
-	 operation alwaysOncycleTest (){
-	 	
+	
+	@Test
+ 	operation alwaysOncycleTest (){
 	 	enter
 		assert active (AlwaysOncycle.main_region.StateA)
 		while (value < 5) {

test-plugins/org.yakindu.sct.test.models/tests/AssignmentAsExpression.sctunit

@@ -1,49 +1,49 @@
-package tests
-testclass AssignmentAsExpression for statechart AssignmentAsExpression{
-	
-	 
-	  operation simpleAssignment(){ 
-	  	enter
-	  	assert active(AssignmentAsExpression.main_region.Add)
-	  		  	
-	  	assert b == 5
-	  	assert a == 9	  	
-	   	
-	  	cycle
-	  	assert active(AssignmentAsExpression.main_region.Subtract) 
-	  	assert d == 6
-	  	
-	  	cycle
-	  	assert active(AssignmentAsExpression.main_region.Multiply) 
-	  	assert e == 15
-	  	
-	  	cycle
-	  	assert active(AssignmentAsExpression.main_region.Divide) 
-	  	assert g == 1	  	
-	  	
-	  	cycle
-	  	assert active(AssignmentAsExpression.main_region.Modulo)
-	  	assert i == 1
-
-	  	cycle
-	  	assert active(AssignmentAsExpression.main_region.Shift)
-		assert j == 16
-		assert k == 4
-		
-	  	cycle
-	  	assert active(AssignmentAsExpression.main_region.boolean_And)
-		assert l == 1
-
-	  	cycle
-	  	assert active(AssignmentAsExpression.main_region.boolean_Or)
-		assert p == 15
-		
-	  	cycle
-	  	assert active(AssignmentAsExpression.main_region.boolean_Xor)
-		assert u == 12		
-	  	
-	  	exit
-	  } 
-	 
-}
+package tests
+testclass AssignmentAsExpression for statechart AssignmentAsExpression{
+	
+	@Test 
+  	operation simpleAssignment(){ 
+	  	enter
+	  	assert active(AssignmentAsExpression.main_region.Add)
+	  		  	
+	  	assert b == 5
+	  	assert a == 9	  	
+	   	
+	  	cycle
+	  	assert active(AssignmentAsExpression.main_region.Subtract) 
+	  	assert d == 6
+	  	
+	  	cycle
+	  	assert active(AssignmentAsExpression.main_region.Multiply) 
+	  	assert e == 15
+	  	
+	  	cycle
+	  	assert active(AssignmentAsExpression.main_region.Divide) 
+	  	assert g == 1	  	
+	  	
+	  	cycle
+	  	assert active(AssignmentAsExpression.main_region.Modulo)
+	  	assert i == 1
+
+	  	cycle
+	  	assert active(AssignmentAsExpression.main_region.Shift)
+		assert j == 16
+		assert k == 4
+		
+	  	cycle
+	  	assert active(AssignmentAsExpression.main_region.boolean_And)
+		assert l == 1
+
+	  	cycle
+	  	assert active(AssignmentAsExpression.main_region.boolean_Or)
+		assert p == 15
+		
+	  	cycle
+	  	assert active(AssignmentAsExpression.main_region.boolean_Xor)
+		assert u == 12		
+	  	
+	  	exit
+	  } 
+	 
+}
 	

test-plugins/org.yakindu.sct.test.models/tests/BitExpression.sctunit

@@ -1,20 +1,20 @@
-package tests
-testclass BitExpressions for statechart BitExpressions {
-	
-	operation BitExpressions(){
-		enter
-		assert active ( BitExpressions.main_region.StateA)
-		assert myBit1 == 5
-		assert myBit2 == 7
-		raise e1
-		cycle
-		
-		assert active (BitExpressions.main_region.StateB)
-		assert leftBitshift == 10
-		assert rightBitshift == 2
-		assert complementBitshift == -6
-		assert bitwiseAnd == 5
-		assert bitwiseOr == 7
-		assert bitwiseXor == 2	 
-	}   
+package tests
+testclass BitExpressions for statechart BitExpressions {
+	@Test
+	operation BitExpressions () {
+		enter
+		assert active (BitExpressions.main_region.StateA)
+		assert myBit1 == 5
+		assert myBit2 == 7
+		raise e1
+		cycle
+
+		assert active (BitExpressions.main_region.StateB)
+		assert leftBitshift == 10
+		assert rightBitshift == 2
+		assert complementBitshift == - 6
+		assert bitwiseAnd == 5
+		assert bitwiseOr == 7
+		assert bitwiseXor == 2
+	}
 }      

test-plugins/org.yakindu.sct.test.models/tests/BooleanExpressions.sctunit

@@ -1,17 +1,18 @@
-package tests
-testclass BooleanExpressions for statechart BooleanExpressions {
-	operation booleanExpressions(){
-		enter
-		assert active (BooleanExpressions.main_region.StateA)
-		assert myBool1 == true
-		assert myBool2 == false
-		raise e1
-		cycle
-		assert active (BooleanExpressions.main_region.StateB)
-		assert and == false
-		assert or == true
-		assert not == false
-		assert equal == false
-		assert notequal == true 
-	}
+package tests
+testclass BooleanExpressions for statechart BooleanExpressions {
+	@Test
+	operation booleanExpressions(){
+		enter
+		assert active (BooleanExpressions.main_region.StateA)
+		assert myBool1 == true
+		assert myBool2 == false
+		raise e1
+		cycle
+		assert active (BooleanExpressions.main_region.StateB)
+		assert and == false
+		assert or == true
+		assert not == false
+		assert equal == false
+		assert notequal == true 
+	}
 }

test-plugins/org.yakindu.sct.test.models/tests/CKeywords.sctunit

@@ -1,12 +1,13 @@
-package tests
-testclass CKeywords for statechart CKeywords { 
-	operation CKeywordsTest(){ 
-		enter
-		assert active ( CKeywords.auto.char ) 
-		raise auto 
-		cycle 
-		assert active (CKeywords.auto.loop) 
-		assert active ( CKeywords.auto.loop.switch.case )
-		assert active ( CKeywords.auto.loop.switch.case.enum.asm ) 
-	} 
+package tests
+testclass CKeywords for statechart CKeywords { 
+	@Test
+	operation CKeywordsTest(){ 
+		enter
+		assert active ( CKeywords.auto.char ) 
+		raise auto 
+		cycle 
+		assert active (CKeywords.auto.loop) 
+		assert active ( CKeywords.auto.loop.switch.case )
+		assert active ( CKeywords.auto.loop.switch.case.enum.asm ) 
+	} 
 }

test-plugins/org.yakindu.sct.test.models/tests/CastExpressions.sctunit

@@ -1,16 +1,16 @@
-package tests
-testclass CastExpressions for statechart CastExpressions{
-	
-	operation CastExpressionTest(){ 
-		enter
-		assert realValue == 5
-		assert intValue == 5
-		cycle
-		assert realValue == 15
-		cycle
-		assert active(CastExpressions.main_region.C)
-		
-		assert realValue == 757
-	} 
-}
+package tests
+testclass CastExpressions for statechart CastExpressions{
+	@Test
+	operation CastExpressionTest(){ 
+		enter
+		assert realValue == 5
+		assert intValue == 5
+		cycle
+		assert realValue == 15
+		cycle
+		assert active(CastExpressions.main_region.C)
+		
+		assert realValue == 757
+	} 
+}
 	

test-plugins/org.yakindu.sct.test.models/tests/Choice.sctunit

@@ -1,92 +1,94 @@
-package tests
-testclass Choice for statechart Choice { 
-
-	operation elseChoiceUsingNonDefaultTransition(){
-		enter
-		
-		assert active (Choice.main_region.A)
-		c = true
-		raise e
-		
-		cycle		
-		assert active (Choice.main_region.C)
-	}
-	
-	operation elseChoiceUsingDefaultTransition(){
-		enter
-		
-		assert active (Choice.main_region.A)
-		c = false
-		raise e
-		
-		cycle		
-		assert active (Choice.main_region.B)
-	}
-	
-	operation defaultChoiceUsingNonDefaultTransition(){
-		enter
-		
-		assert active (Choice.main_region.A)
-		c = true
-		raise g
-		
-		cycle		
-		assert active (Choice.main_region.C)
-	}
-	
-	operation defaultChoiceUsingDefaultTransition(){
-		enter
-		
-		assert active (Choice.main_region.A)
-		c = false
-		raise g
-		
-		cycle		
-		assert active (Choice.main_region.B)
-	}
-	
-	operation uncheckedChoiceUsingNonDefaultTransition(){
-		enter
-		
-		assert active (Choice.main_region.A)
-		c = true
-		raise f
-		
-		cycle		
-		assert active (Choice.main_region.C)
-	}
-	
-	/*
-	 * An outgiong transition with an empty trigger 
-	 * will be handled like a default transition. 
-	 */
-	operation uncheckedChoiceUsingDefaultTransition(){
-		enter
-		
-		assert active (Choice.main_region.A)
-		c = false
-		raise f
-		
-		cycle		
-		assert active (Choice.main_region.B)
-	}
-	
-	/* A transition with a 'true' guard is always true and must
-	 * be used according to its predefined priority. 
-	 * 
-	 * This test case makes sure that default transition reordering
-	 * does not impact these transitions.
-	 */
-	operation alwaysTrueTransitionInChoice(){
-		enter
-		
-		assert active (Choice.main_region.A)
-		c = true
-		raise h
-		
-		cycle		
-		assert active (Choice.main_region.C)
-	}
-		
-	
+package tests
+testclass Choice for statechart Choice { 
+	@Test
+	operation elseChoiceUsingNonDefaultTransition(){
+		enter
+		
+		assert active (Choice.main_region.A)
+		c = true
+		raise e
+		
+		cycle		
+		assert active (Choice.main_region.C)
+	}
+	@Test
+	operation elseChoiceUsingDefaultTransition(){
+		enter
+		
+		assert active (Choice.main_region.A)
+		c = false
+		raise e
+		
+		cycle		
+		assert active (Choice.main_region.B)
+	}
+	@Test
+	operation defaultChoiceUsingNonDefaultTransition(){
+		enter
+		
+		assert active (Choice.main_region.A)
+		c = true
+		raise g
+		
+		cycle		
+		assert active (Choice.main_region.C)
+	}
+	@Test
+	operation defaultChoiceUsingDefaultTransition(){
+		enter
+		
+		assert active (Choice.main_region.A)
+		c = false
+		raise g
+		
+		cycle		
+		assert active (Choice.main_region.B)
+	}
+	@Test
+	operation uncheckedChoiceUsingNonDefaultTransition(){
+		enter
+		
+		assert active (Choice.main_region.A)
+		c = true
+		raise f
+		
+		cycle		
+		assert active (Choice.main_region.C)
+	}
+	
+	/*
+	 * An outgiong transition with an empty trigger 
+	 * will be handled like a default transition. 
+	 */
+	@Test
+	operation uncheckedChoiceUsingDefaultTransition(){
+		enter
+		
+		assert active (Choice.main_region.A)
+		c = false
+		raise f
+		
+		cycle		
+		assert active (Choice.main_region.B)
+	}
+	
+	/* A transition with a 'true' guard is always true and must
+	 * be used according to its predefined priority. 
+	 * 
+	 * This test case makes sure that default transition reordering
+	 * does not impact these transitions.
+	 */
+	@Test
+	operation alwaysTrueTransitionInChoice(){
+		enter
+		
+		assert active (Choice.main_region.A)
+		c = true
+		raise h
+		
+		cycle		
+		assert active (Choice.main_region.C)
+	}
+		
+	
 }

test-plugins/org.yakindu.sct.test.models/tests/ConditionalExpression.sctunit

@@ -1,21 +1,21 @@
-package tests
-testclass ConditionalExpression for statechart ConditionalExpressions{
-	
-	operation ConditionalExpressionTest(){ 
-		enter
-		assert active (ConditionalExpressions.main_region.A)
-		assert condition == 1
-		
-		raise e
-		cycle
-		
-		assert active (ConditionalExpressions.main_region.B)
-		assert condition == 2
-		
-		
-		
-		 
-		 
-	} 
-}
+package tests
+testclass ConditionalExpression for statechart ConditionalExpressions{
+	@Test
+	operation ConditionalExpressionTest(){ 
+		enter
+		assert active (ConditionalExpressions.main_region.A)
+		assert condition == 1
+		
+		raise e
+		cycle
+		
+		assert active (ConditionalExpressions.main_region.B)
+		assert condition == 2
+		
+		
+		
+		 
+		 
+	} 
+}
 	

test-plugins/org.yakindu.sct.test.models/tests/ConstOnlyDefaultScope.sctunit

@@ -1,26 +1,28 @@
-package tests
-testclass ConstOnlyDefaultScope for statechart declarations.ConstOnlyDefaultScope {
-
-	/*
-	 * Test is the statechart is entered correctly.
-	 */	
-	operation statechartEntry(){ 		
-		enter		 
-		assert active(declarations.ConstOnlyDefaultScope.main_region.A)
-	
-	} 
-	
-
-	/*
-	 * Test is the statechart is entered correctly.
-	 */	
-	operation stateTransition(){
-		
-		enter
-		raise A.e : 1
-		cycle
-		assert active(declarations.ConstOnlyDefaultScope.main_region.B)
-		
-	}
-}
+package tests
+testclass ConstOnlyDefaultScope for statechart declarations.ConstOnlyDefaultScope {
+
+	/*
+	 * Test is the statechart is entered correctly.
+	 */	
+	@Test 
+	operation statechartEntry(){ 		
+		enter		 
+		assert active(declarations.ConstOnlyDefaultScope.main_region.A)
+	
+	} 
+	
+
+	/*
+	 * Test is the statechart is entered correctly.
+	 */	
+	@Test
+	operation stateTransition(){
+		
+		enter
+		raise A.e : 1
+		cycle
+		assert active(declarations.ConstOnlyDefaultScope.main_region.B)
+		
+	}
+}
 	

test-plugins/org.yakindu.sct.test.models/tests/ConstOnlyInternalScope.sctunit

@@ -1,26 +1,28 @@
-package tests
-testclass ConstOnlyInternalScope for statechart declarations.ConstOnlyInternalScope {
-
-	/*
-	 * Test is the statechart is entered correctly.
-	 */	
-	operation statechartEntry(){ 		
-		enter		 
-		assert active(declarations.ConstOnlyInternalScope.main_region.A)
-	
-	} 
-	
-
-	/*
-	 * Test is the statechart is entered correctly.
-	 */	
-	operation stateTransition(){
-		
-		enter
-		raise e : 1
-		cycle
-		assert active(declarations.ConstOnlyInternalScope.main_region.B)
-		
-	}
-}
+package tests
+testclass ConstOnlyInternalScope for statechart declarations.ConstOnlyInternalScope {
+
+	/*
+	 * Test is the statechart is entered correctly.
+	 */	
+	@Test
+	operation statechartEntry(){ 		
+		enter		 
+		assert active(declarations.ConstOnlyInternalScope.main_region.A)
+	
+	} 
+	
+
+	/*
+	 * Test is the statechart is entered correctly.
+	 */	
+	@Test
+	operation stateTransition(){
+		
+		enter
+		raise e : 1
+		cycle
+		assert active(declarations.ConstOnlyInternalScope.main_region.B)
+		
+	}
+}
 	

test-plugins/org.yakindu.sct.test.models/tests/ConstOnlyNamedScope.sctunit

@@ -1,26 +1,28 @@
-package tests
-testclass ConstOnlyNamedScope for statechart declarations.ConstOnlyNamedScope {
-
-	/*
-	 * Test is the statechart is entered correctly.
-	 */	
-	operation statechartEntry(){ 		
-		enter		 
-		assert active(declarations.ConstOnlyNamedScope.main_region.A)
-	
-	} 
-	
-
-	/*
-	 * Test is the statechart is entered correctly.
-	 */	
-	operation stateTransition(){
-		
-		enter
-		raise e : 1
-		cycle
-		assert active(declarations.ConstOnlyNamedScope.main_region.B)
-		
-	}
-}
+package tests
+testclass ConstOnlyNamedScope for statechart declarations.ConstOnlyNamedScope {
+
+	/*
+	 * Test is the statechart is entered correctly.
+	 */	
+ 	@Test		
+	operation statechartEntry(){ 		
+		enter		 
+		assert active(declarations.ConstOnlyNamedScope.main_region.A)
+	
+	} 
+	
+
+	/*
+	 * Test is the statechart is entered correctly.
+	 */	
+	@Test
+	operation stateTransition(){
+		
+		enter
+		raise e : 1
+		cycle
+		assert active(declarations.ConstOnlyNamedScope.main_region.B)
+		
+	}
+}
 	

test-plugins/org.yakindu.sct.test.models/tests/Constants.sctunit

@@ -1,30 +1,30 @@
-package tests
-testclass ConstantsTests for statechart Constants {
-
-	operation constantDefinition(){ 
-		enter
-		assert active(Constants.main_region.A)
-		//After initialization, constant values must be set
-		assert x == 10
-		assert y == 20
-		assert Named.y == "Hello World"
-		//Caluclation with constants 
-		raise e
-		cycle
-		assert result == 20
-		
-		raise e
-		cycle
-		
-		
-		assert active(Constants.main_region.C)
-		assert result == 100
-		
-		raise e2 : x
-		cycle
-	
-		assert result == 1000
-		assert active(Constants.main_region.A)
-	} 
-}
+package tests
+testclass ConstantsTests for statechart Constants {
+	@Test
+	operation constantDefinition(){ 
+		enter
+		assert active(Constants.main_region.A)
+		//After initialization, constant values must be set
+		assert x == 10
+		assert y == 20
+		assert Named.y == "Hello World"
+		//Caluclation with constants 
+		raise e
+		cycle
+		assert result == 20
+		
+		raise e
+		cycle
+		
+		
+		assert active(Constants.main_region.C)
+		assert result == 100
+		
+		raise e2 : x
+		cycle
+	
+		assert result == 1000
+		assert active(Constants.main_region.A)
+	} 
+}
 	

test-plugins/org.yakindu.sct.test.models/tests/Declarations.sctunit

@@ -1,7 +1,7 @@
-package tests
-testclass Declarations for statechart Declarations {
-	
-	operation declarationsTest(){
-		enter
-	}
+package tests
+testclass Declarations for statechart Declarations {
+	@Test
+	operation declarationsTest(){
+		enter
+	}
 }

test-plugins/org.yakindu.sct.test.models/tests/DeepEntry.sctunit

@@ -1,27 +1,28 @@
-package tests
-testclass DeepEntry for statechart DeepEntry {
-	
-	operation enterToSubstate(){
-		
-		assert x == 0
-		assert y == 0
-		assert z == 0
-		enter
-		assert x == 1
-		assert y == 1
-		assert z == 2
-		
-		raise e
-		cycle
-		assert active ( DeepEntry.r2.B.r.BB )
-
-		raise f
-		cycle
-		assert active ( DeepEntry.r2.C )
-		
-		raise f
-		cycle
-		assert active ( DeepEntry.r2.B.r.BB )
-		assert y == 1
-	}
+package tests
+testclass DeepEntry for statechart DeepEntry {
+	
+	@Test
+	operation enterToSubstate(){
+		
+		assert x == 0
+		assert y == 0
+		assert z == 0
+		enter
+		assert x == 1
+		assert y == 1
+		assert z == 2
+		
+		raise e
+		cycle
+		assert active ( DeepEntry.r2.B.r.BB )
+
+		raise f
+		cycle
+		assert active ( DeepEntry.r2.C )
+		
+		raise f
+		cycle
+		assert active ( DeepEntry.r2.B.r.BB )
+		assert y == 1
+	}
 }

test-plugins/org.yakindu.sct.test.models/tests/DeepHistory.sctunit

@@ -1,37 +1,38 @@
-package tests
-testclass DeepHistory for statechart DeepHistory {
-	operation deepHistoryTest(){
-		// Change active states to State9;
-		
-		enter
-		
-		raise event1
-		cycle
-		raise event3
-		cycle
-		raise event5
-		cycle
-		raise event7
-		cycle
-		//Not possible to assert event1 because it is an IN event.
-		//assert event1
-		
-		assert !active (DeepHistory.mainRegion.State1)
-		assert active (DeepHistory.mainRegion.State2._region0.State4._region0.State7._region0.State9)
-		
-		// Leave State2. State4 and State9 should be saved as history.
-		raise event2
-		cycle
-		assert active ( DeepHistory.mainRegion.State1)
-		assert !active ( DeepHistory.mainRegion.State2._region0.State4._region0.State7._region0.State9)
-		
-		// Reenter State2. State9 should be activated (History of State2).
-		raise event1
-		cycle
-		assert !active (DeepHistory.mainRegion.State1)
-		assert active (DeepHistory.mainRegion.State2._region0.State4._region0.State7._region0.State9)
-	
-	}
-}
-
+package tests
+testclass DeepHistory for statechart DeepHistory {
+	@Test
+	operation deepHistoryTest(){
+		// Change active states to State9;
+		
+		enter
+		
+		raise event1
+		cycle
+		raise event3
+		cycle
+		raise event5
+		cycle
+		raise event7
+		cycle
+		//Not possible to assert event1 because it is an IN event.
+		//assert event1
+		
+		assert !active (DeepHistory.mainRegion.State1)
+		assert active (DeepHistory.mainRegion.State2._region0.State4._region0.State7._region0.State9)
+		
+		// Leave State2. State4 and State9 should be saved as history.
+		raise event2
+		cycle
+		assert active ( DeepHistory.mainRegion.State1)
+		assert !active ( DeepHistory.mainRegion.State2._region0.State4._region0.State7._region0.State9)
+		
+		// Reenter State2. State9 should be activated (History of State2).
+		raise event1
+		cycle
+		assert !active (DeepHistory.mainRegion.State1)
+		assert active (DeepHistory.mainRegion.State2._region0.State4._region0.State7._region0.State9)
+	
+	}
+}
+
  

test-plugins/org.yakindu.sct.test.models/tests/DynamicChoice.sctunit

@@ -1,11 +1,11 @@
-package tests
-testclass DynamicChoice for statechart DynamicChoice{
-	
-	operation DynamicChoiceTest(){ 
-		enter		
-		assert active(DynamicChoice.main_region.Start)
-		cycle
-		assert active(DynamicChoice.main_region.A)	 
-	} 
-}
+package tests
+testclass DynamicChoice for statechart DynamicChoice{
+	@Test
+	operation DynamicChoiceTest(){ 
+		enter		
+		assert active(DynamicChoice.main_region.Start)
+		cycle
+		assert active(DynamicChoice.main_region.A)	 
+	} 
+}
 	

test-plugins/org.yakindu.sct.test.models/tests/EmptyTransition.sctunit

@@ -1,11 +1,12 @@
-package tests
-testclass EmptyTransition for statechart EmptyTransition{
-	operation EmptyTransitionTest(){ 
-		enter
-		cycle
-		assert !active (EmptyTransition.main_region.B)
-		assert active  (EmptyTransition.main_region.A) 
-		 
-	} 
-}
+package tests
+testclass EmptyTransition for statechart EmptyTransition{
+	@Test
+	operation EmptyTransitionTest(){ 
+		enter
+		cycle
+		assert !active (EmptyTransition.main_region.B)
+		assert active  (EmptyTransition.main_region.A) 
+		 
+	} 
+}
 	

test-plugins/org.yakindu.sct.test.models/tests/EnterState.sctunit

@@ -1,40 +1,43 @@
-package tests
-testclass EnterState for statechart EnterState {
-	
-		
-	/* An entry without a specified entry point must enter the region through the default entry.
-	 */
-	operation defaultEntry(){ 
-		enter
-		assert active(EnterState.r.A)
-		
-		raise e
-		cycle
-		assert active(EnterState.r.B.r.E) 
-	} 
-
-	/* An entry with a specified entry point must take the entry node with the specified name.
-	 */
-	operation namedEntryThroughNamedTransition(){ 
-		enter
-		assert active(EnterState.r.A)
-		
-		raise f
-		cycle
-		assert active(EnterState.r.B.r.F) 
-	} 
-
-	/* An entry with a specified entry point that does not match any entry node by name must be taken through the default entry node.
-	 */
-	operation namedEntryThroughDefaultTransition(){ 
-		enter
-		assert active(EnterState.r.A)
-		
-		raise g
-		cycle
-		assert active(EnterState.r.B.r.E) 
-	} 
-	
-	 
-}
+package tests
+testclass EnterState for statechart EnterState {
+	
+		
+	/* An entry without a specified entry point must enter the region through the default entry.
+	 */
+	@Test
+	operation defaultEntry(){ 
+		enter
+		assert active(EnterState.r.A)
+		
+		raise e
+		cycle
+		assert active(EnterState.r.B.r.E) 
+	} 
+
+	/* An entry with a specified entry point must take the entry node with the specified name.
+	 */
+	@Test
+	operation namedEntryThroughNamedTransition(){ 
+		enter
+		assert active(EnterState.r.A)
+		
+		raise f
+		cycle
+		assert active(EnterState.r.B.r.F) 
+	} 
+
+	/* An entry with a specified entry point that does not match any entry node by name must be taken through the default entry node.
+	 */
+	@Test
+	operation namedEntryThroughDefaultTransition(){ 
+		enter
+		assert active(EnterState.r.A)
+		
+		raise g
+		cycle
+		assert active(EnterState.r.B.r.E) 
+	} 
+	
+	 
+}
 	

test-plugins/org.yakindu.sct.test.models/tests/EntryChoice.sctunit

@@ -1,10 +1,11 @@
-package tests
-testclass EntryChoice for statechart EntryChoice {
-	operation EntryChoiceTest(){
-		enter
-		cycle
-		cycle
-		assert active ( EntryChoice.main_region.A )
-	}
-}
+package tests
+testclass EntryChoice for statechart EntryChoice {
+	@Test
+	operation EntryChoiceTest(){
+		enter
+		cycle
+		cycle
+		assert active ( EntryChoice.main_region.A )
+	}
+}
 	

test-plugins/org.yakindu.sct.test.models/tests/EntryExitSelfTransition.sctunit

@@ -1,41 +1,41 @@
-package tests
-testclass EntryExitSelfTransition for statechart EntryExitSelfTransition{
-
-	operation SelfTransitionToChildState(){ 
-		enter
-		
-		cycle
-		assert entries == 1 
-		assert active(EntryExitSelfTransition.main_region.A._region0.B)
-		
-		entries = 0
-		raise e
-		cycle
-		assert entries == 1
-		assert exits == 1
-		assert active(EntryExitSelfTransition.main_region.A._region0.C)
-	} 
-
-
-	operation SelfTransitionFromChildState(){ 
-		enter
-		
-		cycle
-		assert entries == 1 
-		
-		entries = 0
-		raise e1
-		cycle
-		assert entries == 0
-		assert exits == 0
-		assert active(EntryExitSelfTransition.main_region.A._region0.C)
-	
-		raise e1
-		cycle
-		assert active(EntryExitSelfTransition.main_region.A._region0.B)
-		assert entries == 1
-		assert exits == 1 
-	} 
-
-}
+package tests
+testclass EntryExitSelfTransition for statechart EntryExitSelfTransition{
+	@Test
+	operation SelfTransitionToChildState(){ 
+		enter
+		
+		cycle
+		assert entries == 1 
+		assert active(EntryExitSelfTransition.main_region.A._region0.B)
+		
+		entries = 0
+		raise e
+		cycle
+		assert entries == 1
+		assert exits == 1
+		assert active(EntryExitSelfTransition.main_region.A._region0.C)
+	} 
+
+	@Test
+	operation SelfTransitionFromChildState(){ 
+		enter
+		
+		cycle
+		assert entries == 1 
+		
+		entries = 0
+		raise e1
+		cycle
+		assert entries == 0
+		assert exits == 0
+		assert active(EntryExitSelfTransition.main_region.A._region0.C)
+	
+		raise e1
+		cycle
+		assert active(EntryExitSelfTransition.main_region.A._region0.B)
+		assert entries == 1
+		assert exits == 1 
+	} 
+
+}
 	

test-plugins/org.yakindu.sct.test.models/tests/EntryReactionAction.sctunit

@@ -1,72 +1,75 @@
-package tests
-testclass EntryReactionAction for statechart entries.EntryReactionAction {
-
-	/*
-	 * Actions on an entry transition should be executed during entering the state machine.
-	 */	
-	operation entryTransitionActionOnStatechartEnter(){ 
-		
-		enter		 
-		assert enteredR1
-		assert enteredR2
-		assert enteredBdefault
-		assert ! enteredBother
-		
-	} 
-	
-	/*
-	 * Actions on an entry transition should be executed if it is used during a run to completion step.
-	 */
-	operation entryOnRTS(){
-		enter
-		
-		raise b 
-		cycle 
-		raise d 
-		cycle
-		
-		enteredR1 = false
-		enteredR2 = false
-		enteredBdefault = false
-		enteredBother = false
-		raise b
-		cycle
-		
-		assert ! enteredR1
-		assert ! enteredR2
-		assert ! enteredBdefault
-		assert enteredBother		
-		
-	}
-	
-	
-	/*
-	 * Actions on an entry transition should not be executed if be executed when entering 
-	 * a region using a history.
-	 */
-	operation noEntryTransitionActionOnHistory(){
-		
-		enter
-		
-		raise b
-		cycle
-		raise d
-		cycle
-		
-		enteredR1 = false
-		enteredR2 = false
-		enteredBdefault = false
-		enteredBother = false
-		raise d
-		cycle
-		
-		assert ! enteredR1
-		assert ! enteredR2
-		assert ! enteredBdefault
-		assert ! enteredBother		
-	}
-
-
-	
-}
+package tests
+testclass EntryReactionAction for statechart entries.EntryReactionAction {
+
+	/*
+	 * Actions on an entry transition should be executed during entering the state machine.
+	 */
+	@Test
+	operation entryTransitionActionOnStatechartEnter(){ 
+		
+		enter		 
+		assert enteredR1
+		assert enteredR2
+		assert enteredBdefault
+		assert ! enteredBother
+		
+	} 
+	
+	/*
+	 * Actions on an entry transition should be executed if it is used during a run to completion step.
+	 */
+	@Test
+	operation entryOnRTS(){
+		enter
+		
+		raise b 
+		cycle 
+		raise d 
+		cycle
+		
+		enteredR1 = false
+		enteredR2 = false
+		enteredBdefault = false
+		enteredBother = false
+		raise b
+		cycle
+		
+		assert ! enteredR1
+		assert ! enteredR2
+		assert ! enteredBdefault
+		assert enteredBother		
+		
+	}
+	
+	
+	/*
+	 * Actions on an entry transition should not be executed if be executed when entering 
+	 * a region using a history.
+	 */
+	@Test
+	operation noEntryTransitionActionOnHistory(){
+		
+		enter
+		
+		raise b
+		cycle
+		raise d
+		cycle
+		
+		enteredR1 = false
+		enteredR2 = false
+		enteredBdefault = false
+		enteredBother = false
+		raise d
+		cycle
+		
+		assert ! enteredR1
+		assert ! enteredR2
+		assert ! enteredBdefault
+		assert ! enteredBother		
+	}
+
+
+	
+}
 	

test-plugins/org.yakindu.sct.test.models/tests/ExitOnSelfTransition.sctunit

@@ -1,22 +1,23 @@
-package tests
-testclass ExitOnSelfTransition for statechart ExitOnSelfTransition {
-	operation ExitOnSelfTransitionTest(){ 
-		
-		enter
-		
-		assert active(ExitOnSelfTransition.main_region.A) 
-		assert entryCount == 1 
-		assert exitCount == 0
-		
-		raise e
-		cycle
-		assert entryCount == 2
-		assert exitCount == 1
-		
-		raise f
-		cycle
-		assert entryCount == 2
-		assert exitCount == 2 
-	} 
-}
+package tests
+testclass ExitOnSelfTransition for statechart ExitOnSelfTransition {
+	@Test
+	operation ExitOnSelfTransitionTest(){ 
+		
+		enter
+		
+		assert active(ExitOnSelfTransition.main_region.A) 
+		assert entryCount == 1 
+		assert exitCount == 0
+		
+		raise e
+		cycle
+		assert entryCount == 2
+		assert exitCount == 1
+		
+		raise f
+		cycle
+		assert entryCount == 2
+		assert exitCount == 2 
+	} 
+}
 	

test-plugins/org.yakindu.sct.test.models/tests/ExitState.sctunit

@@ -1,45 +1,49 @@
-package tests
-testclass ExitState for statechart ExitState {
-	
-	/* An exit through an unnamed exit point must be taken by the transition without exit point spec (it must also be unguarded). */
-	operation defaultExit(){ 
-		enter
-		assert active(ExitState.r.A)
-		
-		raise e
-		cycle
-		assert active(ExitState.r.E) 
-	} 
-
-	/* An exit through an named exit point must be taken by the transition with the matching exit point spec if it exists. */
-	operation namedExitThroughNamedTransition(){ 
-		enter
-		assert active(ExitState.r.A)
-		
-		raise f
-		cycle
-		assert active(ExitState.r.F) 
-	} 
-
-	/* An exit through an named exit point must be taken by the default transition if no transition for this exit point exists.  */
-	operation namedExitThroughDefaultTransition(){ 
-		enter
-		assert active(ExitState.r.A)
-		
-		raise g
-		cycle
-		assert active(ExitState.r.E) 
-	} 
-
-
-	/* If no event is raised then the statechart must remain in state A.  */
-	operation remainInA(){ 
-		enter
-		assert active(ExitState.r.A)
-		
-		cycle
-		assert active(ExitState.r.A) 
-	} 
-
-}
+package tests
+testclass ExitState for statechart ExitState {
+	
+	/* An exit through an unnamed exit point must be taken by the transition without exit point spec (it must also be unguarded). */
+	@Test
+	operation defaultExit(){ 
+		enter
+		assert active(ExitState.r.A)
+		
+		raise e
+		cycle
+		assert active(ExitState.r.E) 
+	} 
+
+	/* An exit through an named exit point must be taken by the transition with the matching exit point spec if it exists. */
+	@Test
+	operation namedExitThroughNamedTransition(){ 
+		enter
+		assert active(ExitState.r.A)
+		
+		raise f
+		cycle
+		assert active(ExitState.r.F) 
+	} 
+
+	/* An exit through an named exit point must be taken by the default transition if no transition for this exit point exists.  */
+	@Test
+	operation namedExitThroughDefaultTransition(){ 
+		enter
+		assert active(ExitState.r.A)
+		
+		raise g
+		cycle
+		assert active(ExitState.r.E) 
+	} 
+
+
+	/* If no event is raised then the statechart must remain in state A.  */
+	@Test
+	operation remainInA(){ 
+		enter
+		assert active(ExitState.r.A)
+		
+		cycle
+		assert active(ExitState.r.A) 
+	} 
+
+}
 	

test-plugins/org.yakindu.sct.test.models/tests/FeatureCalls.sctunit

@@ -1,12 +1,13 @@
-package tests
-testclass FeatureCalls for statechart FeatureCalls {
-	operation FeatureCalls(){
-		enter
-		assert active ( FeatureCalls.main_region.A)
-		//assert MyInterface.myInt == 0
-		//raise MyInterface.Event1
-		cycle
-		//assert MyInterface.myInt == 42
-		assert active (FeatureCalls.main_region.A)
-	}
+package tests
+testclass FeatureCalls for statechart FeatureCalls {
+	@Test
+	operation FeatureCalls(){
+		enter
+		assert active ( FeatureCalls.main_region.A)
+		//assert MyInterface.myInt == 0
+		//raise MyInterface.Event1
+		cycle
+		//assert MyInterface.myInt == 42
+		assert active (FeatureCalls.main_region.A)
+	}
 }   

test-plugins/org.yakindu.sct.test.models/tests/FinalState.sctunit

@@ -1,10 +1,11 @@
-package tests
-testclass FinalState for statechart FinalState{
-	operation StatechartNameTest(){ 
-		enter
-		cycle
-		assert is_final
-		 
-	} 
-}
+package tests
+testclass FinalState for statechart FinalState{
+	@Test
+	operation StatechartNameTest(){ 
+		enter
+		cycle
+		assert is_final
+		 
+	} 
+}
 	

test-plugins/org.yakindu.sct.test.models/tests/Guard.sctunit

@@ -1,27 +1,28 @@
-package tests
-testclass Guard for statechart Guard {
-	operation guardTest(){
-		enter
-		assert active (Guard.main_region.A)
-		raise Event1
-		cycle
-		
-		assert active (Guard.main_region.A)
-		raise Event2 
-		cycle
-		
-		assert active (Guard.main_region.B)
-		raise Return
-		cycle
-		
-		assert active (Guard.main_region.A)
-		raise Event1 
-		cycle
-		
-		assert active (Guard.main_region.B)
-		raise Return
-		cycle
-		 
-		assert active (Guard.main_region.A)  
-	}
+package tests
+testclass Guard for statechart Guard {
+	@Test
+	operation guardTest(){
+		enter
+		assert active (Guard.main_region.A)
+		raise Event1
+		cycle
+		
+		assert active (Guard.main_region.A)
+		raise Event2 
+		cycle
+		
+		assert active (Guard.main_region.B)
+		raise Return
+		cycle
+		
+		assert active (Guard.main_region.A)
+		raise Event1 
+		cycle
+		
+		assert active (Guard.main_region.B)
+		raise Return
+		cycle
+		 
+		assert active (Guard.main_region.A)  
+	}
 }  

test-plugins/org.yakindu.sct.test.models/tests/GuardedEntry.sctunit

@@ -1,62 +1,62 @@
-package tests
-testclass GuardedEntry for statechart GuardedEntry{
-	
-	operation EntryNotTakenOnStatechartEnter(){ 
-		
-		assert guard == false
-		
-		enter
-		
-		assert active(GuardedEntry.main_region.A)
-		assert done == false
-		  
-	} 
-
-	operation EntryTakenOnStatechartEnter()
-	{  
-		
-		guard = true
-		
-		enter 
-//		assert false "sctunit does not allow modifiing variables before entering the state machine!"
-		
-		assert active(GuardedEntry.main_region.A)
-		assert done == true
-	}   
-	 
-	operation EntryTakenInTransition(){
-		
-		enter 
-
-		assert active(GuardedEntry.main_region.A)
-		raise e
-		cycle
-		assert active(GuardedEntry.main_region.B)
-		
-		guard = true
-		done = false
-		raise e
-		cycle
-		assert active(GuardedEntry.main_region.A)
-		assert done
-	} 
-		
-	operation EntryNotTakenInTransition(){ 
-
-		enter
-
-		assert active(GuardedEntry.main_region.A)
-		raise e
-		cycle
-		assert active(GuardedEntry.main_region.B)
-		
-		guard = false
-		done = false
-		raise e
-		cycle
-		assert active(GuardedEntry.main_region.A)
-		assert !done
-	} 
-		
-}
+package tests
+testclass GuardedEntry for statechart GuardedEntry{
+	@Test
+	operation EntryNotTakenOnStatechartEnter(){ 
+		
+		assert guard == false
+		
+		enter
+		
+		assert active(GuardedEntry.main_region.A)
+		assert done == false
+		  
+	} 
+	@Test
+	operation EntryTakenOnStatechartEnter()
+	{  
+		
+		guard = true
+		
+		enter 
+//		assert false "sctunit does not allow modifiing variables before entering the state machine!"
+		
+		assert active(GuardedEntry.main_region.A)
+		assert done == true
+	}   
+	@Test
+	operation EntryTakenInTransition(){
+		
+		enter 
+
+		assert active(GuardedEntry.main_region.A)
+		raise e
+		cycle
+		assert active(GuardedEntry.main_region.B)
+		
+		guard = true
+		done = false
+		raise e
+		cycle
+		assert active(GuardedEntry.main_region.A)
+		assert done
+	} 
+	@Test
+	operation EntryNotTakenInTransition(){ 
+
+		enter
+
+		assert active(GuardedEntry.main_region.A)
+		raise e
+		cycle
+		assert active(GuardedEntry.main_region.B)
+		
+		guard = false
+		done = false
+		raise e
+		cycle
+		assert active(GuardedEntry.main_region.A)
+		assert !done
+	} 
+		
+}
 	

test-plugins/org.yakindu.sct.test.models/tests/GuardedExit.sctunit

@@ -1,33 +1,33 @@
-package tests
-testclass GuardedExit for statechart GuardedExit {
-		 
-	operation ExitTaken(){ 
-
-		enter
-
-		assert active(GuardedExit.main_region.A)
-		assert ! guard
-		raise e
-		
-		cycle
-
-		assert active(GuardedExit.main_region.B)
-		assert ! done 
-	} 
-		
-	operation ExitNotTaken(){
-		
-		enter 
-
-		assert active(GuardedExit.main_region.A)
-		guard = true
-		raise e
-		
-		cycle
-
-		assert active(GuardedExit.main_region.B)
-		assert done 
-	} 
-		
-}
+package tests
+testclass GuardedExit for statechart GuardedExit {
+	@Test
+	operation ExitTaken(){ 
+
+		enter
+
+		assert active(GuardedExit.main_region.A)
+		assert ! guard
+		raise e
+		
+		cycle
+
+		assert active(GuardedExit.main_region.B)
+		assert ! done 
+	} 
+	@Test
+	operation ExitNotTaken(){
+		
+		enter 
+
+		assert active(GuardedExit.main_region.A)
+		guard = true
+		raise e
+		
+		cycle
+
+		assert active(GuardedExit.main_region.B)
+		assert done 
+	} 
+		
+}
 	

test-plugins/org.yakindu.sct.test.models/tests/HistoryWithExitPoint.sctunit

@@ -1,31 +1,31 @@
-package tests
-testclass HistoryWithExitPoint for statechart HistoryWithExitPoint {
-	
-	operation historyEntryAfterExit(){
-		enter
-		
-		assert active ( HistoryWithExitPoint.mr.A.r.X1 )
-		
-		raise push 
-		cycle
-		assert active ( HistoryWithExitPoint.mr.B )
-		
-		raise back
-		cycle
-		assert active ( HistoryWithExitPoint.mr.A.r.X1 )
-		
-		raise next
-		cycle
-		assert active ( HistoryWithExitPoint.mr.A.r.X2 )
-		
-		raise push 
-		cycle
-		assert active ( HistoryWithExitPoint.mr.B )
-		
-		raise back
-		cycle
-		assert active ( HistoryWithExitPoint.mr.A.r.X2 )
-		
-	}
-	
+package tests
+testclass HistoryWithExitPoint for statechart HistoryWithExitPoint {
+	@Test
+	operation historyEntryAfterExit(){
+		enter
+		
+		assert active ( HistoryWithExitPoint.mr.A.r.X1 )
+		
+		raise push 
+		cycle
+		assert active ( HistoryWithExitPoint.mr.B )
+		
+		raise back
+		cycle
+		assert active ( HistoryWithExitPoint.mr.A.r.X1 )
+		
+		raise next
+		cycle
+		assert active ( HistoryWithExitPoint.mr.A.r.X2 )
+		
+		raise push 
+		cycle
+		assert active ( HistoryWithExitPoint.mr.B )
+		
+		raise back
+		cycle
+		assert active ( HistoryWithExitPoint.mr.A.r.X2 )
+		
+	}
+	
 }

test-plugins/org.yakindu.sct.test.models/tests/HistoryWithoutInitialStep.sctunit

@@ -1,58 +1,58 @@
-package tests
-testclass HistoryWithoutInitialStep for statechart HistoryWithoutInitialStep {
-	
-	
-	operation enterThroughInitialEntry(){ 
-		
-		enter
-		assert active(HistoryWithoutInitialStep.main_region.A) 
-		
-		raise toB
-		cycle
-		assert active(HistoryWithoutInitialStep.main_region.B.r1.C)
-		
-		raise next
-		cycle
-		assert active(HistoryWithoutInitialStep.main_region.B.r1.D)
-	}
-	
-
-	operation enterCThroughHistory(){
-		enter
-		assert active(HistoryWithoutInitialStep.main_region.A) 
-		
-		raise toB
-		cycle
-		assert active(HistoryWithoutInitialStep.main_region.B.r1.C)
-
-		raise toA
-		cycle
-		assert active(HistoryWithoutInitialStep.main_region.A)
-		
-		raise toHistory
-		cycle
-		assert active(HistoryWithoutInitialStep.main_region.B.r1.C)
-	}
-		 
-
-	operation enterDThroughHistory(){
-		enter
-		assert active(HistoryWithoutInitialStep.main_region.A) 
-		
-		raise toB
-		cycle
-		raise next
-		cycle
-		assert active(HistoryWithoutInitialStep.main_region.B.r1.D)
-
-		raise toA
-		cycle
-		assert active(HistoryWithoutInitialStep.main_region.A)
-		
-		raise toHistory
-		cycle
-		assert active(HistoryWithoutInitialStep.main_region.B.r1.D)
-	}
-		
-		
+package tests
+testclass HistoryWithoutInitialStep for statechart HistoryWithoutInitialStep {
+	
+	@Test
+	operation enterThroughInitialEntry(){ 
+		
+		enter
+		assert active(HistoryWithoutInitialStep.main_region.A) 
+		
+		raise toB
+		cycle
+		assert active(HistoryWithoutInitialStep.main_region.B.r1.C)
+		
+		raise next
+		cycle
+		assert active(HistoryWithoutInitialStep.main_region.B.r1.D)
+	}
+	
+	@Test
+	operation enterCThroughHistory(){
+		enter
+		assert active(HistoryWithoutInitialStep.main_region.A) 
+		
+		raise toB
+		cycle
+		assert active(HistoryWithoutInitialStep.main_region.B.r1.C)
+
+		raise toA
+		cycle
+		assert active(HistoryWithoutInitialStep.main_region.A)
+		
+		raise toHistory
+		cycle
+		assert active(HistoryWithoutInitialStep.main_region.B.r1.C)
+	}
+		 
+	@Test
+	operation enterDThroughHistory(){
+		enter
+		assert active(HistoryWithoutInitialStep.main_region.A) 
+		
+		raise toB
+		cycle
+		raise next
+		cycle
+		assert active(HistoryWithoutInitialStep.main_region.B.r1.D)
+
+		raise toA
+		cycle
+		assert active(HistoryWithoutInitialStep.main_region.A)
+		
+		raise toHistory
+		cycle
+		assert active(HistoryWithoutInitialStep.main_region.B.r1.D)
+	}
+		
+		
 }

test-plugins/org.yakindu.sct.test.models/tests/InEventLifeCycle.sctunit

@@ -1,23 +1,24 @@
-package tests
-/**
- * @author axel terfloth
- */
-testclass InEventLifeCycle for statechart InEventLifeCycle {
-	
-	/** TODO: we require a probe interface for white box testing */
-	operation eventLifeCycle(){
-		
-		enter
-		
-		raise e 
-		
-		// assert e		// the in event must be set before the cycle  
-		assert i == 0	// e is not consumed yet
-		cycle
-		
-		// assert ! e		// after the cycle the event is not available anymore
-		assert i == 1	// within the cycle the in event was consumed
-		
-	}
-		
+package tests
+/**
+ * @author axel terfloth
+ */
+testclass InEventLifeCycle for statechart InEventLifeCycle {
+	
+	/** TODO: we require a probe interface for white box testing */
+	@Test
+	operation eventLifeCycle(){
+		
+		enter
+		
+		raise e 
+		
+		// assert e		// the in event must be set before the cycle  
+		assert i == 0	// e is not consumed yet
+		cycle
+		
+		// assert ! e		// after the cycle the event is not available anymore
+		assert i == 1	// within the cycle the in event was consumed
+		
+	}
+		
 }

test-plugins/org.yakindu.sct.test.models/tests/IntegerExpressions.sctunit

@@ -1,39 +1,40 @@
-package tests
-testclass IntegerExpressions for statechart IntegerExpressions {
-	operation integerExpressions(){
-		
-		enter
-		
-		assert active (IntegerExpressions.main_region.StateA)
-		assert myInt1 == 10
-		assert myInt2 == 5
-		raise e1 
-		cycle 
-		  
-		// comparison
-		assert less == false
-		assert greater == true
-		assert equalOrLess == false
-		assert equalOrGreater == true
-		assert equal == false
-		assert notEqual == true 
-		
-		//
-		assert plus == 15
-		assert minus == 5
-		assert multiply == 50
-		assert division == 2
-		assert modulo == 0
-		
-		//
-		assert negat == -10
-		//TODO  assert complement == -10 
-		
-		//
-		assert multiAssign == 20
-		assert divAssign == 2
-		assert plusAssign == 12
-		assert minusAssign == -8
-		assert moduloAssign == 0
-		}
+package tests
+testclass IntegerExpressions for statechart IntegerExpressions {
+	@Test
+	operation integerExpressions(){
+		
+		enter
+		
+		assert active (IntegerExpressions.main_region.StateA)
+		assert myInt1 == 10
+		assert myInt2 == 5
+		raise e1 
+		cycle 
+		  
+		// comparison
+		assert less == false
+		assert greater == true
+		assert equalOrLess == false
+		assert equalOrGreater == true
+		assert equal == false
+		assert notEqual == true 
+		
+		//
+		assert plus == 15
+		assert minus == 5
+		assert multiply == 50
+		assert division == 2
+		assert modulo == 0
+		
+		//
+		assert negat == -10
+		//TODO  assert complement == -10 
+		
+		//
+		assert multiAssign == 20
+		assert divAssign == 2
+		assert plusAssign == 12
+		assert minusAssign == -8
+		assert moduloAssign == 0
+		}
 	}

test-plugins/org.yakindu.sct.test.models/tests/InternalEventLifeCycle.sctunit

@@ -1,42 +1,42 @@
-package tests
-/** 
- * @author axel terfloth
- */
-testclass InternalEventLifeCycle for statechart InternalEventLifeCycle {
-
-	operation InternalEventLifeCycleTest(){
-		 
-		enter
-		 
-		assert active(InternalEventLifeCycle.r1.A)
-		assert active(InternalEventLifeCycle.r2.C)
-		
-		// the internal event i1 must be raised and consumed in the low priority 
-		// region within the same cycle
-		raise e
-		cycle		
-		assert active(InternalEventLifeCycle.r1.A)
-		assert active(InternalEventLifeCycle.r2.D)
-
-		// the internal event must not be visible after the cycle
-		// but we can't access internal elements yet : assert ! i1
-		
-
-		// make sure nothing happens during an empty cycle		
-		cycle
-		assert active(InternalEventLifeCycle.r1.A)
-		assert active(InternalEventLifeCycle.r2.D)
-		
-		// the internal event i2 should have no impact since it is raised 
-		// in a low priority region and will be cleared after the cycle
-		raise f
-		cycle
-		assert active(InternalEventLifeCycle.r1.A)
-		assert active(InternalEventLifeCycle.r2.C) 
-		
-		// make sure nothing happens during an empty cycle
-		cycle
-		assert active(InternalEventLifeCycle.r1.A)
-		assert active(InternalEventLifeCycle.r2.C) 
-	} 
-}
+package tests
+/** 
+ * @author axel terfloth
+ */
+testclass InternalEventLifeCycle for statechart InternalEventLifeCycle {
+	@Test
+	operation InternalEventLifeCycleTest(){
+		 
+		enter
+		 
+		assert active(InternalEventLifeCycle.r1.A)
+		assert active(InternalEventLifeCycle.r2.C)
+		
+		// the internal event i1 must be raised and consumed in the low priority 
+		// region within the same cycle
+		raise e
+		cycle		
+		assert active(InternalEventLifeCycle.r1.A)
+		assert active(InternalEventLifeCycle.r2.D)
+
+		// the internal event must not be visible after the cycle
+		// but we can't access internal elements yet : assert ! i1
+		
+
+		// make sure nothing happens during an empty cycle		
+		cycle
+		assert active(InternalEventLifeCycle.r1.A)
+		assert active(InternalEventLifeCycle.r2.D)
+		
+		// the internal event i2 should have no impact since it is raised 
+		// in a low priority region and will be cleared after the cycle
+		raise f
+		cycle
+		assert active(InternalEventLifeCycle.r1.A)
+		assert active(InternalEventLifeCycle.r2.C) 
+		
+		// make sure nothing happens during an empty cycle
+		cycle
+		assert active(InternalEventLifeCycle.r1.A)
+		assert active(InternalEventLifeCycle.r2.C) 
+	} 
+}