junit5: fix tests in nflow-tests

NitorCreations · Mar 7, 2019 · d7769ee · d7769ee
1 parent b85f4f3
commit d7769ee
Show file tree

Hide file tree

Showing 16 changed files with 49 additions and 4 deletions.
diff --git a/nflow-tests/src/test/java/io/nflow/tests/AbstractNflowTest.java b/nflow-tests/src/test/java/io/nflow/tests/AbstractNflowTest.java
@@ -13,6 +13,7 @@
 import javax.ws.rs.core.UriBuilder;
 
 import io.nflow.tests.extension.NflowServerConfig;
+import io.nflow.tests.extension.SkipTestMethodsAfterFirstFailureExtension;
 import org.apache.cxf.jaxrs.client.WebClient;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.test.context.ContextConfiguration;
@@ -33,7 +34,7 @@
 import io.nflow.tests.config.RestClientConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@ExtendWith({SpringExtension.class})
+@ExtendWith({SpringExtension.class, SkipTestMethodsAfterFirstFailureExtension.class})
 @ContextConfiguration(classes = { RestClientConfiguration.class, PropertiesConfiguration.class })
 public abstract class AbstractNflowTest {
   protected WebClient workflowInstanceResource;

diff --git a/nflow-tests/src/test/java/io/nflow/tests/ArchiveTest.java b/nflow-tests/src/test/java/io/nflow/tests/ArchiveTest.java
@@ -15,11 +15,13 @@
 import javax.inject.Inject;
 
 import io.nflow.tests.extension.NflowServerConfig;
+import io.nflow.tests.extension.NflowServerExtension;
 import org.joda.time.DateTime;
 import org.junit.jupiter.api.MethodOrderer;
 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.context.annotation.ComponentScan;
 
 import io.nflow.engine.service.ArchiveService;
@@ -28,6 +30,7 @@
 import io.nflow.tests.demo.workflow.DemoWorkflow;
 import io.nflow.tests.demo.workflow.FibonacciWorkflow;
 
+@ExtendWith(NflowServerExtension.class)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class ArchiveTest extends AbstractNflowTest {
   private static final int STEP_1_WORKFLOWS = 4;

diff --git a/nflow-tests/src/test/java/io/nflow/tests/ChildWorkflowTest.java b/nflow-tests/src/test/java/io/nflow/tests/ChildWorkflowTest.java
@@ -12,11 +12,14 @@
 import io.nflow.rest.v1.msg.CreateWorkflowInstanceResponse;
 import io.nflow.rest.v1.msg.ListWorkflowInstanceResponse;
 import io.nflow.tests.demo.workflow.FibonacciWorkflow;
+import io.nflow.tests.extension.NflowServerExtension;
 import org.junit.jupiter.api.MethodOrderer;
 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;
 
+@ExtendWith(NflowServerExtension.class)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class ChildWorkflowTest extends AbstractNflowTest {
     public static NflowServerConfig server = new NflowServerConfig.Builder().build();

diff --git a/nflow-tests/src/test/java/io/nflow/tests/CreditApplicationWorkflowTest.java b/nflow-tests/src/test/java/io/nflow/tests/CreditApplicationWorkflowTest.java
@@ -20,11 +20,14 @@
 import io.nflow.rest.v1.msg.ListWorkflowInstanceResponse;
 import io.nflow.rest.v1.msg.UpdateWorkflowInstanceRequest;
 import io.nflow.tests.demo.workflow.CreditApplicationWorkflow;
+import io.nflow.tests.extension.NflowServerExtension;
 import org.junit.jupiter.api.MethodOrderer;
 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;
 
+@ExtendWith(NflowServerExtension.class)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class CreditApplicationWorkflowTest extends AbstractNflowTest {
 

diff --git a/nflow-tests/src/test/java/io/nflow/tests/DeleteHistoryTest.java b/nflow-tests/src/test/java/io/nflow/tests/DeleteHistoryTest.java
@@ -7,17 +7,20 @@
 import static org.hamcrest.Matchers.notNullValue;
 
 import io.nflow.tests.extension.NflowServerConfig;
+import io.nflow.tests.extension.NflowServerExtension;
 import org.junit.jupiter.api.MethodOrderer;
 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.context.annotation.ComponentScan;
 
 import io.nflow.rest.v1.msg.CreateWorkflowInstanceRequest;
 import io.nflow.rest.v1.msg.CreateWorkflowInstanceResponse;
 import io.nflow.rest.v1.msg.ListWorkflowInstanceResponse;
 import io.nflow.tests.demo.workflow.DeleteHistoryWorkflow;
 
+@ExtendWith(NflowServerExtension.class)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class DeleteHistoryTest extends AbstractNflowTest {
 

diff --git a/nflow-tests/src/test/java/io/nflow/tests/DemoWorkflowTest.java b/nflow-tests/src/test/java/io/nflow/tests/DemoWorkflowTest.java
@@ -10,17 +10,20 @@
 import static org.hamcrest.Matchers.nullValue;
 
 import io.nflow.tests.extension.NflowServerConfig;
+import io.nflow.tests.extension.NflowServerExtension;
 import org.junit.jupiter.api.MethodOrderer;
 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.context.annotation.ComponentScan;
 
 import io.nflow.rest.v1.msg.CreateWorkflowInstanceRequest;
 import io.nflow.rest.v1.msg.CreateWorkflowInstanceResponse;
 import io.nflow.rest.v1.msg.ListWorkflowInstanceResponse;
 import io.nflow.tests.demo.workflow.DemoWorkflow;
 
+@ExtendWith(NflowServerExtension.class)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class DemoWorkflowTest extends AbstractNflowTest {
 

diff --git a/nflow-tests/src/test/java/io/nflow/tests/ExecutorRecoveryTest.java b/nflow-tests/src/test/java/io/nflow/tests/ExecutorRecoveryTest.java
@@ -16,11 +16,14 @@
 import io.nflow.rest.v1.msg.CreateWorkflowInstanceResponse;
 import io.nflow.rest.v1.msg.ListWorkflowInstanceResponse;
 import io.nflow.tests.demo.workflow.SlowWorkflow;
+import io.nflow.tests.extension.NflowServerExtension;
 import org.junit.jupiter.api.MethodOrderer;
 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;
 
+@ExtendWith(NflowServerExtension.class)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class ExecutorRecoveryTest extends AbstractNflowTest {
 

diff --git a/nflow-tests/src/test/java/io/nflow/tests/FutureWorkflowTest.java b/nflow-tests/src/test/java/io/nflow/tests/FutureWorkflowTest.java
@@ -14,11 +14,13 @@
 import javax.inject.Inject;
 
 import io.nflow.tests.extension.NflowServerConfig;
+import io.nflow.tests.extension.NflowServerExtension;
 import org.joda.time.DateTime;
 import org.junit.jupiter.api.MethodOrderer;
 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.context.annotation.ComponentScan;
 import org.springframework.core.env.Environment;
 
@@ -28,6 +30,7 @@
 import io.nflow.rest.v1.msg.UpdateWorkflowInstanceRequest;
 import io.nflow.tests.demo.workflow.DemoWorkflow;
 
+@ExtendWith(NflowServerExtension.class)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class FutureWorkflowTest extends AbstractNflowTest {
   static DateTime FUTURE = new DateTime(2038, 1, 1, 1, 2, 3, 321);

diff --git a/nflow-tests/src/test/java/io/nflow/tests/MetricsAdminServletTest.java b/nflow-tests/src/test/java/io/nflow/tests/MetricsAdminServletTest.java
@@ -11,11 +11,14 @@
 import javax.ws.rs.core.Response;
 
 import io.nflow.tests.extension.NflowServerConfig;
+import io.nflow.tests.extension.NflowServerExtension;
 import org.junit.jupiter.api.MethodOrderer;
 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;
 
+@ExtendWith(NflowServerExtension.class)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class MetricsAdminServletTest extends AbstractNflowTest {
 

diff --git a/nflow-tests/src/test/java/io/nflow/tests/PreviewCreditApplicationWorkflowTest.java b/nflow-tests/src/test/java/io/nflow/tests/PreviewCreditApplicationWorkflowTest.java
@@ -16,6 +16,7 @@
 import javax.ws.rs.core.Response.Status.Family;
 
 import io.nflow.tests.extension.NflowServerConfig;
+import io.nflow.tests.extension.NflowServerExtension;
 import org.joda.time.DateTime;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -30,7 +31,9 @@
 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;
 
+@ExtendWith(NflowServerExtension.class)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class PreviewCreditApplicationWorkflowTest extends AbstractNflowTest {
 

diff --git a/nflow-tests/src/test/java/io/nflow/tests/SignalWorkflowTest.java b/nflow-tests/src/test/java/io/nflow/tests/SignalWorkflowTest.java
@@ -9,10 +9,12 @@
 import static org.junit.jupiter.api.Assertions.fail;
 
 import io.nflow.tests.extension.NflowServerConfig;
+import io.nflow.tests.extension.NflowServerExtension;
 import org.junit.jupiter.api.MethodOrderer;
 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.context.annotation.ComponentScan;
 
 import io.nflow.engine.workflow.instance.WorkflowInstanceAction.WorkflowActionType;
@@ -23,6 +25,7 @@
 import io.nflow.tests.demo.workflow.DemoWorkflow;
 import io.nflow.tests.demo.workflow.SlowWorkflow;
 
+@ExtendWith(NflowServerExtension.class)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class SignalWorkflowTest extends AbstractNflowTest {
 

diff --git a/nflow-tests/src/test/java/io/nflow/tests/SkipAutoStartTest.java b/nflow-tests/src/test/java/io/nflow/tests/SkipAutoStartTest.java
@@ -18,8 +18,10 @@ public class SkipAutoStartTest extends AbstractNflowTest {
   // no database access should happen. This test fails if SQL statements are
   // issued during bean initialization.
   public static NflowServerConfig server = new NflowServerConfig.Builder()
-      .prop("nflow.autoinit", "false").prop("nflow.autostart", "false").prop("nflow.db.create_on_startup", "false")
-    .build();
+          .prop("nflow.autoinit", "false")
+          .prop("nflow.autostart", "false")
+          .prop("nflow.db.create_on_startup", "false")
+          .build();
 
   public SkipAutoStartTest() {
     super(server);
@@ -28,7 +30,7 @@ public SkipAutoStartTest() {
   @Test
   @Order(1)
   public void startServerButNotNflow() {
-    assertNotNull(server.getInstanceName());
+    assertNotNull(server.getHttpAddress());
   }
 
 }
diff --git a/nflow-tests/src/test/java/io/nflow/tests/StateVariablesTest.java b/nflow-tests/src/test/java/io/nflow/tests/StateVariablesTest.java
@@ -13,10 +13,12 @@
 import java.util.UUID;
 
 import io.nflow.tests.extension.NflowServerConfig;
+import io.nflow.tests.extension.NflowServerExtension;
 import org.junit.jupiter.api.MethodOrderer;
 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.context.annotation.Bean;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -30,6 +32,7 @@
 import io.nflow.tests.demo.workflow.StateWorkflow;
 import io.nflow.tests.demo.workflow.StateWorkflow.State;
 
+@ExtendWith(NflowServerExtension.class)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class StateVariablesTest extends AbstractNflowTest {
 

diff --git a/nflow-tests/src/test/java/io/nflow/tests/StatisticsTest.java b/nflow-tests/src/test/java/io/nflow/tests/StatisticsTest.java
@@ -14,6 +14,7 @@
 import javax.ws.rs.core.Response.Status.Family;
 
 import io.nflow.tests.extension.NflowServerConfig;
+import io.nflow.tests.extension.NflowServerExtension;
 import org.joda.time.DateTime;
 
 import io.nflow.rest.v1.msg.CreateWorkflowInstanceRequest;
@@ -24,7 +25,9 @@
 import io.nflow.rest.v1.msg.WorkflowDefinitionStatisticsResponse.StateStatistics;
 import io.nflow.tests.DemoWorkflowTest.DemoConfiguration;
 import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.extension.ExtendWith;
 
+@ExtendWith(NflowServerExtension.class)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class StatisticsTest extends AbstractNflowTest {
 

diff --git a/nflow-tests/src/test/java/io/nflow/tests/Swagger2MarkupTest.java b/nflow-tests/src/test/java/io/nflow/tests/Swagger2MarkupTest.java
@@ -10,8 +10,11 @@
 import io.nflow.tests.extension.NflowServerConfig;
 
 import io.github.swagger2markup.Swagger2MarkupConverter;
+import io.nflow.tests.extension.NflowServerExtension;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
+@ExtendWith(NflowServerExtension.class)
 public class Swagger2MarkupTest extends AbstractNflowTest {
 
   private static final Path SWAGGER2_MARKUP_ASCIIDOC_DIR = Paths.get("src/main/asciidoc/swagger2markup");

diff --git a/nflow-tests/src/test/java/io/nflow/tests/WorkflowDefinitionUpdateTest.java b/nflow-tests/src/test/java/io/nflow/tests/WorkflowDefinitionUpdateTest.java
@@ -5,16 +5,19 @@
 import static org.junit.jupiter.api.Assertions.fail;
 
 import io.nflow.tests.extension.NflowServerConfig;
+import io.nflow.tests.extension.NflowServerExtension;
 import org.junit.jupiter.api.MethodOrderer;
 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.context.annotation.Bean;
 
 import io.nflow.rest.v1.msg.ListWorkflowDefinitionResponse;
 import io.nflow.tests.demo.workflow.DemoWorkflow;
 import io.nflow.tests.demo.workflow.StateWorkflow;
 
+@ExtendWith(NflowServerExtension.class)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class WorkflowDefinitionUpdateTest extends AbstractNflowTest {