HADOOP-19646. [Addendum] [JDK17] Migrate hadoop-aws module from JUnit4 Assume to JUnit5 Assumptions. (#7951) Contributed by Hualong Zhang.

* HADOOP-19646. [Addendum] [JDK17] Migrate hadoop-aws module from JUnit4 Assume to JUnit5 Assumptions.

Reviewed-by: Cheng Pan <[email protected]>
Signed-off-by: Shilun Fan <[email protected]>

Author: zhtttylz

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

@@ -59,7 +59,7 @@
         SSLChannelMode.Default_JSSE_with_GCM;
 import static org.apache.hadoop.security.ssl.DelegatingSSLSocketFactory.
         SSLChannelMode.OpenSSL;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 
 /**

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

@@ -27,6 +27,7 @@
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.opentest4j.AssertionFailedError;
 import software.amazon.awssdk.services.s3.model.MultipartUpload;
 
 import org.apache.hadoop.conf.Configuration;
@@ -316,7 +317,7 @@ public void testDistCp() throws Throwable {
           options, getConfiguration());
     } else {
       // distcp fails if uploads are visible
-      intercept(org.junit.ComparisonFailure.class, () -> {
+      intercept(AssertionFailedError.class, () -> {
         DistCpTestUtils.assertRunDistCp(DistCpConstants.SUCCESS, src.toString(), dest.toString(),
             options, getConfiguration());
       });
@@ -339,7 +340,7 @@ public void testDistCpNoIterator() throws Throwable {
           options, getConfiguration());
     } else {
       // distcp fails if uploads are visible
-      intercept(org.junit.ComparisonFailure.class, () -> {
+      intercept(AssertionFailedError.class, () -> {
         DistCpTestUtils.assertRunDistCp(DistCpConstants.SUCCESS, src.toString(), dest.toString(),
             options, getConfiguration());
       });