Merge pull request #1376 from Yakindu/adaption_sctunittestmodels

Updated the Syntax of running a cycle

plugins/org.yakindu.sct.simulation.core.sexec/src/org/yakindu/sct/simulation/core/sexec/container/AbstractExecutionFlowSimulationEngine.java

@@ -1,180 +1,146 @@
-/**
- * Copyright (c) 2012 committers of YAKINDU and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * Contributors:
- * 	committers of YAKINDU - initial API and implementation
- * 
- */
-
-package org.yakindu.sct.simulation.core.sexec.container;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IStatusHandler;
-import org.eclipse.debug.core.model.IDebugTarget;
-import org.eclipse.emf.common.util.WrappedException;
-import org.yakindu.base.types.validation.IValidationIssueAcceptor.ListBasedValidationIssueAcceptor;
-import org.yakindu.base.types.validation.IValidationIssueAcceptor.ValidationIssue.Severity;
-import org.yakindu.sct.model.sexec.ExecutionFlow;
-import org.yakindu.sct.model.sexec.transformation.IModelSequencer;
-import org.yakindu.sct.model.sgraph.Statechart;
-import org.yakindu.sct.simulation.core.SimulationCoreActivator;
-import org.yakindu.sct.simulation.core.engine.IExecutionControl;
-import org.yakindu.sct.simulation.core.engine.ISimulationEngine;
-import org.yakindu.sct.simulation.core.sexec.interpreter.IExecutionFlowInterpreter;
-import org.yakindu.sct.simulation.core.sruntime.ExecutionContext;
-
-import com.google.inject.Inject;
-
-/**
- * Abstract implementation if the {@link ISimulationEngine} interface.
- * transforms a {@link Statechart} to an {@link ExecutionFlow} and holds an
- * {@link ExecutionContext}
- * 
- * @author andreas muelder - Initial contribution and API
- * 
- */
-public abstract class AbstractExecutionFlowSimulationEngine implements ISimulationEngine, IExecutionControl {
-
-	private static final String ERROR_MSG = "An unexpected error ocurred during simulation.";
-	
-	public static final int ERROR_DURING_SIMULATION = 765;
-
-	@Inject
-	protected ExecutionContext context;
-	@Inject
-	private IModelSequencer sequencer;
-	@Inject
-	protected IExecutionFlowInterpreter interpreter;
-	@Inject
-	private IExecutionContextInitializer contextInitializer;
-
-	protected boolean terminated = false;
-	protected boolean suspended = false;
-
-	private Statechart statechart;
-
-	public AbstractExecutionFlowSimulationEngine(Statechart statechart) {
-		this.statechart = statechart;
-	}
-
-	protected void runCycle() {
-		try {
-			interpreter.runCycle();
-		} catch (Exception e) {
-			e.printStackTrace();
-			handleException(e);
-		}
-	}
-
-	protected void handleException(Throwable t) {
-		if (t instanceof WrappedException) {
-			t = ((WrappedException) t).getCause();
-		}
-		String statusMessage = t.getMessage() == null ? ERROR_MSG : t.getMessage();
-		Status errorStatus = new Status(Status.ERROR, SimulationCoreActivator.PLUGIN_ID, ERROR_DURING_SIMULATION,
-				statusMessage, t);
-		SimulationCoreActivator.getDefault().getLog().log(errorStatus);
-		IStatusHandler statusHandler = DebugPlugin.getDefault().getStatusHandler(errorStatus);
-		try {
-			statusHandler.handleStatus(errorStatus, getDebugTarget());
-		} catch (CoreException e) {
-			e.printStackTrace();
-		} finally {
-			interpreter.suspend();
-			terminate();
-		}
-	}
-
-	protected Object getDebugTarget() {
-		IDebugTarget[] debugTargets = DebugPlugin.getDefault().getLaunchManager().getDebugTargets();
-		for (IDebugTarget iDebugTarget : debugTargets) {
-			if (iDebugTarget.isTerminated())
-				continue;
-			if (iDebugTarget.getAdapter(ISimulationEngine.class) == this)
-				return iDebugTarget;
-		}
-		return null;
-	}
-
-	@Override
-	public void init() {
-		ListBasedValidationIssueAcceptor acceptor = new ListBasedValidationIssueAcceptor();
-		ExecutionFlow flow = sequencer.transform(statechart, acceptor);
-		if (acceptor.getTraces(Severity.ERROR).size() > 0) {
-			Status errorStatus = new Status(Status.ERROR, SimulationCoreActivator.PLUGIN_ID, ERROR_DURING_SIMULATION,
-					acceptor.getTraces(Severity.ERROR).iterator().next().toString(), null);
-			IStatusHandler statusHandler = DebugPlugin.getDefault().getStatusHandler(errorStatus);
-			try {
-				statusHandler.handleStatus(errorStatus, getDebugTarget());
-			} catch (CoreException e) {
-				e.printStackTrace();
-			}
-		}
-
-		if (!context.isSnapshot()) {
-			contextInitializer.initialize(context, flow);
-		}
-		interpreter.initialize(flow, context);
-	}
-
-	public void start() {
-		try {
-			interpreter.enter();
-		} catch (Exception ex) {
-			handleException(ex);
-		}
-	}
-
-	public void suspend() {
-		suspended = true;
-		interpreter.suspend();
-	}
-
-	public void resume() {
-		try {
-			suspended = false;
-			interpreter.resume();
-		} catch (Exception ex) {
-			handleException(ex);
-		}
-	}
-
-	public void terminate() {
-		terminated = true;
-		interpreter.tearDown();
-	}
-
-	public void stepForward() {
-		try {
-			interpreter.resume();
-			interpreter.runCycle();
-			interpreter.suspend();
-		} catch (Exception ex) {
-			handleException(ex);
-		}
-	}
-
-	public void stepBackward() {
-
-	}
-
-	@Override
-	public ExecutionContext getExecutionContext() {
-		return context;
-	}
-
-	public void setExecutionContext(ExecutionContext context) {
-		this.context = context;
-	}
-
-	@Override
-	public IExecutionControl getExecutionControl() {
-		return this;
-	}
-
-}
+/**
+ * Copyright (c) 2012 committers of YAKINDU and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * Contributors:
+ * 	committers of YAKINDU - initial API and implementation
+ * 
+ */
+
+package org.yakindu.sct.simulation.core.sexec.container;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.debug.core.DebugPlugin;
+import org.eclipse.debug.core.IStatusHandler;
+import org.eclipse.debug.core.model.IDebugTarget;
+import org.eclipse.emf.common.util.WrappedException;
+import org.yakindu.base.types.validation.IValidationIssueAcceptor.ListBasedValidationIssueAcceptor;
+import org.yakindu.base.types.validation.IValidationIssueAcceptor.ValidationIssue.Severity;
+import org.yakindu.sct.model.sexec.ExecutionFlow;
+import org.yakindu.sct.model.sexec.transformation.IModelSequencer;
+import org.yakindu.sct.model.sgraph.Statechart;
+import org.yakindu.sct.simulation.core.SimulationCoreActivator;
+import org.yakindu.sct.simulation.core.engine.IExecutionControl;
+import org.yakindu.sct.simulation.core.engine.ISimulationEngine;
+import org.yakindu.sct.simulation.core.sexec.interpreter.IExecutionFlowInterpreter;
+import org.yakindu.sct.simulation.core.sruntime.ExecutionContext;
+
+import com.google.inject.Inject;
+
+/**
+ * Abstract implementation if the {@link ISimulationEngine} interface.
+ * transforms a {@link Statechart} to an {@link ExecutionFlow} and holds an
+ * {@link ExecutionContext}
+ * 
+ * @author andreas muelder - Initial contribution and API
+ * 
+ */
+public abstract class AbstractExecutionFlowSimulationEngine extends AbstractSimulationEngine{
+
+	@Inject
+	protected ExecutionContext context;
+	@Inject
+	private IModelSequencer sequencer;
+	@Inject
+	protected IExecutionFlowInterpreter interpreter;
+	@Inject
+	private IExecutionContextInitializer contextInitializer;
+
+	protected boolean terminated = false;
+	protected boolean suspended = false;
+
+	private Statechart statechart;
+
+	public AbstractExecutionFlowSimulationEngine(Statechart statechart) {
+		this.statechart = statechart;
+	}
+
+	protected void runCycle() {
+		try {
+			interpreter.runCycle();
+		} catch (Exception e) {
+			e.printStackTrace();
+			handleException(e);
+		}
+	}
+
+	@Override
+	public void init() {
+		ListBasedValidationIssueAcceptor acceptor = new ListBasedValidationIssueAcceptor();
+		ExecutionFlow flow = sequencer.transform(statechart, acceptor);
+		if (acceptor.getTraces(Severity.ERROR).size() > 0) {
+			Status errorStatus = new Status(Status.ERROR, SimulationCoreActivator.PLUGIN_ID, ERROR_DURING_SIMULATION,
+					acceptor.getTraces(Severity.ERROR).iterator().next().toString(), null);
+			IStatusHandler statusHandler = DebugPlugin.getDefault().getStatusHandler(errorStatus);
+			try {
+				statusHandler.handleStatus(errorStatus, getDebugTarget());
+			} catch (CoreException e) {
+				e.printStackTrace();
+			}
+		}
+
+		if (!context.isSnapshot()) {
+			contextInitializer.initialize(context, flow);
+		}
+		interpreter.initialize(flow, context);
+	}
+
+	public void start() {
+		try {
+			interpreter.enter();
+		} catch (Exception ex) {
+			handleException(ex);
+		}
+	}
+
+	public void suspend() {
+		suspended = true;
+		interpreter.suspend();
+	}
+
+	public void resume() {
+		try {
+			suspended = false;
+			interpreter.resume();
+		} catch (Exception ex) {
+			handleException(ex);
+		}
+	}
+
+	public void terminate() {
+		terminated = true;
+		interpreter.tearDown();
+	}
+
+	public void stepForward() {
+		try {
+			interpreter.resume();
+			interpreter.runCycle();
+			interpreter.suspend();
+		} catch (Exception ex) {
+			handleException(ex);
+		}
+	}
+
+	public void stepBackward() {
+
+	}
+
+	@Override
+	public ExecutionContext getExecutionContext() {
+		return context;
+	}
+
+	public void setExecutionContext(ExecutionContext context) {
+		this.context = context;
+	}
+
+	@Override
+	public IExecutionControl getExecutionControl() {
+		return this;
+	}
+
+}

plugins/org.yakindu.sct.simulation.core.sexec/src/org/yakindu/sct/simulation/core/sexec/container/AbstractSimulationEngine.java

@@ -0,0 +1,59 @@
+/**
+* Copyright (c) 2017 itemis AG - All rights Reserved
+* Unauthorized copying of this file, via any medium is strictly prohibited
+* 
+* Contributors:
+* 	Jonathan Thoene - itemis AG
+*
+*/
+package org.yakindu.sct.simulation.core.sexec.container;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.debug.core.DebugPlugin;
+import org.eclipse.debug.core.IStatusHandler;
+import org.eclipse.debug.core.model.IDebugTarget;
+import org.eclipse.emf.common.util.WrappedException;
+import org.yakindu.sct.simulation.core.SimulationCoreActivator;
+import org.yakindu.sct.simulation.core.engine.IExecutionControl;
+import org.yakindu.sct.simulation.core.engine.ISimulationEngine;
+
+public abstract class AbstractSimulationEngine implements ISimulationEngine, IExecutionControl {
+	public static final String ERROR_MSG = "An unexpected error ocurred during simulation.";
+
+	public static final int ERROR_DURING_SIMULATION = 765;
+	
+	protected void handleException(Throwable t) {
+		if (t instanceof WrappedException) {
+			t = ((WrappedException) t).getCause();
+		}
+		String statusMessage = t.getMessage() == null ? ERROR_MSG : t.getMessage();
+		Status errorStatus = new Status(Status.ERROR, SimulationCoreActivator.PLUGIN_ID, ERROR_DURING_SIMULATION,
+				statusMessage, t);
+		SimulationCoreActivator.getDefault().getLog().log(errorStatus);
+		IStatusHandler statusHandler = DebugPlugin.getDefault().getStatusHandler(errorStatus);
+		try {
+			statusHandler.handleStatus(errorStatus, getDebugTarget());
+		} catch (CoreException e) {
+			e.printStackTrace();
+		} finally {
+			terminate();
+		}
+	}
+	
+	protected Object getDebugTarget() {
+		IDebugTarget[] debugTargets = DebugPlugin.getDefault().getLaunchManager().getDebugTargets();
+		for (IDebugTarget iDebugTarget : debugTargets) {
+			if (iDebugTarget.isTerminated())
+				continue;
+			if (iDebugTarget.getAdapter(ISimulationEngine.class) == this)
+				return iDebugTarget;
+		}
+		return null;
+	}
+	
+	@Override
+	public IExecutionControl getExecutionControl() {
+		return this;
+	}
+}

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

@@ -1,20 +1,20 @@
 testclass AlwaysOncycle for statechart AlwaysOncycle {
 	
 	@Test
- 	operation alwaysOncycleTest (){
+ 	operation alwaysOnCycleTest (){
 	 	enter
 		assert active (AlwaysOncycle.main_region.StateA)
 		while (value < 5) {
-			cycle
+			proceed 1 cycle
 			assert active (AlwaysOncycle.main_region.StateA)
 		}
-		cycle
-		assert active ( AlwaysOncycle.main_region.StateB)
+		proceed 1 cycle
+		assert active (AlwaysOncycle.main_region.StateB)
 		while (value < 5) {
-			cycle
+			proceed 1 cycle
 			assert active (AlwaysOncycle.main_region.StateB)
 		}
-		cycle
+		proceed 1 cycle
 		assert active (AlwaysOncycle.main_region.StateA)  
 	}
 		

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

@@ -8,36 +8,36 @@ testclass AssignmentAsExpression for statechart AssignmentAsExpression{
 	  	assert b == 5
 	  	assert a == 9	  	
 	   	
-	  	cycle
+	  	proceed 1 cycle
 	  	assert active(AssignmentAsExpression.main_region.Subtract) 
 	  	assert d == 6
 	  	
-	  	cycle
+	  	proceed 1 cycle
 	  	assert active(AssignmentAsExpression.main_region.Multiply) 
 	  	assert e == 15
 	  	
-	  	cycle
+	  	proceed 1 cycle
 	  	assert active(AssignmentAsExpression.main_region.Divide) 
 	  	assert g == 1	  	
 	  	
-	  	cycle
+	  	proceed 1 cycle
 	  	assert active(AssignmentAsExpression.main_region.Modulo)
 	  	assert i == 1
 
-	  	cycle
+	  	proceed 1 cycle
 	  	assert active(AssignmentAsExpression.main_region.Shift)
 		assert j == 16
 		assert k == 4
 		
-	  	cycle
+	  	proceed 1 cycle
 	  	assert active(AssignmentAsExpression.main_region.boolean_And)
 		assert l == 1
 
-	  	cycle
+	  	proceed 1 cycle
 	  	assert active(AssignmentAsExpression.main_region.boolean_Or)
 		assert p == 15
 		
-	  	cycle
+	  	proceed 1 cycle
 	  	assert active(AssignmentAsExpression.main_region.boolean_Xor)
 		assert u == 12		
 	  	

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

@@ -6,7 +6,7 @@ testclass BitExpressions for statechart BitExpressions {
 		assert myBit1 == 5
 		assert myBit2 == 7
 		raise e1
-		cycle
+		proceed 1 cycle
 
 		assert active (BitExpressions.main_region.StateB)
 		assert leftBitshift == 10

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

@@ -6,7 +6,7 @@ testclass BooleanExpressions for statechart BooleanExpressions {
 		assert myBool1 == true
 		assert myBool2 == false
 		raise e1
-		cycle
+		proceed 1 cycle
 		assert active (BooleanExpressions.main_region.StateB)
 		assert and == false
 		assert or == true

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

@@ -4,7 +4,7 @@ testclass CKeywords for statechart CKeywords {
 		enter
 		assert active ( CKeywords.auto.char ) 
 		raise auto 
-		cycle 
+		proceed 1 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

@@ -4,9 +4,9 @@ testclass CastExpressions for statechart CastExpressions{
 		enter
 		assert realValue == 5
 		assert intValue == 5
-		cycle
+		proceed 1 cycle
 		assert realValue == 15
-		cycle
+		proceed 1 cycle
 		assert active(CastExpressions.main_region.C)
 		
 		assert realValue == 757

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

@@ -54,7 +54,7 @@ testclass Choice for statechart Choice {
 		c = valueForC
 		raise e
 		
-		cycle
+		proceed 1 cycle
 	}
 	
 	operation initForEventF(valueForC : boolean){
@@ -64,7 +64,7 @@ testclass Choice for statechart Choice {
 		c = valueForC
 		raise f
 		
-		cycle
+		proceed 1 cycle
 	}
 	
 	operation initForEventG(valueForC : boolean){
@@ -74,7 +74,7 @@ testclass Choice for statechart Choice {
 		c = valueForC
 		raise g
 		
-		cycle
+		proceed 1 cycle
 	}
 	
 	operation initForEventH(valueForC : boolean){
@@ -84,6 +84,6 @@ testclass Choice for statechart Choice {
 		c = valueForC
 		raise h
 		
-		cycle
+		proceed 1 cycle
 	}
 }

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

@@ -6,7 +6,7 @@ testclass ConditionalExpression for statechart ConditionalExpressions{
 		assert condition == 1
 		
 		raise e
-		cycle
+		proceed 1 cycle
 		
 		assert active (ConditionalExpressions.main_region.B)
 		assert condition == 2

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

@@ -19,7 +19,7 @@ testclass ConstOnlyDefaultScope for statechart declarations.ConstOnlyDefaultScop
 		
 		enter
 		raise A.e : 1
-		cycle
+		proceed 1 cycle
 		assert active(declarations.ConstOnlyDefaultScope.main_region.B)
 		
 	}

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

@@ -19,7 +19,7 @@ testclass ConstOnlyInternalScope for statechart declarations.ConstOnlyInternalSc
 		
 		enter
 		raise e : 1
-		cycle
+		proceed 1 cycle
 		assert active(declarations.ConstOnlyInternalScope.main_region.B)
 		
 	}

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

@@ -19,7 +19,7 @@ testclass ConstOnlyNamedScope for statechart declarations.ConstOnlyNamedScope {
 		
 		enter
 		raise e : 1
-		cycle
+		proceed 1 cycle
 		assert active(declarations.ConstOnlyNamedScope.main_region.B)
 		
 	}

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

@@ -9,18 +9,18 @@ testclass ConstantsTests for statechart Constants {
 		assert Named.y == "Hello World"
 		//Caluclation with constants 
 		raise e
-		cycle
+		proceed 1 cycle
 		assert result == 20
 		
 		raise e
-		cycle
+		proceed 1 cycle
 		
 		
 		assert active(Constants.main_region.C)
 		assert result == 100
 		
 		raise e2 : x
-		cycle
+		proceed 1 cycle
 	
 		assert result == 1000
 		assert active(Constants.main_region.A)

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

@@ -2,26 +2,29 @@ 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
+		var vergleich : integer = 4
+		assert vergleich == 4
+		exit
+//		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

@@ -6,13 +6,13 @@ testclass DeepHistory for statechart DeepHistory {
 		enter
 		
 		raise event1
-		cycle
+		proceed 1 cycle
 		raise event3
-		cycle
+		proceed 1 cycle
 		raise event5
-		cycle
+		proceed 1 cycle
 		raise event7
-		cycle
+		proceed 1 cycle
 		//Not possible to assert event1 because it is an IN event.
 		//assert event1
 		
@@ -21,13 +21,13 @@ testclass DeepHistory for statechart DeepHistory {
 		
 		// Leave State2. State4 and State9 should be saved as history.
 		raise event2
-		cycle
+		proceed 1 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
+		proceed 1 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

@@ -3,7 +3,7 @@ testclass DynamicChoice for statechart DynamicChoice{
 	operation DynamicChoiceTest(){ 
 		enter		
 		assert active(DynamicChoice.main_region.Start)
-		cycle
+		proceed 1 cycle
 		assert active(DynamicChoice.main_region.A)	 
 	} 
 }

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

@@ -2,7 +2,7 @@ testclass EmptyTransition for statechart EmptyTransition{
 	@Test
 	operation EmptyTransitionTest(){ 
 		enter
-		cycle
+		proceed 1 cycle
 		assert !active (EmptyTransition.main_region.B)
 		assert active  (EmptyTransition.main_region.A) 
 		 

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

@@ -9,7 +9,7 @@ testclass EnterState for statechart EnterState {
 		assert active(EnterState.r.A)
 		
 		raise e
-		cycle
+		proceed 1 cycle
 		assert active(EnterState.r.B.r.E) 
 	} 
 
@@ -21,7 +21,7 @@ testclass EnterState for statechart EnterState {
 		assert active(EnterState.r.A)
 		
 		raise f
-		cycle
+		proceed 1 cycle
 		assert active(EnterState.r.B.r.F) 
 	} 
 
@@ -33,7 +33,7 @@ testclass EnterState for statechart EnterState {
 		assert active(EnterState.r.A)
 		
 		raise g
-		cycle
+		proceed 1 cycle
 		assert active(EnterState.r.B.r.E) 
 	} 
 	

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

@@ -2,8 +2,8 @@ testclass EntryChoice for statechart EntryChoice {
 	@Test
 	operation EntryChoiceTest(){
 		enter
-		cycle
-		cycle
+		proceed 1 cycle
+		proceed 1 cycle
 		assert active ( EntryChoice.main_region.A )
 	}
 }

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

@@ -3,31 +3,33 @@ testclass EntryExitSelfTransition for statechart EntryExitSelfTransition{
 	operation SelfTransitionToChildState(){ 
 		init()
 		raise e
-		cycle
+		proceed 1 cycle
 		assert entries == 1
 		assert exits == 1
 		assert active(EntryExitSelfTransition.main_region.A._region0.C)
+		exit
 	} 
 
 	@Test
 	operation SelfTransitionFromChildState(){ 
 		init()
 		raise e1
-		cycle
+		proceed 1 cycle
 		assert entries == 0
 		assert exits == 0
 		assert active(EntryExitSelfTransition.main_region.A._region0.C)
 	
 		raise e1
-		cycle
+		proceed 1 cycle
 		assert active(EntryExitSelfTransition.main_region.A._region0.B)
 		assert entries == 1
 		assert exits == 1 
+		exit
 	} 
 	
 	operation init(){
 		enter
-		cycle
+		proceed 1 cycle
 		
 		assert entries == 1 
 		assert active(EntryExitSelfTransition.main_region.A._region0.B)

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

@@ -21,7 +21,7 @@ testclass EntryReactionAction for statechart entries.EntryReactionAction {
 	operation entryOnRTS(){
 		init()
 		raise b
-		cycle
+		proceed 1 cycle
 		
 		assert ! enteredR1
 		assert ! enteredR2
@@ -39,7 +39,7 @@ testclass EntryReactionAction for statechart entries.EntryReactionAction {
 	operation noEntryTransitionActionOnHistory(){
 		init()
 		raise d
-		cycle
+		proceed 1 cycle
 		
 		assert ! enteredR1
 		assert ! enteredR2
@@ -51,9 +51,9 @@ testclass EntryReactionAction for statechart entries.EntryReactionAction {
 		enter
 		
 		raise b 
-		cycle 
+		proceed 1 cycle
 		raise d 
-		cycle
+		proceed 1 cycle
 		
 		enteredR1 = false
 		enteredR2 = false

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

@@ -9,12 +9,12 @@ testclass ExitOnSelfTransition for statechart ExitOnSelfTransition {
 		assert exitCount == 0
 		
 		raise e
-		cycle
+		proceed 1 cycle
 		assert entryCount == 2
 		assert exitCount == 1
 		
 		raise f
-		cycle
+		proceed 1 cycle
 		assert entryCount == 2
 		assert exitCount == 2 
 	} 

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

@@ -7,7 +7,7 @@ testclass ExitState for statechart ExitState {
 		assert active(ExitState.r.A)
 		
 		raise e
-		cycle
+		proceed 1 cycle
 		assert active(ExitState.r.E) 
 	} 
 
@@ -18,7 +18,7 @@ testclass ExitState for statechart ExitState {
 		assert active(ExitState.r.A)
 		
 		raise f
-		cycle
+		proceed 1 cycle
 		assert active(ExitState.r.F) 
 	} 
 
@@ -29,7 +29,7 @@ testclass ExitState for statechart ExitState {
 		assert active(ExitState.r.A)
 		
 		raise g
-		cycle
+		proceed 1 cycle
 		assert active(ExitState.r.E) 
 	} 
 
@@ -40,7 +40,7 @@ testclass ExitState for statechart ExitState {
 		enter
 		assert active(ExitState.r.A)
 		
-		cycle
+		proceed 1 cycle
 		assert active(ExitState.r.A) 
 	} 
 

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

@@ -5,7 +5,7 @@ testclass FeatureCalls for statechart FeatureCalls {
 		assert active ( FeatureCalls.main_region.A)
 		//assert MyInterface.myInt == 0
 		//raise MyInterface.Event1
-		cycle
+		proceed 1 cycle
 		//assert MyInterface.myInt == 42
 		assert active (FeatureCalls.main_region.A)
 	}

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

@@ -2,7 +2,7 @@ testclass FinalState for statechart FinalState{
 	@Test
 	operation StatechartNameTest(){ 
 		enter
-		cycle
+		proceed 1 cycle
 		assert is_final
 		 
 	} 

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

@@ -4,23 +4,23 @@ testclass Guard for statechart Guard {
 		enter
 		assert active (Guard.main_region.A)
 		raise Event1
-		cycle
+		proceed 1 cycle
 		
 		assert active (Guard.main_region.A)
 		raise Event2 
-		cycle
+		proceed 1 cycle
 		
 		assert active (Guard.main_region.B)
 		raise Return
-		cycle
+		proceed 1 cycle
 		
 		assert active (Guard.main_region.A)
 		raise Event1 
-		cycle
+		proceed 1 cycle
 		
 		assert active (Guard.main_region.B)
 		raise Return
-		cycle
+		proceed 1 cycle
 		 
 		assert active (Guard.main_region.A)  
 	}

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

@@ -38,13 +38,13 @@ testclass GuardedEntry for statechart GuardedEntry{
 
 		assert active(GuardedEntry.main_region.A)
 		raise e
-		cycle
+		proceed 1 cycle
 		assert active(GuardedEntry.main_region.B)
 		
 		guard = guardVar
 		done = doneVar
 		raise e
-		cycle
+		proceed 1 cycle
 		assert active(GuardedEntry.main_region.A)
 	}
 		

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

@@ -21,7 +21,7 @@ testclass GuardedExit for statechart GuardedExit {
 	operation checkDone(shouldBeDone : boolean){
 		raise e
 		
-		cycle
+		proceed 1 cycle
 
 		assert active(GuardedExit.main_region.B)
 		assert shouldBeDone ? done : !done

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

@@ -6,23 +6,23 @@ testclass HistoryWithExitPoint for statechart HistoryWithExitPoint {
 		assert active ( HistoryWithExitPoint.mr.A.r.X1 )
 		
 		raise push 
-		cycle
+		proceed 1 cycle
 		assert active ( HistoryWithExitPoint.mr.B )
 		
 		raise back
-		cycle
+		proceed 1 cycle
 		assert active ( HistoryWithExitPoint.mr.A.r.X1 )
 		
 		raise next
-		cycle
+		proceed 1 cycle
 		assert active ( HistoryWithExitPoint.mr.A.r.X2 )
 		
 		raise push 
-		cycle
+		proceed 1 cycle
 		assert active ( HistoryWithExitPoint.mr.B )
 		
 		raise back
-		cycle
+		proceed 1 cycle
 		assert active ( HistoryWithExitPoint.mr.A.r.X2 )
 		
 	}

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

@@ -6,7 +6,7 @@ testclass HistoryWithoutInitialStep for statechart HistoryWithoutInitialStep {
 		assert active(HistoryWithoutInitialStep.main_region.B.r1.C)
 		
 		raise next
-		cycle
+		proceed 1 cycle
 		assert active(HistoryWithoutInitialStep.main_region.B.r1.D)
 	}
 	
@@ -16,11 +16,11 @@ testclass HistoryWithoutInitialStep for statechart HistoryWithoutInitialStep {
 		assert active(HistoryWithoutInitialStep.main_region.B.r1.C)
 
 		raise toA
-		cycle
+		proceed 1 cycle
 		assert active(HistoryWithoutInitialStep.main_region.A)
 		
 		raise toHistory
-		cycle
+		proceed 1 cycle
 		assert active(HistoryWithoutInitialStep.main_region.B.r1.C)
 	}
 		 
@@ -28,15 +28,15 @@ testclass HistoryWithoutInitialStep for statechart HistoryWithoutInitialStep {
 	operation enterDThroughHistory(){
 		init()
 		raise next
-		cycle
+		proceed 1 cycle
 		assert active(HistoryWithoutInitialStep.main_region.B.r1.D)
 
 		raise toA
-		cycle
+		proceed 1 cycle
 		assert active(HistoryWithoutInitialStep.main_region.A)
 		
 		raise toHistory
-		cycle
+		proceed 1 cycle
 		assert active(HistoryWithoutInitialStep.main_region.B.r1.D)
 	}
 		
@@ -45,6 +45,6 @@ testclass HistoryWithoutInitialStep for statechart HistoryWithoutInitialStep {
 		assert active(HistoryWithoutInitialStep.main_region.A) 
 		
 		raise toB
-		cycle
+		proceed 1 cycle
 	}
 }

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

@@ -13,7 +13,7 @@ testclass InEventLifeCycle for statechart InEventLifeCycle {
 		
 		// assert e		// the in event must be set before the cycle  
 		assert i == 0	// e is not consumed yet
-		cycle
+		proceed 1 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

@@ -8,7 +8,7 @@ testclass IntegerExpressions for statechart IntegerExpressions {
 		assert myInt1 == 10
 		assert myInt2 == 5
 		raise e1 
-		cycle 
+		proceed 1 cycle
 		  
 		// comparison
 		assert less == false

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

@@ -13,7 +13,7 @@ testclass InternalEventLifeCycle for statechart InternalEventLifeCycle {
 		// the internal event i1 must be raised and consumed in the low priority 
 		// region within the same cycle
 		raise e
-		cycle		
+		proceed 1 cycle
 		assert active(InternalEventLifeCycle.r1.A)
 		assert active(InternalEventLifeCycle.r2.D)
 
@@ -22,19 +22,19 @@ testclass InternalEventLifeCycle for statechart InternalEventLifeCycle {
 		
 
 		// make sure nothing happens during an empty cycle		
-		cycle
+		proceed 1 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
+		proceed 1 cycle
 		assert active(InternalEventLifeCycle.r1.A)
 		assert active(InternalEventLifeCycle.r2.C) 
 		
 		// make sure nothing happens during an empty cycle
-		cycle
+		proceed 1 cycle
 		assert active(InternalEventLifeCycle.r1.A)
 		assert active(InternalEventLifeCycle.r2.C) 
 	} 

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

@@ -4,7 +4,7 @@ testclass LocalReactions for statechart LocalReactions{
 		
 		enter
 		assert active(LocalReactions.main_region.A) 
-		cycle
+		proceed 1 cycle
 		assert x == 1
 		 
 	} 

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

@@ -3,7 +3,7 @@ testclass LogicalAndTests for statechart LogicalAnd {
 	operation operandEvaluationOrder(){
 		
 		enter
-		cycle
+		proceed 1 cycle
 		
 		assert x == 4 && b message "logical and expression was executed in wrong order..."	
 	}

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

@@ -3,7 +3,7 @@ testclass LogicalOrTests for statechart LogicalOr {
 	operation operandEvaluationOrder(){
 		
 		enter
-		cycle
+		proceed 1 cycle
 		
 		assert x == 4 && b message "logical or expression was executed in wrong order..."	
 	}

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

@@ -3,13 +3,13 @@ testclass NamedInterfaceAccess for statechart NamedInterfaceAccess{
 	operation SafeOpenSuccess(){ 
 		enter
 		
-		cycle
+		proceed 1 cycle
 		raise User.numberPressed : 3
-		cycle
+		proceed 1 cycle
 		raise User.numberPressed : 7
-		cycle
+		proceed 1 cycle
 		raise User.numberPressed : 5
-		cycle
+		proceed 1 cycle
 		assert Safe.open
 	} 
 }  

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

@@ -4,7 +4,7 @@ testclass NullCheck for statechart NullCheck {
 		enter
 				
 		assert active(NullCheck.main_region.A)
-		cycle
+		proceed 1 cycle
 		assert active(NullCheck.main_region.B)			
 
 	} 

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

@@ -5,7 +5,7 @@ testclass OperationsTest for statechart Operations {
 		
 		enter
 		assert active ( Operations.main_region.A )
-		cycle
+		proceed 1 cycle
 
 		assert active ( Operations.main_region.B )
 		assert called internalOperation1 
@@ -19,7 +19,7 @@ testclass OperationsTest for statechart Operations {
 		
 		
 		raise ev
-		cycle
+		proceed 1 cycle
 
 		assert active(Operations.main_region.C)
 		assert called Interface1.interfaceOperation1  
@@ -32,7 +32,7 @@ testclass OperationsTest for statechart Operations {
 		assert called Interface1.interfaceOperation5a
 		
 		raise ev
-		cycle
+		proceed 1 cycle
 		
 		
 		assert active(Operations.main_region.D)

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

@@ -1,21 +1,16 @@
 testclass OperationsWithoutBraces for statechart OperationsWithoutBraces{
 	@Test
 	operation OperationsWithoutBracesTest(){ 
+		mock myBoolOp returns (false)
+		mock myIntOp returns (0)
+		mock myRealOp returns (0.0)
 		enter
-		assert active (OperationsWithoutBraces.main_region.A)
 		assert active (OperationsWithoutBraces.another_region.A)
-		
-		cycle
-		assert active (OperationsWithoutBraces.main_region.B)
-		assert active (OperationsWithoutBraces.another_region.B)
-		 
-		cycle
-		
+		assert active (OperationsWithoutBraces.main_region.A)
+		proceed 1 cycle
+		assert active (OperationsWithoutBraces.another_region.C)
 		assert active (OperationsWithoutBraces.main_region.C)
-		assert active (OperationsWithoutBraces.another_region.C) 
-		
-		cycle
-		
+		proceed 1 cycle	
 		assert active (OperationsWithoutBraces.main_region.D)
 		assert active (OperationsWithoutBraces.another_region.D)
 

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

@@ -10,7 +10,7 @@ testclass OutEventLifeCycle for statechart OutEventLifeCycle {
 		enter
 
 		raise e
-		cycle
+		proceed 1 cycle
 		
 		assert f
 		
@@ -44,9 +44,9 @@ testclass OutEventLifeCycle for statechart OutEventLifeCycle {
 		enter
 
 		raise e
-		cycle
+		proceed 1 cycle
 		if(sndCycle){
-			cycle
+			proceed 1 cycle
 		}	
 	}
 }

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

@@ -27,7 +27,7 @@ testclass PerformanceTests for statechart PerformanceTest {
 				}
 			}
 
-			cycle
+			proceed 1 cycle
 		}
 
 		assert a > 2

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

@@ -6,7 +6,7 @@ testclass PriorityValues for statechart PriorityValues {
 		
 		assert active (PriorityValues.main_region.A)
 		raise event1
-		cycle
+		proceed 1 cycle
 		assert active(PriorityValues.main_region.C)
 	}
 	@Test
@@ -16,7 +16,7 @@ testclass PriorityValues for statechart PriorityValues {
 		
 		assert active (PriorityValues.someRegion.A)
 		raise event2
-		cycle
+		proceed 1 cycle
 		assert active(PriorityValues.someRegion.B)
 		assert !active(PriorityValues.main_region.E)
 		

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

@@ -7,8 +7,8 @@ testclass RaiseEvent for statechart RaiseEvent {
 		assert active ( RaiseEvent.second_region.SateA)
 		assert active (RaiseEvent.main_region.StateA)
 		raise e2
-		cycle
-		cycle
+		proceed 1 cycle
+		proceed 1 cycle
 		assert active (RaiseEvent.second_region.StateB)
 		assert active (RaiseEvent.main_region.StateB)
 	}

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

@@ -14,7 +14,7 @@ testclass ReadOnlyVariable for statechart ReadOnlyVariable{
 		assert A.myBool == true
 		assert A.myReal == 1.1
 		
-		cycle
+		proceed 1 cycle
 		
 		assert active(ReadOnlyVariable.main_region.StateB)
 		assert myInt == 100

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

@@ -6,11 +6,11 @@ testclass SameNameDifferentRegion for statechart SameNameDifferentRegion {
 		
 		assert active ( SameNameDifferentRegion.main_region.StateA)
 		raise e1
-		cycle
+		proceed 1 cycle
 		assert active (SameNameDifferentRegion.main_region.StateB)
 		assert active (SameNameDifferentRegion.main_region.StateB.r1.StateA)
 		raise e1
-		cycle
+		proceed 1 cycle
 		assert active (SameNameDifferentRegion.main_region.StateB) 
 		assert active (SameNameDifferentRegion.main_region.StateB.r1.StateB) 
 	}

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

@@ -6,43 +6,43 @@ testclass ShallowHistory for statechart ShallowHistory {
 		
 		// Change active states to State9;
 		raise event1
-		cycle
+		proceed 1 cycle
 		raise event3
-		cycle
+		proceed 1 cycle
 		raise event5
-		cycle 
+		proceed 1 cycle
 		raise event7
-		cycle
+		proceed 1 cycle
 		assert !active ( ShallowHistory.mainRegion.State1)
 		assert active  (ShallowHistory.mainRegion.State2._region0.State4._region0.State7._region0.State9)
 		
 		// Leave State7. State9 should be saved as history.
 		raise event6
-		cycle
+		proceed 1 cycle
 		assert !active (ShallowHistory.mainRegion.State2._region0.State4._region0.State7._region0.State9)
 		assert active ( ShallowHistory.mainRegion.State2._region0.State4._region0.State6)
 		
 		// Reenter State7. State9 should be activated because of saved history.
 		raise event5						
-		cycle
+		proceed 1 cycle
 		assert !active ( ShallowHistory.mainRegion.State2._region0.State4._region0.State7._region0.State8)
 		assert active (ShallowHistory.mainRegion.State2._region0.State4._region0.State7._region0.State9)  
 		
 		// Leave State2. State4 and State9 should be saved as history.
 		raise event2
-		cycle
+		proceed 1 cycle
 		assert !active (ShallowHistory.mainRegion.State2._region0.State4._region0.State7._region0.State9)
 		assert active (ShallowHistory.mainRegion.State1)
 		
 		// Reenter State2. State6 should be activated (History of State2).
 		raise event1
-		cycle
+		proceed 1 cycle
 		assert active (ShallowHistory.mainRegion.State2._region0.State4._region0.State6)
 		assert!active (ShallowHistory.mainRegion.State1)
 	
 		// Reenter State7. State9 should be activated (History of State7).
 		raise event5
-		cycle
+		proceed 1 cycle
 		assert !active(ShallowHistory.mainRegion.State2._region0.State4._region0.State6)
 		assert active (ShallowHistory.mainRegion.State2._region0.State4._region0.State7._region0.State9)
 	}

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

@@ -8,15 +8,15 @@ testclass ShallowHistoryWithDeepEntry for statechart ShallowHistoryWithDeepEntry
 		assert active(ShallowHistoryWithDeepEntry.main_region.Y) 
 		
 		raise toZ
-		cycle
+		proceed 1 cycle
 		assert active(ShallowHistoryWithDeepEntry.main_region.Z._region0.A)
 		
 		raise toY
-		cycle
+		proceed 1 cycle
 		assert active(ShallowHistoryWithDeepEntry.main_region.Y)
 		
 		raise toZ
-		cycle
+		proceed 1 cycle
 		assert active(ShallowHistoryWithDeepEntry.main_region.Z._region0.A)		
 		 
 	} 
@@ -27,20 +27,20 @@ testclass ShallowHistoryWithDeepEntry for statechart ShallowHistoryWithDeepEntry
 		assert active(ShallowHistoryWithDeepEntry.main_region.Y) 
 		
 		raise toZ
-		cycle
+		proceed 1 cycle
 		assert active(ShallowHistoryWithDeepEntry.main_region.Z._region0.A)
 		
 		raise toC
-		cycle
+		proceed 1 cycle
 		assert active(ShallowHistoryWithDeepEntry.main_region.Z._region0.B._region0.C)
 		assert active(ShallowHistoryWithDeepEntry.main_region.Z._region0.B)
 		
 		raise toY
-		cycle
+		proceed 1 cycle
 		assert active(ShallowHistoryWithDeepEntry.main_region.Y)
 		
 		raise toZ
-		cycle
+		proceed 1 cycle
 		assert active(ShallowHistoryWithDeepEntry.main_region.Z._region0.B._region0.C)
 		assert active(ShallowHistoryWithDeepEntry.main_region.Z._region0.B)
 		
@@ -51,16 +51,16 @@ testclass ShallowHistoryWithDeepEntry for statechart ShallowHistoryWithDeepEntry
 		assert active(ShallowHistoryWithDeepEntry.main_region.Y) 
 		
 		raise toC
-		cycle
+		proceed 1 cycle
 		assert active(ShallowHistoryWithDeepEntry.main_region.Z._region0.B._region0.C)
 		assert active(ShallowHistoryWithDeepEntry.main_region.Z._region0.B)
 		
 		raise toY
-		cycle
+		proceed 1 cycle
 		assert active(ShallowHistoryWithDeepEntry.main_region.Y)
 		
 		raise toZ
-		cycle
+		proceed 1 cycle
 		assert active(ShallowHistoryWithDeepEntry.main_region.Z._region0.B._region0.C)
 		assert active(ShallowHistoryWithDeepEntry.main_region.Z._region0.B)
 		

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

@@ -7,10 +7,10 @@ testclass SimpleEvent for statechart SimpleEvent {
 		assert active (SimpleEvent.main_region.A) message "Expected A to be active"
 		assert 5 == 5
 		raise Event1
-		cycle
+		proceed 1 cycle
 		assert active (SimpleEvent.main_region.B) message "Expected B to be active"
 		
-		cycle
+		proceed 1 cycle
 		assert !active (SimpleEvent.main_region.B)	
 		      
 	}        

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

@@ -8,7 +8,7 @@ testclass SimpleHierachy for statechart SimpleHierachy {
 		raise Event1
 		raise Event1
 		raise Event1
-		cycle
+		proceed 1 cycle
 		assert active (SimpleHierachy.main_region.B)
 		assert active (SimpleHierachy.main_region.B.subregion1.B1)
 	}

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

@@ -7,8 +7,8 @@ testclass StateIsActive for statechart StateIsActive {
 		assert active (StateIsActive.R1.R1A )
 		assert active (StateIsActive.R2.R2A)
 		raise Event1
-		cycle
-		cycle //Todo warum 2 cycle?
+		proceed 1 cycle
+		proceed 1 cycle //Todo warum 2 cycle?
 		assert active(StateIsActive.R1.R1B)
 		assert active (StateIsActive.R2.R2B)
 	} 

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

@@ -13,7 +13,7 @@ testclass StatechartLocalReactions for statechart StatechartLocalReactions {
 			}else {
 				assert active (StatechartLocalReactions.main_region.S2)
 			}
-			cycle 
+			proceed 1 cycle 
 		} 
 	}
 }

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

@@ -3,7 +3,7 @@ testclass StaticChoice for statechart StaticChoice{
 	operation StaticChoiceTest(){ 
 		enter
 		assert active(StaticChoice.main_region.Start)
-		cycle
+		proceed 1 cycle
 		//assert active(StaticChoice.main_region.B) // doesn't work atm		 
 	} 
 }

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

@@ -25,7 +25,7 @@ testclass STextKeywordsInStatesAndRegions for statechart STextKeywordsInStatesAn
 		assert active(STextKeywordsInStatesAndRegions.active.raise)
 				
 		raise e1
-		cycle
+		proceed 1 cycle
 		assert active(STextKeywordsInStatesAndRegions.default.namespace)
 		assert active(STextKeywordsInStatesAndRegions.operation.internal) //x
 		assert active(STextKeywordsInStatesAndRegions.namespace.event)
@@ -48,7 +48,7 @@ testclass STextKeywordsInStatesAndRegions for statechart STextKeywordsInStatesAn
 		assert active(STextKeywordsInStatesAndRegions.active.raise)
 		
 		raise e2
-		cycle
+		proceed 1 cycle
 		assert active(STextKeywordsInStatesAndRegions.default.namespace)
 		assert active(STextKeywordsInStatesAndRegions.operation.internal) 
 		assert active(STextKeywordsInStatesAndRegions.namespace.local) //x
@@ -71,7 +71,7 @@ testclass STextKeywordsInStatesAndRegions for statechart STextKeywordsInStatesAn
 		assert active(STextKeywordsInStatesAndRegions.active.raise)
 		
 		raise e1
-		cycle
+		proceed 1 cycle
 		assert active(STextKeywordsInStatesAndRegions.default.namespace)
 		assert active(STextKeywordsInStatesAndRegions.operation.internal) 
 		assert active(STextKeywordsInStatesAndRegions.namespace.local)
@@ -94,7 +94,7 @@ testclass STextKeywordsInStatesAndRegions for statechart STextKeywordsInStatesAn
 		assert active(STextKeywordsInStatesAndRegions.active.raise)
 		
 		raise e2
-		cycle
+		proceed 1 cycle
 		assert active(STextKeywordsInStatesAndRegions.default.namespace)
 		assert active(STextKeywordsInStatesAndRegions.operation.internal) 
 		assert active(STextKeywordsInStatesAndRegions.namespace.local)
@@ -117,7 +117,7 @@ testclass STextKeywordsInStatesAndRegions for statechart STextKeywordsInStatesAn
 		assert active(STextKeywordsInStatesAndRegions.active.raise)		
 		
 		raise e1	
-		cycle
+		proceed 1 cycle
 		assert active(STextKeywordsInStatesAndRegions.default.namespace)
 		assert active(STextKeywordsInStatesAndRegions.operation.internal) 
 		assert active(STextKeywordsInStatesAndRegions.namespace.local)
@@ -140,7 +140,7 @@ testclass STextKeywordsInStatesAndRegions for statechart STextKeywordsInStatesAn
 		assert active(STextKeywordsInStatesAndRegions.active.raise)			
 		
 		raise e2
-		cycle
+		proceed 1 cycle
 		assert active(STextKeywordsInStatesAndRegions.default.namespace)
 		assert active(STextKeywordsInStatesAndRegions.operation.internal) 
 		assert active(STextKeywordsInStatesAndRegions.namespace.local)
@@ -163,7 +163,7 @@ testclass STextKeywordsInStatesAndRegions for statechart STextKeywordsInStatesAn
 		assert active(STextKeywordsInStatesAndRegions.active.raise)	
 		 
 		raise e1
-		cycle
+		proceed 1 cycle
 		assert active(STextKeywordsInStatesAndRegions.default.namespace)
 		assert active(STextKeywordsInStatesAndRegions.operation.internal) 
 		assert active(STextKeywordsInStatesAndRegions.namespace.local)
@@ -186,7 +186,7 @@ testclass STextKeywordsInStatesAndRegions for statechart STextKeywordsInStatesAn
 		assert active(STextKeywordsInStatesAndRegions.active.raise)			 
 		 
 		raise e2
-		cycle
+		proceed 1 cycle
 		assert active(STextKeywordsInStatesAndRegions.default.namespace)
 		assert active(STextKeywordsInStatesAndRegions.operation.internal) 
 		assert active(STextKeywordsInStatesAndRegions.namespace.local)
@@ -209,7 +209,7 @@ testclass STextKeywordsInStatesAndRegions for statechart STextKeywordsInStatesAn
 		assert active(STextKeywordsInStatesAndRegions.active.raise)				 
 		 
 		raise e1
-		cycle
+		proceed 1 cycle
 		assert active(STextKeywordsInStatesAndRegions.default.namespace)
 		assert active(STextKeywordsInStatesAndRegions.operation.internal) 
 		assert active(STextKeywordsInStatesAndRegions.namespace.local)
@@ -232,7 +232,7 @@ testclass STextKeywordsInStatesAndRegions for statechart STextKeywordsInStatesAn
 		assert active(STextKeywordsInStatesAndRegions.active.raise)	
 		
 		raise e2
-		cycle
+		proceed 1 cycle
 		assert active(STextKeywordsInStatesAndRegions.default.namespace)
 		assert active(STextKeywordsInStatesAndRegions.operation.internal) 
 		assert active(STextKeywordsInStatesAndRegions.namespace.local)
@@ -255,7 +255,7 @@ testclass STextKeywordsInStatesAndRegions for statechart STextKeywordsInStatesAn
 		assert active(STextKeywordsInStatesAndRegions.active.raise)	
 		
 		raise e1
-		cycle
+		proceed 1 cycle
 		assert active(STextKeywordsInStatesAndRegions.default.namespace)
 		assert active(STextKeywordsInStatesAndRegions.operation.internal) 
 		assert active(STextKeywordsInStatesAndRegions.namespace.local)
@@ -278,7 +278,7 @@ testclass STextKeywordsInStatesAndRegions for statechart STextKeywordsInStatesAn
 		assert active(STextKeywordsInStatesAndRegions.active.raise)	
 		
 		raise e2
-		cycle
+		proceed 1 cycle
 		assert active(STextKeywordsInStatesAndRegions.default.namespace)
 		assert active(STextKeywordsInStatesAndRegions.operation.internal) 
 		assert active(STextKeywordsInStatesAndRegions.namespace.local)
@@ -301,7 +301,7 @@ testclass STextKeywordsInStatesAndRegions for statechart STextKeywordsInStatesAn
 		assert active(STextKeywordsInStatesAndRegions.active.raise)	
 		
 		raise e1
-		cycle
+		proceed 1 cycle
 		assert active(STextKeywordsInStatesAndRegions.default.namespace)
 		assert active(STextKeywordsInStatesAndRegions.operation.internal) 
 		assert active(STextKeywordsInStatesAndRegions.namespace.local)
@@ -324,7 +324,7 @@ testclass STextKeywordsInStatesAndRegions for statechart STextKeywordsInStatesAn
 		assert active(STextKeywordsInStatesAndRegions.active.raise)
 			
 		raise e2	
-		cycle
+		proceed 1 cycle
 		assert active(STextKeywordsInStatesAndRegions.default.namespace)
 		assert active(STextKeywordsInStatesAndRegions.operation.internal) 
 		assert active(STextKeywordsInStatesAndRegions.namespace.local)
@@ -347,7 +347,7 @@ testclass STextKeywordsInStatesAndRegions for statechart STextKeywordsInStatesAn
 		assert active(STextKeywordsInStatesAndRegions.active.raise)		
 				 
 		raise e1		 
-		cycle
+		proceed 1 cycle
 		assert active(STextKeywordsInStatesAndRegions.default.namespace)
 		assert active(STextKeywordsInStatesAndRegions.operation.internal) 
 		assert active(STextKeywordsInStatesAndRegions.namespace.local)
@@ -370,7 +370,7 @@ testclass STextKeywordsInStatesAndRegions for statechart STextKeywordsInStatesAn
 		assert active(STextKeywordsInStatesAndRegions.active.raise)					 
 		
 		raise e2 
-		cycle
+		proceed 1 cycle
 		assert active(STextKeywordsInStatesAndRegions.default.namespace)
 		assert active(STextKeywordsInStatesAndRegions.operation.internal) 
 		assert active(STextKeywordsInStatesAndRegions.namespace.local)
@@ -393,7 +393,7 @@ testclass STextKeywordsInStatesAndRegions for statechart STextKeywordsInStatesAn
 		assert active(STextKeywordsInStatesAndRegions.active.raise)	
 		 
 		raise e1 
-		cycle
+		proceed 1 cycle
 		assert active(STextKeywordsInStatesAndRegions.default.namespace)
 		assert active(STextKeywordsInStatesAndRegions.operation.internal) 
 		assert active(STextKeywordsInStatesAndRegions.namespace.local)
@@ -416,7 +416,7 @@ testclass STextKeywordsInStatesAndRegions for statechart STextKeywordsInStatesAn
 		assert active(STextKeywordsInStatesAndRegions.active.raise)			 
 		
 		raise e2 
-		cycle
+		proceed 1 cycle
 		assert active(STextKeywordsInStatesAndRegions.default.namespace)
 		assert active(STextKeywordsInStatesAndRegions.operation.internal) 
 		assert active(STextKeywordsInStatesAndRegions.namespace.local)
@@ -439,7 +439,7 @@ testclass STextKeywordsInStatesAndRegions for statechart STextKeywordsInStatesAn
 		assert active(STextKeywordsInStatesAndRegions.active.raise)			 
 		
 		raise e1 
-		cycle
+		proceed 1 cycle
 		assert active(STextKeywordsInStatesAndRegions.default.namespace)
 		assert active(STextKeywordsInStatesAndRegions.operation.internal) 
 		assert active(STextKeywordsInStatesAndRegions.namespace.local)
@@ -462,7 +462,7 @@ testclass STextKeywordsInStatesAndRegions for statechart STextKeywordsInStatesAn
 		assert active(STextKeywordsInStatesAndRegions.active.valueof)	//x	 	 
 		
 		raise e2 
-		cycle
+		proceed 1 cycle
 		assert active(STextKeywordsInStatesAndRegions.default.namespace)
 		assert active(STextKeywordsInStatesAndRegions.operation.internal) 
 		assert active(STextKeywordsInStatesAndRegions.namespace.local)

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

@@ -9,7 +9,7 @@ testclass StringExpressions for statechart StringExpressions	{
 		
 		
 		raise e
-		cycle
+		proceed 1 cycle
 		assert active(StringExpressions.main_region.VarToVarCompareSucceeded)
 		assert guardStringEqual
 		assert guardStringNotEqual
@@ -17,7 +17,7 @@ testclass StringExpressions for statechart StringExpressions	{
 		assert stringVarNotEqual
 		
 		raise e
-		cycle
+		proceed 1 cycle
 		assert active(StringExpressions.main_region.VarToConstCompareSucceeded)	
 		assert guardStringEqual
 		assert guardStringNotEqual
@@ -25,7 +25,7 @@ testclass StringExpressions for statechart StringExpressions	{
 		assert stringVarNotEqual
 		
 		raise e
-		cycle
+		proceed 1 cycle
 		assert active(StringExpressions.main_region.ConstToVarCompareSucceeded)		
 		assert guardStringEqual
 		assert guardStringNotEqual
@@ -33,7 +33,7 @@ testclass StringExpressions for statechart StringExpressions	{
 		assert stringVarNotEqual
 		
 		raise e		
-		cycle
+		proceed 1 cycle
 		assert active(StringExpressions.main_region.ConstToConstCompareSucceeded)
 		assert guardStringEqual
 		assert guardStringNotEqual

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

@@ -6,24 +6,24 @@ testclass SyncFork for statechart SyncFork {
 		
 		assert active (SyncFork.main_region.A)
 		raise f
-		cycle
+		proceed 1 cycle
 		
 		assert active (SyncFork.main_region.B)
 		assert active (SyncFork.main_region.B.r1.C1)
 		assert active (SyncFork.main_region.B.r2.D1)
 		
 		raise f 
-		cycle
+		proceed 1 cycle
 		assert active (SyncFork.main_region.B)
 		assert active (SyncFork.main_region.B.r1.C2	)	
 		assert active (SyncFork.main_region.B.r2.D2)
 		
 		raise e
-		cycle
+		proceed 1 cycle
 		assert active (SyncFork.main_region.A)
 		
 		raise f
-		cycle
+		proceed 1 cycle
 		assert active (SyncFork.main_region.B)
 		assert active (SyncFork.main_region.B.r1.C1)
 		assert active (SyncFork.main_region.B.r2.D1)

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

@@ -12,47 +12,47 @@ testclass SyncJoin for statechart SyncJoin {
 		   		
 		   		
 		raise e
-		cycle 
+		proceed 1 cycle
 		assert active (SyncJoin.main_region.B.r1.C2)
 		assert active (SyncJoin.main_region.B.r2.D1)
 		 
 		// require configuration C2Waits 
 		raise jc
-		cycle 
+		proceed 1 cycle
 		assert active (SyncJoin.main_region.B.r1.C2)
 		assert active (SyncJoin.main_region.B.r2.D1)
 		
 		raise jd
-		cycle
+		proceed 1 cycle
 		assert active (SyncJoin.main_region.B.r1.C2)
 		assert active (SyncJoin.main_region.B.r2.D1)
 		
 		// 'If all required triggers exist' 'but the lower priority state is not active no join transition must be taken.' 
 		raise jc
 		raise jd
-		cycle
+		proceed 1 cycle
 		assert active (SyncJoin.main_region.B.r1.C2)
 		assert active (SyncJoin.main_region.B.r2.D1)
 		
 		raise f
-		cycle
+		proceed 1 cycle
 		assert active (SyncJoin.main_region.B.r1.C2)
 		assert active (SyncJoin.main_region.B.r2.D2)
 		
 		raise jc
-		cycle 
+		proceed 1 cycle
 		assert active (SyncJoin.main_region.B.r1.C2)
 		assert active (SyncJoin.main_region.B.r2.D2)
 		
 		raise jd
-		cycle
+		proceed 1 cycle
 		assert active (SyncJoin.main_region.B.r1.C2)
 		assert active (SyncJoin.main_region.B.r2.D2)
 		
 
 		raise jc
 		raise jd
-		cycle
+		proceed 1 cycle
 		assert active (SyncJoin.main_region.A)
 	}
 	@Test
@@ -65,29 +65,29 @@ testclass SyncJoin for statechart SyncJoin {
 		assert active (SyncJoin.main_region.B.r2.D1)
 		   		
 		raise f
-		cycle 
+		proceed 1 cycle
 		assert active (SyncJoin.main_region.B.r1.C1)
 		assert active (SyncJoin.main_region.B.r2.D2)
 		 
 		raise jc
-		cycle 
+		proceed 1 cycle
 		assert active (SyncJoin.main_region.B.r1.C1)
 		assert active (SyncJoin.main_region.B.r2.D2)
 		
 		raise jd
-		cycle
+		proceed 1 cycle
 		assert active (SyncJoin.main_region.B.r1.C1)
 		assert active (SyncJoin.main_region.B.r2.D2)
 		
 		// 'If all required triggers exist' 'but the lower priority state is not active no join transition must be taken.' 
 		raise jc
 		raise jd
-		cycle
+		proceed 1 cycle
 		assert active (SyncJoin.main_region.B.r1.C1)
 		assert active (SyncJoin.main_region.B.r2.D2)
 		
 		raise e
-		cycle
+		proceed 1 cycle
 		assert active (SyncJoin.main_region.B.r1.C2)
 		assert active (SyncJoin.main_region.B.r2.D2)
 				
@@ -103,11 +103,11 @@ testclass SyncJoin for statechart SyncJoin {
 		
 		raise e
 		raise f
-		cycle
+		proceed 1 cycle
 		
 		raise jc
 		raise jd
-		cycle
+		proceed 1 cycle
 		
 		assert active (SyncJoin.main_region.A)
 		assert x == 1

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

@@ -4,8 +4,8 @@ testclass TimedTransitions for statechart TimedTransitions{
 		enter 
 		assert active (TimedTransitions.main_region.Start)
 		
-		wait 2030ms
-		cycle
+		proceed 2030ms
+		proceed 1 cycle
 		
 		assert active (TimedTransitions.main_region.End)				
 	}		

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

@@ -5,7 +5,7 @@ testclass TransitionWithoutCondition for statechart TransitionWithoutCondition{
 		
 		assert active(TransitionWithoutCondition.main_region.A)
 	
-		cycle
+		proceed 1 cycle
 			
 		assert active(TransitionWithoutCondition.main_region.B)
 	

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

@@ -15,7 +15,7 @@ testclass TriggerExpressionPrecedence for statechart expressions.TriggerExpressi
 		c1 = false
 		c2 = false
 		
-		cycle
+		proceed 1 cycle
 		
 		assert ! e1_transition
 	}
@@ -30,7 +30,7 @@ testclass TriggerExpressionPrecedence for statechart expressions.TriggerExpressi
 		c1 = true
 		c2 = false
 		
-		cycle
+		proceed 1 cycle
 		
 		assert ! e1_transition
 	}
@@ -45,7 +45,7 @@ testclass TriggerExpressionPrecedence for statechart expressions.TriggerExpressi
 		c1 = false
 		c2 = true
 		
-		cycle
+		proceed 1 cycle
 		
 		assert ! e1_transition
 	}
@@ -60,7 +60,7 @@ testclass TriggerExpressionPrecedence for statechart expressions.TriggerExpressi
 		c1 = true
 		c2 = true
 		
-		cycle
+		proceed 1 cycle
 		
 		assert ! e1_transition
 	}

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

@@ -9,20 +9,20 @@ testclass TriggerGuardExpressions for statechart TriggerGuardExpressions {
 		
 		raise e1
 		b = true
-		cycle
+		proceed 1 cycle
 		assert active (TriggerGuardExpressions.main_region.B)
 		
-		cycle
+		proceed 1 cycle
 		assert active (TriggerGuardExpressions.main_region.A)
 		raise e2
-		cycle
+		proceed 1 cycle
 		assert active (TriggerGuardExpressions.main_region.B)
 		
-		cycle
+		proceed 1 cycle
 		assert active (TriggerGuardExpressions.main_region.A)
 		raise e1
 		raise e2
-		cycle
+		proceed 1 cycle
 		assert active (TriggerGuardExpressions.main_region.B)
 	}
 	
@@ -35,16 +35,16 @@ testclass TriggerGuardExpressions for statechart TriggerGuardExpressions {
 		b = false
 		
 		raise e1
-		cycle
+		proceed 1 cycle
 		assert active (TriggerGuardExpressions.main_region.A)
 		
 		raise e2
-		cycle
+		proceed 1 cycle
 		assert active (TriggerGuardExpressions.main_region.A)
 		
 		raise e1
 		raise e2
-		cycle
+		proceed 1 cycle
 		assert active (TriggerGuardExpressions.main_region.A)
 	}
 	

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

@@ -5,17 +5,17 @@ testclass TypeAlias for statechart TypeAlias{
 		assert active(TypeAlias.main_region.Start)
 		assert myVar == 1
 		
-		cycle
+		proceed 1 cycle
 		
 		assert active(TypeAlias.main_region.Mid)
 		assert myString == "TypeSystem"
 		
-		cycle
+		proceed 1 cycle
 		
 		assert active(TypeAlias.main_region.Mid2)
 		
 		raise myEvent 
-		cycle
+		proceed 1 cycle
 		
 		assert active(TypeAlias.main_region.End)		 
 	} 

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

@@ -3,7 +3,7 @@ testclass ValuedEvents for statechart ValuedEvents {
 	operation valuedEventsTest(){
 		
 		enter
-		cycle
+		proceed 1 cycle
 //		assert active(ValuedEvents.main_region1.A)
 //		assert active (ValuedEvents.integer_region.C)
 //		assert active (ValuedEvents.string_region.C)
@@ -19,7 +19,7 @@ testclass ValuedEvents for statechart ValuedEvents {
 		raise realEvent : 20
 		raise stringEvent : "tool"
 		
-		cycle
+		proceed 1 cycle
 		assert active (ValuedEvents.integer_region.D)
 		assert active (ValuedEvents.string_region.D)
 		assert active (ValuedEvents.boolean_region.D)