HADOOP-19415. [JDK17] Upgrade JUnit from 4 to 5 in hadoop-common Part10.

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/audit/TestCommonAuditContext.java

@@ -25,7 +25,7 @@
 import java.util.stream.StreamSupport;
 
 import org.assertj.core.api.AbstractStringAssert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/impl/TestFlagSet.java

@@ -20,8 +20,7 @@
 
 import java.util.EnumSet;
 
-import org.assertj.core.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.test.AbstractHadoopTestBase;
@@ -31,6 +30,7 @@
 import static org.apache.hadoop.fs.impl.FlagSet.buildFlagSet;
 import static org.apache.hadoop.fs.impl.FlagSet.createFlagSet;
 import static org.apache.hadoop.test.LambdaTestUtils.intercept;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Unit tests for {@link FlagSet} class.
@@ -68,7 +68,7 @@ private enum OtherEnum { a }
    */
   @Test
   public void testEntryEnableDisable() {
-    Assertions.assertThat(flagSet.flags()).isEmpty();
+    assertThat(flagSet.flags()).isEmpty();
     assertDisabled(SimpleEnum.a);
     flagSet.enable(SimpleEnum.a);
     assertEnabled(SimpleEnum.a);
@@ -81,7 +81,7 @@ public void testEntryEnableDisable() {
    */
   @Test
   public void testSetMethod() {
-    Assertions.assertThat(flagSet.flags()).isEmpty();
+    assertThat(flagSet.flags()).isEmpty();
     flagSet.set(SimpleEnum.a, true);
     assertEnabled(SimpleEnum.a);
     flagSet.set(SimpleEnum.a, false);
@@ -136,15 +136,15 @@ public void testToString() throws Throwable {
    * @param expected expected value
    */
   private void assertStringValue(final String expected) {
-    Assertions.assertThat(flagSet.toString())
+    assertThat(flagSet.toString())
         .isEqualTo(expected);
   }
 
   /**
    * Assert the configuration string form matches that expected.
    */
   public void assertConfigurationStringMatches(final String expected) {
-    Assertions.assertThat(flagSet.toConfigurationString())
+    assertThat(flagSet.toConfigurationString())
         .describedAs("Configuration string of %s", flagSet)
         .isEqualTo(expected);
   }
@@ -224,7 +224,7 @@ private static Configuration mkConf(final String value) {
    * @param capability capability to probe for
    */
   private void assertHasCapability(final String capability) {
-    Assertions.assertThat(flagSet.hasCapability(capability))
+    assertThat(flagSet.hasCapability(capability))
         .describedAs("Capability of %s on %s", capability, flagSet)
         .isTrue();
   }
@@ -234,7 +234,7 @@ private void assertHasCapability(final String capability) {
    * @param capability capability to probe for
    */
   private void assertLacksCapability(final String capability) {
-    Assertions.assertThat(flagSet.hasCapability(capability))
+    assertThat(flagSet.hasCapability(capability))
         .describedAs("Capability of %s on %s", capability, flagSet)
         .isFalse();
   }
@@ -248,7 +248,7 @@ public void testStarEntry() {
     assertFlags(SimpleEnum.a, SimpleEnum.b, SimpleEnum.c);
     assertHasCapability(CAPABILITY_A);
     assertHasCapability(CAPABILITY_B);
-    Assertions.assertThat(flagSet.pathCapabilities())
+    assertThat(flagSet.pathCapabilities())
         .describedAs("path capabilities of %s", flagSet)
         .containsExactlyInAnyOrder(CAPABILITY_A, CAPABILITY_B, CAPABILITY_C);
   }
@@ -259,7 +259,7 @@ public void testRoundTrip() {
         KEYDOT,
         allOf(SimpleEnum.class));
     final FlagSet<SimpleEnum> s2 = roundTrip(s1);
-    Assertions.assertThat(s1.flags()).isEqualTo(s2.flags());
+    assertThat(s1.flags()).isEqualTo(s2.flags());
     assertFlagSetMatches(s2, SimpleEnum.a, SimpleEnum.b, SimpleEnum.c);
   }
 
@@ -268,13 +268,13 @@ public void testEmptyRoundTrip() {
     final FlagSet<SimpleEnum> s1 = createFlagSet(SimpleEnum.class, KEYDOT,
         noneOf(SimpleEnum.class));
     final FlagSet<SimpleEnum> s2 = roundTrip(s1);
-    Assertions.assertThat(s1.flags())
+    assertThat(s1.flags())
         .isEqualTo(s2.flags());
-    Assertions.assertThat(s2.isEmpty())
+    assertThat(s2.isEmpty())
         .describedAs("empty flagset %s", s2)
         .isTrue();
     assertFlagSetMatches(flagSet);
-    Assertions.assertThat(flagSet.pathCapabilities())
+    assertThat(flagSet.pathCapabilities())
         .describedAs("path capabilities of %s", flagSet)
         .isEmpty();
   }
@@ -298,10 +298,10 @@ public void testEquality() {
     final FlagSet<SimpleEnum> s2 = createFlagSet(SimpleEnum.class, KEYDOT, SimpleEnum.a);
     // make one of them immutable
     s2.makeImmutable();
-    Assertions.assertThat(s1)
+    assertThat(s1)
         .describedAs("s1 == s2")
         .isEqualTo(s2);
-    Assertions.assertThat(s1.hashCode())
+    assertThat(s1.hashCode())
         .describedAs("hashcode of s1 == hashcode of s2")
         .isEqualTo(s2.hashCode());
   }
@@ -312,7 +312,7 @@ public void testInequality() {
         createFlagSet(SimpleEnum.class, KEYDOT, noneOf(SimpleEnum.class));
     final FlagSet<SimpleEnum> s2 =
         createFlagSet(SimpleEnum.class, KEYDOT, SimpleEnum.a, SimpleEnum.b);
-    Assertions.assertThat(s1)
+    assertThat(s1)
         .describedAs("s1 == s2")
         .isNotEqualTo(s2);
   }
@@ -323,7 +323,7 @@ public void testClassInequality() {
         createFlagSet(SimpleEnum.class, KEYDOT, noneOf(SimpleEnum.class));
     final FlagSet<?> s2 =
         createFlagSet(OtherEnum.class, KEYDOT, OtherEnum.a);
-    Assertions.assertThat(s1)
+    assertThat(s1)
         .describedAs("s1 == s2")
         .isNotEqualTo(s2);
   }
@@ -338,13 +338,13 @@ public void testCopy() throws Throwable {
             createFlagSet(SimpleEnum.class, KEYDOT, SimpleEnum.a, SimpleEnum.b);
     s1.makeImmutable();
     FlagSet<SimpleEnum> s2 = s1.copy();
-    Assertions.assertThat(s2)
+    assertThat(s2)
         .describedAs("copy of %s", s1)
         .isNotSameAs(s1);
-    Assertions.assertThat(!s2.isImmutable())
+    assertThat(!s2.isImmutable())
         .describedAs("set %s is immutable", s2)
         .isTrue();
-    Assertions.assertThat(s1)
+    assertThat(s1)
         .describedAs("s1 == s2")
         .isEqualTo(s2);
   }
@@ -377,7 +377,7 @@ private FlagSet<SimpleEnum> roundTrip(FlagSet<SimpleEnum> flagset) {
    * @param flag flag to check
    */
   private void assertEnabled(final SimpleEnum flag) {
-    Assertions.assertThat(flagSet.enabled(flag))
+    assertThat(flagSet.enabled(flag))
         .describedAs("status of flag %s in %s", flag, flagSet)
         .isTrue();
   }
@@ -387,7 +387,7 @@ private void assertEnabled(final SimpleEnum flag) {
    * @param flag flag to check
    */
   private void assertDisabled(final SimpleEnum flag) {
-    Assertions.assertThat(flagSet.enabled(flag))
+    assertThat(flagSet.enabled(flag))
         .describedAs("status of flag %s in %s", flag, flagSet)
         .isFalse();
   }
@@ -409,7 +409,7 @@ private void assertFlags(final SimpleEnum... flags) {
   private void assertFlagSetMatches(
       FlagSet<SimpleEnum> fs,
       SimpleEnum... flags) {
-    Assertions.assertThat(fs.flags())
+    assertThat(fs.flags())
         .describedAs("path capabilities of %s", fs)
         .containsExactly(flags);
   }
@@ -424,7 +424,7 @@ private void assertFlagSetMatches(
   private void assertPathCapabilitiesMatch(
       FlagSet<SimpleEnum> fs,
       String... capabilities) {
-    Assertions.assertThat(fs.pathCapabilities())
+    assertThat(fs.pathCapabilities())
         .describedAs("path capabilities of %s", fs)
         .containsExactlyInAnyOrder(capabilities);
   }

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/impl/TestLeakReporter.java

@@ -20,8 +20,7 @@
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.assertj.core.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -30,6 +29,7 @@
 
 import static org.apache.hadoop.fs.impl.LeakReporter.THREAD_FORMAT;
 import static org.apache.hadoop.test.GenericTestUtils.LogCapturer.captureLogs;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public final class TestLeakReporter extends AbstractHadoopTestBase {
 
@@ -74,7 +74,7 @@ public void testLeakInvocation() throws Throwable {
         oldName,
         Thread.currentThread().getId());
     // log auditing
-    Assertions.assertThat(output)
+    assertThat(output)
         .describedAs("output from the logs")
         .contains("WARN")
         .contains(message)
@@ -140,7 +140,7 @@ public void testCloseActionSwallowed() throws Throwable {
         this::raiseNPE);
     reporter.close();
 
-    Assertions.assertThat(reporter.isClosed())
+    assertThat(reporter.isClosed())
         .describedAs("reporter closed)")
         .isTrue();
   }
@@ -158,7 +158,7 @@ private boolean raiseNPE() {
    * @param ex expected.
    */
   private void assertCloseCount(final int ex) {
-    Assertions.assertThat(closeCount.get())
+    assertThat(closeCount.get())
         .describedAs("close count")
         .isEqualTo(ex);
   }

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/impl/prefetch/TestBlockCache.java

@@ -21,19 +21,19 @@
 
 import java.nio.ByteBuffer;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.LocalDirAllocator;
 import org.apache.hadoop.test.AbstractHadoopTestBase;
 
 import static org.apache.hadoop.fs.CommonConfigurationKeys.HADOOP_TMP_DIR;
 import static org.apache.hadoop.test.LambdaTestUtils.intercept;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class TestBlockCache extends AbstractHadoopTestBase {
 

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/impl/prefetch/TestBlockData.java

@@ -19,14 +19,14 @@
 
 package org.apache.hadoop.fs.impl.prefetch;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.apache.hadoop.test.AbstractHadoopTestBase;
 
 import static org.apache.hadoop.test.LambdaTestUtils.intercept;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class TestBlockData extends AbstractHadoopTestBase {
 

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/impl/prefetch/TestBlockOperations.java

@@ -21,12 +21,12 @@
 
 import java.lang.reflect.Method;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.apache.hadoop.test.AbstractHadoopTestBase;
 
 import static org.apache.hadoop.test.LambdaTestUtils.intercept;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class TestBlockOperations extends AbstractHadoopTestBase {
 

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/impl/prefetch/TestBoundedResourcePool.java

@@ -24,16 +24,16 @@
 import java.util.IdentityHashMap;
 import java.util.Set;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.apache.hadoop.test.AbstractHadoopTestBase;
 
 import static org.apache.hadoop.test.LambdaTestUtils.intercept;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class TestBoundedResourcePool extends AbstractHadoopTestBase {
 

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/impl/prefetch/TestBufferData.java

@@ -26,16 +26,16 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.apache.hadoop.test.AbstractHadoopTestBase;
 
 import static org.apache.hadoop.test.LambdaTestUtils.intercept;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 public class TestBufferData extends AbstractHadoopTestBase {
 

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/impl/prefetch/TestBufferPool.java

@@ -19,15 +19,15 @@
 
 package org.apache.hadoop.fs.impl.prefetch;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.apache.hadoop.test.AbstractHadoopTestBase;
 
 import static org.apache.hadoop.test.LambdaTestUtils.intercept;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 public class TestBufferPool extends AbstractHadoopTestBase {