HADOOP-19425. Improve Some Code.

Author: slfan1989

hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/extensions/TestCustomOauthTokenProvider.java

@@ -55,17 +55,17 @@ public void testCustomProviderBinding() throws Throwable {
         "not-a-real-account");
     CustomTokenProviderAdapter provider =
         (CustomTokenProviderAdapter) abfs.getTokenProvider();
-    assertEquals("User agent", INITED, provider.getUserAgentSuffix());
+    assertEquals(INITED, provider.getUserAgentSuffix(), "User agent");
 
     // now mimic the bind call
     ExtensionHelper.bind(provider,
         new URI("abfs://[email protected]"),
         conf);
-    assertEquals("User agent", BOUND,
-        ExtensionHelper.getUserAgentSuffix(provider, ""));
+    assertEquals(BOUND,
+        ExtensionHelper.getUserAgentSuffix(provider, ""), "User agent");
     AzureADToken token = provider.getToken();
-    assertEquals("Access token propagation",
-        ACCESS_TOKEN, token.getAccessToken());
+    assertEquals(ACCESS_TOKEN, token.getAccessToken(),
+        "Access token propagation");
     Date expiry = token.getExpiry();
     long time = expiry.getTime();
     assertTrue(time <= System.currentTimeMillis(),

hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/extensions/TestDTManagerLifecycle.java

@@ -20,9 +20,9 @@
 
 import java.net.URI;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import  org.junit.jupiter.api.Test;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.azurebfs.AbstractAbfsTestWithTimeout;
@@ -54,12 +54,12 @@ public class TestDTManagerLifecycle extends AbstractAbfsTestWithTimeout {
 
   public static final Text KIND2 = new Text("kind2");
 
-  @Before
+  @BeforeEach
   public void setup() throws Exception {
     conf = StubDelegationTokenManager.useStubDTManager(new Configuration());
   }
 
-  @After
+  @AfterEach
   public void teardown() throws Exception {
   }
 

hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/TestAbfsRenameRetryRecovery.java

@@ -25,8 +25,8 @@
 import java.time.Duration;
 
 import org.assertj.core.api.Assertions;
-import org.junit.Assume;
-import org.junit.Test;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -257,7 +257,7 @@ public void testRenameRecoveryEtagMatchFsLevel() throws IOException {
     AzureBlobFileSystemStore abfsStore = fs.getAbfsStore();
     TracingContext testTracingContext = getTestTracingContext(fs, false);
 
-    Assume.assumeTrue(fs.getAbfsStore().getIsNamespaceEnabled(testTracingContext));
+    Assumptions.assumeTrue(fs.getAbfsStore().getIsNamespaceEnabled(testTracingContext));
 
     AbfsClient mockClient = getMockAbfsClient();
 
@@ -314,7 +314,7 @@ public void testRenameRecoveryEtagMismatchFsLevel() throws Exception {
     AzureBlobFileSystemStore abfsStore = fs.getAbfsStore();
     TracingContext testTracingContext = getTestTracingContext(fs, false);
 
-    Assume.assumeTrue(fs.getAbfsStore().getIsNamespaceEnabled(testTracingContext));
+    Assumptions.assumeTrue(fs.getAbfsStore().getIsNamespaceEnabled(testTracingContext));
 
     AbfsClient mockClient = getMockAbfsClient();
 
@@ -337,7 +337,7 @@ public void testRenameRecoveryFailsForDirFsLevel() throws Exception {
     AzureBlobFileSystemStore abfsStore = fs.getAbfsStore();
     TracingContext testTracingContext = getTestTracingContext(fs, false);
 
-    Assume.assumeTrue(fs.getAbfsStore().getIsNamespaceEnabled(testTracingContext));
+    Assumptions.assumeTrue(fs.getAbfsStore().getIsNamespaceEnabled(testTracingContext));
 
     AbfsClient mockClient = getMockAbfsClient();
 
@@ -406,7 +406,7 @@ public void testDirRenameRecoveryUnsupported() throws Exception {
     AzureBlobFileSystem fs = getFileSystem();
     TracingContext testTracingContext = getTestTracingContext(fs, false);
 
-    Assume.assumeTrue(fs.getAbfsStore().getIsNamespaceEnabled(testTracingContext));
+    Assumptions.assumeTrue(fs.getAbfsStore().getIsNamespaceEnabled(testTracingContext));
 
     AbfsClient spyClient = getMockAbfsClient();
 
@@ -436,7 +436,7 @@ public void testExistingPathCorrectlyRejected() throws Exception {
     AzureBlobFileSystem fs = getFileSystem();
     TracingContext testTracingContext = getTestTracingContext(fs, false);
 
-    Assume.assumeTrue(fs.getAbfsStore().getIsNamespaceEnabled(testTracingContext));
+    Assumptions.assumeTrue(fs.getAbfsStore().getIsNamespaceEnabled(testTracingContext));
 
     AbfsClient spyClient = getMockAbfsClient();
 
@@ -461,7 +461,7 @@ public void testExistingPathCorrectlyRejected() throws Exception {
    */
   @Test
   public void testRenameRecoveryUnsupportedForFlatNamespace() throws Exception {
-    Assume.assumeTrue(!isNamespaceEnabled);
+    Assumptions.assumeTrue(!isNamespaceEnabled);
     // In DFS endpoint, renamePath is O(1) API call and idempotency issue can happen.
     // For blob endpoint, client orchestrates the rename operation.
     assumeDfsServiceType();
@@ -519,7 +519,7 @@ public void testResilientCommitOperation() throws Throwable {
     TracingContext testTracingContext = getTestTracingContext(fs, false);
 
     final AzureBlobFileSystemStore store = fs.getAbfsStore();
-    Assume.assumeTrue(store.getIsNamespaceEnabled(testTracingContext));
+    Assumptions.assumeTrue(store.getIsNamespaceEnabled(testTracingContext));
 
     // patch in the mock abfs client to the filesystem, for the resilient
     // commit API to pick up.
@@ -551,7 +551,7 @@ public void testResilientCommitOperationTagMismatch() throws Throwable {
     TracingContext testTracingContext = getTestTracingContext(fs, false);
 
     final AzureBlobFileSystemStore store = fs.getAbfsStore();
-    Assume.assumeTrue(store.getIsNamespaceEnabled(testTracingContext));
+    Assumptions.assumeTrue(store.getIsNamespaceEnabled(testTracingContext));
 
     // patch in the mock abfs client to the filesystem, for the resilient
     // commit API to pick up.

hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/TestAzureADAuthenticator.java

@@ -20,7 +20,7 @@
 import java.io.IOException;
 
 import org.assertj.core.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.apache.hadoop.fs.azurebfs.AbfsConfiguration;
 import org.apache.hadoop.fs.azurebfs.AbstractAbfsIntegrationTest;

hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/TestAzcopyToolHelper.java

@@ -19,7 +19,7 @@
 package org.apache.hadoop.fs.azurebfs.utils;
 
 import org.assertj.core.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.azurebfs.AbstractAbfsIntegrationTest;