HADOOP-19416. Fix CheckStyle & Junit Test.

Author: fanshilun

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AEncryptionWithDefaultS3Settings.java

@@ -21,8 +21,8 @@
 import java.io.IOException;
 import java.util.Optional;
 
-import org.junit.Ignore;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import org.apache.commons.lang3.StringUtils;
@@ -119,13 +119,13 @@ public void testEncryptionFileAttributes() throws Exception {
 
 
   @Override
-  @Ignore
+  @Disabled
   @Test
   public void testEncryptionSettingPropagation() throws Throwable {
   }
 
   @Override
-  @Ignore
+  @Disabled
   @Test
   public void testEncryption() throws Throwable {
   }

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3APrefetchingLruEviction.java

@@ -28,9 +28,8 @@
 import java.util.concurrent.TimeUnit;
 
 import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
-import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -55,21 +54,19 @@
 /**
  * Test the prefetching input stream with LRU cache eviction on S3ACachingInputStream.
  */
-@RunWith(Parameterized.class)
 public class ITestS3APrefetchingLruEviction extends AbstractS3ACostTest {
 
-  private final String maxBlocks;
+  private String maxBlocks;
 
-  @Parameterized.Parameters(name = "max-blocks-{0}")
   public static Collection<Object[]> params() {
     return Arrays.asList(new Object[][]{
         {"1"},
         {"2"}
     });
   }
 
-  public ITestS3APrefetchingLruEviction(final String maxBlocks) {
-    this.maxBlocks = maxBlocks;
+  public void initITestS3APrefetchingLruEviction(final String pMaxBlocks) {
+    this.maxBlocks = pMaxBlocks;
   }
 
   private static final Logger LOG =
@@ -95,8 +92,10 @@ public Configuration createConfiguration() {
     return conf;
   }
 
-  @Test
-  public void testSeeksWithLruEviction() throws Throwable {
+  @MethodSource("params")
+  @ParameterizedTest(name = "max-blocks-{0}")
+  public void testSeeksWithLruEviction(String pMaxBlocks) throws Throwable {
+    initITestS3APrefetchingLruEviction(pMaxBlocks);
     IOStatistics ioStats;
     byte[] data = ContractTestUtils.dataset(SMALL_FILE_SIZE, 'x', 26);
     // Path for file which should have length > block size so S3ACachingInputStream is used

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AStorageClass.java

@@ -24,9 +24,8 @@
 import java.util.Map;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
@@ -50,25 +49,23 @@
 /**
  * Tests of storage class.
  */
-@RunWith(Parameterized.class)
 public class ITestS3AStorageClass extends AbstractS3ATestBase {
 
   /**
    * HADOOP-18339. Parameterized the test for different fast upload buffer types
    * to ensure the storage class configuration works with all of them.
    */
-  @Parameterized.Parameters(name = "fast-upload-buffer-{0}")
   public static Collection<Object[]> params() {
     return Arrays.asList(new Object[][]{
         {FAST_UPLOAD_BUFFER_DISK},
         {FAST_UPLOAD_BUFFER_ARRAY}
     });
   }
 
-  private final String fastUploadBufferType;
+  private String fastUploadBufferType;
 
-  public ITestS3AStorageClass(String fastUploadBufferType) {
-    this.fastUploadBufferType = fastUploadBufferType;
+  public void initITestS3AStorageClass(String pFastUploadBufferType) {
+    this.fastUploadBufferType = pFastUploadBufferType;
   }
 
   @Override
@@ -86,8 +83,11 @@ protected Configuration createConfiguration() {
    * This test ensures the default storage class configuration (no config or null)
    * works well with create and copy operations
    */
-  @Test
-  public void testCreateAndCopyObjectWithStorageClassDefault() throws Throwable {
+  @MethodSource("params")
+  @ParameterizedTest(name = "fast-upload-buffer-{0}")
+  public void testCreateAndCopyObjectWithStorageClassDefault(
+      String pFastUploadBufferType) throws Throwable {
+    initITestS3AStorageClass(pFastUploadBufferType);
     Configuration conf = this.createConfiguration();
     S3AContract contract = (S3AContract) createContract(conf);
     contract.init();
@@ -108,8 +108,11 @@ public void testCreateAndCopyObjectWithStorageClassDefault() throws Throwable {
    * Verify object can be created and copied correctly
    * with specified storage class
    */
-  @Test
-  public void testCreateAndCopyObjectWithStorageClassReducedRedundancy() throws Throwable {
+  @MethodSource("params")
+  @ParameterizedTest(name = "fast-upload-buffer-{0}")
+  public void testCreateAndCopyObjectWithStorageClassReducedRedundancy(
+      String pFastUploadBufferType) throws Throwable {
+    initITestS3AStorageClass(pFastUploadBufferType);
     Configuration conf = this.createConfiguration();
     conf.set(STORAGE_CLASS, STORAGE_CLASS_REDUCED_REDUNDANCY);
     S3AContract contract = (S3AContract) createContract(conf);
@@ -133,8 +136,11 @@ public void testCreateAndCopyObjectWithStorageClassReducedRedundancy() throws Th
    * Archive storage classes have different behavior
    * from general storage classes
    */
-  @Test
-  public void testCreateAndCopyObjectWithStorageClassGlacier() throws Throwable {
+  @MethodSource("params")
+  @ParameterizedTest(name = "fast-upload-buffer-{0}")
+  public void testCreateAndCopyObjectWithStorageClassGlacier(
+      String pFastUploadBufferType) throws Throwable {
+    initITestS3AStorageClass(pFastUploadBufferType);
     Configuration conf = this.createConfiguration();
     conf.set(STORAGE_CLASS, STORAGE_CLASS_GLACIER);
     S3AContract contract = (S3AContract) createContract(conf);
@@ -162,8 +168,11 @@ public void testCreateAndCopyObjectWithStorageClassGlacier() throws Throwable {
    * Verify object can be created and copied correctly
    * with completely invalid storage class
    */
-  @Test
-  public void testCreateAndCopyObjectWithStorageClassInvalid() throws Throwable {
+  @MethodSource("params")
+  @ParameterizedTest(name = "fast-upload-buffer-{0}")
+  public void testCreateAndCopyObjectWithStorageClassInvalid(
+      String pFastUploadBufferType) throws Throwable {
+    initITestS3AStorageClass(pFastUploadBufferType);
     Configuration conf = this.createConfiguration();
     conf.set(STORAGE_CLASS, "testing");
     S3AContract contract = (S3AContract) createContract(conf);
@@ -187,8 +196,11 @@ public void testCreateAndCopyObjectWithStorageClassInvalid() throws Throwable {
    * Verify object can be created and copied correctly
    * with empty string configuration
    */
-  @Test
-  public void testCreateAndCopyObjectWithStorageClassEmpty() throws Throwable {
+  @MethodSource("params")
+  @ParameterizedTest(name = "fast-upload-buffer-{0}")
+  public void testCreateAndCopyObjectWithStorageClassEmpty(
+      String pFastUploadBufferType) throws Throwable {
+    initITestS3AStorageClass(pFastUploadBufferType);
     Configuration conf = this.createConfiguration();
     conf.set(STORAGE_CLASS, "");
     S3AContract contract = (S3AContract) createContract(conf);

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/auth/ITestCustomSigner.java

@@ -28,17 +28,15 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import software.amazon.awssdk.auth.signer.Aws4Signer;
 import software.amazon.awssdk.auth.signer.AwsS3V4Signer;
 import software.amazon.awssdk.auth.signer.internal.AbstractAwsS3V4Signer;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
 import software.amazon.awssdk.core.signer.Signer;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -67,7 +65,6 @@
  * Because the v2 sdk has had some problems with bulk delete
  * and custom signing, this suite is parameterized.
  */
-@RunWith(Parameterized.class)
 public class ITestCustomSigner extends AbstractS3ATestBase {
 
   private static final Logger LOG = LoggerFactory
@@ -79,15 +76,14 @@ public class ITestCustomSigner extends AbstractS3ATestBase {
   /**
    * Parameterization.
    */
-  @Parameterized.Parameters(name = "{0}")
   public static Collection<Object[]> params() {
     return Arrays.asList(new Object[][]{
         {"bulk delete",  true},
         {"simple-delete", false},
     });
   }
 
-  private final boolean bulkDelete;
+  private boolean bulkDelete;
 
   private final UserGroupInformation ugi1 = UserGroupInformation.createRemoteUser("user1");
 
@@ -97,13 +93,13 @@ public static Collection<Object[]> params() {
 
   private String endpoint;
 
-  public ITestCustomSigner(
+  public void initITestCustomSigner(
       final String ignored,
-      final boolean bulkDelete) {
+      final boolean bulkDelete) throws Exception {
     this.bulkDelete = bulkDelete;
+    setup();
   }
 
-  @BeforeEach
   @Override
   public void setup() throws Exception {
     super.setup();
@@ -131,10 +127,11 @@ public void teardown() throws Exception {
     FileSystem.closeAllForUGI(ugi2);
   }
 
-  @Test
-  public void testCustomSignerAndInitializer()
-      throws IOException, InterruptedException {
-
+  @MethodSource("params")
+  @ParameterizedTest(name = "{0}")
+  public void testCustomSignerAndInitializer(final String ignored,
+      final boolean bulkDelete) throws Exception {
+    initITestCustomSigner(ignored, bulkDelete);
     final Path basePath = path(getMethodName());
     FileSystem fs1 = runStoreOperationsAndVerify(ugi1,
         new Path(basePath, "customsignerpath1"), "id1");

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/commit/ITestS3ACommitterFactory.java

@@ -22,7 +22,6 @@
 import java.util.Arrays;
 import java.util.Collection;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.slf4j.Logger;
@@ -176,7 +175,6 @@ private static void maybeSetCommitterName(final Configuration conf, final String
     }
   }
 
-  @BeforeEach
   @Override
   public void setup() throws Exception {
     // destroy all filesystems from previous runs.

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/commit/integration/ITestS3ACommitterMRJob.java

@@ -167,11 +167,11 @@ public static Collection<Object[]> params() {
    * @param pCommitterTestBinding binding for the test.
    */
   public void initITestS3ACommitterMRJob(
-      final CommitterTestBinding pCommitterTestBinding) {
+      final CommitterTestBinding pCommitterTestBinding) throws Exception {
     this.committerTestBinding = pCommitterTestBinding;
+    setup();
   }
 
-  @BeforeEach
   @Override
   public void setup() throws Exception {
     super.setup();

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/commit/magic/ITestMagicCommitProtocol.java

@@ -73,7 +73,6 @@ protected String getCommitterName() {
     return CommitConstants.COMMITTER_NAME_MAGIC;
   }
 
-  @BeforeEach
   @Override
   public void setup() throws Exception {
     super.setup();