Merge branch 'apache:trunk' into MAPREDUCE-7420-v2

Author: slfan1989

hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/SimpleCopyListing.java

@@ -75,8 +75,8 @@ public class SimpleCopyListing extends CopyListing {
   private long totalDirs = 0;
   private long totalBytesToCopy = 0;
   private int numListstatusThreads = 1;
-  private final int fileStatusLimit;
-  private final boolean randomizeFileListing;
+  private int fileStatusLimit;
+  private boolean randomizeFileListing;
   private final int maxRetries = 3;
   private CopyFilter copyFilter;
   private DistCpSync distCpSync;
@@ -119,6 +119,17 @@ protected SimpleCopyListing(Configuration configuration,
     this.randomizeFileListing = randomizeFileListing;
   }
 
+  @VisibleForTesting
+  protected void initSimpleCopyListing(Configuration pConfiguration,
+      Credentials pCredentials, int pNumListstatusThreads, int pFileStatusLimit,
+      boolean pRandomizeFileListing) {
+    setConf(pConfiguration);
+    setCredentials(pCredentials);
+    this.numListstatusThreads = pNumListstatusThreads;
+    this.fileStatusLimit = Math.max(1, pFileStatusLimit);
+    this.randomizeFileListing = pRandomizeFileListing;
+  }
+
   protected SimpleCopyListing(Configuration configuration,
                               Credentials credentials,
                               DistCpSync distCpSync) {

hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestCopyFilter.java

@@ -18,12 +18,12 @@
 
 package org.apache.hadoop.tools;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.apache.hadoop.conf.Configuration;
 
 import static org.apache.hadoop.test.LambdaTestUtils.intercept;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Test {@link CopyFilter}.
@@ -34,17 +34,17 @@ public class TestCopyFilter {
   public void testGetCopyFilterTrueCopyFilter() {
     Configuration configuration = new Configuration(false);
     CopyFilter copyFilter = CopyFilter.getCopyFilter(configuration);
-    assertTrue("copyFilter should be instance of TrueCopyFilter",
-            copyFilter instanceof TrueCopyFilter);
+    assertTrue(copyFilter instanceof TrueCopyFilter,
+        "copyFilter should be instance of TrueCopyFilter");
   }
 
   @Test
   public void testGetCopyFilterRegexCopyFilter() {
     Configuration configuration = new Configuration(false);
     configuration.set(DistCpConstants.CONF_LABEL_FILTERS_FILE, "random");
     CopyFilter copyFilter = CopyFilter.getCopyFilter(configuration);
-    assertTrue("copyFilter should be instance of RegexCopyFilter",
-            copyFilter instanceof RegexCopyFilter);
+    assertTrue(copyFilter instanceof RegexCopyFilter,
+        "copyFilter should be instance of RegexCopyFilter");
   }
 
   @Test
@@ -54,8 +54,8 @@ public void testGetCopyFilterRegexpInConfigurationFilter() {
     Configuration configuration = new Configuration(false);
     configuration.set(DistCpConstants.CONF_LABEL_FILTERS_CLASS, filterName);
     CopyFilter copyFilter = CopyFilter.getCopyFilter(configuration);
-    assertTrue("copyFilter should be instance of RegexpInConfigurationFilter",
-            copyFilter instanceof RegexpInConfigurationFilter);
+    assertTrue(copyFilter instanceof RegexpInConfigurationFilter,
+        "copyFilter should be instance of RegexpInConfigurationFilter");
   }
 
   @Test