You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sl...@apache.org on 2025/09/09 11:00:33 UTC
(hadoop) branch trunk updated: HADOOP-19415. [JDK17] Upgrade JUnit from 4 to 5 in hadoop-common Part13. (#7944)
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 0b0510257d3 HADOOP-19415. [JDK17] Upgrade JUnit from 4 to 5 in hadoop-common Part13. (#7944)
0b0510257d3 is described below
commit 0b0510257d3ef2d872bb22bbd2b0629a5b41cf93
Author: zhtttylz <hu...@hotmail.com>
AuthorDate: Tue Sep 9 19:00:26 2025 +0800
HADOOP-19415. [JDK17] Upgrade JUnit from 4 to 5 in hadoop-common Part13. (#7944)
* HADOOP-19415. [JDK17] Upgrade JUnit from 4 to 5 in hadoop-common Part13.
Co-authored-by: Shilun Fan <sl...@apache.org>
Reviewed-by: Shilun Fan <sl...@apache.org>
Signed-off-by: Shilun Fan <sl...@apache.org>
---
.../hadoop/crypto/key/TestKeyProviderCryptoExtension.java | 8 ++------
.../test/java/org/apache/hadoop/fs/TestSymlinkLocalFS.java | 2 +-
.../java/org/apache/hadoop/fs/shell/find/TestResult.java | 9 ++-------
.../test/java/org/apache/hadoop/ipc/TestProtoBufRpc.java | 2 +-
.../org/apache/hadoop/security/TestJNIGroupsMapping.java | 2 +-
.../authorize/TestDefaultImpersonationProvider.java | 8 ++------
.../security/ssl/TestDelegatingSSLSocketFactory.java | 14 +++++++-------
7 files changed, 16 insertions(+), 29 deletions(-)
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/key/TestKeyProviderCryptoExtension.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/key/TestKeyProviderCryptoExtension.java
index aa713abd4b4..173c36a15eb 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/key/TestKeyProviderCryptoExtension.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/key/TestKeyProviderCryptoExtension.java
@@ -25,7 +25,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.concurrent.TimeUnit;
import javax.crypto.Cipher;
import javax.crypto.spec.IvParameterSpec;
@@ -34,9 +33,8 @@
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.crypto.key.KeyProviderCryptoExtension.EncryptedKeyVersion;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.Rule;
import org.junit.jupiter.api.Test;
-import org.junit.rules.Timeout;
+import org.junit.jupiter.api.Timeout;
import static org.apache.hadoop.crypto.key.KeyProvider.KeyVersion;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
@@ -46,6 +44,7 @@
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
+@Timeout(180)
public class TestKeyProviderCryptoExtension {
private static final String CIPHER = "AES";
@@ -57,9 +56,6 @@ public class TestKeyProviderCryptoExtension {
private static KeyProvider.Options options;
private static KeyVersion encryptionKey;
- @Rule
- public Timeout testTimeout = new Timeout(180000, TimeUnit.MILLISECONDS);
-
@BeforeAll
public static void setup() throws Exception {
conf = new Configuration();
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFS.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFS.java
index 4435aeee2d5..bdba2ee08a8 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFS.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFS.java
@@ -22,7 +22,7 @@
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.io.File;
import java.io.FileNotFoundException;
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/find/TestResult.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/find/TestResult.java
index 77d3d2b5e5d..ed66ffa122e 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/find/TestResult.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/find/TestResult.java
@@ -19,17 +19,12 @@
import static org.junit.jupiter.api.Assertions.*;
-import org.junit.Rule;
-import org.junit.rules.Timeout;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
-import java.util.concurrent.TimeUnit;
-
+@Timeout(10)
public class TestResult {
- @Rule
- public Timeout globalTimeout = new Timeout(10000, TimeUnit.MILLISECONDS);
-
// test the PASS value
@Test
public void testPass() {
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestProtoBufRpc.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestProtoBufRpc.java
index 2130b78b5e1..4b24dd06b04 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestProtoBufRpc.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestProtoBufRpc.java
@@ -53,7 +53,7 @@
import static org.apache.hadoop.test.MetricsAsserts.getMetrics;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.fail;
-import static org.junit.Assume.assumeFalse;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
/**
* Test for testing protocol buffer based RPC mechanism.
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestJNIGroupsMapping.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestJNIGroupsMapping.java
index 5183e894a98..fd9dfccb75d 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestJNIGroupsMapping.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestJNIGroupsMapping.java
@@ -16,8 +16,8 @@
* limitations under the License.
*/
package org.apache.hadoop.security;
-import static org.junit.Assume.assumeTrue;
import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.util.Arrays;
import java.util.List;
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/authorize/TestDefaultImpersonationProvider.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/authorize/TestDefaultImpersonationProvider.java
index 47d25044e67..98bc830707a 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/authorize/TestDefaultImpersonationProvider.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/authorize/TestDefaultImpersonationProvider.java
@@ -24,16 +24,14 @@
import org.apache.hadoop.test.LambdaTestUtils;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.Rule;
import org.junit.jupiter.api.Test;
-import org.junit.rules.Timeout;
+import org.junit.jupiter.api.Timeout;
import org.mockito.Mockito;
-import java.util.concurrent.TimeUnit;
-
/**
* Test class for @DefaultImpersonationProvider
*/
+@Timeout(10)
public class TestDefaultImpersonationProvider {
private String proxyUser;
@@ -44,8 +42,6 @@ public class TestDefaultImpersonationProvider {
private UserGroupInformation realUserUGI = Mockito
.mock(UserGroupInformation.class);
private Configuration conf;
- @Rule
- public Timeout globalTimeout = new Timeout(10000, TimeUnit.MILLISECONDS);
@BeforeEach
public void setup() {
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/ssl/TestDelegatingSSLSocketFactory.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/ssl/TestDelegatingSSLSocketFactory.java
index f02c7570e28..844286fc15e 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/ssl/TestDelegatingSSLSocketFactory.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/ssl/TestDelegatingSSLSocketFactory.java
@@ -26,7 +26,7 @@
import org.apache.hadoop.util.NativeCodeLoader;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
/**
* Tests for {@link DelegatingSSLSocketFactory}.
@@ -35,10 +35,10 @@ public class TestDelegatingSSLSocketFactory {
@Test
public void testOpenSSL() throws IOException {
- assumeTrue("Unable to load native libraries",
- NativeCodeLoader.isNativeCodeLoaded());
- assumeTrue("Build was not compiled with support for OpenSSL",
- NativeCodeLoader.buildSupportsOpenssl());
+ assumeTrue(NativeCodeLoader.isNativeCodeLoaded(),
+ "Unable to load native libraries");
+ assumeTrue(NativeCodeLoader.buildSupportsOpenssl(),
+ "Build was not compiled with support for OpenSSL");
DelegatingSSLSocketFactory.initializeDefaultFactory(
DelegatingSSLSocketFactory.SSLChannelMode.OpenSSL);
assertThat(DelegatingSSLSocketFactory.getDefaultFactory()
@@ -47,8 +47,8 @@ public void testOpenSSL() throws IOException {
@Test
public void testJSEENoGCMJava8() throws IOException {
- assumeTrue("Not running on Java 8",
- System.getProperty("java.version").startsWith("1.8"));
+ assumeTrue(System.getProperty("java.version").startsWith("1.8"),
+ "Not running on Java 8");
DelegatingSSLSocketFactory.initializeDefaultFactory(
DelegatingSSLSocketFactory.SSLChannelMode.Default_JSSE);
assertThat(Arrays.stream(DelegatingSSLSocketFactory.getDefaultFactory()
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org