HADOOP-19424. [S3A] Upgrade JUnit from 4 to 5 in hadoop-aws.

Author: slfan1989

hadoop-tools/hadoop-aws/pom.xml

@@ -499,11 +499,6 @@
       <artifactId>wildfly-openssl</artifactId>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-inline</artifactId>
@@ -618,10 +613,5 @@
       <artifactId>junit-platform-launcher</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/AbstractS3AMockTest.java

@@ -30,8 +30,6 @@
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.Rule;
-import org.junit.rules.ExpectedException;
 
 
 /**
@@ -49,9 +47,6 @@ public abstract class AbstractS3AMockTest {
               .build())
           .build();
 
-  @Rule
-  public ExpectedException exception = ExpectedException.none();
-
   protected S3AFileSystem fs;
   protected S3Client s3;
   protected Configuration conf;

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3AAWSCredentialsProvider.java

@@ -644,10 +644,10 @@ public void testConcurrentAuthentication() throws Throwable {
 
       for (Future<AwsCredentials> result : results) {
         AwsCredentials credentials = result.get();
-        assertEquals("Access key from credential provider",
-            "expectedAccessKey", credentials.accessKeyId());
-        assertEquals("Secret key from credential provider",
-            "expectedSecret", credentials.secretAccessKey());
+        assertEquals("expectedAccessKey", credentials.accessKeyId(),
+            "Access key from credential provider");
+        assertEquals("expectedSecret", credentials.secretAccessKey(),
+            "Secret key from credential provider");
       }
     } finally {
       pool.awaitTermination(TERMINATION_TIMEOUT, TimeUnit.SECONDS);

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3AGetFileStatus.java

@@ -131,16 +131,17 @@ public void testRoot() throws Exception {
 
   @Test
   public void testNotFound() throws Exception {
-    Path path = new Path("/dir");
-    String key = path.toUri().getPath().substring(1);
-    when(s3.headObject(argThat(correctGetMetadataRequest(BUCKET, key))))
-      .thenThrow(NOT_FOUND);
-    when(s3.headObject(argThat(
-      correctGetMetadataRequest(BUCKET, key + "/")
-    ))).thenThrow(NOT_FOUND);
-    setupListMocks(Collections.emptyList(), Collections.emptyList());
-    exception.expect(FileNotFoundException.class);
-    fs.getFileStatus(path);
+    assertThrows(FileNotFoundException.class, () -> {
+      Path path = new Path("/dir");
+      String key = path.toUri().getPath().substring(1);
+      when(s3.headObject(argThat(correctGetMetadataRequest(BUCKET, key))))
+          .thenThrow(NOT_FOUND);
+      when(s3.headObject(argThat(
+          correctGetMetadataRequest(BUCKET, key + "/")
+      ))).thenThrow(NOT_FOUND);
+      setupListMocks(Collections.emptyList(), Collections.emptyList());
+      fs.getFileStatus(path);
+    });
   }
 
   private void setupListMocks(List<CommonPrefix> prefixes,

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3AInputPolicies.java

@@ -19,17 +19,15 @@
 package org.apache.hadoop.fs.s3a;
 
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import java.util.Arrays;
 import java.util.Collection;
 
 /**
  * Unit test of the input policy logic, without making any S3 calls.
  */
-@RunWith(Parameterized.class)
 public class TestS3AInputPolicies {
 
   private S3AInputPolicy policy;
@@ -45,7 +43,7 @@ public class TestS3AInputPolicies {
   public static final long _1MB = 1024L * 1024;
   public static final long _10MB = _1MB * 10;
 
-  public TestS3AInputPolicies(S3AInputPolicy policy,
+  public void initTestS3AInputPolicies(S3AInputPolicy policy,
       long targetPos,
       long length,
       long contentLength,
@@ -59,7 +57,6 @@ public TestS3AInputPolicies(S3AInputPolicy policy,
     this.expectedLimit = expectedLimit;
   }
 
-  @Parameterized.Parameters
   public static Collection<Object[]> data() {
     return Arrays.asList(new Object[][]{
         {S3AInputPolicy.Normal, 0, -1, 0, _64K, 0},
@@ -79,8 +76,12 @@ public static Collection<Object[]> data() {
     });
   }
 
-  @Test
-  public void testInputPolicies() throws Throwable {
+  @MethodSource("data")
+  @ParameterizedTest
+  public void testInputPolicies(S3AInputPolicy policy,
+      long targetPos, long length, long contentLength,
+      long readahead, long expectedLimit) throws Throwable {
+    initTestS3AInputPolicies(policy, targetPos, length, contentLength, readahead, expectedLimit);
     Assertions.assertEquals(
         expectedLimit,
         S3AInputStream.calculateRequestLimit(policy, targetPos,

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/commit/AbstractITCommitProtocol.java

@@ -733,8 +733,8 @@ private void validateContent(Path dir,
     expectedOutput.append(KEY_1).append("\n");
     expectedOutput.append(KEY_2).append('\t').append(VAL_2).append("\n");
     String output = readFile(expectedFile);
-    assertEquals("Content of " + expectedFile,
-        expectedOutput.toString(), output);
+    assertEquals(expectedOutput.toString(), output,
+        "Content of " + expectedFile);
   }
 
   /**

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/commit/TestMagicCommitPaths.java

@@ -178,9 +178,9 @@ public void testFinalDestinationRootMagic2() {
 
   @Test
   public void testFinalDestinationMagicNoChild() {
-      Assertions.assertThrows(IllegalArgumentException.class, () -> {
-          finalDestination(l(MAGIC_PATH_PREFIX));
-      });
+    Assertions.assertThrows(IllegalArgumentException.class, () -> {
+      finalDestination(l(MAGIC_PATH_PREFIX));
+    });
   }
 
   @Test
@@ -190,9 +190,9 @@ public void testFinalDestinationBaseDirectChild() {
 
   @Test
   public void testFinalDestinationBaseNoChild() {
-      Assertions.assertThrows(IllegalArgumentException.class, () -> {
-          assertEquals(l(), finalDestination(l(MAGIC_PATH_PREFIX, BASE)));
-      });
+    Assertions.assertThrows(IllegalArgumentException.class, () -> {
+      assertEquals(l(), finalDestination(l(MAGIC_PATH_PREFIX, BASE)));
+    });
   }
 
   @Test
@@ -239,8 +239,8 @@ public void assertChildren(String[] expected, List<String> elements) {
 
   private void assertPathSplits(String pathString, String[] expected) {
     Path path = new Path(pathString);
-    assertArrayEquals(expected
-,         splitPathToElements(path).toArray(), "From path " + path);
+    assertArrayEquals(expected,
+        splitPathToElements(path).toArray(), "From path " + path);
   }
 
   private void assertListEquals(String[] expected, List<String> actual) {

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/commit/TestMagicCommitTrackerUtils.java

@@ -57,8 +57,9 @@ public void testExtractTaskAttemptIdFromPath() {
         taskAttemptId);
     Path path = CommitUtilsWithMR
         .getBaseMagicTaskAttemptPath(taskAttemptContext, "00001", DEST_PATH);
-    assertEquals(attemptId
-,         MagicCommitTrackerUtils.extractTaskAttemptIdFromPath(path), "TaskAttemptId didn't match");
+    assertEquals(attemptId,
+        MagicCommitTrackerUtils.extractTaskAttemptIdFromPath(path),
+        "TaskAttemptId didn't match");
 
   }
 }

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/commit/magic/ITestMagicCommitProtocol.java

@@ -170,9 +170,9 @@ protected void validateTaskAttemptWorkingDirectory(
       final AbstractS3ACommitter committer,
       final TaskAttemptContext context) throws IOException {
     URI wd = committer.getWorkPath().toUri();
-    assertEquals("Wrong schema for working dir " + wd
-        + " with committer " + committer,
-        "s3a", wd.getScheme());
+    assertEquals("s3a", wd.getScheme(),
+        "Wrong schema for working dir " + wd
+        + " with committer " + committer);
     Assertions.assertThat(wd.getPath())
         .contains("/" + MAGIC_PATH_PREFIX + committer.getUUID() + "/");
   }