MAPREDUCE-7421. Fix CheckStyle & Junit Test.

Author: fanshilun

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/ClusterMapReduceTestCase.java

@@ -22,8 +22,8 @@
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.test.GenericTestUtils;
 
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 
 import java.io.File;
 import java.io.IOException;
@@ -64,7 +64,7 @@ protected static void setupClassBase(Class<?> testClass) throws Exception {
    *
    * @throws Exception
    */
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     startCluster(true, null);
   }
@@ -125,7 +125,7 @@ protected void stopCluster() throws Exception {
    *
    * @throws Exception
    */
-  @After
+  @AfterEach
   public void tearDown() throws Exception {
     stopCluster();
   }

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/HadoopTestCase.java

@@ -21,8 +21,8 @@
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.mapreduce.MRConfig;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 
 import java.io.IOException;
 
@@ -139,7 +139,7 @@ public boolean isLocalFS() {
    *
    * @throws Exception
    */
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     if (localFS) {
       fileSystem = FileSystem.getLocal(new JobConf());
@@ -163,7 +163,7 @@ public void setUp() throws Exception {
    *
    * @throws Exception
    */
-  @After
+  @AfterEach
   public void tearDown() throws Exception {
     try {
       if (mrCluster != null) {

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestChild.java

@@ -30,7 +30,6 @@
 import org.apache.hadoop.mapred.HadoopTestCase;
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.log4j.Level;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -63,25 +62,21 @@ protected void setup(Context context) throws IOException,
       boolean oldConfigs = conf.getBoolean(OLD_CONFIGS, false);
       if (oldConfigs) {
         String javaOpts = conf.get(JobConf.MAPRED_TASK_JAVA_OPTS);
-        assertNotNull(
-                      javaOpts, JobConf.MAPRED_TASK_JAVA_OPTS + " is null!");
-        assertEquals(
-                     javaOpts, TASK_OPTS_VAL, JobConf.MAPRED_TASK_JAVA_OPTS + " has value of: " + 
-                     javaOpts);
+        assertNotNull(javaOpts, JobConf.MAPRED_TASK_JAVA_OPTS + " is null!");
+        assertEquals(javaOpts, TASK_OPTS_VAL,
+            JobConf.MAPRED_TASK_JAVA_OPTS + " has value of: " + javaOpts);
       } else {
         String mapJavaOpts = conf.get(JobConf.MAPRED_MAP_TASK_JAVA_OPTS);
-        assertNotNull(
-                      mapJavaOpts, JobConf.MAPRED_MAP_TASK_JAVA_OPTS + " is null!");
-        assertEquals(
-                     mapJavaOpts, MAP_OPTS_VAL, JobConf.MAPRED_MAP_TASK_JAVA_OPTS + " has value of: " + 
-                     mapJavaOpts);
+        assertNotNull(mapJavaOpts, JobConf.MAPRED_MAP_TASK_JAVA_OPTS + " is null!");
+        assertEquals(mapJavaOpts, MAP_OPTS_VAL,
+            JobConf.MAPRED_MAP_TASK_JAVA_OPTS + " has value of: " + mapJavaOpts);
       }
 
       Level logLevel = 
         Level.toLevel(conf.get(JobConf.MAPRED_MAP_TASK_LOG_LEVEL, 
                                Level.INFO.toString()));  
-      assertEquals(logLevel, Level.OFF, JobConf.MAPRED_MAP_TASK_LOG_LEVEL + "has value of " + 
-                   logLevel);
+      assertEquals(logLevel, Level.OFF,
+          JobConf.MAPRED_MAP_TASK_LOG_LEVEL + "has value of " + logLevel);
     }
   }
 
@@ -95,18 +90,15 @@ protected void setup(Context context)
       boolean oldConfigs = conf.getBoolean(OLD_CONFIGS, false);
       if (oldConfigs) {
         String javaOpts = conf.get(JobConf.MAPRED_TASK_JAVA_OPTS);
-        assertNotNull(
-                      javaOpts, JobConf.MAPRED_TASK_JAVA_OPTS + " is null!");
-        assertEquals(
-                     javaOpts, TASK_OPTS_VAL, JobConf.MAPRED_TASK_JAVA_OPTS + " has value of: " + 
-                     javaOpts);
+        assertNotNull(javaOpts, JobConf.MAPRED_TASK_JAVA_OPTS + " is null!");
+        assertEquals(javaOpts, TASK_OPTS_VAL,
+            JobConf.MAPRED_TASK_JAVA_OPTS + " has value of: " + javaOpts);
       } else {
         String reduceJavaOpts = conf.get(JobConf.MAPRED_REDUCE_TASK_JAVA_OPTS);
-        assertNotNull(
-                      reduceJavaOpts, JobConf.MAPRED_REDUCE_TASK_JAVA_OPTS + " is null!");
-        assertEquals(
-                     reduceJavaOpts, REDUCE_OPTS_VAL, JobConf.MAPRED_REDUCE_TASK_JAVA_OPTS + " has value of: " + 
-                     reduceJavaOpts);
+        assertNotNull(reduceJavaOpts,
+            JobConf.MAPRED_REDUCE_TASK_JAVA_OPTS + " is null!");
+        assertEquals(reduceJavaOpts, REDUCE_OPTS_VAL,
+            JobConf.MAPRED_REDUCE_TASK_JAVA_OPTS + " has value of: " + reduceJavaOpts);
       }
 
       Level logLevel = 
@@ -135,11 +127,11 @@ private Job submitAndValidateJob(JobConf conf, int numMaps, int numReds,
                 numMaps, numReds);
     job.setMapperClass(MyMapper.class);
     job.setReducerClass(MyReducer.class);
-    assertFalse(
-               job.isConnected(), "Job already has a job tracker connection, before it's submitted");
+    assertFalse(job.isConnected(),
+        "Job already has a job tracker connection, before it's submitted");
     job.submit();
-    assertTrue(
-              job.isConnected(), "Job doesn't have a job tracker connection, even though it's been submitted");
+    assertTrue(job.isConnected(),
+        "Job doesn't have a job tracker connection, even though it's been submitted");
     job.waitForCompletion(true);
     assertTrue(job.isSuccessful());
 
@@ -148,8 +140,8 @@ private Job submitAndValidateJob(JobConf conf, int numMaps, int numReds,
     assertTrue(fs.exists(outDir), "Job output directory doesn't exit!");
     FileStatus[] list = fs.listStatus(outDir, new OutputFilter());
     int numPartFiles = numReds == 0 ? numMaps : numReds;
-    assertTrue(list.length == numPartFiles, "Number of part-files is " + list.length + " and not "
-        + numPartFiles);
+    assertTrue(list.length == numPartFiles,
+        "Number of part-files is " + list.length + " and not " + numPartFiles);
     return job;
   }
 

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestClientProtocolProviderImpls.java

@@ -91,9 +91,9 @@ public void testClusterExceptionRootCause() throws Exception {
       fail("Cluster init should fail because of non-existing FileSystem");
     } catch (IOException ioEx) {
       final String stackTrace = StringUtils.stringifyException(ioEx);
-      assertTrue(
-         stackTrace.contains(UnsupportedFileSystemException.class.getName())
-              && stackTrace.contains("nosuchfs"), "No root cause detected");
+      assertTrue(stackTrace.contains(
+          UnsupportedFileSystemException.class.getName()) && stackTrace.contains("nosuchfs"),
+          "No root cause detected");
     }
   }
 }

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestCounters.java

@@ -25,7 +25,10 @@
 import org.slf4j.LoggerFactory;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 /**
  * TestCounters checks the sanity and recoverability of {@code Counters}
  */

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestLargeSort.java

@@ -59,8 +59,8 @@ public void testLargeSort() throws Exception {
       conf.setInt(MRJobConfig.IO_SORT_MB, ioSortMb);
       conf.setInt(LargeSorter.NUM_MAP_TASKS, 1);
       conf.setInt(LargeSorter.MBS_PER_MAP, ioSortMb);
-      assertEquals(0
-,           ToolRunner.run(conf, new LargeSorter(), args), "Large sort failed for " + ioSortMb);
+      assertEquals(0, ToolRunner.run(conf, new LargeSorter(), args),
+          "Large sort failed for " + ioSortMb);
     }
   }
 }

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMRIntermediateDataEncryption.java

@@ -34,12 +34,10 @@
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.junit.jupiter.api.AfterAll;
-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;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -66,6 +64,10 @@
 import org.apache.hadoop.util.Time;
 import org.apache.hadoop.util.ToolRunner;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 /**
  * This class tests the support of Intermediate data encryption
  * (Spill data encryption).
@@ -86,7 +88,6 @@
  *    combine the output files into a single one.
  * 6- Verify that the maps spilled files.
  */
-@RunWith(Parameterized.class)
 public class TestMRIntermediateDataEncryption {
   public static final Logger LOG =
       LoggerFactory.getLogger(TestMRIntermediateDataEncryption.class);
@@ -113,35 +114,34 @@ public class TestMRIntermediateDataEncryption {
   /**
    * Test parameters.
    */
-  private final String testTitleName;
-  private final int numMappers;
-  private final int numReducers;
-  private final boolean isUber;
+  private String testTitleName;
+  private int numMappers;
+  private int numReducers;
+  private boolean isUber;
   private Configuration config;
   private Path jobOutputPath;
 
   /**
    * Initialized the parametrized JUnit test.
-   * @param testName the name of the unit test to be executed.
-   * @param mappers number of mappers in the tests.
-   * @param reducers number of the reducers.
-   * @param uberEnabled boolean flag for isUber
+   * @param pTestName the name of the unit test to be executed.
+   * @param pMappers number of mappers in the tests.
+   * @param pReducers number of the reducers.
+   * @param pUberEnabled boolean flag for isUber
+   * @throws Exception unit test error.
    */
-  public TestMRIntermediateDataEncryption(String testName, int mappers,
-      int reducers, boolean uberEnabled) {
-    this.testTitleName = testName;
-    this.numMappers = mappers;
-    this.numReducers = reducers;
-    this.isUber = uberEnabled;
+  public void initTestMRIntermediateDataEncryption(String pTestName,
+      int pMappers, int pReducers, boolean pUberEnabled) throws Exception {
+    this.testTitleName = pTestName;
+    this.numMappers = pMappers;
+    this.numReducers = pReducers;
+    this.isUber = pUberEnabled;
+    setup();
   }
 
   /**
    * List of arguments to run the JunitTest.
    * @return
    */
-  @Parameterized.Parameters(
-      name = "{index}: TestMRIntermediateDataEncryption.{0} .. "
-          + "mappers:{1}, reducers:{2}, isUber:{3})")
   public static Collection<Object[]> getTestParameters() {
     return Arrays.asList(new Object[][]{
         {"testSingleReducer", 3, 1, false},
@@ -176,8 +176,8 @@ public static void setupClass() throws Exception {
     fs.mkdirs(jobsDirPath);
     jobInputDirPath = new Path(jobsDirPath, "in-dir");
     // run the input generator job.
-    Assertions.assertEquals(0
-,         generateInputTextFile(), "Generating input should succeed");
+    assertEquals(0,
+        generateInputTextFile(), "Generating input should succeed");
     // run the reference job
     runReferenceJob();
   }
@@ -194,7 +194,7 @@ public static void tearDown() throws IOException {
     // make sure that generated input file is deleted
     final File textInputFile = new File(testRootDir, "input.txt");
     if (textInputFile.exists()) {
-      Assertions.assertTrue(textInputFile.delete());
+      assertTrue(textInputFile.delete());
     }
   }
 
@@ -290,19 +290,19 @@ private static void runReferenceJob() throws Exception {
     if (fs.exists(jobRefDirPath) && !fs.delete(jobRefDirPath, true)) {
       throw new IOException("Could not delete " + jobRefDirPath);
     }
-    Assertions.assertTrue(fs.mkdirs(jobRefDirPath));
+    assertTrue(fs.mkdirs(jobRefDirPath));
     Path jobRefOutputPath = new Path(jobRefDirPath, "out-dir");
     Configuration referenceConf = new Configuration(commonConfig);
     referenceConf.setBoolean(MRJobConfig.MR_ENCRYPTED_INTERMEDIATE_DATA, false);
     Job jobReference = runWordCountJob(jobRefLabel, jobRefOutputPath,
         referenceConf, 4, 1);
-    Assertions.assertTrue(jobReference.isSuccessful());
+    assertTrue(jobReference.isSuccessful());
     FileStatus[] fileStatusArr =
         fs.listStatus(jobRefOutputPath,
             new Utils.OutputFileUtils.OutputFilesFilter());
-    Assertions.assertEquals(1, fileStatusArr.length);
+    assertEquals(1, fileStatusArr.length);
     checkSumReference = fs.getFileChecksum(fileStatusArr[0].getPath());
-    Assertions.assertTrue(fs.delete(jobRefDirPath, true));
+    assertTrue(fs.delete(jobRefDirPath, true));
   }
 
   private static Job runWordCountJob(String postfixName, Path jOutputPath,
@@ -346,8 +346,8 @@ private static Job runWordCountJob(String postfixName, Path jOutputPath,
    * @throws Exception if the output is missing or the combiner job fails.
    */
   private boolean validateJobOutput() throws Exception {
-    Assertions.assertTrue(
-       fs.exists(jobOutputPath), "Job Output path [" + jobOutputPath + "] should exist");
+    assertTrue(fs.exists(jobOutputPath),
+        "Job Output path [" + jobOutputPath + "] should exist");
     Path outputPath = jobOutputPath;
     if (numReducers != 1) {
       // combine the result into one file by running a combiner job
@@ -391,7 +391,6 @@ private boolean validateJobOutput() throws Exception {
     return checkSumReference.equals(jobFileChecksum);
   }
 
-  @BeforeEach
   public void setup() throws Exception {
     LOG.info("Starting TestMRIntermediateDataEncryption#{}.......",
         testTitleName);
@@ -419,8 +418,12 @@ public void setup() throws Exception {
     config.setInt("mapreduce.reduce.maxattempts", 1);
   }
 
-  @Test
-  public void testWordCount() throws Exception {
+  @ParameterizedTest(name = "{index}: TestMRIntermediateDataEncryption.{0} .. "
+       + "mappers:{1}, reducers:{2}, isUber:{3})")
+  @MethodSource("getTestParameters")
+  public void testWordCount(String pTestName,
+      int pMappers, int pReducers, boolean pUberEnabled) throws Exception {
+    initTestMRIntermediateDataEncryption(pTestName, pMappers, pReducers, pUberEnabled);
     LOG.info("........Starting main Job Driver #{} starting at {}.......",
         testTitleName, Time.formatTime(System.currentTimeMillis()));
     SpillCallBackPathsFinder spillInjector =
@@ -435,7 +438,7 @@ public void testWordCount() throws Exception {
           testTitleName, Time.formatTime(System.currentTimeMillis())));
       Job job = runWordCountJob(testTitleName, jobOutputPath, config,
           numMappers, numReducers);
-      Assertions.assertTrue(job.isSuccessful());
+      assertTrue(job.isSuccessful());
       long endTime = Time.monotonicNow();
       testSummary.append(String.format("%nJob %s ended at %s",
               job.getJobName(), Time.formatTime(System.currentTimeMillis())));
@@ -451,16 +454,16 @@ public void testWordCount() throws Exception {
                 fStatus.getPath(), fileSize));
       }
       // Validate the checksum of the output.
-      Assertions.assertTrue(validateJobOutput());
+      assertTrue(validateJobOutput());
       // Check intermediate files and spilling.
       long spilledRecords =
           job.getCounters().findCounter(TaskCounter.SPILLED_RECORDS).getValue();
-      Assertions.assertTrue(
-         spilledRecords > 0, "Spill records must be greater than 0");
-      Assertions.assertFalse(
-         spillInjector.getEncryptedSpilledFiles().isEmpty(), "The encrypted spilled files should not be empty.");
-      Assertions.assertTrue(
-         spillInjector.getInvalidSpillEntries().isEmpty(), "Invalid access to spill file positions");
+      assertTrue(
+          spilledRecords > 0, "Spill records must be greater than 0");
+      assertFalse(spillInjector.getEncryptedSpilledFiles().isEmpty(),
+          "The encrypted spilled files should not be empty.");
+      assertTrue(spillInjector.getInvalidSpillEntries().isEmpty(),
+          "Invalid access to spill file positions");
     } finally {
       testSummary.append(spillInjector.getSpilledFileReport());
       LOG.info(testSummary.toString());