HADOOP-19426. [JDK17] Upgrade JUnit from 4 to 5 in hadoop-azure-datalake.

slfan1989 · slfan1989 · commit 389c6a6f02f4 · 2025-04-26T18:16:18.000+08:00
diff --git a/hadoop-tools/hadoop-azure-datalake/src/test/java/org/apache/hadoop/fs/adl/TestAzureADTokenProvider.java b/hadoop-tools/hadoop-azure-datalake/src/test/java/org/apache/hadoop/fs/adl/TestAzureADTokenProvider.java
@@ -44,15 +44,15 @@
     .AZURE_AD_TOKEN_PROVIDER_TYPE_KEY;
 import static org.apache.hadoop.fs.adl.AdlConfKeys.DEVICE_CODE_CLIENT_APP_ID;
 import static org.apache.hadoop.fs.adl.TokenProviderType.*;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.hadoop.security.ProviderUtils;
 import org.apache.hadoop.security.alias.CredentialProvider;
 import org.apache.hadoop.security.alias.CredentialProviderFactory;
 import org.apache.hadoop.test.GenericTestUtils;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
 import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.rules.TemporaryFolder;
 
 /**
@@ -81,7 +81,7 @@ public void testRefreshTokenProvider()
     AdlFileSystem fileSystem = new AdlFileSystem();
     fileSystem.initialize(uri, conf);
     AccessTokenProvider tokenProvider = fileSystem.getTokenProvider();
-    Assert.assertTrue(tokenProvider instanceof RefreshTokenBasedTokenProvider);
+    Assertions.assertTrue(tokenProvider instanceof RefreshTokenBasedTokenProvider);
   }
 
   @Test
@@ -97,7 +97,7 @@ public void testClientCredTokenProvider()
     AdlFileSystem fileSystem = new AdlFileSystem();
     fileSystem.initialize(uri, conf);
     AccessTokenProvider tokenProvider = fileSystem.getTokenProvider();
-    Assert.assertTrue(tokenProvider instanceof ClientCredsTokenProvider);
+    Assertions.assertTrue(tokenProvider instanceof ClientCredsTokenProvider);
   }
 
   @Test
@@ -110,7 +110,7 @@ public void testMSITokenProvider()
     AdlFileSystem fileSystem = new AdlFileSystem();
     fileSystem.initialize(uri, conf);
     AccessTokenProvider tokenProvider = fileSystem.getTokenProvider();
-    Assert.assertTrue(tokenProvider instanceof MsiTokenProvider);
+    Assertions.assertTrue(tokenProvider instanceof MsiTokenProvider);
   }
 
   @Test
@@ -129,7 +129,7 @@ public void testDeviceCodeTokenProvider()
       AdlFileSystem fileSystem = new AdlFileSystem();
       fileSystem.initialize(uri, conf);
       AccessTokenProvider tokenProvider = fileSystem.getTokenProvider();
-      Assert.assertTrue(tokenProvider instanceof DeviceCodeTokenProvider);
+      Assertions.assertTrue(tokenProvider instanceof DeviceCodeTokenProvider);
     }
   }
 
@@ -145,7 +145,7 @@ public void testCustomCredTokenProvider()
     AdlFileSystem fileSystem = new AdlFileSystem();
     fileSystem.initialize(uri, conf);
     AccessTokenProvider tokenProvider = fileSystem.getTokenProvider();
-    Assert.assertTrue(tokenProvider instanceof SdkTokenProviderAdapter);
+    Assertions.assertTrue(tokenProvider instanceof SdkTokenProviderAdapter);
   }
 
   @Test
@@ -157,7 +157,7 @@ public void testInvalidProviderConfigurationForType()
     AdlFileSystem fileSystem = new AdlFileSystem();
     try {
       fileSystem.initialize(uri, conf);
-      Assert.fail("Initialization should have failed due no token provider "
+      Assertions.fail("Initialization should have failed due no token provider "
           + "configuration");
     } catch (IllegalArgumentException e) {
       GenericTestUtils.assertExceptionContains(
@@ -179,10 +179,10 @@ public void testInvalidProviderConfigurationForClassPath()
         "wrong.classpath.CustomMockTokenProvider");
     try {
       fileSystem.initialize(uri, conf);
-      Assert.fail("Initialization should have failed due invalid provider "
+      Assertions.fail("Initialization should have failed due invalid provider "
           + "configuration");
     } catch (RuntimeException e) {
-      Assert.assertTrue(
+      Assertions.assertTrue(
           e.getMessage().contains("wrong.classpath.CustomMockTokenProvider"));
     }
   }
@@ -217,7 +217,7 @@ public void testRefreshTokenWithCredentialProvider()
     fileSystem.initialize(uri, conf);
     RefreshTokenBasedTokenProvider expected =
         new RefreshTokenBasedTokenProvider(CLIENT_ID, REFRESH_TOKEN);
-    Assert.assertTrue(EqualsBuilder.reflectionEquals(expected,
+    Assertions.assertTrue(EqualsBuilder.reflectionEquals(expected,
         fileSystem.getTokenProvider()));
   }
 
@@ -236,7 +236,7 @@ public void testRefreshTokenWithCredentialProviderFallback()
     fileSystem.initialize(uri, conf);
     RefreshTokenBasedTokenProvider expected =
         new RefreshTokenBasedTokenProvider(CLIENT_ID, REFRESH_TOKEN);
-    Assert.assertTrue(EqualsBuilder.reflectionEquals(expected,
+    Assertions.assertTrue(EqualsBuilder.reflectionEquals(expected,
         fileSystem.getTokenProvider()));
   }
 
@@ -263,7 +263,7 @@ public void testClientCredWithCredentialProvider()
     fileSystem.initialize(uri, conf);
     ClientCredsTokenProvider expected = new ClientCredsTokenProvider(
         REFRESH_URL, CLIENT_ID, CLIENT_SECRET);
-    Assert.assertTrue(EqualsBuilder.reflectionEquals(expected,
+    Assertions.assertTrue(EqualsBuilder.reflectionEquals(expected,
         fileSystem.getTokenProvider()));
   }
 
@@ -283,7 +283,7 @@ public void testClientCredWithCredentialProviderFallback()
     fileSystem.initialize(uri, conf);
     ClientCredsTokenProvider expected = new ClientCredsTokenProvider(
         REFRESH_URL, CLIENT_ID, CLIENT_SECRET);
-    Assert.assertTrue(EqualsBuilder.reflectionEquals(expected,
+    Assertions.assertTrue(EqualsBuilder.reflectionEquals(expected,
         fileSystem.getTokenProvider()));
   }
 
diff --git a/hadoop-tools/hadoop-azure-datalake/src/test/java/org/apache/hadoop/fs/adl/TestRelativePathFormation.java b/hadoop-tools/hadoop-azure-datalake/src/test/java/org/apache/hadoop/fs/adl/TestRelativePathFormation.java
@@ -20,8 +20,8 @@
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.net.URI;
@@ -48,17 +48,17 @@ public void testToRelativePath() throws URISyntaxException, IOException {
 
     fs.initialize(new URI("adl://temp.account.net"), configuration);
 
-    Assert.assertEquals("/usr", fs.toRelativeFilePath(new Path("/usr")));
-    Assert.assertEquals("/usr",
+    Assertions.assertEquals("/usr", fs.toRelativeFilePath(new Path("/usr")));
+    Assertions.assertEquals("/usr",
         fs.toRelativeFilePath(new Path("adl://temp.account.net/usr")));
 
     // When working directory is set.
     fs.setWorkingDirectory(new Path("/a/b/"));
-    Assert.assertEquals("/usr", fs.toRelativeFilePath(new Path("/usr")));
-    Assert.assertEquals("/a/b/usr", fs.toRelativeFilePath(new Path("usr")));
-    Assert.assertEquals("/usr",
+    Assertions.assertEquals("/usr", fs.toRelativeFilePath(new Path("/usr")));
+    Assertions.assertEquals("/a/b/usr", fs.toRelativeFilePath(new Path("usr")));
+    Assertions.assertEquals("/usr",
         fs.toRelativeFilePath(new Path("adl://temp.account.net/usr")));
-    Assert.assertEquals("/usr",
+    Assertions.assertEquals("/usr",
         fs.toRelativeFilePath(new Path("wasb://temp.account.net/usr")));
   }
 
diff --git a/hadoop-tools/hadoop-azure-datalake/src/test/java/org/apache/hadoop/fs/adl/TestValidateConfiguration.java b/hadoop-tools/hadoop-azure-datalake/src/test/java/org/apache/hadoop/fs/adl/TestValidateConfiguration.java
@@ -20,7 +20,7 @@
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.test.GenericTestUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.apache.hadoop.fs.adl.AdlConfKeys.ADL_BLOCK_SIZE;
 import static org.apache.hadoop.fs.adl.AdlConfKeys
@@ -57,7 +57,7 @@
     .TOKEN_PROVIDER_TYPE_REFRESH_TOKEN;
 import static org.apache.hadoop.fs.adl.AdlConfKeys.WRITE_BUFFER_SIZE_KEY;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/hadoop-tools/hadoop-azure-datalake/src/test/java/org/apache/hadoop/fs/adl/live/TestAdlContractAppendLive.java b/hadoop-tools/hadoop-azure-datalake/src/test/java/org/apache/hadoop/fs/adl/live/TestAdlContractAppendLive.java
@@ -23,7 +23,7 @@
 import org.apache.hadoop.fs.contract.AbstractContractAppendTest;
 import org.apache.hadoop.fs.contract.AbstractFSContract;
 import org.apache.hadoop.fs.contract.ContractTestUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test Append on Adl file system.
diff --git a/hadoop-tools/hadoop-azure-datalake/src/test/java/org/apache/hadoop/fs/adl/live/TestAdlContractConcatLive.java b/hadoop-tools/hadoop-azure-datalake/src/test/java/org/apache/hadoop/fs/adl/live/TestAdlContractConcatLive.java
@@ -23,7 +23,7 @@
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.contract.AbstractContractConcatTest;
 import org.apache.hadoop.fs.contract.AbstractFSContract;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.apache.hadoop.fs.contract.ContractTestUtils.touch;
 
diff --git a/hadoop-tools/hadoop-azure-datalake/src/test/java/org/apache/hadoop/fs/adl/live/TestAdlDifferentSizeWritesLive.java b/hadoop-tools/hadoop-azure-datalake/src/test/java/org/apache/hadoop/fs/adl/live/TestAdlDifferentSizeWritesLive.java
@@ -24,10 +24,10 @@
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.adl.common.Parallelized;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
@@ -71,7 +71,7 @@ public static Collection testDataForIntegrityTest() {
             {10 * 1024, 8 * 1024}});
   }
 
-  @BeforeClass
+  @BeforeAll
   public static void cleanUpParent() throws IOException, URISyntaxException {
     if (AdlStorageConfiguration.isContractTestEnabled()) {
       Path path = new Path("/test/dataIntegrityCheck/");
@@ -80,7 +80,7 @@ public static void cleanUpParent() throws IOException, URISyntaxException {
     }
   }
 
-  @Before
+  @BeforeEach
   public void setup() throws Exception {
     org.junit.Assume
         .assumeTrue(AdlStorageConfiguration.isContractTestEnabled());
@@ -117,7 +117,7 @@ public void testDataIntegrity() throws IOException {
     FSDataInputStream in = fs.open(path);
     in.readFully(0, actualData);
     in.close();
-    Assert.assertArrayEquals(expectedData, actualData);
-    Assert.assertTrue(fs.delete(path, true));
+    Assertions.assertArrayEquals(expectedData, actualData);
+    Assertions.assertTrue(fs.delete(path, true));
   }
 }
diff --git a/hadoop-tools/hadoop-azure-datalake/src/test/java/org/apache/hadoop/fs/adl/live/TestAdlFileContextCreateMkdirLive.java b/hadoop-tools/hadoop-azure-datalake/src/test/java/org/apache/hadoop/fs/adl/live/TestAdlFileContextCreateMkdirLive.java
@@ -26,7 +26,7 @@
 import org.apache.hadoop.fs.FileContextTestHelper;
 import org.apache.hadoop.fs.FileSystem;
 import org.junit.Assume;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.BeforeAll;
 
 import java.net.URI;
 import java.util.UUID;
@@ -38,7 +38,7 @@ public class TestAdlFileContextCreateMkdirLive
     extends FileContextCreateMkdirBaseTest {
   private static final String KEY_FILE_SYSTEM = "test.fs.adl.name";
 
-  @BeforeClass
+  @BeforeAll
   public static void skipTestCheck() {
     Assume.assumeTrue(AdlStorageConfiguration.isContractTestEnabled());
   }
diff --git a/hadoop-tools/hadoop-azure-datalake/src/test/java/org/apache/hadoop/fs/adl/live/TestAdlFileContextMainOperationsLive.java b/hadoop-tools/hadoop-azure-datalake/src/test/java/org/apache/hadoop/fs/adl/live/TestAdlFileContextMainOperationsLive.java
@@ -22,8 +22,8 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.*;
 import org.junit.Assume;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.net.URI;
@@ -39,7 +39,7 @@ public class TestAdlFileContextMainOperationsLive
 
   private static final String KEY_FILE_SYSTEM = "test.fs.adl.name";
 
-  @BeforeClass
+  @BeforeAll
   public static void skipTestCheck() {
     Assume.assumeTrue(AdlStorageConfiguration.isContractTestEnabled());
   }
diff --git a/hadoop-tools/hadoop-azure-datalake/src/test/java/org/apache/hadoop/fs/adl/live/TestAdlFileSystemContractLive.java b/hadoop-tools/hadoop-azure-datalake/src/test/java/org/apache/hadoop/fs/adl/live/TestAdlFileSystemContractLive.java
@@ -22,9 +22,9 @@
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.FileSystemContractBaseTest;
 import org.apache.hadoop.fs.Path;
-import org.junit.After;
+import org.junit.jupiter.api.AfterEach;
 import static org.junit.Assume.*;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 
 import java.io.IOException;
 
@@ -34,7 +34,7 @@
 public class TestAdlFileSystemContractLive extends FileSystemContractBaseTest {
   private FileSystem adlStore;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     skipTestCheck();
     adlStore = AdlStorageConfiguration.createStorageConnector();
@@ -44,7 +44,7 @@ public void setUp() throws Exception {
     assumeNotNull(fs);
   }
 
-  @After
+  @AfterEach
   public void tearDown() throws Exception {
     if (AdlStorageConfiguration.isContractTestEnabled()) {
       cleanup();
diff --git a/hadoop-tools/hadoop-azure-datalake/src/test/java/org/apache/hadoop/fs/adl/live/TestAdlInternalCreateNonRecursive.java b/hadoop-tools/hadoop-azure-datalake/src/test/java/org/apache/hadoop/fs/adl/live/TestAdlInternalCreateNonRecursive.java
@@ -25,10 +25,10 @@
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.adl.common.Parallelized;
 import org.apache.hadoop.fs.permission.FsPermission;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
 import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
@@ -92,7 +92,7 @@ public static Collection adlCreateNonRecursiveTestData()
             IOException.class }*/});
   }
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     Assume.assumeTrue(AdlStorageConfiguration.isContractTestEnabled());
     adlStore = AdlStorageConfiguration.createStorageConnector();
@@ -122,12 +122,12 @@ public void testCreateNonRecursiveFunctionality() throws IOException {
         throw e;
       }
 
-      Assert.assertEquals(expectedExceptionType, e.getClass());
+      Assertions.assertEquals(expectedExceptionType, e.getClass());
       return;
     }
 
     if (expectedExceptionType != null) {
-      Assert.fail("CreateNonRecursive should have failed with exception "
+      Assertions.fail("CreateNonRecursive should have failed with exception "
           + expectedExceptionType.getName());
     }
   }
diff --git a/hadoop-tools/hadoop-azure-datalake/src/test/java/org/apache/hadoop/fs/adl/live/TestAdlSdkConfiguration.java b/hadoop-tools/hadoop-azure-datalake/src/test/java/org/apache/hadoop/fs/adl/live/TestAdlSdkConfiguration.java
@@ -23,9 +23,9 @@
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.adl.AdlFileSystem;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
 import org.junit.Assume;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -57,8 +57,8 @@ public void testDefaultTimeout() throws IOException {
     // Skip this test if we can't get a real FS
     Assume.assumeNotNull(fs);
     effectiveTimeout = fs.getAdlClient().getDefaultTimeout();
-    Assert.assertFalse("A negative timeout is not supposed to take effect",
-        effectiveTimeout < 0);
+    Assertions.assertFalse(effectiveTimeout < 0,
+        "A negative timeout is not supposed to take effect");
 
     conf = AdlStorageConfiguration.getConfiguration();
     conf.setInt(ADL_HTTP_TIMEOUT, 17);
@@ -71,8 +71,8 @@ public void testDefaultTimeout() throws IOException {
     }
 
     effectiveTimeout = fs.getAdlClient().getDefaultTimeout();
-    Assert.assertEquals("Timeout is getting set",
-        effectiveTimeout, 17);
+    Assertions.assertEquals(
+        effectiveTimeout, 17, "Timeout is getting set");
 
     // The default value may vary by SDK, so that value is not tested here.
   }
@@ -101,8 +101,8 @@ public void testSSLChannelMode(SSLChannelMode expectedMode,
     Assume.assumeNotNull(fs);
 
     SSLChannelMode sslChannelMode = fs.getAdlClient().getSSLChannelMode();
-    Assert.assertEquals(
-        "Unexpected SSL Channel Mode for adl.ssl.channel.mode config value : "
-            + sslChannelModeConfigValue, expectedMode, sslChannelMode);
+    Assertions.assertEquals(
+    expectedMode, sslChannelMode, "Unexpected SSL Channel Mode for adl.ssl.channel.mode config value : "
+            + sslChannelModeConfigValue);
   }
 }
diff --git a/hadoop-tools/hadoop-azure-datalake/src/test/java/org/apache/hadoop/fs/adl/live/TestAdlSupportedCharsetInPath.java b/hadoop-tools/hadoop-azure-datalake/src/test/java/org/apache/hadoop/fs/adl/live/TestAdlSupportedCharsetInPath.java
diff --git a/hadoop-tools/hadoop-azure-datalake/src/test/java/org/apache/hadoop/fs/adl/live/TestMetadata.java b/hadoop-tools/hadoop-azure-datalake/src/test/java/org/apache/hadoop/fs/adl/live/TestMetadata.java
