switched karate-demo to junit5 removed legacy code

Author: ptrthomas

README.md

@@ -3937,7 +3937,7 @@ Karate's `callonce` keyword behaves exactly like [`call`](#call) but is guarante
 
 This does require you to move 'set-up' into a separate `*.feature` (or JavaScript) file. But this totally makes sense for things not part of the 'main' test flow and which typically need to be re-usable anyway.
 
-So when you use the combination of `callonce` in a `Background`, you can indeed get the same effect as using a [`@BeforeClass`](http://junit.sourceforge.net/javadoc/org/junit/BeforeClass.html) annotation, and you can find examples in the [karate-demo](karate-demo), such as this one: [`callonce.feature`](karate-demo/src/test/java/demo/callonce/call-once.feature).
+So when you use the combination of `callonce` in a `Background`, you can indeed get the same effect as using a [`@BeforeAll`](https://junit.org/junit5/docs/5.0.0/api/org/junit/jupiter/api/BeforeAll.html) annotation, and you can find examples in the [karate-demo](karate-demo), such as this one: [`callonce.feature`](karate-demo/src/test/java/demo/callonce/call-once.feature).
 
 A `callonce` is ideally used for only "pure" JSON. You may face issues if you attempt to mix in JS functions or Java code. See [`karate.callSingle()`](#karatecallsingle).
 

karate-core/src/test/java/com/intuit/karate/fatjar/FeatureServerTest.java

@@ -17,7 +17,7 @@ class FeatureServerTest {
     static MockServer server;
 
     @BeforeAll
-    static void beforeClass() {
+    static void beforeAll() {
         server = MockServer
                 .feature("classpath:com/intuit/karate/fatjar/server.feature")
                 .pathPrefix("/v1")
@@ -38,7 +38,7 @@ void testClient() {
     }
 
     @AfterAll
-    static void afterClass() {
+    static void afterAll() {
         server.stop();
     }
 

karate-core/src/test/java/com/intuit/karate/fatjar/ProxyServerSslTest.java

@@ -39,7 +39,7 @@ class ProxyServerSslTest {
     static MockServer server;
 
     @BeforeAll
-    static void beforeClass() {
+    static void beforeAll() {
         proxy = new ProxyServer(0, null, null);
         server = MockServer.feature("classpath:com/intuit/karate/fatjar/server.feature").https(0).build();
         int port = server.getPort();
@@ -49,7 +49,7 @@ static void beforeClass() {
     }
 
     @AfterAll
-    static void afterClass() {
+    static void afterAll() {
         server.stop();
         proxy.stop();
     }

karate-core/src/test/java/com/intuit/karate/fatjar/ProxyServerTest.java

@@ -35,7 +35,7 @@ class ProxyServerTest {
     static MockServer server;
 
     @BeforeAll
-    static void beforeClass() {
+    static void beforeAll() {
         proxy = new ProxyServer(0, null, null);
         server = MockServer
                 .feature("classpath:com/intuit/karate/fatjar/server.feature")
@@ -48,7 +48,7 @@ static void beforeClass() {
     }
 
     @AfterAll
-    static void afterClass() {
+    static void afterAll() {
         server.stop();
         proxy.stop();
     }

karate-demo/pom.xml

@@ -75,7 +75,7 @@
         </dependency>                                                                                  
         <dependency>
             <groupId>com.intuit.karate</groupId>
-            <artifactId>karate-junit4</artifactId>
+            <artifactId>karate-junit5</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>               

karate-demo/src/test/java/demo/DemoRunner.java

@@ -0,0 +1,36 @@
+package demo;
+
+import com.intuit.karate.Results;
+import com.intuit.karate.Runner;
+import com.intuit.karate.junit5.Karate;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+/**
+ *
+ * @author peter
+ */
+class DemoRunner {
+
+    @BeforeAll
+    static void beforeAll() {
+        TestBase.startServer();
+    }
+
+    @Karate.Test
+    Karate testAbort() {
+        // skip 'callSingle' in karate-config.js
+        return Karate.run("classpath:demo/abort").karateEnv("mock");
+    }
+
+    @Test
+    void testEncodingParallel() {
+        Results results = Runner.path("classpath:demo/encoding")
+                .outputCucumberJson(true)
+                .parallel(5);
+        DemoTestParallel.generateReport(results.getReportDir());
+        assertTrue(results.getFailCount() == 0, results.getErrorMessages());
+    }
+
+}

karate-demo/src/test/java/demo/DemoTestParallel.java

@@ -9,30 +9,29 @@
 import net.masterthought.cucumber.Configuration;
 import net.masterthought.cucumber.ReportBuilder;
 import org.apache.commons.io.FileUtils;
-import static org.junit.Assert.*;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  *
  * @author pthomas3
  */
-// important: do not use @RunWith(Karate.class) !
 public class DemoTestParallel {
 
-    @BeforeClass
-    public static void beforeClass() throws Exception {
-        TestBase.beforeClass();
+    @BeforeAll
+    static void beforeAll() {
+        TestBase.beforeAll();
     }
 
     @Test
-    public void testParallel() {
+    void testParallel() {
         Results results = Runner.path("classpath:demo")
                 .outputCucumberJson(true)
                 .karateEnv("demo")
                 .parallel(5);
         generateReport(results.getReportDir());
-        assertTrue(results.getErrorMessages(), results.getFailCount() == 0);
+        assertTrue(results.getFailCount() == 0, results.getErrorMessages());
     }
 
     public static void generateReport(String karateOutputPath) {

karate-demo/src/test/java/demo/DemoTestSelected.java

@@ -4,26 +4,25 @@
 import com.intuit.karate.Results;
 import java.util.Arrays;
 import java.util.List;
-import static org.junit.Assert.*;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
- * an alternative way to run selected paths, tags and even features using the
- * java api here you don't need to use the KarateOptions annotation and you can
+ * an alternative way to run selected paths, tags and even features and you can
  * dynamically determine the features that need to be executed
  *
  * @author pthomas3
  */
-public class DemoTestSelected {
+class DemoTestSelected {
 
-    @BeforeClass
-    public static void beforeClass() throws Exception {
-        TestBase.beforeClass();
+    @BeforeAll
+    static void beforeAll() {
+        TestBase.beforeAll();
     }     
 
     @Test
-    public void testSelected() {
+    void testSelected() {
         List<String> tags = Arrays.asList("~@skipme");
         List<String> features = Arrays.asList("classpath:demo/cats");
         String karateOutputPath = "target/surefire-reports";
@@ -32,7 +31,7 @@ public void testSelected() {
                 .outputCucumberJson(true)
                 .reportDir(karateOutputPath).parallel(5);
         DemoTestParallel.generateReport(karateOutputPath);
-        assertTrue(results.getErrorMessages(), results.getFailCount() == 0);
+        assertTrue(results.getFailCount() == 0, results.getErrorMessages());
     }
 
 }

karate-demo/src/test/java/demo/TestBase.java

@@ -1,31 +1,32 @@
 package demo;
 
-import com.intuit.karate.junit4.Karate;
-import org.junit.BeforeClass;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeAll;
 import test.ServerStart;
 
 /**
  *
  * @author pthomas3
  */
-@RunWith(Karate.class)
 public abstract class TestBase {
-    
-    private static ServerStart server;
-    
-    public static int startServer() throws Exception {
+
+    static ServerStart server;
+
+    public static int startServer() {
         if (server == null) { // keep spring boot side alive for all tests including package 'mock'
             server = new ServerStart();
-            server.start(new String[]{"--server.port=0"}, false);
+            try {
+                server.start(new String[]{"--server.port=0"}, false);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
         }
         System.setProperty("demo.server.port", server.getPort() + "");
-        return server.getPort();        
+        return server.getPort();
     }
-    
-    @BeforeClass
-    public static void beforeClass() throws Exception {
+
+    @BeforeAll
+    public static void beforeAll() {
         startServer();
     }
-    
+
 }

karate-demo/src/test/java/demo/abort/AbortRunner.java

@@ -1,4 +1,4 @@
-Feature: test set-up routines that run only once, similar to how @BeforeClass works
+Feature: test set-up routines that run only once, similar to how @BeforeAll works
 
 Background:
 

karate-demo/src/test/java/demo/binary/BinaryRunner.java

@@ -24,8 +24,8 @@
 package demo.cats;
 
 import com.intuit.karate.demo.domain.Cat;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  *