HADOOP-19617 - [JDK17] Remove JUnit4 Dependency - Common.

hadoop-common-project/hadoop-auth/pom.xml

@@ -41,11 +41,6 @@
       <artifactId>hadoop-annotations</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>

hadoop-common-project/hadoop-common/pom.xml

@@ -162,11 +162,6 @@
       <artifactId>reload4j</artifactId>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>

hadoop-common-project/hadoop-kms/pom.xml

@@ -38,11 +38,6 @@
       <artifactId>hadoop-minikdc</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-inline</artifactId>

hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMSAudit.java

@@ -118,7 +118,10 @@ public void testAggregation() throws Exception {
     kmsAudit.evictCacheForTesting();
     String out = getAndResetLogOutput();
     System.out.println(out);
-    boolean doesMatch = out.matches(
+    String cleanedOut =
+        out.replaceAll("fs\\.default\\.name in core-default\\.xml is deprecated\\. " +
+        "Instead, use fs\\.defaultFS", "");
+    boolean doesMatch = cleanedOut.matches(
         "OK\\[op=DECRYPT_EEK, key=k1, user=luser@REALM, accessCount=1, "
             + "interval=[^m]{1,4}ms\\] testmsg"
             // Not aggregated !!
@@ -156,11 +159,14 @@ public void testAggregationUnauth() throws Exception {
     kmsAudit.evictCacheForTesting();
     String out = getAndResetLogOutput();
     System.out.println(out);
+    String cleanedOut =
+        out.replaceAll("fs\\.default\\.name in core-default\\.xml is deprecated\\. " +
+        "Instead, use fs\\.defaultFS", "");
 
     // The UNAUTHORIZED will trigger cache invalidation, which then triggers
     // the aggregated OK (accessCount=5). But the order of the UNAUTHORIZED and
     // the aggregated OK is arbitrary - no correctness concerns, but flaky here.
-    boolean doesMatch = out.matches(
+    boolean doesMatch = cleanedOut.matches(
         "UNAUTHORIZED\\[op=GENERATE_EEK, key=k2, user=luser@REALM\\] "
             + "OK\\[op=GENERATE_EEK, key=k3, user=luser@REALM, accessCount=1,"
             + " interval=[^m]{1,4}ms\\] testmsg"
@@ -169,7 +175,7 @@ public void testAggregationUnauth() throws Exception {
             + "UNAUTHORIZED\\[op=GENERATE_EEK, key=k3, user=luser@REALM\\] "
             + "OK\\[op=GENERATE_EEK, key=k3, user=luser@REALM, accessCount=1,"
             + " interval=[^m]{1,4}ms\\] testmsg");
-    doesMatch = doesMatch || out.matches(
+    doesMatch = doesMatch || cleanedOut.matches(
         "UNAUTHORIZED\\[op=GENERATE_EEK, key=k2, user=luser@REALM\\] "
             + "OK\\[op=GENERATE_EEK, key=k3, user=luser@REALM, accessCount=1,"
             + " interval=[^m]{1,4}ms\\] testmsg"

hadoop-common-project/hadoop-minikdc/pom.xml

@@ -68,11 +68,6 @@
       <artifactId>junit-jupiter-engine</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.junit.platform</groupId>
       <artifactId>junit-platform-launcher</artifactId>

hadoop-common-project/hadoop-nfs/pom.xml

@@ -53,11 +53,6 @@
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-inline</artifactId>
@@ -97,6 +92,31 @@
       <artifactId>assertj-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-launcher</artifactId>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 
   <build>

hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/TestNfsExports.java

@@ -18,8 +18,8 @@
 package org.apache.hadoop.nfs;
 
 import org.apache.hadoop.nfs.nfs3.Nfs3Constant;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 public class TestNfsExports {
 
@@ -37,148 +37,141 @@ public class TestNfsExports {
   @Test
   public void testWildcardRW() {
     NfsExports matcher = new NfsExports(CacheSize, ExpirationPeriod, "* rw");
-    Assert.assertEquals(AccessPrivilege.READ_WRITE,
+    Assertions.assertEquals(AccessPrivilege.READ_WRITE,
         matcher.getAccessPrivilege(address1, hostname1));
   }
 
   @Test
   public void testWildcardRO() {
     NfsExports matcher = new NfsExports(CacheSize, ExpirationPeriod, "* ro");
-    Assert.assertEquals(AccessPrivilege.READ_ONLY,
+    Assertions.assertEquals(AccessPrivilege.READ_ONLY,
         matcher.getAccessPrivilege(address1, hostname1));
   }
 
   @Test
   public void testExactAddressRW() {
     NfsExports matcher = new NfsExports(CacheSize, ExpirationPeriod, address1
         + " rw");
-    Assert.assertEquals(AccessPrivilege.READ_WRITE,
+    Assertions.assertEquals(AccessPrivilege.READ_WRITE,
         matcher.getAccessPrivilege(address1, hostname1));
-    Assert.assertFalse(AccessPrivilege.READ_WRITE == matcher
+    Assertions.assertFalse(AccessPrivilege.READ_WRITE == matcher
         .getAccessPrivilege(address2, hostname1));
   }
 
   @Test
   public void testExactAddressRO() {
     NfsExports matcher = new NfsExports(CacheSize, ExpirationPeriod, address1);
-    Assert.assertEquals(AccessPrivilege.READ_ONLY,
+    Assertions.assertEquals(AccessPrivilege.READ_ONLY,
         matcher.getAccessPrivilege(address1, hostname1));
-    Assert.assertEquals(AccessPrivilege.NONE,
-        matcher.getAccessPrivilege(address2, hostname1));
+    Assertions.assertEquals(AccessPrivilege.NONE, matcher.getAccessPrivilege(address2, hostname1));
   }
 
   @Test
   public void testExactHostRW() {
     NfsExports matcher = new NfsExports(CacheSize, ExpirationPeriod, hostname1
         + " rw");
-    Assert.assertEquals(AccessPrivilege.READ_WRITE,
+    Assertions.assertEquals(AccessPrivilege.READ_WRITE,
         matcher.getAccessPrivilege(address1, hostname1));
   }
 
   @Test
   public void testExactHostRO() {
     NfsExports matcher = new NfsExports(CacheSize, ExpirationPeriod, hostname1);
-    Assert.assertEquals(AccessPrivilege.READ_ONLY,
+    Assertions.assertEquals(AccessPrivilege.READ_ONLY,
         matcher.getAccessPrivilege(address1, hostname1));
   }
 
   @Test
   public void testCidrShortRW() {
     NfsExports matcher = new NfsExports(CacheSize, ExpirationPeriod,
         "192.168.0.0/22 rw");
-    Assert.assertEquals(AccessPrivilege.READ_WRITE,
+    Assertions.assertEquals(AccessPrivilege.READ_WRITE,
         matcher.getAccessPrivilege(address1, hostname1));
-    Assert.assertEquals(AccessPrivilege.NONE,
-        matcher.getAccessPrivilege(address2, hostname1));
+    Assertions.assertEquals(AccessPrivilege.NONE, matcher.getAccessPrivilege(address2, hostname1));
   }
 
   @Test
   public void testCidrShortRO() {
     NfsExports matcher = new NfsExports(CacheSize, ExpirationPeriod,
         "192.168.0.0/22");
-    Assert.assertEquals(AccessPrivilege.READ_ONLY,
+    Assertions.assertEquals(AccessPrivilege.READ_ONLY,
         matcher.getAccessPrivilege(address1, hostname1));
-    Assert.assertEquals(AccessPrivilege.NONE,
-        matcher.getAccessPrivilege(address2, hostname1));
+    Assertions.assertEquals(AccessPrivilege.NONE, matcher.getAccessPrivilege(address2, hostname1));
   }
 
   @Test
   public void testCidrLongRW() {
     NfsExports matcher = new NfsExports(CacheSize, ExpirationPeriod, 
         "192.168.0.0/255.255.252.0 rw");
-    Assert.assertEquals(AccessPrivilege.READ_WRITE,
+    Assertions.assertEquals(AccessPrivilege.READ_WRITE,
         matcher.getAccessPrivilege(address1, hostname1));
-    Assert.assertEquals(AccessPrivilege.NONE,
-        matcher.getAccessPrivilege(address2, hostname1));
+    Assertions.assertEquals(AccessPrivilege.NONE, matcher.getAccessPrivilege(address2, hostname1));
   }
 
   @Test
   public void testCidrLongRO() {
     NfsExports matcher = new NfsExports(CacheSize, ExpirationPeriod, 
         "192.168.0.0/255.255.252.0");
-    Assert.assertEquals(AccessPrivilege.READ_ONLY,
+    Assertions.assertEquals(AccessPrivilege.READ_ONLY,
         matcher.getAccessPrivilege(address1, hostname1));
-    Assert.assertEquals(AccessPrivilege.NONE,
-        matcher.getAccessPrivilege(address2, hostname1));
+    Assertions.assertEquals(AccessPrivilege.NONE, matcher.getAccessPrivilege(address2, hostname1));
   }
 
   @Test
   public void testRegexIPRW() {
     NfsExports matcher = new NfsExports(CacheSize, ExpirationPeriod,
         "192.168.0.[0-9]+ rw");
-    Assert.assertEquals(AccessPrivilege.READ_WRITE,
+    Assertions.assertEquals(AccessPrivilege.READ_WRITE,
         matcher.getAccessPrivilege(address1, hostname1));
-    Assert.assertEquals(AccessPrivilege.NONE,
-        matcher.getAccessPrivilege(address2, hostname1));
+    Assertions.assertEquals(AccessPrivilege.NONE, matcher.getAccessPrivilege(address2, hostname1));
   }
 
   @Test
   public void testRegexIPRO() {
     NfsExports matcher = new NfsExports(CacheSize, ExpirationPeriod,
         "192.168.0.[0-9]+");
-    Assert.assertEquals(AccessPrivilege.READ_ONLY,
+    Assertions.assertEquals(AccessPrivilege.READ_ONLY,
         matcher.getAccessPrivilege(address1, hostname1));
-    Assert.assertEquals(AccessPrivilege.NONE,
-        matcher.getAccessPrivilege(address2, hostname1));
+    Assertions.assertEquals(AccessPrivilege.NONE, matcher.getAccessPrivilege(address2, hostname1));
   }
 
   @Test
   public void testRegexHostRW() {
     NfsExports matcher = new NfsExports(CacheSize, ExpirationPeriod,
         "[a-z]+.b.com rw");
-    Assert.assertEquals(AccessPrivilege.READ_WRITE,
+    Assertions.assertEquals(AccessPrivilege.READ_WRITE,
         matcher.getAccessPrivilege(address1, hostname1));
     // address1 will hit the cache
-    Assert.assertEquals(AccessPrivilege.READ_WRITE,
+    Assertions.assertEquals(AccessPrivilege.READ_WRITE,
         matcher.getAccessPrivilege(address1, hostname2));
   }
 
   @Test
   public void testRegexHostRO() {
     NfsExports matcher = new NfsExports(CacheSize, ExpirationPeriod,
         "[a-z]+.b.com");
-    Assert.assertEquals(AccessPrivilege.READ_ONLY,
+    Assertions.assertEquals(AccessPrivilege.READ_ONLY,
         matcher.getAccessPrivilege(address1, hostname1));
     // address1 will hit the cache
-    Assert.assertEquals(AccessPrivilege.READ_ONLY,
+    Assertions.assertEquals(AccessPrivilege.READ_ONLY,
         matcher.getAccessPrivilege(address1, hostname2));
   }
 
   @Test
   public void testRegexGrouping() {
     NfsExports matcher = new NfsExports(CacheSize, ExpirationPeriod,
         "192.168.0.(12|34)");
-    Assert.assertEquals(AccessPrivilege.READ_ONLY,
+    Assertions.assertEquals(AccessPrivilege.READ_ONLY,
         matcher.getAccessPrivilege(address1, hostname1));
     // address1 will hit the cache
-    Assert.assertEquals(AccessPrivilege.READ_ONLY,
+    Assertions.assertEquals(AccessPrivilege.READ_ONLY,
         matcher.getAccessPrivilege(address1, hostname2));
 
     matcher = new NfsExports(CacheSize, ExpirationPeriod, "\\w*.a.b.com");
-    Assert.assertEquals(AccessPrivilege.READ_ONLY,
+    Assertions.assertEquals(AccessPrivilege.READ_ONLY,
         matcher.getAccessPrivilege("1.2.3.4", "web.a.b.com"));
     // address "1.2.3.4" will hit the cache
-    Assert.assertEquals(AccessPrivilege.READ_ONLY,
+    Assertions.assertEquals(AccessPrivilege.READ_ONLY,
         matcher.getAccessPrivilege("1.2.3.4", "email.a.b.org"));
   }
 
@@ -187,16 +180,16 @@ public void testMultiMatchers() throws Exception {
     long shortExpirationPeriod = 1 * 1000 * 1000 * 1000; // 1s
     NfsExports matcher = new NfsExports(CacheSize, shortExpirationPeriod, 
         "192.168.0.[0-9]+;[a-z]+.b.com rw");
-    Assert.assertEquals(AccessPrivilege.READ_ONLY,
+    Assertions.assertEquals(AccessPrivilege.READ_ONLY,
         matcher.getAccessPrivilege(address1, hostname2));
-    Assert.assertEquals(AccessPrivilege.READ_ONLY,
+    Assertions.assertEquals(AccessPrivilege.READ_ONLY,
         matcher.getAccessPrivilege(address1, address1));
-    Assert.assertEquals(AccessPrivilege.READ_ONLY,
+    Assertions.assertEquals(AccessPrivilege.READ_ONLY,
         matcher.getAccessPrivilege(address1, hostname1));
-    Assert.assertEquals(AccessPrivilege.READ_WRITE,
+    Assertions.assertEquals(AccessPrivilege.READ_WRITE,
         matcher.getAccessPrivilege(address2, hostname1));
     // address2 will hit the cache
-    Assert.assertEquals(AccessPrivilege.READ_WRITE,
+    Assertions.assertEquals(AccessPrivilege.READ_WRITE,
         matcher.getAccessPrivilege(address2, hostname2));
 
     Thread.sleep(1000);
@@ -210,18 +203,22 @@ public void testMultiMatchers() throws Exception {
       }
       Thread.sleep(500);
     } while ((System.nanoTime() - startNanos) / NanosPerMillis < 5000);
-    Assert.assertEquals(AccessPrivilege.NONE, ap);
+    Assertions.assertEquals(AccessPrivilege.NONE, ap);
   }
 
-  @Test(expected=IllegalArgumentException.class)
+  @Test
   public void testInvalidHost() {
-      NfsExports matcher = new NfsExports(CacheSize, ExpirationPeriod,
+      Assertions.assertThrows(IllegalArgumentException.class, () -> {
+          NfsExports matcher = new NfsExports(CacheSize, ExpirationPeriod,
         "foo#bar");
+      });
   }
 
-  @Test(expected=IllegalArgumentException.class)
+  @Test
   public void testInvalidSeparator() {
-      NfsExports matcher = new NfsExports(CacheSize, ExpirationPeriod,
+      Assertions.assertThrows(IllegalArgumentException.class, () -> {
+          NfsExports matcher = new NfsExports(CacheSize, ExpirationPeriod,
         "foo ro : bar rw");
+      });
   }
 }

hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/TestNfsTime.java

@@ -17,18 +17,18 @@
  */
 package org.apache.hadoop.nfs;
 
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
 
 import org.apache.hadoop.nfs.NfsTime;
 import org.apache.hadoop.oncrpc.XDR;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestNfsTime {
   @Test
   public void testConstructor() {
     NfsTime nfstime = new NfsTime(1001);
-    Assert.assertEquals(1, nfstime.getSeconds());
-    Assert.assertEquals(1000000, nfstime.getNseconds());
+    Assertions.assertEquals(1, nfstime.getSeconds());
+    Assertions.assertEquals(1000000, nfstime.getNseconds());
   }
 
   @Test
@@ -42,6 +42,6 @@ public void testSerializeDeserialize() {
     NfsTime t2 = NfsTime.deserialize(xdr.asReadOnlyWrap());
 
     // Ensure the NfsTimes are equal
-    Assert.assertEquals(t1, t2);
+    Assertions.assertEquals(t1, t2);
   }
 }