HADOOP-19415. Fix CheckStyle & UnitTest.

Author: fanshilun

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractFSContractTestBase.java

@@ -23,7 +23,11 @@
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.extend.TestName;
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Timeout;
 import org.junit.AssumptionViolatedException;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.slf4j.Logger;

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/extend/TestName.java

@@ -1,18 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package org.apache.hadoop.fs.extend;
 
 import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
 
+/**
+ * This is a custom JUnit5 `RegisterExtension`
+ * we created to obtain the methond name of the executing function.
+ */
 public class TestName implements BeforeEachCallback {
 
-    private volatile String name;
+  private volatile String name;
 
-    @Override
-    public void beforeEach(ExtensionContext extensionContext) throws Exception {
-        name = extensionContext.getTestMethod().get().getName();
-    }
+  @Override
+  public void beforeEach(ExtensionContext extensionContext) throws Exception {
+    name = extensionContext.getTestMethod().get().getName();
+  }
 
-    public String getMethodName() {
-        return this.name;
-    }
+  public String getMethodName() {
+    return this.name;
+  }
 }

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/output/committer/manifest/AbstractManifestCommitterTest.java

@@ -37,6 +37,7 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeEach;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -309,6 +310,7 @@ protected Configuration createConfiguration() {
     return enableManifestCommitter(super.createConfiguration());
   }
 
+  @BeforeEach
   @Override
   public void setup() throws Exception {
 

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

@@ -32,7 +32,7 @@
 import org.apache.hadoop.io.IOUtils;
 
 import org.junit.jupiter.api.AfterAll;
-import org.junit.Assume;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -44,6 +44,7 @@
 import static org.apache.hadoop.fs.contract.ContractTestUtils.writeDataset;
 import static org.apache.hadoop.fs.statistics.IOStatisticsLogging.ioStatisticsToPrettyString;
 import static org.apache.hadoop.fs.statistics.IOStatisticsSupport.snapshotIOStatistics;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 /**
  * An extension of the contract test base set up for S3A tests.
@@ -112,6 +113,7 @@ public void setup() throws Exception {
     IOStatisticsContext.getCurrentIOStatisticsContext().reset();
   }
 
+  @AfterEach
   @Override
   public void teardown() throws Exception {
     Thread.currentThread().setName("teardown");
@@ -233,8 +235,8 @@ protected AuditSpan span(AuditSpanSource source) throws IOException {
    *  Method to assume that S3 client side encryption is disabled on a test.
    */
   public void skipIfClientSideEncryption() {
-    Assume.assumeTrue("Skipping test if CSE is enabled",
-        !getFileSystem().isCSEEnabled());
+    assumeTrue(!getFileSystem().isCSEEnabled(),
+        "Skipping test if CSE is enabled");
   }
 
   /**

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

@@ -21,6 +21,7 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -68,6 +69,7 @@ public Configuration createConfiguration() {
     return conf;
   }
 
+  @BeforeEach
   @Override
   public void setup() throws Exception {
     super.setup();

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

@@ -20,6 +20,7 @@
 
 import java.io.IOException;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -59,6 +60,7 @@ protected Configuration createConfiguration() {
     return disableCreateSession(super.createConfiguration());
   }
 
+  @BeforeEach
   @Override
   public void setup() throws Exception {
     super.setup();

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

@@ -29,6 +29,7 @@
 import java.util.concurrent.ExecutorService;
 
 import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -116,14 +117,14 @@ protected String getDelegationBinding() {
     return DELEGATION_TOKEN_SESSION_BINDING;
   }
 
+  @BeforeEach
   @Override
   public void setup() throws Exception {
     super.setup();
     assumeSessionTestsEnabled(getConfiguration());
     S3AFileSystem fileSystem = getFileSystem();
-    assertNotNull(
-    
-       fileSystem.getCanonicalServiceName(), "No delegation tokens in FS");
+    assertNotNull(fileSystem.getCanonicalServiceName(),
+        "No delegation tokens in FS");
     dataDir = GenericTestUtils.getTestDir("kerberos");
     dataDir.mkdirs();
   }

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

@@ -21,10 +21,10 @@
 import java.util.Collection;
 
 import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
-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;
 
@@ -86,7 +86,6 @@
  * This is needed to verify that job resources have their tokens extracted
  * too.
  */
-@RunWith(Parameterized.class)
 public class ITestDelegatedMRJob extends AbstractDelegationIT {
 
   private static final Logger LOG =
@@ -98,11 +97,11 @@ public class ITestDelegatedMRJob extends AbstractDelegationIT {
   @SuppressWarnings("StaticNonFinalField")
   private static MiniKerberizedHadoopCluster cluster;
 
-  private final String name;
+  private String name;
 
-  private final String tokenBinding;
+  private String tokenBinding;
 
-  private final Text tokenKind;
+  private Text tokenKind;
 
   /**
    * Created in test setup.
@@ -127,7 +126,6 @@ public class ITestDelegatedMRJob extends AbstractDelegationIT {
    * Test array for parameterized test runs.
    * @return a list of parameter tuples.
    */
-  @Parameterized.Parameters
   public static Collection<Object[]> params() {
     return Arrays.asList(new Object[][]{
         {"session", DELEGATION_TOKEN_SESSION_BINDING, SESSION_TOKEN_KIND},
@@ -136,10 +134,12 @@ public static Collection<Object[]> params() {
     });
   }
 
-  public ITestDelegatedMRJob(String name, String tokenBinding, Text tokenKind) {
-    this.name = name;
-    this.tokenBinding = tokenBinding;
-    this.tokenKind = tokenKind;
+  public void initITestDelegatedMRJob(String pName, String pTokenBinding, Text pTokenKind)
+      throws Exception {
+    this.name = pName;
+    this.tokenBinding = pTokenBinding;
+    this.tokenKind = pTokenKind;
+    setup();
   }
 
   /***
@@ -213,6 +213,7 @@ public void setup() throws Exception {
 
   }
 
+  @AfterEach
   @Override
   public void teardown() throws Exception {
     describe("Teardown operations");
@@ -241,17 +242,23 @@ protected int getTestTimeoutMillis() {
     return getTestTimeoutSeconds() * 1000;
   }
 
-  @Test
-  public void testCommonCrawlLookup() throws Throwable {
+  @MethodSource("params")
+  @ParameterizedTest
+  public void testCommonCrawlLookup(String pName, String pTokenBinding,
+      Text pTokenKind) throws Throwable {
+    initITestDelegatedMRJob(pName, pTokenBinding, pTokenKind);
     FileSystem resourceFS = extraJobResourcePath.getFileSystem(
         getConfiguration());
     FileStatus status = resourceFS.getFileStatus(extraJobResourcePath);
     LOG.info("Extra job resource is {}", status);
     assertTrue(status.isEncrypted(), "Not encrypted: " + status);
   }
 
-  @Test
-  public void testJobSubmissionCollectsTokens() throws Exception {
+  @MethodSource("params")
+  @ParameterizedTest
+  public void testJobSubmissionCollectsTokens(String pName, String pTokenBinding,
+      Text pTokenKind) throws Exception {
+    initITestDelegatedMRJob(pName, pTokenBinding, pTokenKind);
     describe("Mock Job test");
     JobConf conf = new JobConf(getConfiguration());
     if (isUsingDefaultExternalDataFile(conf)) {

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

@@ -22,6 +22,7 @@
 
 import org.apache.hadoop.fs.s3a.S3AFileSystem;
 import org.apache.hadoop.io.Text;
+import org.junit.jupiter.api.BeforeEach;
 
 import static org.apache.hadoop.fs.s3a.auth.RoleTestUtils.probeForAssumedRoleARN;
 import static org.apache.hadoop.fs.s3a.auth.delegation.DelegationConstants.DELEGATION_TOKEN_ROLE_BINDING;
@@ -35,6 +36,7 @@
 public class ITestRoleDelegationInFilesystem extends
     ITestSessionDelegationInFilesystem {
 
+  @BeforeEach
   @Override
   public void setup() throws Exception {
     super.setup();

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

@@ -21,6 +21,7 @@
 import java.util.EnumSet;
 import java.util.List;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -56,6 +57,7 @@ public Text getTokenKind() {
     return ROLE_TOKEN_KIND;
   }
 
+  @BeforeEach
   @Override
   public void setup() throws Exception {
     super.setup();