Merge pull request #12258 from anuragkumawat/JAVA-9808

kwoyke · web-flow · commit c98f02aa9468 · 2022-05-26T10:45:39.000+02:00
JAVA-9808 Fix integration test in spring-state-machine
diff --git a/spring-state-machine/pom.xml b/spring-state-machine/pom.xml
@@ -39,7 +39,7 @@
     <properties>
         <spring-statemachine-core.version>3.2.0</spring-statemachine-core.version>
         <spring-context.version>5.3.19</spring-context.version>
-        <spring-test.version>4.3.7.RELEASE</spring-test.version>
+        <spring-test.version>5.3.19</spring-test.version>
         <jayway.awaitility.version>1.7.0</jayway.awaitility.version>
     </properties>
 
diff --git a/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/config/SimpleStateMachineConfiguration.java b/spring-state-machine/src/main/java/com/baeldung/spring/statemachine/config/SimpleStateMachineConfiguration.java
@@ -38,7 +38,7 @@ public void configure(StateMachineStateConfigurer<String, String> states) throws
           .stateEntry("S3", entryAction())
           .stateExit("S3", exitAction())
           .state("S4", executeAction(), errorAction())
-          .stateDo("S5", executeAction());
+          .state("S5", executeAction(), errorAction());
 
     }
 
diff --git a/spring-state-machine/src/test/java/com/baeldung/spring/statemachine/StateMachineIntegrationTest.java b/spring-state-machine/src/test/java/com/baeldung/spring/statemachine/StateMachineIntegrationTest.java
@@ -1,32 +1,37 @@
 package com.baeldung.spring.statemachine;
 
-import com.baeldung.spring.statemachine.config.SimpleStateMachineConfiguration;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.statemachine.StateMachine;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+import com.baeldung.spring.statemachine.config.SimpleStateMachineConfiguration;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = SimpleStateMachineConfiguration.class)
+@TestMethodOrder(OrderAnnotation.class) 
 public class StateMachineIntegrationTest {
 
     @Autowired
     private StateMachine<String, String> stateMachine;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         stateMachine.start();
     }
 
     @Test
+    @Order(1)  
     public void whenSimpleStringStateMachineEvents_thenEndState() {
         assertEquals("SI", stateMachine.getState().getId());
 
@@ -37,8 +42,8 @@ public void whenSimpleStringStateMachineEvents_thenEndState() {
         assertEquals("S2", stateMachine.getState().getId());
     }
 
-    @Ignore("Fixing in JAVA-9808")
     @Test
+    @Order(2) 
     public void whenSimpleStringMachineActionState_thenActionExecuted() {
 
         stateMachine.sendEvent("E3");
@@ -58,7 +63,7 @@ public void whenSimpleStringMachineActionState_thenActionExecuted() {
         assertEquals(2, stateMachine.getExtendedState().getVariables().get("approvalCount"));
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         stateMachine.stop();
     }

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public void configure(StateMachineStateConfigurer<String, String> states) throws`
`38`	`38`	`.stateEntry("S3", entryAction())`
`39`	`39`	`.stateExit("S3", exitAction())`
`40`	`40`	`.state("S4", executeAction(), errorAction())`
`41`		`- .stateDo("S5", executeAction());`
	`41`	`+ .state("S5", executeAction(), errorAction());`
`42`	`42`
`43`	`43`	`}`
`44`	`44`