HADOOP-19425. [JDK17] Upgrade JUnit from 4 to 5 in hadoop-azure Part2.

hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/AbstractWasbTestWithTimeout.java

@@ -26,13 +26,15 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.apache.hadoop.test.TestName;
 
+import java.util.concurrent.TimeUnit;
+
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 /**
  * Base class for any Wasb test with timeouts & named threads.
  * This class does not attempt to bind to Azure.
  */
-@Timeout(AzureTestConstants.AZURE_TEST_TIMEOUT)
+@Timeout(value = AzureTestConstants.AZURE_TEST_TIMEOUT, unit = TimeUnit.MILLISECONDS)
 public class AbstractWasbTestWithTimeout extends Assertions {
 
   /**

hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/integration/AbstractAzureScaleTest.java

@@ -26,6 +26,8 @@
 import org.apache.hadoop.fs.azure.AbstractWasbTestBase;
 import org.apache.hadoop.fs.azure.AzureBlobStorageTestAccount;
 
+import java.util.concurrent.TimeUnit;
+
 import static org.apache.hadoop.fs.azure.integration.AzureTestUtils.*;
 
 /**
@@ -34,7 +36,7 @@
  * tests if not.
  *
  */
-@Timeout(AzureTestConstants.SCALE_TEST_TIMEOUT_MILLIS)
+@Timeout(value = AzureTestConstants.SCALE_TEST_TIMEOUT_MILLIS, unit = TimeUnit.MILLISECONDS)
 public abstract class AbstractAzureScaleTest
     extends AbstractWasbTestBase implements Sizes {
 

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

@@ -21,6 +21,8 @@
 import org.apache.hadoop.fs.FSMainOperationsBaseTest;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.azurebfs.contract.ABFSContractTestBinding;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 
 /**
@@ -41,12 +43,14 @@ public ITestAzureBlobFileSystemMainOperation () throws Exception {
     binding = new ABFSContractTestBinding(false);
   }
 
+  @BeforeEach
   @Override
   public void setUp() throws Exception {
     binding.setup();
     fSys = binding.getFileSystem();
   }
 
+  @AfterEach
   @Override
   public void tearDown() throws Exception {
     // Note: Because "tearDown()" is called during the testing,

hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/TestBlobListXmlParser.java

@@ -23,15 +23,15 @@
 import javax.xml.parsers.SAXParserFactory;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-import org.assertj.core.api.Assertions;
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.xml.sax.SAXException;
 
 import org.apache.hadoop.fs.azurebfs.contracts.services.BlobListResultEntrySchema;
 import org.apache.hadoop.fs.azurebfs.contracts.services.BlobListResultSchema;
 import org.apache.hadoop.fs.azurebfs.contracts.services.BlobListXmlParser;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestBlobListXmlParser {
   @Test
@@ -105,12 +105,12 @@ public void testXMLParser() throws Exception {
         + "</EnumerationResults>";
     BlobListResultSchema listResultSchema = getResultSchema(xmlResponseWithDelimiter);
     List<BlobListResultEntrySchema> paths = listResultSchema.paths();
-    Assertions.assertThat(paths.size()).isEqualTo(4);
-    Assertions.assertThat(paths.get(0).isDirectory()).isEqualTo(true);
-    Assertions.assertThat(paths.get(1).isDirectory()).isEqualTo(true);
-    Assertions.assertThat(paths.get(2).isDirectory()).isEqualTo(true);
-    Assertions.assertThat(paths.get(3).isDirectory()).isEqualTo(false);
-    Assertions.assertThat(listResultSchema.getNextMarker()).isNotNull();
+    assertThat(paths.size()).isEqualTo(4);
+    assertThat(paths.get(0).isDirectory()).isEqualTo(true);
+    assertThat(paths.get(1).isDirectory()).isEqualTo(true);
+    assertThat(paths.get(2).isDirectory()).isEqualTo(true);
+    assertThat(paths.get(3).isDirectory()).isEqualTo(false);
+    assertThat(listResultSchema.getNextMarker()).isNotNull();
   }
 
   @Test
@@ -124,8 +124,8 @@ public void testEmptyBlobListNullCT() throws Exception {
         + "</EnumerationResults>";
     BlobListResultSchema listResultSchema = getResultSchema(xmlResponse);
     List<BlobListResultEntrySchema> paths = listResultSchema.paths();
-    Assertions.assertThat(paths.size()).isEqualTo(0);
-    Assertions.assertThat(listResultSchema.getNextMarker()).isNull();
+    assertThat(paths.size()).isEqualTo(0);
+    assertThat(listResultSchema.getNextMarker()).isNull();
   }
 
   @Test
@@ -140,8 +140,8 @@ public void testEmptyBlobListValidCT() throws Exception {
         + "</EnumerationResults>";
     BlobListResultSchema listResultSchema = getResultSchema(xmlResponse);
     List<BlobListResultEntrySchema> paths = listResultSchema.paths();
-    Assertions.assertThat(paths.size()).isEqualTo(0);
-    Assertions.assertThat(listResultSchema.getNextMarker()).isNotNull();
+    assertThat(paths.size()).isEqualTo(0);
+    assertThat(listResultSchema.getNextMarker()).isNotNull();
   }
 
   @Test
@@ -160,8 +160,8 @@ public void testNonEmptyBlobListNullCT() throws Exception {
         + "</EnumerationResults>";
     BlobListResultSchema listResultSchema = getResultSchema(xmlResponse);
     List<BlobListResultEntrySchema> paths = listResultSchema.paths();
-    Assertions.assertThat(paths.size()).isEqualTo(1);
-    Assertions.assertThat(listResultSchema.getNextMarker()).isNull();
+    assertThat(paths.size()).isEqualTo(1);
+    assertThat(listResultSchema.getNextMarker()).isNull();
   }
 
   private static final ThreadLocal<SAXParser> SAX_PARSER_THREAD_LOCAL

hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/TestDfsListJsonParser.java

@@ -21,7 +21,7 @@
 import java.io.IOException;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.apache.hadoop.fs.azurebfs.contracts.services.DfsListResultSchema;
 import org.apache.hadoop.fs.azurebfs.contracts.services.ListResultEntrySchema;

hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/diagnostics/TestConfigurationValidators.java

@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.fs.azurebfs.diagnostics;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import org.apache.hadoop.fs.azurebfs.contracts.exceptions.InvalidConfigurationValueException;
 import org.apache.hadoop.fs.azurebfs.utils.Base64;
@@ -36,7 +36,7 @@
 /**
  * Test configuration validators.
  */
-public class TestConfigurationValidators extends Assert {
+public class TestConfigurationValidators extends Assertions {
 
   private static final String FAKE_KEY = "FakeKey";
 
@@ -54,11 +54,14 @@ public void testIntegerConfigValidator() throws Exception {
     assertEquals(MAX_BUFFER_SIZE, (int) integerConfigurationValidator.validate("104857600"));
   }
 
-  @Test(expected = InvalidConfigurationValueException.class)
+  @Test
   public void testIntegerConfigValidatorThrowsIfMissingValidValue() throws Exception {
-    IntegerConfigurationBasicValidator integerConfigurationValidator = new IntegerConfigurationBasicValidator(
-        MIN_BUFFER_SIZE, MAX_BUFFER_SIZE, DEFAULT_READ_BUFFER_SIZE, FAKE_KEY, true);
-    integerConfigurationValidator.validate("3072");
+    assertThrows(InvalidConfigurationValueException.class, () -> {
+      IntegerConfigurationBasicValidator integerConfigurationValidator =
+          new IntegerConfigurationBasicValidator(
+          MIN_BUFFER_SIZE, MAX_BUFFER_SIZE, DEFAULT_READ_BUFFER_SIZE, FAKE_KEY, true);
+      integerConfigurationValidator.validate("3072");
+    });
   }
 
   @Test
@@ -73,12 +76,15 @@ public void testIntegerWithOutlierConfigValidator() throws Exception {
     assertEquals(MAX_LEASE_DURATION, (int) integerConfigurationValidator.validate("60"));
   }
 
-  @Test(expected = InvalidConfigurationValueException.class)
+  @Test
   public void testIntegerWithOutlierConfigValidatorThrowsIfMissingValidValue() throws Exception {
-    IntegerConfigurationBasicValidator integerConfigurationValidator = new IntegerConfigurationBasicValidator(
-        INFINITE_LEASE_DURATION, MIN_LEASE_DURATION, MAX_LEASE_DURATION, DEFAULT_LEASE_DURATION, FAKE_KEY,
-        true);
-    integerConfigurationValidator.validate("14");
+    assertThrows(InvalidConfigurationValueException.class, () -> {
+      IntegerConfigurationBasicValidator integerConfigurationValidator =
+          new IntegerConfigurationBasicValidator(
+          INFINITE_LEASE_DURATION, MIN_LEASE_DURATION, MAX_LEASE_DURATION, DEFAULT_LEASE_DURATION, FAKE_KEY,
+          true);
+      integerConfigurationValidator.validate("14");
+    });
   }
 
   @Test
@@ -91,11 +97,13 @@ public void testLongConfigValidator() throws Exception {
     assertEquals(MAX_BUFFER_SIZE, (long) longConfigurationValidator.validate("104857600"));
   }
 
-  @Test(expected = InvalidConfigurationValueException.class)
+  @Test
   public void testLongConfigValidatorThrowsIfMissingValidValue() throws Exception {
-    LongConfigurationBasicValidator longConfigurationValidator = new LongConfigurationBasicValidator(
-        MIN_BUFFER_SIZE, MAX_BUFFER_SIZE, DEFAULT_READ_BUFFER_SIZE, FAKE_KEY, true);
-    longConfigurationValidator.validate(null);
+    assertThrows(InvalidConfigurationValueException.class, () -> {
+      LongConfigurationBasicValidator longConfigurationValidator = new LongConfigurationBasicValidator(
+      MIN_BUFFER_SIZE, MAX_BUFFER_SIZE, DEFAULT_READ_BUFFER_SIZE, FAKE_KEY, true);
+      longConfigurationValidator.validate(null);
+    });
   }
 
   @Test
@@ -107,10 +115,13 @@ public void testBooleanConfigValidator() throws Exception {
     assertEquals(false, booleanConfigurationValidator.validate(null));
   }
 
-  @Test(expected = InvalidConfigurationValueException.class)
+  @Test
   public void testBooleanConfigValidatorThrowsIfMissingValidValue() throws Exception {
-    BooleanConfigurationBasicValidator booleanConfigurationValidator = new BooleanConfigurationBasicValidator(FAKE_KEY, false, true);
-    booleanConfigurationValidator.validate("almostTrue");
+    assertThrows(InvalidConfigurationValueException.class, () -> {
+      BooleanConfigurationBasicValidator booleanConfigurationValidator =
+          new BooleanConfigurationBasicValidator(FAKE_KEY, false, true);
+      booleanConfigurationValidator.validate("almostTrue");
+    });
   }
 
   @Test
@@ -121,10 +132,13 @@ public void testStringConfigValidator() throws Exception {
     assertEquals("someValue", stringConfigurationValidator.validate("someValue"));
   }
 
-  @Test(expected = InvalidConfigurationValueException.class)
+  @Test
   public void testStringConfigValidatorThrowsIfMissingValidValue() throws Exception {
-    StringConfigurationBasicValidator stringConfigurationValidator = new StringConfigurationBasicValidator(FAKE_KEY, "value", true);
-    stringConfigurationValidator.validate(null);
+    assertThrows(InvalidConfigurationValueException.class, () -> {
+      StringConfigurationBasicValidator stringConfigurationValidator =
+          new StringConfigurationBasicValidator(FAKE_KEY, "value", true);
+      stringConfigurationValidator.validate(null);
+    });
   }
 
   @Test
@@ -136,9 +150,12 @@ public void testBase64StringConfigValidator() throws Exception {
     assertEquals(encodedVal, base64StringConfigurationValidator.validate(encodedVal));
   }
 
-  @Test(expected = InvalidConfigurationValueException.class)
+  @Test
   public void testBase64StringConfigValidatorThrowsIfMissingValidValue() throws Exception {
-    Base64StringConfigurationBasicValidator base64StringConfigurationValidator = new Base64StringConfigurationBasicValidator(FAKE_KEY, "value", true);
-    base64StringConfigurationValidator.validate("some&%Value");
+    assertThrows(InvalidConfigurationValueException.class, () -> {
+      Base64StringConfigurationBasicValidator base64StringConfigurationValidator =
+          new Base64StringConfigurationBasicValidator(FAKE_KEY, "value", true);
+      base64StringConfigurationValidator.validate("some&%Value");
+    });
   }
 }

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

@@ -44,7 +44,7 @@
 
 import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION;
 import static org.apache.hadoop.security.UserGroupInformation.loginUserFromKeytabAndReturnUGI;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * composite service for adding kerberos login for ABFS
@@ -256,8 +256,8 @@ public void loginPrincipal() throws IOException {
    * General assertion that security is turred on for a cluster.
    */
   public static void assertSecurityEnabled() {
-    assertTrue("Security is needed for this test",
-        UserGroupInformation.isSecurityEnabled());
+    assertTrue(UserGroupInformation.isSecurityEnabled(),
+        "Security is needed for this test");
   }
 
 

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

@@ -18,9 +18,8 @@
 
 package org.apache.hadoop.fs.azurebfs.services;
 
-import org.assertj.core.api.Assertions;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import static org.apache.hadoop.fs.azurebfs.enums.AbfsBackoffMetricsEnum.NUMBER_OF_REQUESTS_SUCCEEDED;
 import static org.apache.hadoop.fs.azurebfs.enums.AbfsBackoffMetricsEnum.TOTAL_NUMBER_OF_REQUESTS;
@@ -29,6 +28,7 @@
 import static org.apache.hadoop.fs.azurebfs.enums.RetryValue.TWO;
 import static org.apache.hadoop.fs.azurebfs.enums.StatisticTypeEnum.TYPE_COUNTER;
 import static org.apache.hadoop.fs.azurebfs.enums.StatisticTypeEnum.TYPE_GAUGE;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestAbfsBackoffMetrics {
     private AbfsBackoffMetrics metrics;
@@ -38,7 +38,7 @@ public class TestAbfsBackoffMetrics {
     /**
      * Sets up the test environment by initializing the AbfsBackoffMetrics instance.
      */
-    @Before
+    @BeforeEach
     public void setUp() {
         metrics = new AbfsBackoffMetrics();
     }
@@ -48,12 +48,12 @@ public void setUp() {
      */
     @Test
     public void retrievesMetricNamesBasedOnStatisticType() {
-        String[] counterMetrics = metrics.getMetricNamesByType(TYPE_COUNTER);
-        String[] gaugeMetrics = metrics.getMetricNamesByType(TYPE_GAUGE);
-        Assertions.assertThat(counterMetrics.length)
+      String[] counterMetrics = metrics.getMetricNamesByType(TYPE_COUNTER);
+      String[] gaugeMetrics = metrics.getMetricNamesByType(TYPE_GAUGE);
+      assertThat(counterMetrics.length)
                 .describedAs("Counter metrics should have 22 elements")
                 .isEqualTo(TOTAL_COUNTERS);
-        Assertions.assertThat(gaugeMetrics.length)
+      assertThat(gaugeMetrics.length)
                 .describedAs("Gauge metrics should have 21 elements")
                 .isEqualTo(TOTAL_GAUGES);
     }
@@ -64,10 +64,10 @@ public void retrievesMetricNamesBasedOnStatisticType() {
     @Test
     public void retrievesValueOfSpecificMetric() {
         metrics.setMetricValue(NUMBER_OF_REQUESTS_SUCCEEDED, 5, ONE);
-        Assertions.assertThat(metrics.getMetricValue(NUMBER_OF_REQUESTS_SUCCEEDED, ONE))
+        assertThat(metrics.getMetricValue(NUMBER_OF_REQUESTS_SUCCEEDED, ONE))
                 .describedAs("Number of request succeeded for retry 1 should be 5")
                 .isEqualTo(5);
-        Assertions.assertThat(metrics.getMetricValue(NUMBER_OF_REQUESTS_SUCCEEDED, TWO))
+        assertThat(metrics.getMetricValue(NUMBER_OF_REQUESTS_SUCCEEDED, TWO))
                 .describedAs("Number of request succeeded for other retries except 1 should be 0")
                 .isEqualTo(0);
     }
@@ -78,10 +78,10 @@ public void retrievesValueOfSpecificMetric() {
     @Test
     public void incrementsValueOfSpecificMetric() {
         metrics.incrementMetricValue(NUMBER_OF_REQUESTS_SUCCEEDED, ONE);
-        Assertions.assertThat(metrics.getMetricValue(NUMBER_OF_REQUESTS_SUCCEEDED, ONE))
+        assertThat(metrics.getMetricValue(NUMBER_OF_REQUESTS_SUCCEEDED, ONE))
                 .describedAs("Number of request succeeded for retry 1 should be 1")
                 .isEqualTo(1);
-        Assertions.assertThat(metrics.getMetricValue(NUMBER_OF_REQUESTS_SUCCEEDED, THREE))
+        assertThat(metrics.getMetricValue(NUMBER_OF_REQUESTS_SUCCEEDED, THREE))
                 .describedAs("Number of request succeeded for other retries except 1 should be 0")
                 .isEqualTo(0);
     }
@@ -91,10 +91,10 @@ public void incrementsValueOfSpecificMetric() {
      */
     @Test
     public void returnsStringRepresentationOfEmptyBackoffMetrics() {
-        Assertions.assertThat(metrics.getMetricValue(TOTAL_NUMBER_OF_REQUESTS))
+        assertThat(metrics.getMetricValue(TOTAL_NUMBER_OF_REQUESTS))
                 .describedAs("String representation of backoff metrics should be empty")
                 .isEqualTo(0);
-        Assertions.assertThat(metrics.toString())
+        assertThat(metrics.toString())
                 .describedAs("String representation of backoff metrics should be empty")
                 .isEmpty();
     }
@@ -105,10 +105,10 @@ public void returnsStringRepresentationOfEmptyBackoffMetrics() {
     @Test
     public void returnsStringRepresentationOfBackoffMetrics() {
         metrics.incrementMetricValue(TOTAL_NUMBER_OF_REQUESTS);
-        Assertions.assertThat(metrics.getMetricValue(TOTAL_NUMBER_OF_REQUESTS))
+        assertThat(metrics.getMetricValue(TOTAL_NUMBER_OF_REQUESTS))
                 .describedAs("String representation of backoff metrics should not be empty")
                 .isEqualTo(1);
-        Assertions.assertThat(metrics.toString())
+        assertThat(metrics.toString())
                 .describedAs("String representation of backoff metrics should not be empty")
                 .contains("$TR=1");
     }