METRON-2307 Migrate to JUnit5 (justinleet) closes #1554

Author: justinleet

.travis.yml

@@ -60,6 +60,7 @@ matrix:
 
     - name: Verify Licenses
       script:
+        - time mvn install -T 2C -q -DskipTests=true -Dmaven.javadoc.skip=true -B -V -Dskip.npm
         - time ./dev-utilities/build-utils/verify_licenses.sh
 
 before_cache:

dependencies_with_url.csv

@@ -50,6 +50,9 @@ javax.xml.bind:jaxb-api:jar:2.2.2:compile,CDDL,https://jaxb.dev.java.net/
 javax.xml.bind:jaxb-api:jar:2.3.0:compile,CDDL,https://jaxb.dev.java.net/
 javax.xml.stream:stax-api:jar:1.0-2:compile,COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0,https://docs.oracle.com/javase/7/docs/api/javax/xml/stream/package-summary.html
 jline:jline:jar:0.9.94:compile,BSD,http://jline.sourceforge.net
+junit:junit:jar:3.8.1:compile,Common Public License Version 1.0,http://junit.org
+junit:junit:jar:4.10:compile,Common Public License Version 1.0,http://junit.org
+junit:junit:jar:4.11:compile,Common Public License Version 1.0,http://junit.org
 junit:junit:jar:4.12:compile,Eclipse Public License 1.0,http://junit.org
 net.razorvine:pyrolite:jar:4.13:compile,MIT,https://github.com/irmen/Pyrolite
 net.sf.jopt-simple:jopt-simple:jar:3.2:compile,The MIT License,http://jopt-simple.sourceforge.net
@@ -77,7 +80,7 @@ org.jruby.joni:joni:jar:2.1.2:compile,MIT License,https://github.com/jruby/joni
 org.lz4:lz4-java:jar:1.4.0:compile,ASLv2,https://github.com/lz4/lz4-java
 org.mitre.taxii:taxii:jar:1.1.0.1:compile,The BSD 3-Clause License,https://github.com/TAXIIProject/java-taxii
 org.mitre:stix:jar:1.2.0.2:compile,The BSD 3-Clause License,https://github.com/STIXProject/java-stix
-org.mockito:mockito-core:jar:1.10.19:compile,The MIT License,http://www.mockito.org
+org.mockito:mockito-core:jar:3.1.0:compile,The MIT License,http://www.mockito.org
 org.roaringbitmap:RoaringBitmap:jar:0.5.11:compile,ASLv2,https://github.com/RoaringBitmap/RoaringBitmap
 org.scala-lang:scala-library:jar:2.10.6:compile,BSD-like,http://www.scala-lang.org/
 org.scala-lang.modules:scala-parser-combinators_2.11:jar:1.0.4:compile,BSD-like,http://www.scala-lang.org/
@@ -503,3 +506,10 @@ org.elasticsearch:securesm:jar:1.2:compile
 com.github.stephenc.jcip:jcip-annotations:jar:1.0-1:compile,ASLv2,http://stephenc.github.io/jcip-annotations/
 com.nimbusds:nimbus-jose-jwt:jar:4.41.2:compile,ASLv2,https://bitbucket.org/connect2id/nimbus-jose-jwt/wiki/Home
 tomcat:jasper-compiler:jar:5.5.23:compile,ASLv2,https://tomcat.apache.org/
+org.apiguardian:apiguardian-api:jar:1.1.0:compile,ASLv2,https://github.com/apiguardian-team/apiguardian/blob/master/LICENSE
+org.junit.jupiter:junit-jupiter-api:jar:5.5.2:compile,EPL 2.0,https://junit.org
+org.junit.platform:junit-platform-engine:jar:1.5.2:compile,EPL 2.0,https://junit.org
+org.junit.platform:junit-platform-commons:jar:1.5.2:compile,EPL 2.0,https://junit.org
+net.bytebuddy:byte-buddy-agent:jar:1.9.10:compile,ASLv2,https://bytebuddy.net/
+net.bytebuddy:byte-buddy:jar:1.9.10:compile,ASLv2,https://bytebuddy.net/
+org.objenesis:objenesis:jar:2.6:compile,ASLv2,http://objenesis.org/license.html

metron-analytics/metron-maas-common/src/test/java/org/apache/metron/maas/discovery/ServiceDiscoveryIntegrationTest.java

@@ -29,21 +29,22 @@
 import org.apache.metron.maas.config.Endpoint;
 import org.apache.metron.maas.config.Model;
 import org.apache.metron.maas.config.ModelEndpoint;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.net.URL;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class ServiceDiscoveryIntegrationTest {
   private TestingServer testZkServer;
   private String zookeeperUrl;
   private CuratorFramework client;
   private ServiceDiscoverer discoverer;
 
-  @Before
+  @BeforeEach
   public void setup() throws Exception {
     testZkServer = new TestingServer(true);
     zookeeperUrl = testZkServer.getConnectString();
@@ -93,31 +94,31 @@ public void testDiscovery() throws Exception {
     //wait for zk to percolate the changes.
     Thread.sleep(2000);
 
-    Assert.assertEquals(3, discoverer.getEndpoints(new Model("casey", "3.14159")).size());
-    Assert.assertEquals(1, discoverer.getEndpoints(new Model("casey", "3.1416")).size());
-    Assert.assertEquals(0, discoverer.getEndpoints(new Model("casey", "3.17")).size());
+    assertEquals(3, discoverer.getEndpoints(new Model("casey", "3.14159")).size());
+    assertEquals(1, discoverer.getEndpoints(new Model("casey", "3.1416")).size());
+    assertEquals(0, discoverer.getEndpoints(new Model("casey", "3.17")).size());
 
     discoverer.unregisterByContainer("1");
     Thread.sleep(2000);
-    Assert.assertEquals(2, discoverer.getEndpoints(new Model("casey", "3.14159")).size());
-    Assert.assertEquals(1, discoverer.getEndpoints(new Model("casey", "3.1416")).size());
-    Assert.assertEquals(0, discoverer.getEndpoints(new Model("casey", "3.17")).size());
+    assertEquals(2, discoverer.getEndpoints(new Model("casey", "3.14159")).size());
+    assertEquals(1, discoverer.getEndpoints(new Model("casey", "3.1416")).size());
+    assertEquals(0, discoverer.getEndpoints(new Model("casey", "3.17")).size());
 
-    Assert.assertEquals(2, discoverer.listEndpoints(new Model("casey", null)).keySet().size());
-    Assert.assertEquals(1, discoverer.listEndpoints(new Model("casey", "3.1416")).keySet().size());
-    Assert.assertEquals(1, discoverer.listEndpoints(new Model("casey", "3.1416"))
+    assertEquals(2, discoverer.listEndpoints(new Model("casey", null)).keySet().size());
+    assertEquals(1, discoverer.listEndpoints(new Model("casey", "3.1416")).keySet().size());
+    assertEquals(1, discoverer.listEndpoints(new Model("casey", "3.1416"))
                                      .get(new Model("casey", "3.1416")).size()
                        );
-    Assert.assertEquals("4", discoverer.listEndpoints(new Model("casey", "3.1416"))
+    assertEquals("4", discoverer.listEndpoints(new Model("casey", "3.1416"))
                                        .get(new Model("casey", "3.1416"))
                                        .get(0)
                                        .getContainerId()
                        );
-    Assert.assertEquals(0, discoverer.listEndpoints(new Model("casey", "3.17")).keySet().size());
-    Assert.assertEquals(0, discoverer.listEndpoints(new Model("dummy", null)).keySet().size());
+    assertEquals(0, discoverer.listEndpoints(new Model("casey", "3.17")).keySet().size());
+    assertEquals(0, discoverer.listEndpoints(new Model("dummy", null)).keySet().size());
 
   }
-  @After
+  @AfterEach
   public void teardown() throws Exception {
 
     if(discoverer != null) {

metron-analytics/metron-maas-service/src/test/java/org/apache/metron/maas/service/MaasIntegrationTest.java

@@ -16,25 +16,17 @@
  * limitations under the License.
  */
 package org.apache.metron.maas.service;
-import java.io.*;
-import java.net.HttpURLConnection;
-import java.net.InetAddress;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.logging.Level;
 
 import com.google.common.base.Splitter;
 import com.google.common.collect.Iterables;
-import org.apache.hadoop.fs.FileSystem;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.curator.RetryPolicy;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.CuratorFrameworkFactory;
 import org.apache.curator.retry.ExponentialBackoffRetry;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.util.Shell;
@@ -45,20 +37,30 @@
 import org.apache.metron.integration.ComponentRunner;
 import org.apache.metron.integration.components.YarnComponent;
 import org.apache.metron.integration.components.ZKServerComponent;
-import org.apache.metron.maas.discovery.ServiceDiscoverer;
 import org.apache.metron.maas.config.MaaSConfig;
 import org.apache.metron.maas.config.Model;
 import org.apache.metron.maas.config.ModelEndpoint;
+import org.apache.metron.maas.discovery.ServiceDiscoverer;
 import org.apache.metron.maas.queue.ZKQueue;
 import org.apache.metron.maas.submit.ModelSubmission;
 import org.apache.metron.maas.util.ConfigUtil;
 import org.apache.metron.test.utils.UnitTestHelper;
 import org.apache.zookeeper.KeeperException;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.*;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.InetAddress;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.logging.Level;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class MaasIntegrationTest {
   private static final Log LOG =
@@ -68,7 +70,7 @@ public class MaasIntegrationTest {
   private static YarnComponent yarnComponent;
   private static ZKServerComponent zkServerComponent;
 
-  @BeforeClass
+  @BeforeAll
   public static void setupBeforeClass() throws Exception {
     UnitTestHelper.setJavaLoggingLevel(Level.SEVERE);
     LOG.info("Starting up YARN cluster");
@@ -90,25 +92,27 @@ public static void setupBeforeClass() throws Exception {
     client.start();
   }
 
-  @AfterClass
+  @AfterAll
   public static void tearDownAfterClass(){
     if(client != null){
       client.close();
     }
     runner.stop();
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     runner.reset();
   }
 
-  @Test(timeout=900000)
+  @Test
+  @Timeout(900000)
   public void testMaaSWithDomain() throws Exception {
     testDSShell(true);
   }
 
-  @Test(timeout=900000)
+  @Test
+  @Timeout(900000)
   public void testMaaSWithoutDomain() throws Exception {
     testDSShell(false);
   }
@@ -154,7 +158,7 @@ public void testDSShell(boolean haveDomain) throws Exception {
     LOG.info("Initializing DS Client");
     final Client client = new Client(new Configuration(conf));
     boolean initSuccess = client.init(args);
-    Assert.assertTrue(initSuccess);
+    assertTrue(initSuccess);
     LOG.info("Running DS Client");
     final AtomicBoolean result = new AtomicBoolean(false);
     Thread t = new Thread() {
@@ -198,7 +202,7 @@ public void run() {
         break;
       }
     }
-    Assert.assertTrue(errorMessage, verified);
+    assertTrue(verified, errorMessage);
     FileSystem fs = FileSystem.get(conf);
     try {
       new ModelSubmission().execute(FileSystem.get(conf)
@@ -234,13 +238,13 @@ public void run() {
           }
           Thread.sleep(2000);
         }
-        Assert.assertTrue(passed);
+        assertTrue(passed);
       }
 
       {
         List<ModelEndpoint> endpoints = discoverer.getEndpoints(new Model("dummy", "1.0"));
-        Assert.assertNotNull(endpoints);
-        Assert.assertEquals(1, endpoints.size());
+        assertNotNull(endpoints);
+        assertEquals(1, endpoints.size());
       }
       new ModelSubmission().execute(FileSystem.get(conf)
               , new String[]{
@@ -266,7 +270,7 @@ public void run() {
           }
           Thread.sleep(2000);
         }
-        Assert.assertTrue(passed);
+        assertTrue(passed);
       }
     }
     finally {
@@ -336,10 +340,8 @@ private boolean checkHostname(String appHostname) throws Exception {
       return true;
     }
 
-    Assert.assertTrue("Unknown format for hostname " + appHostname,
-            appHostname.contains("/"));
-    Assert.assertTrue("Unknown format for hostname " + hostname,
-            hostname.contains("/"));
+    assertTrue(appHostname.contains("/"), "Unknown format for hostname " + appHostname);
+    assertTrue(hostname.contains("/"), "Unknown format for hostname " + hostname);
 
     String[] appHostnameParts = appHostname.split("/");
     String[] hostnameParts = hostname.split("/");
@@ -395,7 +397,7 @@ private int verifyContainerLog(int containerNum,
         break;
       }
     }
-    Assert.assertTrue(currentContainerLogFileIndex != -1);
+    assertTrue(currentContainerLogFileIndex != -1);
     File[] containerFiles =
             listOfFiles[currentContainerLogFileIndex].listFiles();
 
@@ -417,7 +419,7 @@ private int verifyContainerLog(int containerNum,
                 }
               } else if (output.getName().trim().equals("stdout")){
                 if (! Shell.WINDOWS) {
-                  Assert.assertEquals("The current is" + sCurrentLine,
+                  assertEquals("The current is" + sCurrentLine,
                           expectedContent.get(numOfline), sCurrentLine.trim());
                   numOfline++;
                 } else {
@@ -433,7 +435,7 @@ private int verifyContainerLog(int containerNum,
              */
             if (Shell.WINDOWS && !count
                     && output.getName().trim().equals("stdout")) {
-              Assert.assertTrue(stdOutContent.containsAll(expectedContent));
+              assertTrue(stdOutContent.containsAll(expectedContent));
             }
           } catch (IOException e) {
             e.printStackTrace();