浏览代码

Reordered statechart initialization in operations tests

Robert Rudi 7 年之前
父节点
当前提交
d3821e9d9e

+ 1 - 1
test-plugins/org.yakindu.sct.generator.java.test/src/org/yakindu/sct/generator/java/test/OperationsTestCustom.java

@@ -48,10 +48,10 @@ public class OperationsTestCustom{
 		interface2Mock = mock(SCIInterface1OperationCallback.class);
 		when(interfaceMock.alwaysTrue()).thenReturn(true);
 		statemachine = new OperationsStatemachine();
-		statemachine.init();
 		statemachine.setInternalOperationCallback(internalMock);
 		statemachine.getSCInterface().setSCInterfaceOperationCallback(interfaceMock);
 		statemachine.getSCIInterface1().setSCIInterface1OperationCallback(interface2Mock);
+		statemachine.init();
 	}
 
 	@After

+ 1 - 1
test-plugins/org.yakindu.sct.generator.java.test/src/org/yakindu/sct/generator/java/test/OperationsWithoutBracesCustom.java

@@ -31,8 +31,8 @@ public class OperationsWithoutBracesCustom implements SCInterfaceOperationCallba
 	@Before
 	public void setUp() {
 		statemachine = new OperationsWithoutBracesStatemachine();
-		statemachine.init();
 		statemachine.getSCInterface().setSCInterfaceOperationCallback(this);
+		statemachine.init();
 	}
 
 	@After

+ 1 - 1
test-plugins/org.yakindu.sct.generator.java.test/src/org/yakindu/sct/generator/java/test/VariadicOperationsTestCustom.java

@@ -38,7 +38,6 @@ public class VariadicOperationsTestCustom {
 	@Before
 	public void setUp() {
 		statemachine = new VariadicFunctionsStatemachine();
-		statemachine.init();
 	}
 
 	@After
@@ -58,6 +57,7 @@ public class VariadicOperationsTestCustom {
 		statemachine.setInternalOperationCallback(internalMock);
 		statemachine.getSCInterface().setSCInterfaceOperationCallback(interfaceMock);
 		statemachine.getSCIIF2().setSCIIF2OperationCallback(interface2Mock);
+		statemachine.init();
 		statemachine.enter();
 
 		verify(interfaceMock, times(3)).myVarOperation(interfaceCapture.capture());