test: Ensure all integration tests run via JUnit 5

Author: chadlwilson

.gitignore

@@ -3,8 +3,8 @@ pkg
 doc
 .bundle
 nbproject
-**/target/*
-!**/target/.keep
+target/
+out/
 Gemfile.lock
 .idea
 warbler.iml

integration/pom.xml

@@ -47,15 +47,15 @@
       <type>gem</type>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.13.2</version>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <version>5.14.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-all</artifactId>
-      <version>1.3</version>
+      <artifactId>hamcrest</artifactId>
+      <version>3.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

integration/rails7_test/src/test/java/org/jruby/warbler/Rails7AppTestIT.java

@@ -1,10 +1,10 @@
 package org.jruby.warbler;
 
+import org.junit.jupiter.api.Test;
+
 import java.net.*;
 import java.io.*;
 
-import org.junit.Test;
-
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
 

integration/runnable_test/pom.xml

@@ -9,8 +9,6 @@
   </parent>
 
   <artifactId>runnable_test</artifactId>
-  <packaging>pom</packaging>
-
   <name>runnable_test</name>
 
   <properties>
@@ -21,7 +19,6 @@
     <plugins>
       <plugin>
         <artifactId>maven-clean-plugin</artifactId>
-        <version>2.5</version>
         <executions>
           <execution>
             <id>auto-clean</id>

integration/runnable_test/src/test/java/org/jruby/warbler/RunnableWarTestIT.java

@@ -1,22 +1,21 @@
 package org.jruby.warbler;
 
+import org.junit.jupiter.api.Test;
+
 import java.net.*;
 import java.io.*;
-import org.junit.Assert;
-import org.junit.Test;
-import org.hamcrest.Matcher;
-import org.hamcrest.Matchers;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 
 /**
  * Unit test for simple runnable war.
  */
-public class RunnableWarTestIT
-{
+public class RunnableWarTestIT {
     @Test
-    public void testApp() throws Exception
-    {
+    public void testApp() {
         String testFilename = System.getProperty("testFilename");
         File f = new File(testFilename);
-        Assert.assertTrue(testFilename + "should exist", f.exists());
+        assertTrue(f.exists(), testFilename + "should exist");
     }
 }

integration/runnable_w_bundler_test/pom.xml

@@ -9,8 +9,6 @@
   </parent>
 
   <artifactId>runnable_w_bundler_test</artifactId>
-  <packaging>pom</packaging>
-
   <name>runnable_w_bundler_test</name>
 
   <properties>
@@ -20,8 +18,8 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-clean-plugin</artifactId>
-        <version>2.5</version>
         <executions>
           <execution>
             <id>auto-clean</id>

integration/runnable_w_bundler_test/src/test/java/org/jruby/warbler/RunnableWarTestIT.java

@@ -1,22 +1,20 @@
 package org.jruby.warbler;
 
+import org.junit.jupiter.api.Test;
+
 import java.net.*;
 import java.io.*;
-import org.junit.Assert;
-import org.junit.Test;
-import org.hamcrest.Matcher;
-import org.hamcrest.Matchers;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Unit test for simple runnable war.
  */
-public class RunnableWarTestIT
-{
+public class RunnableWarTestIT {
     @Test
-    public void testApp() throws Exception
-    {
+    public void testApp() {
         String testFilename = System.getProperty("testFilename");
         File f = new File(testFilename);
-        Assert.assertTrue(testFilename + "should exist", f.exists());
+        assertTrue(f.exists(), testFilename + "should exist");
     }
 }

integration/simple_rack_test/pom.xml

@@ -9,8 +9,6 @@
   </parent>
 
   <artifactId>simple_rack_test</artifactId>
-  <packaging>pom</packaging>
-
   <name>simple_rack_test</name>
 
   <build>
@@ -26,7 +24,7 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.mortbay.jetty</groupId>
+        <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
         <executions>
           <execution>

integration/simple_rack_test/src/test/java/org/jruby/warbler/AppTestIT.java

@@ -1,36 +1,33 @@
 package org.jruby.warbler;
 
+import org.junit.jupiter.api.Test;
+
 import java.net.*;
 import java.io.*;
-import org.junit.Assert;
-import org.junit.Test;
-import org.hamcrest.Matcher;
-import org.hamcrest.Matchers;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 
 /**
  * Unit test for simple App.
  */
-public class AppTestIT
-{
-    private static String appName = "simple_rack_test-1.0";
-
+public class AppTestIT {
     /**
      * Hit the web app and test the response
      */
     @Test
-    public void testApp() throws Exception
-    {
-        URL url = new URL("http://localhost:8080/" + appName);
-        URLConnection conn = url.openConnection();
-        BufferedReader in = new BufferedReader( new InputStreamReader( conn.getInputStream()));
-
-        String inputLine;
-        String content = "";
-
-        while ((inputLine = in.readLine()) != null)
-            content = inputLine;
-        in.close();
+    public void testApp() throws Exception {
+        assertEquals("Hello, World", contentFrom("http://localhost:8080/"));
+    }
 
-        Assert.assertEquals("Hello, World", content);
+    private static String contentFrom(@SuppressWarnings("SameParameterValue") String url) throws IOException {
+        URL route = new URL(url);
+        StringBuilder content = new StringBuilder();
+        try (BufferedReader in = new BufferedReader(new InputStreamReader(route.openStream()))) {
+            while (in.ready()) {
+                content.append(in.readLine());
+            }
+        }
+        return content.toString();
     }
 }