This is an automated email from the ASF dual-hosted git repository.
slfan1989 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 3fcf03ab873 HADOOP-19646. [Addendum] [JDK17] Migrate hadoop-aws module
from JUnit4 Assume to JUnit5 Assumptions. (#7951) Contributed by Hualong Zhang.
3fcf03ab873 is described below
commit 3fcf03ab8730b34339f78ef974a96f8bc081911d
Author: zhtttylz <hualon...@hotmail.com>
AuthorDate: Sat Sep 13 00:49:04 2025 +0800
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 <cheng...@apache.org>
Signed-off-by: Shilun Fan <slfan1...@apache.org>
---
.../java/org/apache/hadoop/fs/contract/s3a/ITestS3AContractSeek.java | 2 +-
.../java/org/apache/hadoop/fs/s3a/impl/ITestTreewalkProblems.java | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git
a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3a/ITestS3AContractSeek.java
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3a/ITestS3AContractSeek.java
index 7ba5fe1177c..12433383f67 100644
---
a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3a/ITestS3AContractSeek.java
+++
b/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;
/**
diff --git
a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/impl/ITestTreewalkProblems.java
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/impl/ITestTreewalkProblems.java
index afc4a62a8e8..965512f3a0d 100644
---
a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/impl/ITestTreewalkProblems.java
+++
b/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());
});
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
