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 3df1975a20e HADOOP-19646. [JDK17] Migrate hadoop-aws module from
JUnit4 Assume to JUnit5 Assumptions. (#7858)
3df1975a20e is described below
commit 3df1975a20ead999a2259bedb02b194eade13da2
Author: slfan1989 <55643692+slfan1...@users.noreply.github.com>
AuthorDate: Tue Aug 12 09:38:29 2025 +0800
HADOOP-19646. [JDK17] Migrate hadoop-aws module from JUnit4 Assume to
JUnit5 Assumptions. (#7858)
* HADOOP-19646. Migrate hadoop-aws module from JUnit4 Assume to JUnit5
Assumptions.
Co-authored-by: Steve Loughran <ste...@apache.org>
Reviewed-by: Steve Loughran <ste...@apache.org>
Signed-off-by: Shilun Fan <slfan1...@apache.org>
---
.../org/apache/hadoop/fs/s3a/ITestS3ABlockOutputDisk.java | 6 ++++--
.../java/org/apache/hadoop/fs/s3a/ITestS3ADelayedFNF.java | 8 ++++----
.../src/test/java/org/apache/hadoop/fs/s3a/S3ATestUtils.java | 12 +++++++-----
.../java/org/apache/hadoop/fs/s3a/auth/RoleTestUtils.java | 7 ++++---
.../apache/hadoop/fs/s3a/test/PublicDatasetTestUtils.java | 8 ++++----
5 files changed, 23 insertions(+), 18 deletions(-)
diff --git
a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ABlockOutputDisk.java
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ABlockOutputDisk.java
index ad8c76d2a61..f09cd7e377e 100644
---
a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ABlockOutputDisk.java
+++
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ABlockOutputDisk.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.fs.s3a;
-import org.junit.Assume;
+import static org.assertj.core.api.Assumptions.assumeThat;
/**
* Use {@link Constants#FAST_UPLOAD_BUFFER_DISK} for buffering.
@@ -36,7 +36,9 @@ protected String getBlockOutputBufferName() {
* @return null
*/
protected S3ADataBlocks.BlockFactory createFactory(S3AFileSystem fileSystem)
{
- Assume.assumeTrue("mark/reset not supported", false);
+ assumeThat(false)
+ .as("mark/reset not supported")
+ .isTrue();
return null;
}
}
diff --git
a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ADelayedFNF.java
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ADelayedFNF.java
index cfdfcded4ee..f5753e15fab 100644
---
a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ADelayedFNF.java
+++
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ADelayedFNF.java
@@ -26,7 +26,6 @@
import org.apache.hadoop.fs.s3a.impl.ChangeDetectionPolicy.Source;
import org.apache.hadoop.test.LambdaTestUtils;
-import org.junit.Assume;
import org.junit.jupiter.api.Test;
import java.io.FileNotFoundException;
@@ -36,6 +35,7 @@
import static org.apache.hadoop.fs.s3a.Constants.RETRY_INTERVAL;
import static org.apache.hadoop.fs.s3a.Constants.RETRY_LIMIT;
import static
org.apache.hadoop.fs.s3a.S3ATestUtils.removeBaseAndBucketOverrides;
+import static org.assertj.core.api.Assumptions.assumeThat;
/**
* Tests behavior of a FileNotFound error that happens after open(), i.e. on
@@ -68,9 +68,9 @@ public void testNotFoundFirstRead() throws Exception {
S3AFileSystem fs = getFileSystem();
ChangeDetectionPolicy changeDetectionPolicy =
fs.getChangeDetectionPolicy();
- Assume.assumeFalse("FNF not expected when using a bucket with"
- + " object versioning",
- changeDetectionPolicy.getSource() == Source.VersionId);
+ assumeThat(changeDetectionPolicy.getSource())
+ .as("FNF not expected when using a bucket with object versioning")
+ .isNotEqualTo(Source.VersionId);
Path p = path("some-file");
ContractTestUtils.createFile(fs, p, false, new byte[] {20, 21, 22});
diff --git
a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/S3ATestUtils.java
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/S3ATestUtils.java
index d244e500484..07af6e6b1aa 100644
---
a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/S3ATestUtils.java
+++
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/S3ATestUtils.java
@@ -71,7 +71,6 @@
import org.assertj.core.api.Assertions;
import org.assertj.core.api.Assumptions;
-import org.junit.Assume;
import org.opentest4j.TestAbortedException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -127,6 +126,7 @@
import static
org.apache.hadoop.util.functional.FunctionalIO.uncheckIOExceptions;
import static
org.apache.hadoop.util.functional.RemoteIterators.mappingRemoteIterator;
import static org.apache.hadoop.util.functional.RemoteIterators.toList;
+import static org.assertj.core.api.Assumptions.assumeThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -234,8 +234,9 @@ public static S3AFileSystem
createTestFileSystem(Configuration conf,
}
// This doesn't work with our JUnit 3 style test cases, so instead we'll
// make this whole class not run by default
- Assume.assumeTrue("No test filesystem in " + TEST_FS_S3A_NAME,
- liveTest);
+ assumeThat(liveTest)
+ .as("No test filesystem in " + TEST_FS_S3A_NAME)
+ .isTrue();
S3AFileSystem fs1 = new S3AFileSystem();
//enable purging in tests
@@ -276,8 +277,9 @@ public static FileContext
createTestFileContext(Configuration conf)
}
// This doesn't work with our JUnit 3 style test cases, so instead we'll
// make this whole class not run by default
- Assume.assumeTrue("No test filesystem in " + TEST_FS_S3A_NAME,
- liveTest);
+ assumeThat(liveTest)
+ .as("No test filesystem in " + TEST_FS_S3A_NAME)
+ .isTrue();
FileContext fc = FileContext.getFileContext(testURI, conf);
return fc;
}
diff --git
a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/auth/RoleTestUtils.java
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/auth/RoleTestUtils.java
index 11600fc56ff..a1dd177387b 100644
---
a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/auth/RoleTestUtils.java
+++
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/auth/RoleTestUtils.java
@@ -26,7 +26,6 @@
import java.util.stream.IntStream;
import com.fasterxml.jackson.core.JsonProcessingException;
-import org.junit.Assume;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,6 +45,7 @@
import static org.apache.hadoop.fs.s3a.auth.RolePolicies.*;
import static
org.apache.hadoop.fs.s3a.auth.delegation.DelegationConstants.DELEGATION_TOKEN_BINDING;
import static org.apache.hadoop.test.LambdaTestUtils.intercept;
+import static org.assertj.core.api.Assumptions.assumeThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -212,8 +212,9 @@ public static <T> AccessDeniedException forbidden(
*/
public static String probeForAssumedRoleARN(Configuration conf) {
String arn = conf.getTrimmed(ASSUMED_ROLE_ARN, "");
- Assume.assumeTrue("No ARN defined in " + ASSUMED_ROLE_ARN,
- !arn.isEmpty());
+ assumeThat(arn)
+ .as("No ARN defined in " + ASSUMED_ROLE_ARN)
+ .isNotEmpty();
return arn;
}
diff --git
a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/test/PublicDatasetTestUtils.java
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/test/PublicDatasetTestUtils.java
index 9400cfb3fb2..4ba60a2b20d 100644
---
a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/test/PublicDatasetTestUtils.java
+++
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/test/PublicDatasetTestUtils.java
@@ -18,8 +18,6 @@
package org.apache.hadoop.fs.s3a.test;
-import org.junit.Assume;
-
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
@@ -29,6 +27,7 @@
import static
org.apache.hadoop.fs.s3a.S3ATestConstants.KEY_BUCKET_WITH_MANY_OBJECTS;
import static
org.apache.hadoop.fs.s3a.S3ATestConstants.KEY_REQUESTER_PAYS_FILE;
+import static org.assertj.core.api.Assumptions.assumeThat;
/**
* Provides S3A filesystem URIs for public data sets for specific use cases.
@@ -128,8 +127,9 @@ public static Path requireAnonymousDataPath(Configuration
conf) {
*/
public static String requireDefaultExternalDataFile(Configuration conf) {
String filename = getExternalData(conf).toUri().toString();
- Assume.assumeTrue("External test file is not the default",
- DEFAULT_EXTERNAL_FILE.equals(filename));
+ assumeThat(filename)
+ .as("External test file is not the default")
+ .isEqualTo(DEFAULT_EXTERNAL_FILE);
return filename;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
