diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/conf/TestNoDefaultsJobConf.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/conf/TestNoDefaultsJobConf.java index e2d75ab268a19..ffe4850bf836d 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/conf/TestNoDefaultsJobConf.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/conf/TestNoDefaultsJobConf.java @@ -29,7 +29,7 @@ import org.apache.hadoop.mapred.TextInputFormat; import org.apache.hadoop.mapred.TextOutputFormat; import org.apache.hadoop.mapred.Utils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.BufferedReader; import java.io.IOException; @@ -39,8 +39,10 @@ import java.io.OutputStreamWriter; import java.io.Writer; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * This testcase tests that a JobConf without default values submits jobs @@ -56,10 +58,10 @@ public TestNoDefaultsJobConf() throws IOException { @Test public void testNoDefaults() throws Exception { JobConf configuration = new JobConf(); - assertTrue(configuration.get("hadoop.tmp.dir", null) != null); + assertNotNull(configuration.get("hadoop.tmp.dir", null)); configuration = new JobConf(false); - assertTrue(configuration.get("hadoop.tmp.dir", null) == null); + assertNull(configuration.get("hadoop.tmp.dir", null)); Path inDir = new Path("testing/jobconf/input"); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/DFSCIOTest.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/DFSCIOTest.java index d718556a05437..b2ab0bc8bf60c 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/DFSCIOTest.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/DFSCIOTest.java @@ -34,8 +34,8 @@ import org.apache.hadoop.io.Text; import org.apache.hadoop.io.SequenceFile.CompressionType; import org.apache.hadoop.mapred.*; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -66,7 +66,7 @@ *
  • standard i/o rate deviation
    • * */ -@Ignore +@Disabled public class DFSCIOTest { // Constants private static final Logger LOG = LoggerFactory.getLogger(DFSCIOTest.class); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestDFSIO.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestDFSIO.java index 6ee143dcf4127..9b9fdacbe577a 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestDFSIO.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestDFSIO.java @@ -66,9 +66,10 @@ import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.util.Tool; import org.apache.hadoop.util.ToolRunner; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -226,7 +227,7 @@ private static Path getDataDir(Configuration conf) { private static MiniDFSCluster cluster; private static TestDFSIO bench; - @BeforeClass + @BeforeAll public static void beforeClass() throws Exception { bench = new TestDFSIO(); bench.getConf().setInt(DFSConfigKeys.DFS_HEARTBEAT_INTERVAL_KEY, 1); @@ -241,7 +242,7 @@ public static void beforeClass() throws Exception { testWrite(); } - @AfterClass + @AfterAll public static void afterClass() throws Exception { if(cluster == null) return; @@ -256,14 +257,16 @@ public static void testWrite() throws Exception { bench.analyzeResult(fs, TestType.TEST_TYPE_WRITE, execTime); } - @Test (timeout = 10000) + @Test + @Timeout(value = 10) public void testRead() throws Exception { FileSystem fs = cluster.getFileSystem(); long execTime = bench.readTest(fs); bench.analyzeResult(fs, TestType.TEST_TYPE_READ, execTime); } - @Test (timeout = 10000) + @Test + @Timeout(value = 10) public void testReadRandom() throws Exception { FileSystem fs = cluster.getFileSystem(); bench.getConf().setLong("test.io.skip.size", 0); @@ -271,7 +274,8 @@ public void testReadRandom() throws Exception { bench.analyzeResult(fs, TestType.TEST_TYPE_READ_RANDOM, execTime); } - @Test (timeout = 10000) + @Test + @Timeout(value = 10) public void testReadBackward() throws Exception { FileSystem fs = cluster.getFileSystem(); bench.getConf().setLong("test.io.skip.size", -DEFAULT_BUFFER_SIZE); @@ -279,7 +283,8 @@ public void testReadBackward() throws Exception { bench.analyzeResult(fs, TestType.TEST_TYPE_READ_BACKWARD, execTime); } - @Test (timeout = 10000) + @Test + @Timeout(value = 10) public void testReadSkip() throws Exception { FileSystem fs = cluster.getFileSystem(); bench.getConf().setLong("test.io.skip.size", 1); @@ -287,14 +292,16 @@ public void testReadSkip() throws Exception { bench.analyzeResult(fs, TestType.TEST_TYPE_READ_SKIP, execTime); } - @Test (timeout = 10000) + @Test + @Timeout(value = 10) public void testAppend() throws Exception { FileSystem fs = cluster.getFileSystem(); long execTime = bench.appendTest(fs); bench.analyzeResult(fs, TestType.TEST_TYPE_APPEND, execTime); } - @Test (timeout = 60000) + @Test + @Timeout(value = 60) public void testTruncate() throws Exception { FileSystem fs = cluster.getFileSystem(); bench.createControlFile(fs, DEFAULT_NR_BYTES / 2, DEFAULT_NR_FILES); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestFileSystem.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestFileSystem.java index 075ab9a3f3ca7..2d69f4819dcbf 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestFileSystem.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestFileSystem.java @@ -47,16 +47,16 @@ import org.apache.hadoop.mapred.lib.LongSumReducer; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.util.StringUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.fail; public class TestFileSystem { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestJHLA.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestJHLA.java index 9334a8a0dfaf6..019b358031774 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestJHLA.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestJHLA.java @@ -23,9 +23,9 @@ import java.io.OutputStreamWriter; import java.io.File; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,7 +40,7 @@ public class TestJHLA { private String historyLog = System.getProperty("test.build.data", "build/test/data") + "/history/test.log"; - @Before + @BeforeEach public void setUp() throws Exception { File logFile = new File(historyLog); if(!logFile.getParentFile().exists()) @@ -121,7 +121,7 @@ public void setUp() throws Exception { writer.close(); } - @After + @AfterEach public void tearDown() throws Exception { File logFile = new File(historyLog); if(!logFile.delete()) diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/TestSlive.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/TestSlive.java index 218cae8bf7bea..61b4f718f4ccf 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/TestSlive.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/TestSlive.java @@ -19,8 +19,8 @@ package org.apache.hadoop.fs.slive; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.DataInputStream; import java.io.File; @@ -40,8 +40,8 @@ import org.apache.hadoop.fs.slive.DataVerifier.VerifyOutput; import org.apache.hadoop.fs.slive.DataWriter.GenerateOutput; import org.apache.hadoop.util.ToolRunner; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -194,7 +194,7 @@ private ConfigExtractor getTestConfig(boolean sleep) throws Exception { return extractor; } - @Before + @BeforeEach public void ensureDeleted() throws Exception { rDelete(getTestFile()); rDelete(getTestDir()); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/hdfs/TestNNBench.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/hdfs/TestNNBench.java index 0273613f9fb2f..621ecc021c717 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/hdfs/TestNNBench.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/hdfs/TestNNBench.java @@ -17,9 +17,9 @@ */ package org.apache.hadoop.hdfs; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; import java.io.IOException; @@ -31,8 +31,9 @@ import org.apache.hadoop.mapred.JobConf; import org.apache.hadoop.util.Time; import org.apache.hadoop.util.ToolRunner; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; public class TestNNBench extends HadoopTestCase { private static final String BASE_DIR = @@ -45,39 +46,39 @@ public TestNNBench() throws IOException { super(LOCAL_MR, LOCAL_FS, 1, 1); } - @After + @AfterEach public void tearDown() throws Exception { getFileSystem().delete(new Path(BASE_DIR), true); getFileSystem().delete(new Path(NNBench.DEFAULT_RES_FILE_NAME), true); super.tearDown(); } - @Test(timeout = 30000) + @Test + @Timeout(value = 30) public void testNNBenchCreateReadAndDelete() throws Exception { runNNBench(createJobConf(), "create_write"); Path path = new Path(BASE_DIR + "/data/file_0_0"); - assertTrue("create_write should create the file", - getFileSystem().exists(path)); + assertTrue(getFileSystem().exists(path), "create_write should create the file"); runNNBench(createJobConf(), "open_read"); runNNBench(createJobConf(), "delete"); - assertFalse("Delete operation should delete the file", - getFileSystem().exists(path)); + assertFalse(getFileSystem().exists(path), + "Delete operation should delete the file"); } - @Test(timeout = 30000) + @Test + @Timeout(value = 30) public void testNNBenchCreateAndRename() throws Exception { runNNBench(createJobConf(), "create_write"); Path path = new Path(BASE_DIR + "/data/file_0_0"); - assertTrue("create_write should create the file", - getFileSystem().exists(path)); + assertTrue(getFileSystem().exists(path), "create_write should create the file"); runNNBench(createJobConf(), "rename"); Path renamedPath = new Path(BASE_DIR + "/data/file_0_r_0"); - assertFalse("Rename should rename the file", getFileSystem().exists(path)); - assertTrue("Rename should rename the file", - getFileSystem().exists(renamedPath)); + assertFalse(getFileSystem().exists(path), "Rename should rename the file"); + assertTrue(getFileSystem().exists(renamedPath), "Rename should rename the file"); } - @Test(timeout = 30000) + @Test + @Timeout(value = 30) public void testNNBenchCreateControlFilesWithPool() throws Exception { runNNBench(createJobConf(), "create_write", BASE_DIR, "5"); Path path = new Path(BASE_DIR, CONTROL_DIR_NAME); @@ -86,7 +87,8 @@ public void testNNBenchCreateControlFilesWithPool() throws Exception { assertEquals(5, fileStatuses.length); } - @Test(timeout = 30000) + @Test + @Timeout(value = 30) public void testNNBenchCrossCluster() throws Exception { MiniDFSCluster dfsCluster = new MiniDFSCluster.Builder(new JobConf()) .numDataNodes(1).build(); @@ -96,8 +98,8 @@ public void testNNBenchCrossCluster() throws Exception { runNNBench(createJobConf(), "create_write", baseDir); Path path = new Path(BASE_DIR + "/data/file_0_0"); - assertTrue("create_write should create the file", - dfsCluster.getFileSystem().exists(path)); + assertTrue(dfsCluster.getFileSystem().exists(path), + "create_write should create the file"); dfsCluster.shutdown(); } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/io/TestSequenceFileMergeProgress.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/io/TestSequenceFileMergeProgress.java index 4f1318c044103..b4e424bac9516 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/io/TestSequenceFileMergeProgress.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/io/TestSequenceFileMergeProgress.java @@ -28,8 +28,8 @@ import org.apache.hadoop.mapred.*; import org.slf4j.Logger; -import org.junit.Test; -import static org.junit.Assert.assertEquals; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestSequenceFileMergeProgress { private static final Logger LOG = FileInputFormat.LOG; diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/ipc/TestMRCJCSocketFactory.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/ipc/TestMRCJCSocketFactory.java index 123947a39a302..8899da38248be 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/ipc/TestMRCJCSocketFactory.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/ipc/TestMRCJCSocketFactory.java @@ -34,8 +34,10 @@ import org.apache.hadoop.mapreduce.v2.MiniMRYarnCluster; import org.apache.hadoop.net.StandardSocketFactory; import org.apache.hadoop.yarn.conf.YarnConfiguration; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * This class checks that RPCs can use specialized socket factories. @@ -56,13 +58,13 @@ public void testSocketFactory() throws IOException { // Get a reference to its DFS directly FileSystem fs = cluster.getFileSystem(); - Assert.assertTrue(fs instanceof DistributedFileSystem); + assertTrue(fs instanceof DistributedFileSystem); DistributedFileSystem directDfs = (DistributedFileSystem) fs; Configuration cconf = getCustomSocketConfigs(nameNodePort); fs = FileSystem.get(cconf); - Assert.assertTrue(fs instanceof DistributedFileSystem); + assertTrue(fs instanceof DistributedFileSystem); DistributedFileSystem dfs = (DistributedFileSystem) fs; JobClient client = null; @@ -72,12 +74,12 @@ public void testSocketFactory() throws IOException { // could we test Client-DataNode connections? Path filePath = new Path("/dir"); - Assert.assertFalse(directDfs.exists(filePath)); - Assert.assertFalse(dfs.exists(filePath)); + assertFalse(directDfs.exists(filePath)); + assertFalse(dfs.exists(filePath)); directDfs.mkdirs(filePath); - Assert.assertTrue(directDfs.exists(filePath)); - Assert.assertTrue(dfs.exists(filePath)); + assertTrue(directDfs.exists(filePath)); + assertTrue(dfs.exists(filePath)); // This will test RPC to a Resource Manager fs = FileSystem.get(sconf); @@ -95,7 +97,7 @@ public void testSocketFactory() throws IOException { client = new JobClient(jconf); JobStatus[] jobs = client.jobsToComplete(); - Assert.assertTrue(jobs.length == 0); + assertTrue(jobs.length == 0); } finally { closeClient(client); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/ClusterMapReduceTestCase.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/ClusterMapReduceTestCase.java index f16b8a0f18fc2..b3e1998803ae5 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/ClusterMapReduceTestCase.java +++ b/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(); } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/HadoopTestCase.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/HadoopTestCase.java index 277c0fd4b0ac5..ef7b2de903ac0 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/HadoopTestCase.java +++ b/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) { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/MRCaching.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/MRCaching.java index a71550bce8a44..5d458b0d9d88f 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/MRCaching.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/MRCaching.java @@ -32,7 +32,7 @@ import java.net.URI; -import org.junit.Assert; +import static org.junit.jupiter.api.Assertions.assertEquals; public class MRCaching { static String testStr = "This is a test file " + "used for testing caching " @@ -299,13 +299,12 @@ private static void validateCacheFileSizes(Configuration job, String configValues = job.get(configKey, ""); System.out.println(configKey + " -> " + configValues); String[] realSizes = StringUtils.getStrings(configValues); - Assert.assertEquals("Number of files for "+ configKey, - expectedSizes.length, realSizes.length); + assertEquals(expectedSizes.length, realSizes.length, "Number of files for "+ configKey); for (int i=0; i < expectedSizes.length; ++i) { long actual = Long.valueOf(realSizes[i]); long expected = expectedSizes[i]; - Assert.assertEquals("File "+ i +" for "+ configKey, expected, actual); + assertEquals(expected, actual, "File "+ i +" for "+ configKey); } } } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/NotificationTestCase.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/NotificationTestCase.java index 8acd015ab0987..26feba37a0672 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/NotificationTestCase.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/NotificationTestCase.java @@ -35,11 +35,11 @@ import java.io.IOException; import java.io.DataOutputStream; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertEquals; -import org.junit.Before; -import org.junit.After; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; /** @@ -132,7 +132,7 @@ protected void verifyQuery(String query, String expected) return; } failureCounter++; - assertTrue("The request (" + query + ") does not contain " + expected, false); + assertTrue(false, "The request (" + query + ") does not contain " + expected); } } @@ -149,13 +149,13 @@ protected JobConf createJobConf() { return conf; } - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); startHttpServer(); } - @After + @AfterEach public void tearDown() throws Exception { stopHttpServer(); NotificationServlet.counter = 0; diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestBadRecords.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestBadRecords.java index 1b39583bd729f..b39f9d8d2ef01 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestBadRecords.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestBadRecords.java @@ -38,16 +38,17 @@ import org.apache.hadoop.mapreduce.TaskCounter; import org.apache.hadoop.util.ReflectionUtils; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertNotNull; -@Ignore +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +@Disabled public class TestBadRecords extends ClusterMapReduceTestCase { private static final Logger LOG = @@ -61,7 +62,7 @@ public class TestBadRecords extends ClusterMapReduceTestCase { private List input; - @BeforeClass + @BeforeAll public static void setupClass() throws Exception { setupClassBase(TestBadRecords.class); } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClientRedirect.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClientRedirect.java index f034f34742a6e..2c2066bac7529 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClientRedirect.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClientRedirect.java @@ -146,11 +146,13 @@ import org.apache.hadoop.yarn.factories.RecordFactory; import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider; import org.apache.hadoop.yarn.ipc.YarnRPC; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestClientRedirect { static { @@ -200,7 +202,7 @@ public void testRedirect() throws Exception { org.apache.hadoop.mapreduce.Counters counters = cluster.getJob(jobID).getCounters(); validateCounters(counters); - Assert.assertTrue(amContact); + assertTrue(amContact); LOG.info("Sleeping for 5 seconds before stop for" + " the client socket to not get EOF immediately.."); @@ -218,7 +220,7 @@ public void testRedirect() throws Exception { // Same client //results are returned from fake (not started job) counters = cluster.getJob(jobID).getCounters(); - Assert.assertEquals(0, counters.countCounters()); + assertEquals(0, counters.countCounters()); Job job = cluster.getJob(jobID); org.apache.hadoop.mapreduce.TaskID taskId = new org.apache.hadoop.mapreduce.TaskID(jobID, TaskType.MAP, 0); @@ -242,7 +244,7 @@ public void testRedirect() throws Exception { counters = cluster.getJob(jobID).getCounters(); validateCounters(counters); - Assert.assertTrue(amContact); + assertTrue(amContact); // Stop the AM. It is not even restarting. So it should be treated as // completed. @@ -251,7 +253,7 @@ public void testRedirect() throws Exception { // Same client counters = cluster.getJob(jobID).getCounters(); validateCounters(counters); - Assert.assertTrue(hsContact); + assertTrue(hsContact); rmService.stop(); historyService.stop(); @@ -267,7 +269,7 @@ private void validateCounters(org.apache.hadoop.mapreduce.Counters counters) { LOG.info("Counter is " + itc.next().getDisplayName()); } } - Assert.assertEquals(1, counters.countCounters()); + assertEquals(1, counters.countCounters()); } class RMService extends AbstractService implements ApplicationClientProtocol { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClientServiceDelegate.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClientServiceDelegate.java index ef460e8d74d47..8344466afdcbf 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClientServiceDelegate.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClientServiceDelegate.java @@ -58,35 +58,36 @@ import org.apache.hadoop.yarn.exceptions.ApplicationNotFoundException; import org.apache.hadoop.yarn.exceptions.YarnException; import org.apache.hadoop.yarn.util.Records; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * Tests for ClientServiceDelegate.java */ - -@RunWith(value = Parameterized.class) public class TestClientServiceDelegate { private JobID oldJobId = JobID.forName("job_1315895242400_2"); private org.apache.hadoop.mapreduce.v2.api.records.JobId jobId = TypeConverter .toYarn(oldJobId); private boolean isAMReachableFromClient; - public TestClientServiceDelegate(boolean isAMReachableFromClient) { - this.isAMReachableFromClient = isAMReachableFromClient; + public void initTestClientServiceDelegate(boolean pIsAMReachableFromClient) { + this.isAMReachableFromClient = pIsAMReachableFromClient; } - @Parameters public static Collection data() { Object[][] data = new Object[][] { { true }, { false } }; return Arrays.asList(data); } - @Test - public void testUnknownAppInRM() throws Exception { + @MethodSource("data") + @ParameterizedTest + public void testUnknownAppInRM(boolean pIsAMReachableFromClient) throws Exception { + initTestClientServiceDelegate(pIsAMReachableFromClient); MRClientProtocol historyServerProxy = mock(MRClientProtocol.class); when(historyServerProxy.getJobReport(getJobReportRequest())).thenReturn( getJobReportResponse()); @@ -94,12 +95,14 @@ public void testUnknownAppInRM() throws Exception { historyServerProxy, getRMDelegate()); JobStatus jobStatus = clientServiceDelegate.getJobStatus(oldJobId); - Assert.assertNotNull(jobStatus); + assertNotNull(jobStatus); } - @Test - public void testRemoteExceptionFromHistoryServer() throws Exception { - + @MethodSource("data") + @ParameterizedTest + public void testRemoteExceptionFromHistoryServer(boolean pIsAMReachableFromClient) + throws Exception { + initTestClientServiceDelegate(pIsAMReachableFromClient); MRClientProtocol historyServerProxy = mock(MRClientProtocol.class); when(historyServerProxy.getJobReport(getJobReportRequest())).thenThrow( new IOException("Job ID doesnot Exist")); @@ -113,16 +116,18 @@ public void testRemoteExceptionFromHistoryServer() throws Exception { try { clientServiceDelegate.getJobStatus(oldJobId); - Assert.fail("Invoke should throw exception after retries."); + fail("Invoke should throw exception after retries."); } catch (IOException e) { - Assert.assertTrue(e.getMessage().contains( + assertTrue(e.getMessage().contains( "Job ID doesnot Exist")); } } - @Test - public void testRetriesOnConnectionFailure() throws Exception { - + @MethodSource("data") + @ParameterizedTest + public void testRetriesOnConnectionFailure(boolean pIsAMReachableFromClient) + throws Exception { + initTestClientServiceDelegate(pIsAMReachableFromClient); MRClientProtocol historyServerProxy = mock(MRClientProtocol.class); when(historyServerProxy.getJobReport(getJobReportRequest())).thenThrow( new RuntimeException("1")).thenThrow(new RuntimeException("2")) @@ -136,13 +141,16 @@ public void testRetriesOnConnectionFailure() throws Exception { historyServerProxy, rm); JobStatus jobStatus = clientServiceDelegate.getJobStatus(oldJobId); - Assert.assertNotNull(jobStatus); + assertNotNull(jobStatus); verify(historyServerProxy, times(3)).getJobReport( any(GetJobReportRequest.class)); } - @Test - public void testRetriesOnAMConnectionFailures() throws Exception { + @MethodSource("data") + @ParameterizedTest + public void testRetriesOnAMConnectionFailures(boolean pIsAMReachableFromClient) + throws Exception { + initTestClientServiceDelegate(pIsAMReachableFromClient); if (!isAMReachableFromClient) { return; } @@ -175,16 +183,19 @@ MRClientProtocol instantiateAMProxy( JobStatus jobStatus = clientServiceDelegate.getJobStatus(oldJobId); - Assert.assertNotNull(jobStatus); + assertNotNull(jobStatus); // assert maxClientRetry is not decremented. - Assert.assertEquals(conf.getInt(MRJobConfig.MR_CLIENT_MAX_RETRIES, + assertEquals(conf.getInt(MRJobConfig.MR_CLIENT_MAX_RETRIES, MRJobConfig.DEFAULT_MR_CLIENT_MAX_RETRIES), clientServiceDelegate .getMaxClientRetry()); verify(amProxy, times(5)).getJobReport(any(GetJobReportRequest.class)); } - @Test - public void testNoRetryOnAMAuthorizationException() throws Exception { + @MethodSource("data") + @ParameterizedTest + public void testNoRetryOnAMAuthorizationException(boolean pIsAMReachableFromClient) + throws Exception { + initTestClientServiceDelegate(pIsAMReachableFromClient); if (!isAMReachableFromClient) { return; } @@ -213,27 +224,30 @@ MRClientProtocol instantiateAMProxy( try { clientServiceDelegate.getJobStatus(oldJobId); - Assert.fail("Exception should be thrown upon AuthorizationException"); + fail("Exception should be thrown upon AuthorizationException"); } catch (IOException e) { - Assert.assertEquals(AuthorizationException.class.getName() + ": Denied", + assertEquals(AuthorizationException.class.getName() + ": Denied", e.getMessage()); } // assert maxClientRetry is not decremented. - Assert.assertEquals(conf.getInt(MRJobConfig.MR_CLIENT_MAX_RETRIES, + assertEquals(conf.getInt(MRJobConfig.MR_CLIENT_MAX_RETRIES, MRJobConfig.DEFAULT_MR_CLIENT_MAX_RETRIES), clientServiceDelegate .getMaxClientRetry()); verify(amProxy, times(1)).getJobReport(any(GetJobReportRequest.class)); } - @Test - public void testHistoryServerNotConfigured() throws Exception { + @MethodSource("data") + @ParameterizedTest + public void testHistoryServerNotConfigured( + boolean pIsAMReachableFromClient) throws Exception { + initTestClientServiceDelegate(pIsAMReachableFromClient); //RM doesn't have app report and job History Server is not configured ClientServiceDelegate clientServiceDelegate = getClientServiceDelegate( null, getRMDelegate()); JobStatus jobStatus = clientServiceDelegate.getJobStatus(oldJobId); - Assert.assertEquals("N/A", jobStatus.getUsername()); - Assert.assertEquals(JobStatus.State.PREP, jobStatus.getState()); + assertEquals("N/A", jobStatus.getUsername()); + assertEquals(JobStatus.State.PREP, jobStatus.getState()); //RM has app report and job History Server is not configured ResourceMgrDelegate rm = mock(ResourceMgrDelegate.class); @@ -243,12 +257,15 @@ public void testHistoryServerNotConfigured() throws Exception { clientServiceDelegate = getClientServiceDelegate(null, rm); jobStatus = clientServiceDelegate.getJobStatus(oldJobId); - Assert.assertEquals(applicationReport.getUser(), jobStatus.getUsername()); - Assert.assertEquals(JobStatus.State.SUCCEEDED, jobStatus.getState()); + assertEquals(applicationReport.getUser(), jobStatus.getUsername()); + assertEquals(JobStatus.State.SUCCEEDED, jobStatus.getState()); } - - @Test - public void testJobReportFromHistoryServer() throws Exception { + + @MethodSource("data") + @ParameterizedTest + public void testJobReportFromHistoryServer( + boolean pIsAMReachableFromClient) throws Exception { + initTestClientServiceDelegate(pIsAMReachableFromClient); MRClientProtocol historyServerProxy = mock(MRClientProtocol.class); when(historyServerProxy.getJobReport(getJobReportRequest())).thenReturn( getJobReportResponseFromHistoryServer()); @@ -259,15 +276,18 @@ public void testJobReportFromHistoryServer() throws Exception { historyServerProxy, rm); JobStatus jobStatus = clientServiceDelegate.getJobStatus(oldJobId); - Assert.assertNotNull(jobStatus); - Assert.assertEquals("TestJobFilePath", jobStatus.getJobFile()); - Assert.assertEquals("http://TestTrackingUrl", jobStatus.getTrackingUrl()); - Assert.assertEquals(1.0f, jobStatus.getMapProgress(), 0.0f); - Assert.assertEquals(1.0f, jobStatus.getReduceProgress(), 0.0f); + assertNotNull(jobStatus); + assertEquals("TestJobFilePath", jobStatus.getJobFile()); + assertEquals("http://TestTrackingUrl", jobStatus.getTrackingUrl()); + assertEquals(1.0f, jobStatus.getMapProgress(), 0.0f); + assertEquals(1.0f, jobStatus.getReduceProgress(), 0.0f); } - - @Test - public void testCountersFromHistoryServer() throws Exception { + + @MethodSource("data") + @ParameterizedTest + public void testCountersFromHistoryServer( + boolean pIsAMReachableFromClient) throws Exception { + initTestClientServiceDelegate(pIsAMReachableFromClient); MRClientProtocol historyServerProxy = mock(MRClientProtocol.class); when(historyServerProxy.getCounters(getCountersRequest())).thenReturn( getCountersResponseFromHistoryServer()); @@ -278,12 +298,16 @@ public void testCountersFromHistoryServer() throws Exception { historyServerProxy, rm); Counters counters = TypeConverter.toYarn(clientServiceDelegate.getJobCounters(oldJobId)); - Assert.assertNotNull(counters); - Assert.assertEquals(1001, counters.getCounterGroup("dummyCounters").getCounter("dummyCounter").getValue()); + assertNotNull(counters); + assertEquals(1001, + counters.getCounterGroup("dummyCounters").getCounter("dummyCounter").getValue()); } - @Test - public void testReconnectOnAMRestart() throws IOException { + @MethodSource("data") + @ParameterizedTest + public void testReconnectOnAMRestart( + boolean pIsAMReachableFromClient) throws IOException { + initTestClientServiceDelegate(pIsAMReachableFromClient); //test not applicable when AM not reachable //as instantiateAMProxy is not called at all if(!isAMReachableFromClient) { @@ -338,23 +362,26 @@ public void testReconnectOnAMRestart() throws IOException { clientServiceDelegate).instantiateAMProxy(any(InetSocketAddress.class)); JobStatus jobStatus = clientServiceDelegate.getJobStatus(oldJobId); - Assert.assertNotNull(jobStatus); - Assert.assertEquals("jobName-firstGen", jobStatus.getJobName()); + assertNotNull(jobStatus); + assertEquals("jobName-firstGen", jobStatus.getJobName()); jobStatus = clientServiceDelegate.getJobStatus(oldJobId); - Assert.assertNotNull(jobStatus); - Assert.assertEquals("jobName-secondGen", jobStatus.getJobName()); + assertNotNull(jobStatus); + assertEquals("jobName-secondGen", jobStatus.getJobName()); jobStatus = clientServiceDelegate.getJobStatus(oldJobId); - Assert.assertNotNull(jobStatus); - Assert.assertEquals("jobName-secondGen", jobStatus.getJobName()); + assertNotNull(jobStatus); + assertEquals("jobName-secondGen", jobStatus.getJobName()); verify(clientServiceDelegate, times(2)).instantiateAMProxy( any(InetSocketAddress.class)); } - - @Test - public void testAMAccessDisabled() throws IOException { + + @MethodSource("data") + @ParameterizedTest + public void testAMAccessDisabled( + boolean pIsAMReachableFromClient) throws IOException { + initTestClientServiceDelegate(pIsAMReachableFromClient); //test only applicable when AM not reachable if(isAMReachableFromClient) { return; @@ -379,56 +406,65 @@ public void testAMAccessDisabled() throws IOException { historyServerProxy, rmDelegate)); JobStatus jobStatus = clientServiceDelegate.getJobStatus(oldJobId); - Assert.assertNotNull(jobStatus); - Assert.assertEquals("N/A", jobStatus.getJobName()); + assertNotNull(jobStatus); + assertEquals("N/A", jobStatus.getJobName()); verify(clientServiceDelegate, times(0)).instantiateAMProxy( any(InetSocketAddress.class)); // Should not reach AM even for second and third times too. jobStatus = clientServiceDelegate.getJobStatus(oldJobId); - Assert.assertNotNull(jobStatus); - Assert.assertEquals("N/A", jobStatus.getJobName()); + assertNotNull(jobStatus); + assertEquals("N/A", jobStatus.getJobName()); verify(clientServiceDelegate, times(0)).instantiateAMProxy( any(InetSocketAddress.class)); jobStatus = clientServiceDelegate.getJobStatus(oldJobId); - Assert.assertNotNull(jobStatus); - Assert.assertEquals("N/A", jobStatus.getJobName()); + assertNotNull(jobStatus); + assertEquals("N/A", jobStatus.getJobName()); verify(clientServiceDelegate, times(0)).instantiateAMProxy( any(InetSocketAddress.class)); // The third time around, app is completed, so should go to JHS JobStatus jobStatus1 = clientServiceDelegate.getJobStatus(oldJobId); - Assert.assertNotNull(jobStatus1); - Assert.assertEquals("TestJobFilePath", jobStatus1.getJobFile()); - Assert.assertEquals("http://TestTrackingUrl", jobStatus1.getTrackingUrl()); - Assert.assertEquals(1.0f, jobStatus1.getMapProgress(), 0.0f); - Assert.assertEquals(1.0f, jobStatus1.getReduceProgress(), 0.0f); + assertNotNull(jobStatus1); + assertEquals("TestJobFilePath", jobStatus1.getJobFile()); + assertEquals("http://TestTrackingUrl", jobStatus1.getTrackingUrl()); + assertEquals(1.0f, jobStatus1.getMapProgress(), 0.0f); + assertEquals(1.0f, jobStatus1.getReduceProgress(), 0.0f); verify(clientServiceDelegate, times(0)).instantiateAMProxy( any(InetSocketAddress.class)); } - - @Test - public void testRMDownForJobStatusBeforeGetAMReport() throws IOException { + + @MethodSource("data") + @ParameterizedTest + public void testRMDownForJobStatusBeforeGetAMReport( + boolean pIsAMReachableFromClient) throws IOException { + initTestClientServiceDelegate(pIsAMReachableFromClient); Configuration conf = new YarnConfiguration(); testRMDownForJobStatusBeforeGetAMReport(conf, MRJobConfig.DEFAULT_MR_CLIENT_MAX_RETRIES); } - @Test - public void testRMDownForJobStatusBeforeGetAMReportWithRetryTimes() + @MethodSource("data") + @ParameterizedTest + public void testRMDownForJobStatusBeforeGetAMReportWithRetryTimes( + boolean pIsAMReachableFromClient) throws IOException { + initTestClientServiceDelegate(pIsAMReachableFromClient); Configuration conf = new YarnConfiguration(); conf.setInt(MRJobConfig.MR_CLIENT_MAX_RETRIES, 2); testRMDownForJobStatusBeforeGetAMReport(conf, conf.getInt( MRJobConfig.MR_CLIENT_MAX_RETRIES, MRJobConfig.DEFAULT_MR_CLIENT_MAX_RETRIES)); } - - @Test - public void testRMDownRestoreForJobStatusBeforeGetAMReport() + + @MethodSource("data") + @ParameterizedTest + public void testRMDownRestoreForJobStatusBeforeGetAMReport( + boolean pIsAMReachableFromClient) throws IOException { + initTestClientServiceDelegate(pIsAMReachableFromClient); Configuration conf = new YarnConfiguration(); conf.setInt(MRJobConfig.MR_CLIENT_MAX_RETRIES, 3); @@ -451,7 +487,7 @@ public void testRMDownRestoreForJobStatusBeforeGetAMReport() JobStatus jobStatus = clientServiceDelegate.getJobStatus(oldJobId); verify(rmDelegate, times(3)).getApplicationReport( any(ApplicationId.class)); - Assert.assertNotNull(jobStatus); + assertNotNull(jobStatus); } catch (YarnException e) { throw new IOException(e); } @@ -476,7 +512,7 @@ private void testRMDownForJobStatusBeforeGetAMReport(Configuration conf, conf, rmDelegate, oldJobId, historyServerProxy); try { clientServiceDelegate.getJobStatus(oldJobId); - Assert.fail("It should throw exception after retries"); + fail("It should throw exception after retries"); } catch (IOException e) { System.out.println("fail to get job status,and e=" + e.toString()); } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClusterMapReduceTestCase.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClusterMapReduceTestCase.java index b4e8de2723c57..b55433d948d06 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClusterMapReduceTestCase.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClusterMapReduceTestCase.java @@ -30,16 +30,16 @@ import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.Text; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertFalse; public class TestClusterMapReduceTestCase extends ClusterMapReduceTestCase { - @BeforeClass + @BeforeAll public static void setupClass() throws Exception { setupClassBase(TestClusterMapReduceTestCase.class); } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestCollect.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestCollect.java index 595d09cc2a0fd..83ea506bcd073 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestCollect.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestCollect.java @@ -21,7 +21,7 @@ import org.apache.hadoop.io.*; import org.apache.hadoop.mapred.UtilsForTests.RandomInputFormat; import org.apache.hadoop.mapreduce.MRConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.*; import java.util.*; diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestCombineFileInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestCombineFileInputFormat.java index 4ed9eb2ccd7fc..b45cfe2cd0858 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestCombineFileInputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestCombineFileInputFormat.java @@ -26,11 +26,11 @@ import org.apache.hadoop.mapred.lib.CombineFileInputFormat; import org.apache.hadoop.mapred.lib.CombineFileSplit; import org.apache.hadoop.mapred.lib.CombineFileRecordReader; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestCombineFileInputFormat { private static final Logger LOG = @@ -79,6 +79,6 @@ public RecordReader getRecordReader(InputSplit split, JobConf job, Reporter repo LOG.info("Trying to getSplits with splits = " + SIZE_SPLITS); InputSplit[] splits = format.getSplits(job, SIZE_SPLITS); LOG.info("Got getSplits = " + splits.length); - assertEquals("splits == " + SIZE_SPLITS, SIZE_SPLITS, splits.length); + assertEquals(SIZE_SPLITS, splits.length, "splits == " + SIZE_SPLITS); } } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestCombineOutputCollector.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestCombineOutputCollector.java index 83ad0e54c5fe9..d137c001400c9 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestCombineOutputCollector.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestCombineOutputCollector.java @@ -32,7 +32,7 @@ import org.apache.hadoop.mapred.Task.CombineOutputCollector; import org.apache.hadoop.mapred.Task.TaskReporter; import org.apache.hadoop.mapreduce.MRJobConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestCombineOutputCollector { private CombineOutputCollector coc; diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestCombineSequenceFileInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestCombineSequenceFileInputFormat.java index 4f1d6bae4f1d5..c3b41b6be89d4 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestCombineSequenceFileInputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestCombineSequenceFileInputFormat.java @@ -18,8 +18,8 @@ package org.apache.hadoop.mapred; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import java.io.IOException; import java.util.BitSet; @@ -33,7 +33,8 @@ import org.apache.hadoop.io.SequenceFile; import org.apache.hadoop.mapred.lib.CombineFileSplit; import org.apache.hadoop.mapred.lib.CombineSequenceFileInputFormat; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -57,7 +58,8 @@ public class TestCombineSequenceFileInputFormat { System.getProperty("test.build.data", "/tmp"), "TestCombineSequenceFileInputFormat")); - @Test(timeout=10000) + @Test + @Timeout(value = 10) public void testFormat() throws Exception { JobConf job = new JobConf(conf); @@ -92,10 +94,10 @@ public void testFormat() throws Exception { // we should have a single split as the length is comfortably smaller than // the block size - assertEquals("We got more than one splits!", 1, splits.length); + assertEquals(1, splits.length, "We got more than one splits!"); InputSplit split = splits[0]; - assertEquals("It should be CombineFileSplit", - CombineFileSplit.class, split.getClass()); + assertEquals(CombineFileSplit.class, split.getClass(), + "It should be CombineFileSplit"); // check each split BitSet bits = new BitSet(length); @@ -103,13 +105,13 @@ public void testFormat() throws Exception { format.getRecordReader(split, job, reporter); try { while (reader.next(key, value)) { - assertFalse("Key in multiple partitions.", bits.get(key.get())); + assertFalse(bits.get(key.get()), "Key in multiple partitions."); bits.set(key.get()); } } finally { reader.close(); } - assertEquals("Some keys in no partition.", length, bits.cardinality()); + assertEquals(length, bits.cardinality(), "Some keys in no partition."); } } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestCombineTextInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestCombineTextInputFormat.java index 394630cc5955c..c7abfb1968129 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestCombineTextInputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestCombineTextInputFormat.java @@ -18,9 +18,9 @@ package org.apache.hadoop.mapred; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import java.io.OutputStream; @@ -40,7 +40,8 @@ import org.apache.hadoop.mapred.lib.CombineFileSplit; import org.apache.hadoop.mapred.lib.CombineTextInputFormat; import org.apache.hadoop.util.ReflectionUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -67,7 +68,8 @@ public class TestCombineTextInputFormat { // A reporter that does nothing private static final Reporter voidReporter = Reporter.NULL; - @Test(timeout=10000) + @Test + @Timeout(value = 10) public void testFormat() throws Exception { JobConf job = new JobConf(defaultConf); @@ -96,10 +98,10 @@ public void testFormat() throws Exception { // we should have a single split as the length is comfortably smaller than // the block size - assertEquals("We got more than one splits!", 1, splits.length); + assertEquals(1, splits.length, "We got more than one splits!"); InputSplit split = splits[0]; - assertEquals("It should be CombineFileSplit", - CombineFileSplit.class, split.getClass()); + assertEquals(CombineFileSplit.class, split.getClass(), + "It should be CombineFileSplit"); // check the split BitSet bits = new BitSet(length); @@ -115,7 +117,7 @@ public void testFormat() throws Exception { LOG.warn("conflict with " + v + " at position "+reader.getPos()); } - assertFalse("Key in multiple partitions.", bits.get(v)); + assertFalse(bits.get(v), "Key in multiple partitions."); bits.set(v); count++; } @@ -123,7 +125,7 @@ public void testFormat() throws Exception { } finally { reader.close(); } - assertEquals("Some keys in no partition.", length, bits.cardinality()); + assertEquals(length, bits.cardinality(), "Some keys in no partition."); } } @@ -206,7 +208,8 @@ private static List readSplit(InputFormat format, /** * Test using the gzip codec for reading */ - @Test(timeout=10000) + @Test + @Timeout(value = 10) public void testGzip() throws IOException { JobConf job = new JobConf(defaultConf); CompressionCodec gzip = new GzipCodec(); @@ -219,9 +222,9 @@ public void testGzip() throws IOException { FileInputFormat.setInputPaths(job, workDir); CombineTextInputFormat format = new CombineTextInputFormat(); InputSplit[] splits = format.getSplits(job, 100); - assertEquals("compressed splits == 1", 1, splits.length); + assertEquals(1, splits.length, "compressed splits == 1"); List results = readSplit(format, splits[0], job); - assertEquals("splits[0] length", 8, results.size()); + assertEquals(8, results.size(), "splits[0] length"); final String[] firstList = {"the quick", "brown", "fox jumped", "over", " the lazy", " dog"}; @@ -239,11 +242,11 @@ public void testGzip() throws IOException { private static void testResults(List results, String[] first, String[] second) { for (int i = 0; i < first.length; i++) { - assertEquals("splits[0]["+i+"]", first[i], results.get(i).toString()); + assertEquals(first[i], results.get(i).toString(), "splits[0][" + i + "]"); } for (int i = 0; i < second.length; i++) { int j = i + first.length; - assertEquals("splits[0]["+j+"]", second[i], results.get(j).toString()); + assertEquals(second[i], results.get(j).toString(), "splits[0][" + j + "]"); } } } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestCommandLineJobSubmission.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestCommandLineJobSubmission.java index 7cf5e71e1a57f..b3b66e73911d0 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestCommandLineJobSubmission.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestCommandLineJobSubmission.java @@ -26,15 +26,15 @@ import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.util.ToolRunner; import org.apache.hadoop.hdfs.MiniDFSCluster; -import org.junit.Ignore; -import org.junit.Test; -import static org.junit.Assert.assertTrue; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * check for the job submission options of * -libjars -files -archives */ -@Ignore +@Disabled public class TestCommandLineJobSubmission { // Input output paths for this.. // these are all dummy and does not test @@ -59,7 +59,7 @@ public void testJobShell() throws Exception { stream.close(); mr = new MiniMRCluster(2, fs.getUri().toString(), 1); File thisbuildDir = new File(buildDir, "jobCommand"); - assertTrue("create build dir", thisbuildDir.mkdirs()); + assertTrue(thisbuildDir.mkdirs(), "create build dir"); File f = new File(thisbuildDir, "files_tmp"); FileOutputStream fstream = new FileOutputStream(f); fstream.write("somestrings".getBytes()); @@ -120,13 +120,13 @@ public void testJobShell() throws Exception { JobConf jobConf = mr.createJobConf(); //before running the job, verify that libjar is not in client classpath - assertTrue("libjar not in client classpath", loadLibJar(jobConf)==null); + assertTrue(loadLibJar(jobConf)==null, "libjar not in client classpath"); int ret = ToolRunner.run(jobConf, new testshell.ExternalMapReduce(), args); //after running the job, verify that libjar is in the client classpath - assertTrue("libjar added to client classpath", loadLibJar(jobConf)!=null); + assertTrue(loadLibJar(jobConf)!=null, "libjar added to client classpath"); - assertTrue("not failed ", ret != -1); + assertTrue(ret != -1, "not failed "); f.delete(); thisbuildDir.delete(); } finally { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestComparators.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestComparators.java index f83dbe2857821..e68491c9598cd 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestComparators.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestComparators.java @@ -35,11 +35,11 @@ import org.apache.hadoop.io.WritableComparator; import org.apache.hadoop.mapreduce.MRConfig; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** @@ -312,7 +312,7 @@ public boolean equals (IntWritable v1, IntWritable v2) { } } - @Before + @BeforeEach public void configure() throws Exception { Path testdir = new Path(TEST_DIR.getAbsolutePath()); Path inDir = new Path(testdir, "in"); @@ -355,7 +355,7 @@ public void configure() throws Exception { jc = new JobClient(conf); } - @After + @AfterEach public void cleanup() { FileUtil.fullyDelete(TEST_DIR); } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestConcatenatedCompressedInput.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestConcatenatedCompressedInput.java index 80a9502774eac..0cac3667df327 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestConcatenatedCompressedInput.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestConcatenatedCompressedInput.java @@ -29,8 +29,8 @@ import org.apache.hadoop.io.compress.zlib.ZlibFactory; import org.apache.hadoop.util.LineReader; import org.apache.hadoop.util.ReflectionUtils; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,7 +43,9 @@ import java.util.List; import java.util.zip.Inflater; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Test class for concatenated {@link CompressionInputStream}. @@ -80,7 +82,7 @@ public class TestConcatenatedCompressedInput { } } - @After + @AfterEach public void after() { ZlibFactory.loadNativeZLib(); } @@ -203,7 +205,7 @@ public void testGzip() throws IOException { format.configure(jobConf); InputSplit[] splits = format.getSplits(jobConf, 100); - assertEquals("compressed splits == 2", 2, splits.length); + assertEquals(2, splits.length, "compressed splits == 2"); FileSplit tmp = (FileSplit) splits[0]; if (tmp.getPath().getName().equals("part2.txt.gz")) { splits[0] = splits[1]; @@ -211,16 +213,13 @@ public void testGzip() throws IOException { } List results = readSplit(format, splits[0], jobConf); - assertEquals("splits[0] num lines", 6, results.size()); - assertEquals("splits[0][5]", "member #3", - results.get(5).toString()); + assertEquals(6, results.size(), "splits[0] num lines"); + assertEquals("member #3", results.get(5).toString(), "splits[0][5]"); results = readSplit(format, splits[1], jobConf); - assertEquals("splits[1] num lines", 2, results.size()); - assertEquals("splits[1][0]", "this is a test", - results.get(0).toString()); - assertEquals("splits[1][1]", "of gzip", - results.get(1).toString()); + assertEquals(2, results.size(), "splits[1] num lines"); + assertEquals("this is a test", results.get(0).toString(), "splits[1][0]"); + assertEquals("of gzip", results.get(1).toString(), "splits[1][1]"); } /** @@ -243,43 +242,41 @@ public void testPrototypeInflaterGzip() throws IOException { localFs.copyFromLocalFile(fnLocal, fnHDFS); final FileInputStream in = new FileInputStream(fnLocal.toString()); - assertEquals("concat bytes available", 148, in.available()); + assertEquals(148, in.available(), "concat bytes available"); // should wrap all of this header-reading stuff in a running-CRC wrapper // (did so in BuiltInGzipDecompressor; see below) byte[] compressedBuf = new byte[256]; int numBytesRead = in.read(compressedBuf, 0, 10); - assertEquals("header bytes read", 10, numBytesRead); - assertEquals("1st byte", 0x1f, compressedBuf[0] & 0xff); - assertEquals("2nd byte", 0x8b, compressedBuf[1] & 0xff); - assertEquals("3rd byte (compression method)", 8, compressedBuf[2] & 0xff); + assertEquals(10, numBytesRead, "header bytes read"); + assertEquals(0x1f, compressedBuf[0] & 0xff, "1st byte"); + assertEquals(0x8b, compressedBuf[1] & 0xff, "2nd byte"); + assertEquals(8, compressedBuf[2] & 0xff, "3rd byte (compression method)"); byte flags = (byte)(compressedBuf[3] & 0xff); if ((flags & 0x04) != 0) { // FEXTRA numBytesRead = in.read(compressedBuf, 0, 2); - assertEquals("XLEN bytes read", 2, numBytesRead); + assertEquals(2, numBytesRead, "XLEN bytes read"); int xlen = ((compressedBuf[1] << 8) | compressedBuf[0]) & 0xffff; in.skip(xlen); } if ((flags & 0x08) != 0) { // FNAME while ((numBytesRead = in.read()) != 0) { - assertFalse("unexpected end-of-file while reading filename", - numBytesRead == -1); + assertFalse(numBytesRead == -1, "unexpected end-of-file while reading filename"); } } if ((flags & 0x10) != 0) { // FCOMMENT while ((numBytesRead = in.read()) != 0) { - assertFalse("unexpected end-of-file while reading comment", - numBytesRead == -1); + assertFalse(numBytesRead == -1, "unexpected end-of-file while reading comment"); } } if ((flags & 0xe0) != 0) { // reserved - assertTrue("reserved bits are set??", (flags & 0xe0) == 0); + assertTrue((flags & 0xe0) == 0, "reserved bits are set??"); } if ((flags & 0x02) != 0) { // FHCRC numBytesRead = in.read(compressedBuf, 0, 2); - assertEquals("CRC16 bytes read", 2, numBytesRead); + assertEquals(2, numBytesRead, "CRC16 bytes read"); int crc16 = ((compressedBuf[1] << 8) | compressedBuf[0]) & 0xffff; } @@ -320,9 +317,8 @@ public void testBuiltInGzipDecompressor() throws IOException { localFs.delete(workDir, true); // Don't use native libs for this test ZlibFactory.setNativeZlibLoaded(false); - assertEquals("[non-native (Java) codec]", - org.apache.hadoop.io.compress.zlib.BuiltInGzipDecompressor.class, - gzip.getDecompressorType()); + assertEquals(org.apache.hadoop.io.compress.zlib.BuiltInGzipDecompressor.class, + gzip.getDecompressorType(), "[non-native (Java) codec]"); System.out.println(COLOR_BR_YELLOW + "testBuiltInGzipDecompressor() using" + " non-native (Java Inflater) Decompressor (" + gzip.getDecompressorType() + ")" + COLOR_NORMAL); @@ -347,8 +343,8 @@ public void testBuiltInGzipDecompressor() throws IOException { // here's first pair of DecompressorStreams: final FileInputStream in1 = new FileInputStream(fnLocal1.toString()); final FileInputStream in2 = new FileInputStream(fnLocal2.toString()); - assertEquals("concat bytes available", 2734, in1.available()); - assertEquals("concat bytes available", 3413, in2.available()); // w/hdr CRC + assertEquals(2734, in1.available(), "concat bytes available"); + assertEquals(3413, in2.available(), "concat bytes available"); // w/hdr CRC CompressionInputStream cin2 = gzip.createInputStream(in2); LineReader in = new LineReader(cin2); @@ -360,10 +356,10 @@ public void testBuiltInGzipDecompressor() throws IOException { totalBytes += numBytes; } in.close(); - assertEquals("total uncompressed bytes in concatenated test file", - 5346, totalBytes); - assertEquals("total uncompressed lines in concatenated test file", - 84, lineNum); + assertEquals(5346, totalBytes, + "total uncompressed bytes in concatenated test file"); + assertEquals(84, lineNum, + "total uncompressed lines in concatenated test file"); ZlibFactory.loadNativeZLib(); // test GzipZlibDecompressor (native), just to be sure @@ -442,7 +438,7 @@ private static void doSingleGzipBufferSize(JobConf jConf) throws IOException { // here's Nth pair of DecompressorStreams: InputSplit[] splits = format.getSplits(jConf, 100); - assertEquals("compressed splits == 2", 2, splits.length); + assertEquals(2, splits.length, "compressed splits == 2"); FileSplit tmp = (FileSplit) splits[0]; if (tmp.getPath() .getName().equals("testdata/testCompressThenConcat.txt.gz")) { @@ -452,22 +448,18 @@ private static void doSingleGzipBufferSize(JobConf jConf) throws IOException { } List results = readSplit(format, splits[0], jConf); - assertEquals("splits[0] length (num lines)", 84, results.size()); - assertEquals("splits[0][0]", - "Call me Ishmael. Some years ago--never mind how long precisely--having", - results.get(0).toString()); - assertEquals("splits[0][42]", - "Tell me, does the magnetic virtue of the needles of the compasses of", - results.get(42).toString()); + assertEquals(84, results.size(), "splits[0] length (num lines)"); + assertEquals("Call me Ishmael. Some years ago--never mind how long precisely--having", + results.get(0).toString(), "splits[0][0]"); + assertEquals("Tell me, does the magnetic virtue of the needles of the compasses of", + results.get(42).toString(), "splits[0][42]"); results = readSplit(format, splits[1], jConf); - assertEquals("splits[1] length (num lines)", 84, results.size()); - assertEquals("splits[1][0]", - "Call me Ishmael. Some years ago--never mind how long precisely--having", - results.get(0).toString()); - assertEquals("splits[1][42]", - "Tell me, does the magnetic virtue of the needles of the compasses of", - results.get(42).toString()); + assertEquals(84, results.size(), "splits[1] length (num lines)"); + assertEquals("Call me Ishmael. Some years ago--never mind how long precisely--having", + results.get(0).toString(), "splits[1][0]"); + assertEquals("Tell me, does the magnetic virtue of the needles of the compasses of", + results.get(42).toString(), "splits[1][42]"); } /** @@ -501,7 +493,7 @@ public void testBzip2() throws IOException { // [135 splits for a 208-byte file and a 62-byte file(!)] InputSplit[] splits = format.getSplits(jobConf, 100); - assertEquals("compressed splits == 2", 2, splits.length); + assertEquals(2, splits.length, "compressed splits == 2"); FileSplit tmp = (FileSplit) splits[0]; if (tmp.getPath().getName().equals("part2.txt.bz2")) { splits[0] = splits[1]; @@ -509,16 +501,13 @@ public void testBzip2() throws IOException { } List results = readSplit(format, splits[0], jobConf); - assertEquals("splits[0] num lines", 6, results.size()); - assertEquals("splits[0][5]", "member #3", - results.get(5).toString()); + assertEquals(6, results.size(), "splits[0] num lines"); + assertEquals("member #3", results.get(5).toString(), "splits[0][5]"); results = readSplit(format, splits[1], jobConf); - assertEquals("splits[1] num lines", 2, results.size()); - assertEquals("splits[1][0]", "this is a test", - results.get(0).toString()); - assertEquals("splits[1][1]", "of bzip2", - results.get(1).toString()); + assertEquals(2, results.size(), "splits[1] num lines"); + assertEquals("this is a test", results.get(0).toString(), "splits[1][0]"); + assertEquals("of bzip2", results.get(1).toString(), "splits[1][1]"); } /** @@ -555,8 +544,8 @@ public void testMoreBzip2() throws IOException { // here's first pair of BlockDecompressorStreams: final FileInputStream in1 = new FileInputStream(fnLocal1.toString()); final FileInputStream in2 = new FileInputStream(fnLocal2.toString()); - assertEquals("concat bytes available", 2567, in1.available()); - assertEquals("concat bytes available", 3056, in2.available()); + assertEquals(2567, in1.available(), "concat bytes available"); + assertEquals(3056, in2.available(), "concat bytes available"); CompressionInputStream cin2 = bzip2.createInputStream(in2); LineReader in = new LineReader(cin2); @@ -568,10 +557,10 @@ public void testMoreBzip2() throws IOException { totalBytes += numBytes; } in.close(); - assertEquals("total uncompressed bytes in concatenated test file", - 5346, totalBytes); - assertEquals("total uncompressed lines in concatenated test file", - 84, lineNum); + assertEquals( + 5346, totalBytes, "total uncompressed bytes in concatenated test file"); + assertEquals( + 84, lineNum, "total uncompressed lines in concatenated test file"); // test CBZip2InputStream with lots of different input-buffer sizes doMultipleBzip2BufferSizes(jobConf); @@ -646,7 +635,7 @@ private static void doSingleBzip2BufferSize(JobConf jConf) // here's Nth pair of DecompressorStreams: InputSplit[] splits = format.getSplits(jConf, 100); - assertEquals("compressed splits == 2", 2, splits.length); + assertEquals(2, splits.length, "compressed splits == 2"); FileSplit tmp = (FileSplit) splits[0]; if (tmp.getPath() .getName().equals("testdata/testCompressThenConcat.txt.gz")) { @@ -657,23 +646,19 @@ private static void doSingleBzip2BufferSize(JobConf jConf) // testConcatThenCompress (single) List results = readSplit(format, splits[0], jConf); - assertEquals("splits[0] length (num lines)", 84, results.size()); - assertEquals("splits[0][0]", - "Call me Ishmael. Some years ago--never mind how long precisely--having", - results.get(0).toString()); - assertEquals("splits[0][42]", - "Tell me, does the magnetic virtue of the needles of the compasses of", - results.get(42).toString()); + assertEquals(84, results.size(), "splits[0] length (num lines)"); + assertEquals("Call me Ishmael. Some years ago--never mind how long precisely--having", + results.get(0).toString(), "splits[0][0]"); + assertEquals("Tell me, does the magnetic virtue of the needles of the compasses of", + results.get(42).toString(), "splits[0][42]"); // testCompressThenConcat (multi) results = readSplit(format, splits[1], jConf); - assertEquals("splits[1] length (num lines)", 84, results.size()); - assertEquals("splits[1][0]", - "Call me Ishmael. Some years ago--never mind how long precisely--having", - results.get(0).toString()); - assertEquals("splits[1][42]", - "Tell me, does the magnetic virtue of the needles of the compasses of", - results.get(42).toString()); + assertEquals(84, results.size(), "splits[1] length (num lines)"); + assertEquals("Call me Ishmael. Some years ago--never mind how long precisely--having", + results.get(0).toString(), "splits[1][0]"); + assertEquals("Tell me, does the magnetic virtue of the needles of the compasses of", + results.get(42).toString(), "splits[1][42]"); } private static String unquote(String in) { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestFieldSelection.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestFieldSelection.java index f0b1df3eac18a..4e81896c95dc7 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestFieldSelection.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestFieldSelection.java @@ -23,8 +23,8 @@ import org.apache.hadoop.mapreduce.MapReduceTestUtil; import org.apache.hadoop.mapreduce.lib.fieldsel.FieldSelectionHelper; import org.apache.hadoop.mapreduce.lib.fieldsel.TestMRFieldSelection; -import org.junit.Test; -import static org.junit.Assert.assertEquals; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.nio.charset.StandardCharsets; import java.text.NumberFormat; diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestFileInputFormatPathFilter.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestFileInputFormatPathFilter.java index d87f6fd91a988..40609e64976cc 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestFileInputFormatPathFilter.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestFileInputFormatPathFilter.java @@ -21,10 +21,10 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.PathFilter; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import static org.junit.Assert.assertEquals; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.io.Writer; @@ -57,12 +57,12 @@ public RecordReader getRecordReader(InputSplit split, JobConf job, new Path(new Path(System.getProperty("test.build.data", "."), "data"), "TestFileInputFormatPathFilter"); - @Before + @BeforeEach public void setUp() throws Exception { tearDown(); localFs.mkdirs(workDir); } - @After + @AfterEach public void tearDown() throws Exception { if (localFs.exists(workDir)) { localFs.delete(workDir, true); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestFileOutputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestFileOutputFormat.java index 314123567fa8d..26ec18b9de34b 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestFileOutputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestFileOutputFormat.java @@ -30,8 +30,8 @@ import java.io.OutputStream; import java.util.Iterator; -import org.junit.Test; -import static org.junit.Assert.assertTrue; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestFileOutputFormat extends HadoopTestCase { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestFixedLengthInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestFixedLengthInputFormat.java index 1ae17584a6d8b..d70b2a8d4094d 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestFixedLengthInputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestFixedLengthInputFormat.java @@ -33,12 +33,14 @@ import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.compress.*; import org.apache.hadoop.util.ReflectionUtils; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestFixedLengthInputFormat { @@ -54,7 +56,7 @@ public class TestFixedLengthInputFormat { private static char[] chars; private static Random charRand; - @BeforeClass + @BeforeAll public static void onlyOnce() { try { defaultConf = new Configuration(); @@ -77,7 +79,8 @@ public static void onlyOnce() { * 20 random tests of various record, file, and split sizes. All tests have * uncompressed file as input. */ - @Test (timeout=500000) + @Test + @Timeout(value = 500) public void testFormat() throws IOException { runRandomTests(null); } @@ -86,7 +89,8 @@ public void testFormat() throws IOException { * 20 random tests of various record, file, and split sizes. All tests have * compressed file as input. */ - @Test (timeout=500000) + @Test + @Timeout(value = 500) public void testFormatCompressedIn() throws IOException { runRandomTests(new GzipCodec()); } @@ -94,7 +98,8 @@ public void testFormatCompressedIn() throws IOException { /** * Test with no record length set. */ - @Test (timeout=5000) + @Test + @Timeout(value = 5) public void testNoRecordLength() throws IOException { localFs.delete(workDir, true); Path file = new Path(workDir, "testFormat.txt"); @@ -115,13 +120,14 @@ public void testNoRecordLength() throws IOException { LOG.info("Exception message:" + ioe.getMessage()); } } - assertTrue("Exception for not setting record length:", exceptionThrown); + assertTrue(exceptionThrown, "Exception for not setting record length:"); } /** * Test with record length set to 0 */ - @Test (timeout=5000) + @Test + @Timeout(value = 5) public void testZeroRecordLength() throws IOException { localFs.delete(workDir, true); Path file = new Path(workDir, "testFormat.txt"); @@ -143,13 +149,14 @@ public void testZeroRecordLength() throws IOException { LOG.info("Exception message:" + ioe.getMessage()); } } - assertTrue("Exception for zero record length:", exceptionThrown); + assertTrue(exceptionThrown, "Exception for zero record length:"); } /** * Test with record length set to a negative value */ - @Test (timeout=5000) + @Test + @Timeout(value = 5) public void testNegativeRecordLength() throws IOException { localFs.delete(workDir, true); Path file = new Path(workDir, "testFormat.txt"); @@ -171,13 +178,14 @@ public void testNegativeRecordLength() throws IOException { LOG.info("Exception message:" + ioe.getMessage()); } } - assertTrue("Exception for negative record length:", exceptionThrown); + assertTrue(exceptionThrown, "Exception for negative record length:"); } /** * Test with partial record at the end of a compressed input file. */ - @Test (timeout=5000) + @Test + @Timeout(value = 5) public void testPartialRecordCompressedIn() throws IOException { CompressionCodec gzip = new GzipCodec(); runPartialRecordTest(gzip); @@ -186,7 +194,8 @@ public void testPartialRecordCompressedIn() throws IOException { /** * Test with partial record at the end of an uncompressed input file. */ - @Test (timeout=5000) + @Test + @Timeout(value = 5) public void testPartialRecordUncompressedIn() throws IOException { runPartialRecordTest(null); } @@ -194,7 +203,8 @@ public void testPartialRecordUncompressedIn() throws IOException { /** * Test using the gzip codec with two input files. */ - @Test (timeout=5000) + @Test + @Timeout(value = 5) public void testGzipWithTwoInputs() throws IOException { CompressionCodec gzip = new GzipCodec(); localFs.delete(workDir, true); @@ -210,19 +220,19 @@ public void testGzipWithTwoInputs() throws IOException { writeFile(localFs, new Path(workDir, "part2.txt.gz"), gzip, "ten nine eightsevensix five four threetwo one "); InputSplit[] splits = format.getSplits(job, 100); - assertEquals("compressed splits == 2", 2, splits.length); + assertEquals(2, splits.length, "compressed splits == 2"); FileSplit tmp = (FileSplit) splits[0]; if (tmp.getPath().getName().equals("part2.txt.gz")) { splits[0] = splits[1]; splits[1] = tmp; } List results = readSplit(format, splits[0], job); - assertEquals("splits[0] length", 10, results.size()); - assertEquals("splits[0][5]", "six ", results.get(5)); + assertEquals(10, results.size(), "splits[0] length"); + assertEquals("six ", results.get(5), "splits[0][5]"); results = readSplit(format, splits[1], job); - assertEquals("splits[1] length", 10, results.size()); - assertEquals("splits[1][0]", "ten ", results.get(0)); - assertEquals("splits[1][1]", "nine ", results.get(1)); + assertEquals(10, results.size(), "splits[1] length"); + assertEquals("ten ", results.get(0), "splits[1][0]"); + assertEquals("nine ", results.get(1), "splits[1][1]"); } // Create a file containing fixed length records with random data @@ -329,26 +339,26 @@ private void runRandomTests(CompressionCodec codec) throws IOException { RecordReader reader = format.getRecordReader(split, job, voidReporter); Class clazz = reader.getClass(); - assertEquals("RecordReader class should be FixedLengthRecordReader:", - FixedLengthRecordReader.class, clazz); + assertEquals(FixedLengthRecordReader.class, clazz, + "RecordReader class should be FixedLengthRecordReader:"); // Plow through the records in this split while (reader.next(key, value)) { - assertEquals("Checking key", (long)(recordNumber*recordLength), - key.get()); + assertEquals((long)(recordNumber*recordLength), + key.get(), "Checking key"); String valueString = new String(value.getBytes(), 0, value.getLength()); - assertEquals("Checking record length:", recordLength, - value.getLength()); - assertTrue("Checking for more records than expected:", - recordNumber < totalRecords); + assertEquals(recordLength, + value.getLength(), "Checking record length:"); + assertTrue(recordNumber < totalRecords, + "Checking for more records than expected:"); String origRecord = recordList.get(recordNumber); - assertEquals("Checking record content:", origRecord, valueString); + assertEquals(origRecord, valueString, "Checking record content:"); recordNumber++; } reader.close(); } - assertEquals("Total original records should be total read records:", - recordList.size(), recordNumber); + assertEquals(recordList.size(), recordNumber, + "Total original records should be total read records:"); } } @@ -403,7 +413,7 @@ private void runPartialRecordTest(CompressionCodec codec) throws IOException { "one two threefour five six seveneightnine ten"); InputSplit[] splits = format.getSplits(job, 100); if (codec != null) { - assertEquals("compressed splits == 1", 1, splits.length); + assertEquals(1, splits.length, "compressed splits == 1"); } boolean exceptionThrown = false; for (InputSplit split : splits) { @@ -414,7 +424,7 @@ private void runPartialRecordTest(CompressionCodec codec) throws IOException { LOG.info("Exception message:" + ioe.getMessage()); } } - assertTrue("Exception for partial record:", exceptionThrown); + assertTrue(exceptionThrown, "Exception for partial record:"); } } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestGetSplitHosts.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestGetSplitHosts.java index 3d1c2e71bffdb..614775058de12 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestGetSplitHosts.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestGetSplitHosts.java @@ -20,8 +20,8 @@ import org.apache.hadoop.fs.BlockLocation; import org.apache.hadoop.net.NetworkTopology; -import org.junit.Test; -import static org.junit.Assert.assertTrue; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestGetSplitHosts { @Test diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestIFile.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestIFile.java index a314fc1f578a6..55502f01a95f5 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestIFile.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestIFile.java @@ -27,8 +27,9 @@ import org.apache.hadoop.io.compress.DefaultCodec; import org.apache.hadoop.io.compress.GzipCodec; -import org.junit.Test; -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class TestIFile { @Test diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestIFileStreams.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestIFileStreams.java index a815b28295204..fc5650b4c905b 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestIFileStreams.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestIFileStreams.java @@ -21,15 +21,15 @@ import org.apache.hadoop.fs.ChecksumException; import org.apache.hadoop.io.DataInputBuffer; import org.apache.hadoop.io.DataOutputBuffer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import java.io.OutputStream; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestIFileStreams { @Test @@ -75,7 +75,7 @@ public void testBadIFileStream() throws Exception { } ifis.close(); } catch (ChecksumException e) { - assertEquals("Unexpected bad checksum", DLEN - 1, i); + assertEquals(DLEN - 1, i, "Unexpected bad checksum"); return; } fail("Did not detect bad data in checksum"); @@ -99,7 +99,7 @@ public void testBadLength() throws Exception { } ifis.close(); } catch (ChecksumException e) { - assertEquals("Checksum before close", i, DLEN - 8); + assertEquals(i, DLEN - 8, "Checksum before close"); return; } fail("Did not detect bad data in checksum"); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestInputPath.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestInputPath.java index 0c20c335d89ab..81c641a277430 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestInputPath.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestInputPath.java @@ -21,8 +21,8 @@ import org.apache.hadoop.mapred.FileInputFormat; import org.apache.hadoop.mapred.JobConf; import org.apache.hadoop.util.StringUtils; -import org.junit.Test; -import static org.junit.Assert.assertEquals; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestInputPath { @Test diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJavaSerialization.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJavaSerialization.java index 371a07c17ceb8..532020d98981c 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJavaSerialization.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJavaSerialization.java @@ -35,9 +35,9 @@ import org.apache.hadoop.io.Text; import org.apache.hadoop.io.serializer.JavaSerializationComparator; import org.apache.hadoop.mapreduce.MRConfig; -import org.junit.Test; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertEquals; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestJavaSerialization { @@ -58,8 +58,8 @@ public void map(LongWritable key, Text value, StringTokenizer st = new StringTokenizer(value.toString()); while (st.hasMoreTokens()) { String token = st.nextToken(); - assertTrue("Invalid token; expected 'a' or 'b', got " + token, - token.equals("a") || token.equals("b")); + assertTrue(token.equals("a") || token.equals("b"), + "Invalid token; expected 'a' or 'b', got " + token); output.collect(token, 1L); } } @@ -124,9 +124,9 @@ public void testMapReduceJob() throws Exception { String inputFileContents = FileUtils.readFileToString(new File(INPUT_FILE.toUri().getPath())); - assertTrue("Input file contents not as expected; contents are '" - + inputFileContents + "', expected \"b a\n\" ", - inputFileContents.equals("b a\n")); + assertTrue(inputFileContents.equals("b a\n"), + "Input file contents not as expected; contents are '" + + inputFileContents + "', expected \"b a\n\" "); JobClient.runJob(conf); @@ -137,13 +137,12 @@ public void testMapReduceJob() throws Exception { try (InputStream is = fs.open(outputFiles[0])) { String reduceOutput = org.apache.commons.io.IOUtils.toString(is, StandardCharsets.UTF_8); String[] lines = reduceOutput.split("\n"); - assertEquals("Unexpected output; received output '" + reduceOutput + "'", - "a\t1", lines[0]); - assertEquals("Unexpected output; received output '" + reduceOutput + "'", - "b\t1", lines[1]); - assertEquals( - "Reduce output has extra lines; output is '" + reduceOutput + "'", 2, - lines.length); + assertEquals("a\t1", lines[0], + "Unexpected output; received output '" + reduceOutput + "'"); + assertEquals("b\t1", lines[1], + "Unexpected output; received output '" + reduceOutput + "'"); + assertEquals(2, lines.length, + "Reduce output has extra lines; output is '" + reduceOutput + "'"); } } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobCleanup.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobCleanup.java index 13f2301b9f788..aaa13f61057b9 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobCleanup.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobCleanup.java @@ -30,13 +30,15 @@ import org.apache.hadoop.mapred.lib.IdentityReducer; import org.apache.hadoop.mapreduce.JobCounter; import org.apache.hadoop.mapreduce.v2.jobhistory.JHAdminConfig; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.slf4j.LoggerFactory; import org.slf4j.Logger; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * A JUnit test to test Map-Reduce job cleanup. @@ -57,7 +59,7 @@ public class TestJobCleanup { private static final Logger LOG = LoggerFactory.getLogger(TestJobCleanup.class); - @BeforeClass + @BeforeAll public static void setUp() throws IOException { JobConf conf = new JobConf(); fileSys = FileSystem.get(conf); @@ -82,7 +84,7 @@ public static void setUp() throws IOException { fileSys.mkdirs(emptyInDir); } - @AfterClass + @AfterAll public static void tearDown() throws Exception { if (fileSys != null) { // fileSys.delete(new Path(TEST_ROOT_DIR), true); @@ -169,14 +171,15 @@ private void testSuccessfulJob(String filename, LOG.info("Job finished : " + job.isComplete()); Path testFile = new Path(outDir, filename); - assertTrue("Done file \"" + testFile + "\" missing for job " + id, - fileSys.exists(testFile)); + assertTrue(fileSys.exists(testFile), + "Done file \"" + testFile + "\" missing for job " + id); // check if the files from the missing set exists for (String ex : exclude) { Path file = new Path(outDir, ex); - assertFalse("File " + file + " should not be present for successful job " - + id, fileSys.exists(file)); + assertFalse(fileSys.exists(file), + "File " + file + " should not be present for successful job " + + id); } } @@ -196,19 +199,19 @@ private void testFailedJob(String fileName, RunningJob job = jobClient.submitJob(jc); JobID id = job.getID(); job.waitForCompletion(); - assertEquals("Job did not fail", JobStatus.FAILED, job.getJobState()); + assertEquals(JobStatus.FAILED, job.getJobState(), "Job did not fail"); if (fileName != null) { Path testFile = new Path(outDir, fileName); - assertTrue("File " + testFile + " missing for failed job " + id, - fileSys.exists(testFile)); + assertTrue(fileSys.exists(testFile), + "File " + testFile + " missing for failed job " + id); } // check if the files from the missing set exists for (String ex : exclude) { Path file = new Path(outDir, ex); - assertFalse("File " + file + " should not be present for failed job " - + id, fileSys.exists(file)); + assertFalse(fileSys.exists(file), + "File " + file + " should not be present for failed job " + id); } } @@ -242,19 +245,19 @@ private void testKilledJob(String fileName, job.killJob(); // kill the job job.waitForCompletion(); // wait for the job to complete - assertEquals("Job was not killed", JobStatus.KILLED, job.getJobState()); + assertEquals(JobStatus.KILLED, job.getJobState(), "Job was not killed"); if (fileName != null) { Path testFile = new Path(outDir, fileName); - assertTrue("File " + testFile + " missing for job " + id, - fileSys.exists(testFile)); + assertTrue(fileSys.exists(testFile), + "File " + testFile + " missing for job " + id); } // check if the files from the missing set exists for (String ex : exclude) { Path file = new Path(outDir, ex); - assertFalse("File " + file + " should not be present for killed job " - + id, fileSys.exists(file)); + assertFalse(fileSys.exists(file), + "File " + file + " should not be present for killed job " + id); } } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobClients.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobClients.java index 770ddd2c79d14..8c9d421378720 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobClients.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobClients.java @@ -19,9 +19,10 @@ package org.apache.hadoop.mapred; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.isA; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; @@ -40,8 +41,7 @@ import org.apache.hadoop.mapreduce.MRJobConfig; import org.apache.hadoop.mapreduce.TaskReport; import org.apache.hadoop.mapreduce.TaskType; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; @SuppressWarnings("deprecation") public class TestJobClients { @@ -189,7 +189,7 @@ public void testShowJob() throws Exception { client.displayJobList(new JobStatus[] {mockJobStatus}, new PrintWriter(out)); String commandLineOutput = out.toString(); System.out.println(commandLineOutput); - Assert.assertTrue(commandLineOutput.contains("Total jobs:1")); + assertTrue(commandLineOutput.contains("Total jobs:1")); verify(mockJobStatus, atLeastOnce()).getJobID(); verify(mockJobStatus).getState(); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobCounters.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobCounters.java index 18ef64d15e79f..aad7367329559 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobCounters.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobCounters.java @@ -18,9 +18,9 @@ package org.apache.hadoop.mapred; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.util.ArrayList; @@ -46,9 +46,9 @@ import org.apache.hadoop.mapreduce.lib.input.FileInputFormatCounter; import org.apache.hadoop.mapreduce.lib.output.FileOutputFormatCounter; import org.apache.hadoop.yarn.util.ResourceCalculatorProcessTree; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; /** * This is an wordcount application that tests the count of records @@ -179,7 +179,7 @@ private static long getFileSize(Path path) throws IOException { return len; } - @BeforeClass + @BeforeAll public static void initPaths() throws IOException { final Configuration conf = new Configuration(); final Path TEST_ROOT_DIR = @@ -207,7 +207,7 @@ public static void initPaths() throws IOException { createWordsFile(inFiles[2], conf); } - @AfterClass + @AfterAll public static void cleanup() throws IOException { //clean up the input and output files final Configuration conf = new Configuration(); @@ -528,7 +528,7 @@ public void map(WritableComparable key, Writable val, OutputCollector output, Reporter reporter) throws IOException { - assertNotNull("Mapper not configured!", loader); + assertNotNull(loader, "Mapper not configured!"); // load the memory loader.load(); @@ -557,7 +557,7 @@ public void reduce(WritableComparable key, Iterator val, OutputCollector output, Reporter reporter) throws IOException { - assertNotNull("Reducer not configured!", loader); + assertNotNull(loader, "Reducer not configured!"); // load the memory loader.load(); @@ -581,11 +581,11 @@ private long getTaskCounterUsage (JobClient client, JobID id, int numReports, } else if (TaskType.REDUCE.equals(type)) { reports = client.getReduceTaskReports(id); } - - assertNotNull("No reports found for task type '" + type.name() - + "' in job " + id, reports); + + assertNotNull(reports, "No reports found for task type '" + type.name() + + "' in job " + id); // make sure that the total number of reports match the expected - assertEquals("Mismatch in task id", numReports, reports.length); + assertEquals(numReports, reports.length, "Mismatch in task id"); Counters counters = reports[taskId].getCounters(); @@ -632,7 +632,7 @@ private static RunningJob runHeapUsageTestJob(JobConf conf, Path testRootDir, RunningJob job = client.submitJob(jobConf); job.waitForCompletion(); JobID jobID = job.getID(); - assertTrue("Job " + jobID + " failed!", job.isSuccessful()); + assertTrue(job.isSuccessful(), "Job " + jobID + " failed!"); return job; } @@ -708,11 +708,11 @@ public void testHeapUsageCounter() throws Exception { System.out.println("Job2 (high memory job) reduce task heap usage: " + highMemJobReduceHeapUsage); - assertTrue("Incorrect map heap usage reported by the map task", - lowMemJobMapHeapUsage < highMemJobMapHeapUsage); + assertTrue(lowMemJobMapHeapUsage < highMemJobMapHeapUsage, + "Incorrect map heap usage reported by the map task"); - assertTrue("Incorrect reduce heap usage reported by the reduce task", - lowMemJobReduceHeapUsage < highMemJobReduceHeapUsage); + assertTrue(lowMemJobReduceHeapUsage < highMemJobReduceHeapUsage, + "Incorrect reduce heap usage reported by the reduce task"); } finally { // shutdown the mr cluster mrCluster.shutdown(); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobName.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobName.java index f50089af4a1e1..7284330ab5e49 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobName.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobName.java @@ -30,14 +30,14 @@ import org.apache.hadoop.io.Text; import org.apache.hadoop.mapred.lib.IdentityMapper; -import org.junit.BeforeClass; -import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class TestJobName extends ClusterMapReduceTestCase { - @BeforeClass + @BeforeAll public static void setupClass() throws Exception { setupClassBase(TestJobName.class); } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobSysDirWithDFS.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobSysDirWithDFS.java index 9a5ca075e3fec..0d1281997dd61 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobSysDirWithDFS.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobSysDirWithDFS.java @@ -28,10 +28,10 @@ import org.apache.hadoop.io.Text; import org.apache.hadoop.mapreduce.MapReduceTestUtil; import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig; -import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertFalse; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java index 301cadb08be1c..6393337ee0171 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java @@ -26,13 +26,13 @@ import org.apache.hadoop.io.compress.*; import org.apache.hadoop.util.LineReader; import org.apache.hadoop.util.ReflectionUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; public class TestKeyValueTextInputFormat { private static final Logger LOG = @@ -102,14 +102,15 @@ public void testFormat() throws Exception { RecordReader reader = format.getRecordReader(splits[j], job, reporter); Class readerClass = reader.getClass(); - assertEquals("reader class is KeyValueLineRecordReader.", KeyValueLineRecordReader.class, readerClass); + assertEquals(KeyValueLineRecordReader.class, readerClass, + "reader class is KeyValueLineRecordReader."); Text key = reader.createKey(); Class keyClass = key.getClass(); Text value = reader.createValue(); Class valueClass = value.getClass(); - assertEquals("Key class is Text.", Text.class, keyClass); - assertEquals("Value class is Text.", Text.class, valueClass); + assertEquals(Text.class, keyClass, "Key class is Text."); + assertEquals(Text.class, valueClass, "Value class is Text."); try { int count = 0; while (reader.next(key, value)) { @@ -120,7 +121,7 @@ public void testFormat() throws Exception { " in split " + j + " at position "+reader.getPos()); } - assertFalse("Key in multiple partitions.", bits.get(v)); + assertFalse(bits.get(v), "Key in multiple partitions."); bits.set(v); count++; } @@ -129,7 +130,7 @@ public void testFormat() throws Exception { reader.close(); } } - assertEquals("Some keys in no partition.", length, bits.cardinality()); + assertEquals(length, bits.cardinality(), "Some keys in no partition."); } } @@ -145,11 +146,12 @@ public void testUTF8() throws Exception { in = makeStream("abcd\u20acbdcd\u20ac"); Text line = new Text(); in.readLine(line); - assertEquals("readLine changed utf8 characters", - "abcd\u20acbdcd\u20ac", line.toString()); + assertEquals("abcd\u20acbdcd\u20ac", line.toString(), + "readLine changed utf8 characters"); in = makeStream("abc\u200axyz"); in.readLine(line); - assertEquals("split on fake newline", "abc\u200axyz", line.toString()); + assertEquals("abc\u200axyz", line.toString(), + "split on fake newline"); } finally { if (in != null) { in.close(); @@ -163,18 +165,18 @@ public void testNewLines() throws Exception { in = makeStream("a\nbb\n\nccc\rdddd\r\neeeee"); Text out = new Text(); in.readLine(out); - assertEquals("line1 length", 1, out.getLength()); + assertEquals(1, out.getLength(), "line1 length"); in.readLine(out); - assertEquals("line2 length", 2, out.getLength()); + assertEquals(2, out.getLength(), "line2 length"); in.readLine(out); - assertEquals("line3 length", 0, out.getLength()); + assertEquals(0, out.getLength(), "line3 length"); in.readLine(out); - assertEquals("line4 length", 3, out.getLength()); + assertEquals(3, out.getLength(), "line4 length"); in.readLine(out); - assertEquals("line5 length", 4, out.getLength()); + assertEquals(4, out.getLength(), "line5 length"); in.readLine(out); - assertEquals("line5 length", 5, out.getLength()); - assertEquals("end of file", 0, in.readLine(out)); + assertEquals(5, out.getLength(), "line5 length"); + assertEquals(0, in.readLine(out), "end of file"); } finally { if (in != null) { in.close(); @@ -236,21 +238,19 @@ public void testGzip() throws IOException { KeyValueTextInputFormat format = new KeyValueTextInputFormat(); format.configure(job); InputSplit[] splits = format.getSplits(job, 100); - assertEquals("compressed splits == 2", 2, splits.length); + assertEquals(2, splits.length, "compressed splits == 2"); FileSplit tmp = (FileSplit) splits[0]; if (tmp.getPath().getName().equals("part2.txt.gz")) { splits[0] = splits[1]; splits[1] = tmp; } List results = readSplit(format, splits[0], job); - assertEquals("splits[0] length", 6, results.size()); - assertEquals("splits[0][5]", " dog", results.get(5).toString()); + assertEquals(6, results.size(), "splits[0] length"); + assertEquals(" dog", results.get(5).toString(), "splits[0][5]"); results = readSplit(format, splits[1], job); - assertEquals("splits[1] length", 2, results.size()); - assertEquals("splits[1][0]", "this is a test", - results.get(0).toString()); - assertEquals("splits[1][1]", "of gzip", - results.get(1).toString()); + assertEquals(2, results.size(), "splits[1] length"); + assertEquals("this is a test", results.get(0).toString(), "splits[1][0]"); + assertEquals("of gzip", results.get(1).toString(), "splits[1][1]"); } public static void main(String[] args) throws Exception { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestLazyOutput.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestLazyOutput.java index ef559d95081db..49e81084ed1ac 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestLazyOutput.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestLazyOutput.java @@ -33,8 +33,8 @@ import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapred.lib.LazyOutputFormat; -import org.junit.Test; -import static org.junit.Assert.assertTrue; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * A JUnit test to test the Map-Reduce framework's feature to create part diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestLineRecordReaderJobs.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestLineRecordReaderJobs.java index c25b2b7c2629e..8c084a58d51d8 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestLineRecordReaderJobs.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestLineRecordReaderJobs.java @@ -17,7 +17,7 @@ package org.apache.hadoop.mapred; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.io.OutputStreamWriter; @@ -28,7 +28,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.mapred.lib.IdentityMapper; import org.apache.hadoop.mapred.lib.IdentityReducer; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestLineRecordReaderJobs { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestLocalJobSubmission.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestLocalJobSubmission.java index c8b6c894d0c4b..65cc591a0f17d 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestLocalJobSubmission.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestLocalJobSubmission.java @@ -37,16 +37,16 @@ import org.apache.hadoop.test.GenericTestUtils; import org.apache.hadoop.util.ToolRunner; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TestName; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * check for the job submission options of @@ -58,22 +58,20 @@ public class TestLocalJobSubmission { private static File testRootDir; - @Rule - public TestName unitTestName = new TestName(); private File unitTestDir; private Path jarPath; private Configuration config; - @BeforeClass + @BeforeAll public static void setupClass() throws Exception { // setup the test root directory testRootDir = GenericTestUtils.setupTestRootDir(TestLocalJobSubmission.class); } - @Before - public void setup() throws IOException { - unitTestDir = new File(testRootDir, unitTestName.getMethodName()); + @BeforeEach + public void setup(TestInfo testInfo) throws IOException { + unitTestDir = new File(testRootDir, testInfo.getDisplayName()); unitTestDir.mkdirs(); config = createConfig(); jarPath = makeJar(new Path(unitTestDir.getAbsolutePath(), "test.jar")); @@ -120,7 +118,7 @@ private void testLocalJobLibjarsOption(Configuration conf) LOG.error("Job failed with {}", e.getLocalizedMessage(), e); fail("Job failed"); } - assertEquals("dist job res is not 0:", 0, res); + assertEquals(0, res, "dist job res is not 0:"); } /** @@ -140,13 +138,13 @@ public void testLocalJobEncryptedIntermediateData() throws IOException { (SpillCallBackPathsFinder) IntermediateEncryptedStream .setSpillCBInjector(new SpillCallBackPathsFinder()); res = ToolRunner.run(config, new SleepJob(), args); - Assert.assertTrue("No spill occurred", - spillInjector.getEncryptedSpilledFiles().size() > 0); + assertTrue(spillInjector.getEncryptedSpilledFiles().size() > 0, + "No spill occurred"); } catch (Exception e) { LOG.error("Job failed with {}", e.getLocalizedMessage(), e); fail("Job failed"); } - assertEquals("dist job res is not 0:", 0, res); + assertEquals(0, res, "dist job res is not 0:"); } /** @@ -188,7 +186,7 @@ public void testLocalJobFilesOption() throws IOException { LOG.error("Job failed with {}", e.getLocalizedMessage(), e); fail("Job failed"); } - assertEquals("dist job res is not 0:", 0, res); + assertEquals(0, res, "dist job res is not 0:"); } /** @@ -209,7 +207,7 @@ public void testLocalJobArchivesOption() throws IOException { LOG.error("Job failed with {}" + e.getLocalizedMessage(), e); fail("Job failed"); } - assertEquals("dist job res is not 0:", 0, res); + assertEquals(0, res, "dist job res is not 0:"); } private Path makeJar(Path p) throws IOException { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMRCJCFileInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMRCJCFileInputFormat.java index bbfabe83542ce..e2e7dc20476e4 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMRCJCFileInputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMRCJCFileInputFormat.java @@ -26,16 +26,16 @@ import org.apache.hadoop.hdfs.DFSTestUtil; import org.apache.hadoop.hdfs.MiniDFSCluster; import org.apache.hadoop.io.Text; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import java.io.DataOutputStream; import java.io.IOException; import java.util.concurrent.TimeoutException; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -94,8 +94,8 @@ public void testLocality() throws Exception { blockLocs[0].equals(splitLocs[1]))); } - assertEquals("Expected value of " + FileInputFormat.NUM_INPUT_FILES, - 1, job.getLong(FileInputFormat.NUM_INPUT_FILES, 0)); + assertEquals(1, job.getLong(FileInputFormat.NUM_INPUT_FILES, 0), + "Expected value of " + FileInputFormat.NUM_INPUT_FILES); } private void createInputs(FileSystem fs, Path inDir, String fileName) @@ -135,8 +135,8 @@ public void testNumInputs() throws Exception { inFormat.configure(job); InputSplit[] splits = inFormat.getSplits(job, 1); - assertEquals("Expected value of " + FileInputFormat.NUM_INPUT_FILES, - numFiles, job.getLong(FileInputFormat.NUM_INPUT_FILES, 0)); + assertEquals(numFiles, job.getLong(FileInputFormat.NUM_INPUT_FILES, 0), + "Expected value of " + FileInputFormat.NUM_INPUT_FILES); } final Path root = new Path("/TestFileInputFormat"); @@ -191,8 +191,8 @@ public void testMultiLevelInput() throws Exception { } catch (Exception e) { exceptionThrown = true; } - assertTrue("Exception should be thrown by default for scanning a " - + "directory with directories inside.", exceptionThrown); + assertTrue(exceptionThrown, "Exception should be thrown by default for scanning a " + + "directory with directories inside."); // Enable multi-level/recursive inputs job.setBoolean(FileInputFormat.INPUT_DIR_RECURSIVE, true); @@ -314,7 +314,7 @@ static void writeFile(Configuration conf, Path name, DFSTestUtil.waitReplication(fileSys, name, replication); } - @After + @AfterEach public void tearDown() throws Exception { if (dfs != null) { dfs.shutdown(); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMRCJCFileOutputCommitter.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMRCJCFileOutputCommitter.java index 18d7010a4966a..7814642b55b2f 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMRCJCFileOutputCommitter.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMRCJCFileOutputCommitter.java @@ -26,18 +26,18 @@ import org.apache.hadoop.io.Text; import org.apache.hadoop.mapreduce.JobStatus; import org.apache.hadoop.test.GenericTestUtils; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import java.io.File; import java.io.IOException; import java.net.URI; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestMRCJCFileOutputCommitter { private static Path outDir = new Path(GenericTestUtils.getTempPath("output")); @@ -145,14 +145,14 @@ public void testAbort() throws IOException { committer.abortTask(tContext); File expectedFile = new File(new Path(committer .getTaskAttemptPath(tContext), file).toString()); - assertFalse("task temp dir still exists", expectedFile.exists()); + assertFalse(expectedFile.exists(), "task temp dir still exists"); committer.abortJob(jContext, JobStatus.State.FAILED); expectedFile = new File(new Path(outDir, FileOutputCommitter.TEMP_DIR_NAME) .toString()); - assertFalse("job temp dir "+expectedFile+" still exists", expectedFile.exists()); - assertEquals("Output directory not empty", 0, new File(outDir.toString()) - .listFiles().length); + assertFalse(expectedFile.exists(), "job temp dir "+expectedFile+" still exists"); + assertEquals(0, new File(outDir.toString()) + .listFiles().length, "Output directory not empty"); } public static class FakeFileSystem extends RawLocalFileSystem { @@ -210,7 +210,7 @@ public void testFailAbort() throws IOException { assertNotNull(th); assertTrue(th instanceof IOException); assertTrue(th.getMessage().contains("fake delete failed")); - assertTrue(expectedFile + " does not exists", expectedFile.exists()); + assertTrue(expectedFile.exists(), expectedFile + " does not exists"); th = null; try { @@ -221,10 +221,10 @@ public void testFailAbort() throws IOException { assertNotNull(th); assertTrue(th instanceof IOException); assertTrue(th.getMessage().contains("fake delete failed")); - assertTrue("job temp dir does not exists", jobTmpDir.exists()); + assertTrue(jobTmpDir.exists(), "job temp dir does not exists"); } - @After + @AfterEach public void teardown() { FileUtil.fullyDelete(new File(outDir.toString())); } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMRCJCJobClient.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMRCJCJobClient.java index 9a2c744d8c656..36afd43fb082c 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMRCJCJobClient.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMRCJCJobClient.java @@ -30,12 +30,13 @@ import org.apache.hadoop.mapreduce.tools.CLI; import org.apache.hadoop.util.Tool; -import org.junit.BeforeClass; -import org.junit.Ignore; -@Ignore +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; + +@Disabled public class TestMRCJCJobClient extends TestMRJobClient { - @BeforeClass + @BeforeAll public static void setupClass() throws Exception { setupClassBase(TestMRCJCJobClient.class); } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMRCJCJobConf.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMRCJCJobConf.java index e412383a98601..c4b5c42b64a7b 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMRCJCJobConf.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMRCJCJobConf.java @@ -17,8 +17,8 @@ */ package org.apache.hadoop.mapred; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.io.File; import java.net.URLClassLoader; import java.net.URL; @@ -29,9 +29,11 @@ import org.apache.hadoop.fs.FileUtil; import org.apache.hadoop.util.ClassUtil; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.Assert.*; -@Ignore +@Disabled public class TestMRCJCJobConf { private static final String JAR_RELATIVE_PATH = "build/test/mapred/testjar/testjob.jar"; diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMROpportunisticMaps.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMROpportunisticMaps.java index c2a966302cf66..7bd3c241bbd29 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMROpportunisticMaps.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMROpportunisticMaps.java @@ -28,14 +28,14 @@ import org.apache.hadoop.mapreduce.MRJobConfig; import org.apache.hadoop.mapreduce.util.MRJobConfUtil; import org.apache.hadoop.yarn.conf.YarnConfiguration; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.Writer; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Simple MapReduce to test ability of the MRAppMaster to request and use diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMRTimelineEventHandling.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMRTimelineEventHandling.java index 32e847886721b..8274e9db36177 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMRTimelineEventHandling.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMRTimelineEventHandling.java @@ -18,8 +18,10 @@ package org.apache.hadoop.mapred; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.io.BufferedReader; import java.io.File; @@ -56,8 +58,7 @@ import org.apache.hadoop.yarn.server.timelineservice.storage.FileSystemTimelineWriterImpl; import org.apache.hadoop.yarn.server.timelineservice.storage.TimelineWriter; import org.apache.hadoop.yarn.util.timeline.TimelineUtils; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -85,8 +86,8 @@ public void testTimelineServiceStartInMiniCluster() throws Exception { cluster.start(); //verify that the timeline service is not started. - Assert.assertNull("Timeline Service should not have been started", - cluster.getApplicationHistoryServer()); + assertNull(cluster.getApplicationHistoryServer(), + "Timeline Service should not have been started"); } finally { if(cluster != null) { @@ -103,8 +104,8 @@ public void testTimelineServiceStartInMiniCluster() throws Exception { cluster.start(); //verify that the timeline service is not started. - Assert.assertNull("Timeline Service should not have been started", - cluster.getApplicationHistoryServer()); + assertNull(cluster.getApplicationHistoryServer(), + "Timeline Service should not have been started"); } finally { if(cluster != null) { @@ -135,33 +136,31 @@ public void testMRTimelineEventHandling() throws Exception { Path outDir = new Path(localPathRoot, "output"); RunningJob job = UtilsForTests.runJobSucceed(new JobConf(conf), inDir, outDir); - Assert.assertEquals(JobStatus.SUCCEEDED, - job.getJobStatus().getState().getValue()); + assertEquals(JobStatus.SUCCEEDED, job.getJobStatus().getState().getValue()); TimelineEntities entities = ts.getEntities("MAPREDUCE_JOB", null, null, - null, null, null, null, null, null, null); - Assert.assertEquals(1, entities.getEntities().size()); + null, null, null, null, null, null, null); + assertEquals(1, entities.getEntities().size()); TimelineEntity tEntity = entities.getEntities().get(0); - Assert.assertEquals(job.getID().toString(), tEntity.getEntityId()); - Assert.assertEquals("MAPREDUCE_JOB", tEntity.getEntityType()); - Assert.assertEquals(EventType.AM_STARTED.toString(), - tEntity.getEvents().get(tEntity.getEvents().size() - 1) - .getEventType()); - Assert.assertEquals(EventType.JOB_FINISHED.toString(), - tEntity.getEvents().get(0).getEventType()); + assertEquals(job.getID().toString(), tEntity.getEntityId()); + assertEquals("MAPREDUCE_JOB", tEntity.getEntityType()); + assertEquals(EventType.AM_STARTED.toString(), + tEntity.getEvents().get(tEntity.getEvents().size() - 1) + .getEventType()); + assertEquals(EventType.JOB_FINISHED.toString(), + tEntity.getEvents().get(0).getEventType()); job = UtilsForTests.runJobFail(new JobConf(conf), inDir, outDir); - Assert.assertEquals(JobStatus.FAILED, - job.getJobStatus().getState().getValue()); + assertEquals(JobStatus.FAILED, job.getJobStatus().getState().getValue()); entities = ts.getEntities("MAPREDUCE_JOB", null, null, null, null, null, null, null, null, null); - Assert.assertEquals(2, entities.getEntities().size()); + assertEquals(2, entities.getEntities().size()); tEntity = entities.getEntities().get(0); - Assert.assertEquals(job.getID().toString(), tEntity.getEntityId()); - Assert.assertEquals("MAPREDUCE_JOB", tEntity.getEntityType()); - Assert.assertEquals(EventType.AM_STARTED.toString(), - tEntity.getEvents().get(tEntity.getEvents().size() - 1) - .getEventType()); - Assert.assertEquals(EventType.JOB_FAILED.toString(), + assertEquals(job.getID().toString(), tEntity.getEntityId()); + assertEquals("MAPREDUCE_JOB", tEntity.getEntityType()); + assertEquals(EventType.AM_STARTED.toString(), + tEntity.getEvents().get(tEntity.getEvents().size() - 1) + .getEventType()); + assertEquals(EventType.JOB_FAILED.toString(), tEntity.getEvents().get(0).getEventType()); } finally { if (cluster != null) { @@ -221,7 +220,7 @@ public void testMRNewTimelineServiceEventHandling() throws Exception { UtilsForTests.createConfigValue(101 * 1024)); RunningJob job = UtilsForTests.runJobSucceed(successConf, inDir, outDir); - Assert.assertEquals(JobStatus.SUCCEEDED, + assertEquals(JobStatus.SUCCEEDED, job.getJobStatus().getState().getValue()); YarnClient yarnClient = YarnClient.createYarnClient(); @@ -232,7 +231,7 @@ public void testMRNewTimelineServiceEventHandling() throws Exception { ApplicationId firstAppId = null; List apps = yarnClient.getApplications(appStates); - Assert.assertEquals(apps.size(), 1); + assertEquals(apps.size(), 1); ApplicationReport appReport = apps.get(0); firstAppId = appReport.getApplicationId(); UtilsForTests.waitForAppFinished(job, cluster); @@ -240,11 +239,11 @@ public void testMRNewTimelineServiceEventHandling() throws Exception { LOG.info("Run 2nd job which should be failed."); job = UtilsForTests.runJobFail(new JobConf(conf), inDir, outDir); - Assert.assertEquals(JobStatus.FAILED, + assertEquals(JobStatus.FAILED, job.getJobStatus().getState().getValue()); apps = yarnClient.getApplications(appStates); - Assert.assertEquals(apps.size(), 2); + assertEquals(apps.size(), 2); appReport = apps.get(0).getApplicationId().equals(firstAppId) ? apps.get(0) : apps.get(1); @@ -270,7 +269,7 @@ private void checkNewTimelineEvent(ApplicationId appId, File tmpRootFolder = new File(tmpRoot); - Assert.assertTrue(tmpRootFolder.isDirectory()); + assertTrue(tmpRootFolder.isDirectory()); String basePath = tmpRoot + YarnConfiguration.DEFAULT_RM_CLUSTER_ID + File.separator + UserGroupInformation.getCurrentUser().getShortUserName() + @@ -283,9 +282,8 @@ private void checkNewTimelineEvent(ApplicationId appId, basePath + File.separator + "MAPREDUCE_JOB" + File.separator; File entityFolder = new File(outputDirJob); - Assert.assertTrue("Job output directory: " + outputDirJob + - " does not exist.", - entityFolder.isDirectory()); + assertTrue(entityFolder.isDirectory(), + "Job output directory: " + outputDirJob + " does not exist."); // check for job event file String jobEventFileName = appId.toString().replaceAll("application", "job") @@ -293,9 +291,8 @@ private void checkNewTimelineEvent(ApplicationId appId, String jobEventFilePath = outputDirJob + jobEventFileName; File jobEventFile = new File(jobEventFilePath); - Assert.assertTrue("jobEventFilePath: " + jobEventFilePath + - " does not exist.", - jobEventFile.exists()); + assertTrue(jobEventFile.exists(), + "jobEventFilePath: " + jobEventFilePath + " does not exist."); verifyEntity(jobEventFile, EventType.JOB_FINISHED.name(), true, false, null, false); Set cfgsToCheck = Sets.newHashSet("dummy_conf1", "dummy_conf2", @@ -306,10 +303,8 @@ private void checkNewTimelineEvent(ApplicationId appId, String outputAppDir = basePath + File.separator + "YARN_APPLICATION" + File.separator; entityFolder = new File(outputAppDir); - Assert.assertTrue( - "Job output directory: " + outputAppDir + - " does not exist.", - entityFolder.isDirectory()); + assertTrue(entityFolder.isDirectory(), + "Job output directory: " + outputAppDir + " does not exist."); // check for job event file String appEventFileName = appId.toString() @@ -317,10 +312,9 @@ private void checkNewTimelineEvent(ApplicationId appId, String appEventFilePath = outputAppDir + appEventFileName; File appEventFile = new File(appEventFilePath); - Assert.assertTrue( + assertTrue(appEventFile.exists(), "appEventFilePath: " + appEventFilePath + - " does not exist.", - appEventFile.exists()); + " does not exist."); verifyEntity(appEventFile, null, true, false, null, false); verifyEntity(appEventFile, null, false, true, cfgsToCheck, false); @@ -328,9 +322,9 @@ private void checkNewTimelineEvent(ApplicationId appId, String outputDirTask = basePath + File.separator + "MAPREDUCE_TASK" + File.separator; File taskFolder = new File(outputDirTask); - Assert.assertTrue("Task output directory: " + outputDirTask + - " does not exist.", - taskFolder.isDirectory()); + assertTrue(taskFolder.isDirectory(), + "Task output directory: " + outputDirTask + + " does not exist."); String taskEventFileName = appId.toString().replaceAll("application", "task") + @@ -339,9 +333,8 @@ private void checkNewTimelineEvent(ApplicationId appId, String taskEventFilePath = outputDirTask + taskEventFileName; File taskEventFile = new File(taskEventFilePath); - Assert.assertTrue("taskEventFileName: " + taskEventFilePath + - " does not exist.", - taskEventFile.exists()); + assertTrue(taskEventFile.exists(), + "taskEventFileName: " + taskEventFilePath + " does not exist."); verifyEntity(taskEventFile, EventType.TASK_FINISHED.name(), true, false, null, true); @@ -349,8 +342,9 @@ private void checkNewTimelineEvent(ApplicationId appId, String outputDirTaskAttempt = basePath + File.separator + "MAPREDUCE_TASK_ATTEMPT" + File.separator; File taskAttemptFolder = new File(outputDirTaskAttempt); - Assert.assertTrue("TaskAttempt output directory: " + outputDirTaskAttempt + - " does not exist.", taskAttemptFolder.isDirectory()); + assertTrue(taskAttemptFolder.isDirectory(), + "TaskAttempt output directory: " + outputDirTaskAttempt + + " does not exist."); String taskAttemptEventFileName = appId.toString().replaceAll( "application", "attempt") + "_m_000000_0" + @@ -359,8 +353,9 @@ private void checkNewTimelineEvent(ApplicationId appId, String taskAttemptEventFilePath = outputDirTaskAttempt + taskAttemptEventFileName; File taskAttemptEventFile = new File(taskAttemptEventFilePath); - Assert.assertTrue("taskAttemptEventFileName: " + taskAttemptEventFilePath + - " does not exist.", taskAttemptEventFile.exists()); + assertTrue(taskAttemptEventFile.exists(), + "taskAttemptEventFileName: " + taskAttemptEventFilePath + + " does not exist."); verifyEntity(taskAttemptEventFile, EventType.MAP_ATTEMPT_FINISHED.name(), true, false, null, true); } @@ -397,14 +392,14 @@ private void verifyEntity(File entityFile, String eventId, LOG.info("strLine.trim()= " + strLine.trim()); if (checkIdPrefix) { - Assert.assertTrue("Entity ID prefix expected to be > 0", - entity.getIdPrefix() > 0); + assertTrue(entity.getIdPrefix() > 0, + "Entity ID prefix expected to be > 0"); if (idPrefix == -1) { idPrefix = entity.getIdPrefix(); } else { - Assert.assertEquals("Entity ID prefix should be same across " + - "each publish of same entity", - idPrefix, entity.getIdPrefix()); + assertEquals(idPrefix, entity.getIdPrefix(), + "Entity ID prefix should be same across " + + "each publish of same entity"); } } if (eventId == null) { @@ -492,21 +487,21 @@ public void testMapreduceJobTimelineServiceEnabled() RunningJob job = UtilsForTests.runJobSucceed(new JobConf(conf), inDir, outDir); - Assert.assertEquals(JobStatus.SUCCEEDED, + assertEquals(JobStatus.SUCCEEDED, job.getJobStatus().getState().getValue()); TimelineEntities entities = ts.getEntities("MAPREDUCE_JOB", null, null, null, null, null, null, null, null, null); - Assert.assertEquals(0, entities.getEntities().size()); + assertEquals(0, entities.getEntities().size()); conf.setBoolean(MRJobConfig.MAPREDUCE_JOB_EMIT_TIMELINE_DATA, true); job = UtilsForTests.runJobSucceed(new JobConf(conf), inDir, outDir); - Assert.assertEquals(JobStatus.SUCCEEDED, + assertEquals(JobStatus.SUCCEEDED, job.getJobStatus().getState().getValue()); entities = ts.getEntities("MAPREDUCE_JOB", null, null, null, null, null, null, null, null, null); - Assert.assertEquals(1, entities.getEntities().size()); + assertEquals(1, entities.getEntities().size()); TimelineEntity tEntity = entities.getEntities().get(0); - Assert.assertEquals(job.getID().toString(), tEntity.getEntityId()); + assertEquals(job.getID().toString(), tEntity.getEntityId()); } finally { if (cluster != null) { cluster.stop(); @@ -532,21 +527,21 @@ public void testMapreduceJobTimelineServiceEnabled() conf.setBoolean(MRJobConfig.MAPREDUCE_JOB_EMIT_TIMELINE_DATA, false); RunningJob job = UtilsForTests.runJobSucceed(new JobConf(conf), inDir, outDir); - Assert.assertEquals(JobStatus.SUCCEEDED, + assertEquals(JobStatus.SUCCEEDED, job.getJobStatus().getState().getValue()); TimelineEntities entities = ts.getEntities("MAPREDUCE_JOB", null, null, null, null, null, null, null, null, null); - Assert.assertEquals(0, entities.getEntities().size()); + assertEquals(0, entities.getEntities().size()); conf.setBoolean(MRJobConfig.MAPREDUCE_JOB_EMIT_TIMELINE_DATA, true); job = UtilsForTests.runJobSucceed(new JobConf(conf), inDir, outDir); - Assert.assertEquals(JobStatus.SUCCEEDED, + assertEquals(JobStatus.SUCCEEDED, job.getJobStatus().getState().getValue()); entities = ts.getEntities("MAPREDUCE_JOB", null, null, null, null, null, null, null, null, null); - Assert.assertEquals(1, entities.getEntities().size()); + assertEquals(1, entities.getEntities().size()); TimelineEntity tEntity = entities.getEntities().get(0); - Assert.assertEquals(job.getID().toString(), tEntity.getEntityId()); + assertEquals(job.getID().toString(), tEntity.getEntityId()); } finally { if (cluster != null) { cluster.stop(); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMapOutputType.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMapOutputType.java index e3860fd2e2592..3d9522958321c 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMapOutputType.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMapOutputType.java @@ -31,11 +31,11 @@ import org.apache.hadoop.io.WritableComparable; import org.apache.hadoop.mapreduce.MRConfig; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; /** @@ -90,7 +90,7 @@ public void close() { } } - @Before + @BeforeEach public void configure() throws Exception { Path testdir = new Path(TEST_DIR.getAbsolutePath()); Path inDir = new Path(testdir, "in"); @@ -124,7 +124,7 @@ public void configure() throws Exception { jc = new JobClient(conf); } - @After + @AfterEach public void cleanup() { FileUtil.fullyDelete(TEST_DIR); } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMapProgress.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMapProgress.java index f70a552327f45..2a7583d0872c4 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMapProgress.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMapProgress.java @@ -36,11 +36,11 @@ import org.apache.hadoop.mapreduce.split.JobSplitWriter; import org.apache.hadoop.mapreduce.split.SplitMetaInfoReader; import org.apache.hadoop.util.ReflectionUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Validates map phase progress. @@ -193,8 +193,8 @@ public void setProgress(float progress) { return; } // validate map task progress when the map task is in map phase - assertTrue("Map progress is not the expected value.", - Math.abs(mapTaskProgress - ((float)recordNum/3)) < 0.001); + assertTrue(Math.abs(mapTaskProgress - ((float)recordNum/3)) < 0.001, + "Map progress is not the expected value."); } } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMapRed.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMapRed.java index a63dbec6d9f78..ef6a5c765f4ce 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMapRed.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMapRed.java @@ -48,11 +48,11 @@ import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.util.Tool; import org.apache.hadoop.util.ToolRunner; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; /********************************************************** * MapredLoadTest generates a bunch of work that exercises @@ -254,7 +254,7 @@ public void close() { private static int counts = 100; private static Random r = new Random(); - @After + @AfterEach public void cleanup() { FileUtil.fullyDelete(TEST_DIR); } @@ -309,12 +309,11 @@ public void reduce(WritableComparable key, Iterator values, mapOutputFile.setConf(conf); Path input = mapOutputFile.getInputFile(0); FileSystem fs = FileSystem.get(conf); - assertTrue("reduce input exists " + input, fs.exists(input)); + assertTrue(fs.exists(input), "reduce input exists " + input); SequenceFile.Reader rdr = new SequenceFile.Reader(fs, input, conf); - assertEquals("is reduce input compressed " + input, - compressInput, - rdr.isCompressed()); + assertEquals(compressInput, rdr.isCompressed(), + "is reduce input compressed " + input); rdr.close(); } } @@ -372,10 +371,10 @@ public void testNullKeys() throws Exception { new Path(testdir, "nullout/part-00000"), conf); m = "AAAAAAAAAAAAAA"; for (int i = 1; r.next(NullWritable.get(), t); ++i) { - assertTrue("Unexpected value: " + t, values.remove(t.toString())); + assertTrue(values.remove(t.toString()), "Unexpected value: " + t); m = m.replace((char)('A' + i - 1), (char)('A' + i)); } - assertTrue("Missing values: " + values.toString(), values.isEmpty()); + assertTrue(values.isEmpty(), "Missing values: " + values.toString()); } private void checkCompression(boolean compressMapOutputs, @@ -415,16 +414,15 @@ private void checkCompression(boolean compressMapOutputs, f.writeBytes("Is this done, yet?\n"); f.close(); RunningJob rj = JobClient.runJob(conf); - assertTrue("job was complete", rj.isComplete()); - assertTrue("job was successful", rj.isSuccessful()); + assertTrue(rj.isComplete(), "job was complete"); + assertTrue(rj.isSuccessful(), "job was successful"); Path output = new Path(outDir, Task.getOutputName(0)); - assertTrue("reduce output exists " + output, fs.exists(output)); + assertTrue(fs.exists(output), "reduce output exists " + output); SequenceFile.Reader rdr = new SequenceFile.Reader(fs, output, conf); - assertEquals("is reduce output compressed " + output, - redCompression != CompressionType.NONE, - rdr.isCompressed()); + assertEquals(redCompression != CompressionType.NONE, + rdr.isCompressed(), "is reduce output compressed " + output); rdr.close(); } finally { fs.delete(testdir, true); @@ -663,7 +661,7 @@ public void launch() throws Exception { } finally { bw.close(); } - assertTrue("testMapRed failed", success); + assertTrue(success, "testMapRed failed"); fs.delete(testdir, true); } @@ -778,7 +776,7 @@ public void runJob(int items) { JobClient.runJob(conf); } catch (Exception e) { - assertTrue("Threw exception:" + e,false); + assertTrue(false, "Threw exception:" + e); } } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMerge.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMerge.java index b8a16e146e9e1..a17119ba73597 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMerge.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMerge.java @@ -44,8 +44,8 @@ import org.apache.hadoop.io.serializer.Serializer; import org.apache.hadoop.mapred.Task.TaskReporter; -import org.junit.Test; -import static org.junit.Assert.assertEquals; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; @SuppressWarnings(value={"unchecked", "deprecation"}) /** diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRBringup.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRBringup.java index fc49fa569024e..46f042f87abee 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRBringup.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRBringup.java @@ -20,12 +20,13 @@ import java.io.IOException; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.v2.MiniMRYarnCluster; +import static org.junit.jupiter.api.Assertions.assertEquals; + /** * A Unit-test to test bringup and shutdown of Mini Map-Reduce Cluster. */ @@ -50,7 +51,7 @@ public void testMiniMRYarnClusterWithoutJHS() throws IOException { mr = new MiniMRYarnCluster("testMiniMRYarnClusterWithoutJHS"); mr.init(conf); mr.start(); - Assert.assertEquals(null, mr.getHistoryServer()); + assertEquals(null, mr.getHistoryServer()); } finally { if (mr != null) { mr.stop(); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRChildTask.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRChildTask.java index 28376ebc89c7b..35398207f3abe 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRChildTask.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRChildTask.java @@ -18,10 +18,10 @@ package org.apache.hadoop.mapred; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.io.DataOutputStream; import java.io.File; @@ -42,9 +42,9 @@ import org.apache.hadoop.mapreduce.MRJobConfig; import org.apache.hadoop.mapreduce.v2.MiniMRYarnCluster; import org.apache.hadoop.util.Shell; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -170,19 +170,18 @@ public void configure(JobConf job) { boolean oldConfigs = job.getBoolean(OLD_CONFIGS, false); if (oldConfigs) { String javaOpts = job.get(JobConf.MAPRED_TASK_JAVA_OPTS); - assertNotNull(JobConf.MAPRED_TASK_JAVA_OPTS + " is null!", - javaOpts); + assertNotNull(javaOpts, + JobConf.MAPRED_TASK_JAVA_OPTS + " is null!"); assertThat(javaOpts) .withFailMessage(JobConf.MAPRED_TASK_JAVA_OPTS + " has value of: " + javaOpts) .isEqualTo(TASK_OPTS_VAL); } else { String mapJavaOpts = job.get(JobConf.MAPRED_MAP_TASK_JAVA_OPTS); - assertNotNull(JobConf.MAPRED_MAP_TASK_JAVA_OPTS + " is null!", - mapJavaOpts); - assertEquals(JobConf.MAPRED_MAP_TASK_JAVA_OPTS + " has value of: " + - mapJavaOpts, - mapJavaOpts, MAP_OPTS_VAL); + 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); } // check if X=y works for an already existing parameter @@ -193,8 +192,7 @@ public void configure(JobConf job) { checkEnv("NEW_PATH", File.pathSeparator + "/tmp", "noappend"); String jobLocalDir = job.get(MRJobConfig.JOB_LOCAL_DIR); - assertNotNull(MRJobConfig.JOB_LOCAL_DIR + " is null", - jobLocalDir); + assertNotNull(jobLocalDir, MRJobConfig.JOB_LOCAL_DIR + " is null"); } public void map(WritableComparable key, Writable value, @@ -214,16 +212,15 @@ public void configure(JobConf job) { boolean oldConfigs = job.getBoolean(OLD_CONFIGS, false); if (oldConfigs) { String javaOpts = job.get(JobConf.MAPRED_TASK_JAVA_OPTS); - assertNotNull(JobConf.MAPRED_TASK_JAVA_OPTS + " is null!", - javaOpts); + assertNotNull(javaOpts, JobConf.MAPRED_TASK_JAVA_OPTS + " is null!"); assertThat(javaOpts) .withFailMessage(JobConf.MAPRED_TASK_JAVA_OPTS + " has value of: " + javaOpts) .isEqualTo(TASK_OPTS_VAL); } else { String reduceJavaOpts = job.get(JobConf.MAPRED_REDUCE_TASK_JAVA_OPTS); - assertNotNull(JobConf.MAPRED_REDUCE_TASK_JAVA_OPTS + " is null!", - reduceJavaOpts); + assertNotNull(reduceJavaOpts, + JobConf.MAPRED_REDUCE_TASK_JAVA_OPTS + " is null!"); assertThat(reduceJavaOpts) .withFailMessage(JobConf.MAPRED_REDUCE_TASK_JAVA_OPTS + " has value of: " + reduceJavaOpts) @@ -247,7 +244,7 @@ public void reduce(WritableComparable key, Iterator values, } - @BeforeClass + @BeforeAll public static void setup() throws IOException { // create configuration, dfs, file system and mapred cluster dfs = new MiniDFSCluster.Builder(conf).build(); @@ -272,7 +269,7 @@ public static void setup() throws IOException { localFs.setPermission(APP_JAR, new FsPermission("700")); } - @AfterClass + @AfterAll public static void tearDown() { // close file system and shut down dfs and mapred cluster try { @@ -378,7 +375,7 @@ private void runTestTaskEnv(JobConf config, Path inDir, Path outDir, job.setMaxMapAttempts(1); // speed up failures job.waitForCompletion(true); boolean succeeded = job.waitForCompletion(true); - assertTrue("The environment checker job failed.", succeeded); + assertTrue(succeeded, "The environment checker job failed."); } } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRClasspath.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRClasspath.java index 71f04078b6c12..ff6658275dcb6 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRClasspath.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRClasspath.java @@ -32,8 +32,9 @@ import org.apache.hadoop.io.IntWritable; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * A JUnit test to test Mini Map-Reduce Cluster with multiple directories @@ -175,7 +176,7 @@ public void testClassPath() throws IOException { String result; result = launchWordCount(fileSys.getUri(), jobConf, "The quick brown fox\nhas many silly\n" + "red fox sox\n", 3, 1); - Assert.assertEquals("The\t1\nbrown\t1\nfox\t2\nhas\t1\nmany\t1\n" + assertEquals("The\t1\nbrown\t1\nfox\t2\nhas\t1\nmany\t1\n" + "quick\t1\nred\t1\nsilly\t1\nsox\t1\n", result); } finally { @@ -208,7 +209,7 @@ public void testExternalWritable() result = launchExternal(fileSys.getUri(), jobConf, "Dennis was here!\nDennis again!", 3, 1); - Assert.assertEquals("Dennis again!\t1\nDennis was here!\t1\n", result); + assertEquals("Dennis again!\t1\nDennis was here!\t1\n", result); } finally { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRClientCluster.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRClientCluster.java index 7630d18798eae..22b9a64d18831 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRClientCluster.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRClientCluster.java @@ -18,8 +18,8 @@ package org.apache.hadoop.mapred; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.util.StringTokenizer; @@ -34,9 +34,9 @@ import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.v2.jobhistory.JHAdminConfig; import org.apache.hadoop.yarn.conf.YarnConfiguration; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; /** * Basic testing for the MiniMRClientCluster. This test shows an example class @@ -54,7 +54,7 @@ public class TestMiniMRClientCluster { private class InternalClass { } - @BeforeClass + @BeforeAll public static void setup() throws IOException { final Configuration conf = new Configuration(); final Path TEST_ROOT_DIR = new Path(System.getProperty("test.build.data", @@ -81,7 +81,7 @@ public static void setup() throws IOException { InternalClass.class, 1, new Configuration()); } - @AfterClass + @AfterAll public static void cleanup() throws IOException { // clean up the input and output files final Configuration conf = new Configuration(); @@ -128,27 +128,26 @@ public void testRestart() throws Exception { String mrHistWebAppAddress2 = mrCluster.getConfig().get( JHAdminConfig.MR_HISTORY_WEBAPP_ADDRESS); - assertEquals("Address before restart: " + rmAddress1 - + " is different from new address: " + rmAddress2, rmAddress1, - rmAddress2); - assertEquals("Address before restart: " + rmAdminAddress1 - + " is different from new address: " + rmAdminAddress2, - rmAdminAddress1, rmAdminAddress2); - assertEquals("Address before restart: " + rmSchedAddress1 - + " is different from new address: " + rmSchedAddress2, - rmSchedAddress1, rmSchedAddress2); - assertEquals("Address before restart: " + rmRstrackerAddress1 - + " is different from new address: " + rmRstrackerAddress2, - rmRstrackerAddress1, rmRstrackerAddress2); - assertEquals("Address before restart: " + rmWebAppAddress1 - + " is different from new address: " + rmWebAppAddress2, - rmWebAppAddress1, rmWebAppAddress2); - assertEquals("Address before restart: " + mrHistAddress1 - + " is different from new address: " + mrHistAddress2, mrHistAddress1, - mrHistAddress2); - assertEquals("Address before restart: " + mrHistWebAppAddress1 - + " is different from new address: " + mrHistWebAppAddress2, - mrHistWebAppAddress1, mrHistWebAppAddress2); + assertEquals(rmAddress1, rmAddress2, "Address before restart: " + rmAddress1 + + " is different from new address: " + rmAddress2); + assertEquals(rmAdminAddress1, rmAdminAddress2, + "Address before restart: " + rmAdminAddress1 + + " is different from new address: " + rmAdminAddress2); + assertEquals(rmSchedAddress1, rmSchedAddress2, + "Address before restart: " + rmSchedAddress1 + + " is different from new address: " + rmSchedAddress2); + assertEquals(rmRstrackerAddress1, rmRstrackerAddress2, + "Address before restart: " + rmRstrackerAddress1 + + " is different from new address: " + rmRstrackerAddress2); + assertEquals(rmWebAppAddress1, rmWebAppAddress2, + "Address before restart: " + rmWebAppAddress1 + + " is different from new address: " + rmWebAppAddress2); + assertEquals(mrHistAddress1, mrHistAddress2, + "Address before restart: " + mrHistAddress1 + + " is different from new address: " + mrHistAddress2); + assertEquals(mrHistWebAppAddress1, mrHistWebAppAddress2, + "Address before restart: " + mrHistWebAppAddress1 + + " is different from new address: " + mrHistWebAppAddress2); } @@ -165,14 +164,14 @@ public void testJob() throws Exception { private void validateCounters(Counters counters, long mapInputRecords, long mapOutputRecords, long reduceInputGroups, long reduceOutputRecords) { - assertEquals("MapInputRecords", mapInputRecords, counters.findCounter( - "MyCounterGroup", "MAP_INPUT_RECORDS").getValue()); - assertEquals("MapOutputRecords", mapOutputRecords, counters.findCounter( - "MyCounterGroup", "MAP_OUTPUT_RECORDS").getValue()); - assertEquals("ReduceInputGroups", reduceInputGroups, counters.findCounter( - "MyCounterGroup", "REDUCE_INPUT_GROUPS").getValue()); - assertEquals("ReduceOutputRecords", reduceOutputRecords, counters - .findCounter("MyCounterGroup", "REDUCE_OUTPUT_RECORDS").getValue()); + assertEquals(mapInputRecords, counters.findCounter("MyCounterGroup", + "MAP_INPUT_RECORDS").getValue(), "MapInputRecords"); + assertEquals(mapOutputRecords, counters.findCounter("MyCounterGroup", + "MAP_OUTPUT_RECORDS").getValue(), "MapOutputRecords"); + assertEquals(reduceInputGroups, counters.findCounter("MyCounterGroup", + "REDUCE_INPUT_GROUPS").getValue(), "ReduceInputGroups"); + assertEquals(reduceOutputRecords, counters.findCounter("MyCounterGroup", + "REDUCE_OUTPUT_RECORDS").getValue(), "ReduceOutputRecords"); } private static void createFile(Path inFile, Configuration conf) diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRDFSCaching.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRDFSCaching.java index 3f64f7a35b961..8948d9490ea47 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRDFSCaching.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRDFSCaching.java @@ -21,9 +21,9 @@ import org.apache.hadoop.hdfs.MiniDFSCluster; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.mapred.MRCaching.TestResult; -import org.junit.Ignore; -import org.junit.Test; -import static org.junit.Assert.assertTrue; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; @@ -31,7 +31,7 @@ * A JUnit test to test caching with DFS * */ -@Ignore +@Disabled public class TestMiniMRDFSCaching { @Test @@ -52,7 +52,7 @@ public void testWithDFS() throws IOException { mr.createJobConf(), "The quick brown fox\nhas many silly\n" + "red fox sox\n"); - assertTrue("Archives not matching", ret.isOutputOk); + assertTrue(ret.isOutputOk, "Archives not matching"); // launch MR cache with symlinks ret = MRCaching.launchMRCache("/testing/wc/input", "/testing/wc/output", @@ -60,7 +60,7 @@ public void testWithDFS() throws IOException { mr.createJobConf(), "The quick brown fox\nhas many silly\n" + "red fox sox\n"); - assertTrue("Archives not matching", ret.isOutputOk); + assertTrue(ret.isOutputOk, "Archives not matching"); } finally { if (fileSys != null) { fileSys.close(); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRWithDFSWithDistinctUsers.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRWithDFSWithDistinctUsers.java index 221fd3c15c6aa..53ed32d36ced1 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRWithDFSWithDistinctUsers.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRWithDFSWithDistinctUsers.java @@ -28,10 +28,11 @@ import org.apache.hadoop.mapreduce.MRJobConfig; import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig; import org.apache.hadoop.security.UserGroupInformation; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * A JUnit test to test Mini Map-Reduce Cluster with Mini-DFS. @@ -70,10 +71,10 @@ public RunningJob run() throws IOException { }); rj.waitForCompletion(); - Assert.assertEquals("SUCCEEDED", JobStatus.getJobRunState(rj.getJobState())); + assertEquals("SUCCEEDED", JobStatus.getJobRunState(rj.getJobState())); } - @Before + @BeforeEach public void setUp() throws Exception { dfs = new MiniDFSCluster.Builder(conf).numDataNodes(4).build(); @@ -98,7 +99,7 @@ public FileSystem run() throws IOException { 1, null, null, MR_UGI, mrConf); } - @After + @AfterEach public void tearDown() throws Exception { if (mr != null) { mr.shutdown();} if (dfs != null) { dfs.shutdown(); } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMultiFileInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMultiFileInputFormat.java index 3a02f4cbe1fff..e9c2a23a00fd5 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMultiFileInputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMultiFileInputFormat.java @@ -25,12 +25,12 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.Text; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; public class TestMultiFileInputFormat { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMultiFileSplit.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMultiFileSplit.java index d57be9d537a73..b6bb719101bb0 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMultiFileSplit.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMultiFileSplit.java @@ -28,11 +28,11 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.IOUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMultipleLevelCaching.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMultipleLevelCaching.java index 7e8dfef03f134..1d4ef0b23bcbe 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMultipleLevelCaching.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMultipleLevelCaching.java @@ -27,17 +27,17 @@ import org.apache.hadoop.mapred.lib.IdentityReducer; import org.apache.hadoop.mapreduce.JobCounter; import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.io.IOException; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * This test checks whether the task caches are created and used properly. */ -@Ignore +@Disabled public class TestMultipleLevelCaching { private static final int MAX_LEVEL = 5; final Path inDir = new Path("/cachetesting"); @@ -158,14 +158,12 @@ static void launchJobAndTestCounters(String jobName, MiniMRCluster mr, } RunningJob job = launchJob(jobConf, in, out, numMaps, jobName); Counters counters = job.getCounters(); - assertEquals("Number of local maps", - counters.getCounter(JobCounter.OTHER_LOCAL_MAPS), otherLocalMaps); - assertEquals("Number of Data-local maps", - counters.getCounter(JobCounter.DATA_LOCAL_MAPS), - dataLocalMaps); - assertEquals("Number of Rack-local maps", - counters.getCounter(JobCounter.RACK_LOCAL_MAPS), - rackLocalMaps); + assertEquals(counters.getCounter(JobCounter.OTHER_LOCAL_MAPS), + otherLocalMaps, "Number of local maps"); + assertEquals(counters.getCounter(JobCounter.DATA_LOCAL_MAPS), + dataLocalMaps, "Number of Data-local maps"); + assertEquals(counters.getCounter(JobCounter.RACK_LOCAL_MAPS), + rackLocalMaps, "Number of Rack-local maps"); mr.waitUntilIdle(); mr.shutdown(); } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMultipleTextOutputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMultipleTextOutputFormat.java index 114b6054d3fe4..61f6239502d94 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMultipleTextOutputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMultipleTextOutputFormat.java @@ -22,13 +22,13 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapred.lib.MultipleTextOutputFormat; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.io.IOException; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; public class TestMultipleTextOutputFormat { private static JobConf defaultConf = new JobConf(); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestNetworkedJob.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestNetworkedJob.java index ed8ed61ff9b16..c01e7a0bfb6f3 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestNetworkedJob.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestNetworkedJob.java @@ -19,7 +19,10 @@ package org.apache.hadoop.mapred; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -47,7 +50,8 @@ import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.exceptions.YarnRuntimeException; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; public class TestNetworkedJob { private static String TEST_ROOT_DIR = new File(System.getProperty( @@ -56,7 +60,8 @@ public class TestNetworkedJob { private static Path inFile = new Path(testDir, "in"); private static Path outDir = new Path(testDir, "out"); - @Test (timeout=5000) + @Test + @Timeout(value = 5) public void testGetNullCounters() throws Exception { //mock creation Job mockJob = mock(Job.class); @@ -68,7 +73,8 @@ public void testGetNullCounters() throws Exception { verify(mockJob).getCounters(); } - @Test (timeout=500000) + @Test + @Timeout(value = 500) public void testGetJobStatus() throws IOException, InterruptedException, ClassNotFoundException { MiniMRClientCluster mr = null; @@ -101,11 +107,11 @@ public void testGetJobStatus() throws IOException, InterruptedException, // The following asserts read JobStatus twice and ensure the returned // JobStatus objects correspond to the same Job. - assertEquals("Expected matching JobIDs", jobId, client.getJob(jobId) - .getJobStatus().getJobID()); - assertEquals("Expected matching startTimes", rj.getJobStatus() + assertEquals(jobId, client.getJob(jobId) + .getJobStatus().getJobID(), "Expected matching JobIDs"); + assertEquals(rj.getJobStatus() .getStartTime(), client.getJob(jobId).getJobStatus() - .getStartTime()); + .getStartTime(), "Expected matching startTimes"); } finally { if (fileSys != null) { fileSys.delete(testDir, true); @@ -120,7 +126,8 @@ public void testGetJobStatus() throws IOException, InterruptedException, * @throws Exception */ @SuppressWarnings( "deprecation" ) - @Test (timeout=500000) + @Test + @Timeout(value = 500) public void testNetworkedJob() throws Exception { // mock creation MiniMRClientCluster mr = null; @@ -252,10 +259,10 @@ public void testNetworkedJob() throws Exception { // test JobClient // The following asserts read JobStatus twice and ensure the returned // JobStatus objects correspond to the same Job. - assertEquals("Expected matching JobIDs", jobId, client.getJob(jobId) - .getJobStatus().getJobID()); - assertEquals("Expected matching startTimes", rj.getJobStatus() - .getStartTime(), client.getJob(jobId).getJobStatus().getStartTime()); + assertEquals(jobId, client.getJob(jobId) + .getJobStatus().getJobID(), "Expected matching JobIDs"); + assertEquals(rj.getJobStatus().getStartTime(), + client.getJob(jobId).getJobStatus().getStartTime(), "Expected matching startTimes"); } finally { if (fileSys != null) { fileSys.delete(testDir, true); @@ -271,7 +278,8 @@ public void testNetworkedJob() throws Exception { * * @throws IOException */ - @Test (timeout=5000) + @Test + @Timeout(value = 5) public void testBlackListInfo() throws IOException { BlackListInfo info = new BlackListInfo(); info.setBlackListReport("blackListInfo"); @@ -293,7 +301,8 @@ public void testBlackListInfo() throws IOException { * test run from command line JobQueueClient * @throws Exception */ - @Test (timeout=500000) + @Test + @Timeout(value = 500) public void testJobQueueClient() throws Exception { MiniMRClientCluster mr = null; FileSystem fileSys = null; diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestOldCombinerGrouping.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestOldCombinerGrouping.java index 1f6395dfb7892..4b35c57c9bde4 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestOldCombinerGrouping.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestOldCombinerGrouping.java @@ -18,8 +18,7 @@ package org.apache.hadoop.mapred; -import org.junit.After; -import org.junit.Assert; +import org.junit.jupiter.api.AfterEach; import org.apache.hadoop.fs.FileUtil; import org.apache.hadoop.fs.Path; @@ -28,7 +27,7 @@ import org.apache.hadoop.io.Text; import org.apache.hadoop.test.GenericTestUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.BufferedReader; import java.io.File; @@ -40,6 +39,12 @@ import java.util.Iterator; import java.util.Set; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + public class TestOldCombinerGrouping { private static File testRootDir = GenericTestUtils.getRandomizedTestDir(); @@ -119,7 +124,7 @@ public int compare(Text o1, Text o2) { } - @After + @AfterEach public void cleanup() { FileUtil.fullyDelete(testRootDir); } @@ -169,30 +174,30 @@ public void testCombiner() throws Exception { long combinerOutputRecords = counters.getGroup( "org.apache.hadoop.mapreduce.TaskCounter"). getCounter("COMBINE_OUTPUT_RECORDS"); - Assert.assertTrue(combinerInputRecords > 0); - Assert.assertTrue(combinerInputRecords > combinerOutputRecords); + assertTrue(combinerInputRecords > 0); + assertTrue(combinerInputRecords > combinerOutputRecords); BufferedReader br = new BufferedReader(new FileReader( new File(out, "part-00000"))); Set output = new HashSet(); String line = br.readLine(); - Assert.assertNotNull(line); + assertNotNull(line); output.add(line.substring(0, 1) + line.substring(4, 5)); line = br.readLine(); - Assert.assertNotNull(line); + assertNotNull(line); output.add(line.substring(0, 1) + line.substring(4, 5)); line = br.readLine(); - Assert.assertNull(line); + assertNull(line); br.close(); Set expected = new HashSet(); expected.add("A2"); expected.add("B5"); - Assert.assertEquals(expected, output); + assertEquals(expected, output); } else { - Assert.fail("Job failed"); + fail("Job failed"); } } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestQueueConfigurationParser.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestQueueConfigurationParser.java index bdfe0f5dc6982..6233a16fc73f4 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestQueueConfigurationParser.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestQueueConfigurationParser.java @@ -32,9 +32,11 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; -import static org.junit.Assert.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; + +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestQueueConfigurationParser { /** @@ -42,7 +44,8 @@ public class TestQueueConfigurationParser { * @throws ParserConfigurationException * @throws Exception */ - @Test (timeout=5000) + @Test + @Timeout(value = 5) public void testQueueConfigurationParser() throws ParserConfigurationException, Exception { JobQueueInfo info = new JobQueueInfo("root", "rootInfo"); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestReduceFetch.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestReduceFetch.java index 767459f88b4df..1d7284bce8d0a 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestReduceFetch.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestReduceFetch.java @@ -19,10 +19,10 @@ package org.apache.hadoop.mapred; import org.apache.hadoop.mapreduce.TaskCounter; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestReduceFetch extends TestReduceFetchFromPartialMem { @@ -44,10 +44,11 @@ public void testReduceFromDisk() throws Exception { Counters c = runJob(job); final long spill = c.findCounter(TaskCounter.SPILLED_RECORDS).getCounter(); final long out = c.findCounter(TaskCounter.MAP_OUTPUT_RECORDS).getCounter(); - assertTrue("Expected all records spilled during reduce (" + spill + ")", - spill >= 2 * out); // all records spill at map, reduce - assertTrue("Expected intermediate merges (" + spill + ")", - spill >= 2 * out + (out / MAP_TASKS)); // some records hit twice + assertTrue(spill >= 2 * out, + "Expected all records spilled during reduce (" + + spill + ")"); // all records spill at map, reduce + assertTrue(spill >= 2 * out + (out / MAP_TASKS), + "Expected intermediate merges (" + spill + ")"); // some records hit twice } /** @@ -65,6 +66,6 @@ public void testReduceFromMem() throws Exception { Counters c = runJob(job); final long spill = c.findCounter(TaskCounter.SPILLED_RECORDS).getCounter(); final long out = c.findCounter(TaskCounter.MAP_OUTPUT_RECORDS).getCounter(); - assertEquals("Spilled records: " + spill, out, spill); // no reduce spill + assertEquals(out, spill, "Spilled records: " + spill); // no reduce spill } } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestReduceFetchFromPartialMem.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestReduceFetchFromPartialMem.java index 1b99ce0c0aa1d..3a3f2cb111cc7 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestReduceFetchFromPartialMem.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestReduceFetchFromPartialMem.java @@ -27,9 +27,9 @@ import org.apache.hadoop.io.WritableComparator; import org.apache.hadoop.mapreduce.TaskCounter; import org.apache.hadoop.mapreduce.task.reduce.Fetcher; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.DataInput; import java.io.DataOutput; @@ -39,16 +39,16 @@ import java.util.Iterator; import static org.apache.hadoop.mapreduce.task.reduce.Fetcher.SHUFFLE_ERR_GRP_NAME; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class TestReduceFetchFromPartialMem { protected static MiniMRCluster mrCluster = null; protected static MiniDFSCluster dfsCluster = null; - @Before + @BeforeEach public void setUp() throws Exception { Configuration conf = new Configuration(); dfsCluster = new MiniDFSCluster.Builder(conf).numDataNodes(2).build(); @@ -56,7 +56,7 @@ public void setUp() throws Exception { dfsCluster.getFileSystem().getUri().toString(), 1); } - @After + @AfterEach public void tearDown() throws Exception { if (dfsCluster != null) { dfsCluster.shutdown(); } if (mrCluster != null) { mrCluster.shutdown(); } @@ -87,8 +87,9 @@ public void testReduceFromPartialMem() throws Exception { Counters c = runJob(job); final long out = c.findCounter(TaskCounter.MAP_OUTPUT_RECORDS).getCounter(); final long spill = c.findCounter(TaskCounter.SPILLED_RECORDS).getCounter(); - assertTrue("Expected some records not spilled during reduce" + spill + ")", - spill < 2 * out); // spilled map records, some records at the reduce + assertTrue(spill < 2 * out, + "Expected some records not spilled during reduce" + spill + ")"); + // spilled map records, some records at the reduce long shuffleIoErrors = c.getGroup(SHUFFLE_ERR_GRP_NAME).getCounter(Fetcher.ShuffleErrors.IO_ERROR.toString()); assertEquals(0, shuffleIoErrors); @@ -226,8 +227,8 @@ public void reduce(Text key, Iterator values, out.collect(key, val); ++nRec; } - assertEquals("Bad rec count for " + key, recCheck, nRec - preRec); - assertEquals("Bad rec group for " + key, vcCheck, vc); + assertEquals(recCheck, nRec - preRec, "Bad rec count for " + key); + assertEquals(vcCheck, vc, "Bad rec group for " + key); } @Override @@ -235,7 +236,7 @@ public void close() throws IOException { assertEquals(4095, nKey); assertEquals(nMaps - 1, aKey); assertEquals(nMaps - 1, bKey); - assertEquals("Bad record count", nMaps * (4096 + 2), nRec); + assertEquals(nMaps * (4096 + 2), nRec, "Bad record count"); } } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestReduceTask.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestReduceTask.java index 69546a6cba24e..f904ca05a865a 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestReduceTask.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestReduceTask.java @@ -26,12 +26,12 @@ import org.apache.hadoop.io.compress.CompressionCodec; import org.apache.hadoop.io.compress.DefaultCodec; import org.apache.hadoop.util.Progressable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * This test exercises the ValueIterator. diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestReporter.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestReporter.java index 48df092e377c8..d42ab19c90e71 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestReporter.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestReporter.java @@ -31,11 +31,12 @@ import org.apache.hadoop.mapreduce.lib.input.FileInputFormat; import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Tests the old mapred APIs with {@link Reporter#getProgress()}. @@ -48,14 +49,14 @@ public class TestReporter { private static FileSystem fs = null; - @BeforeClass + @BeforeAll public static void setup() throws Exception { fs = FileSystem.getLocal(new Configuration()); fs.delete(testRootTempDir, true); fs.mkdirs(testRootTempDir); } - @AfterClass + @AfterAll public static void cleanup() throws Exception { fs.delete(testRootTempDir, true); } @@ -92,16 +93,16 @@ public void map(LongWritable key, Text value, float mapProgress = ((float)++numRecords)/INPUT_LINES; // calculate the attempt progress based on the progress range float attemptProgress = progressRange * mapProgress; - assertEquals("Invalid progress in map", - attemptProgress, reporter.getProgress(), 0f); + assertEquals(attemptProgress, reporter.getProgress(), 0f, + "Invalid progress in map"); output.collect(new Text(value.toString() + numRecords), value); } @Override public void close() throws IOException { super.close(); - assertEquals("Invalid progress in map cleanup", - progressRange, reporter.getProgress(), 0f); + assertEquals(progressRange, reporter.getProgress(), 0f, + "Invalid progress in map cleanup"); } } @@ -147,7 +148,7 @@ public void testReporterProgressForMapOnlyJob() throws IOException { 1, 0, INPUT); job.waitForCompletion(); - assertTrue("Job failed", job.isSuccessful()); + assertTrue(job.isSuccessful(), "Job failed"); } /** @@ -175,18 +176,17 @@ public void reduce(Text key, Iterator values, throws IOException { float reducePhaseProgress = ((float)++recordCount)/INPUT_LINES; float weightedReducePhaseProgress = - reducePhaseProgress * REDUCE_PROGRESS_RANGE; - assertEquals("Invalid progress in reduce", - SHUFFLE_PROGRESS_RANGE + weightedReducePhaseProgress, - reporter.getProgress(), 0.02f); + reducePhaseProgress * REDUCE_PROGRESS_RANGE; + assertEquals(SHUFFLE_PROGRESS_RANGE + weightedReducePhaseProgress, + reporter.getProgress(), 0.02f, "Invalid progress in reduce"); this.reporter = reporter; } @Override public void close() throws IOException { super.close(); - assertEquals("Invalid progress in reduce cleanup", - 1.0f, reporter.getProgress(), 0f); + assertEquals(1.0f, reporter.getProgress(), 0f, + "Invalid progress in reduce cleanup"); } } @@ -210,7 +210,7 @@ public void testReporterProgressForMRJob() throws IOException { 1, 1, INPUT); job.waitForCompletion(); - assertTrue("Job failed", job.isSuccessful()); + assertTrue(job.isSuccessful(), "Job failed"); } @Test @@ -244,7 +244,7 @@ public void testStatusLimit() throws IOException, InterruptedException, job.waitForCompletion(true); - assertTrue("Job failed", job.isSuccessful()); + assertTrue(job.isSuccessful(), "Job failed"); } } \ No newline at end of file diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestResourceMgrDelegate.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestResourceMgrDelegate.java index d6754f06f49e4..1b90ecc618962 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestResourceMgrDelegate.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestResourceMgrDelegate.java @@ -22,8 +22,6 @@ import java.util.ArrayList; import java.util.List; -import org.junit.Assert; - import org.apache.hadoop.mapreduce.JobStatus; import org.apache.hadoop.mapreduce.JobStatus.State; import org.apache.hadoop.yarn.api.ApplicationClientProtocol; @@ -41,9 +39,15 @@ import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.exceptions.YarnException; import org.apache.hadoop.yarn.util.Records; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; -import org.mockito.Mockito; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; public class TestResourceMgrDelegate { @@ -53,13 +57,13 @@ public class TestResourceMgrDelegate { */ @Test public void testGetRootQueues() throws IOException, InterruptedException { - final ApplicationClientProtocol applicationsManager = Mockito.mock(ApplicationClientProtocol.class); - GetQueueInfoResponse response = Mockito.mock(GetQueueInfoResponse.class); + final ApplicationClientProtocol applicationsManager = mock(ApplicationClientProtocol.class); + GetQueueInfoResponse response = mock(GetQueueInfoResponse.class); org.apache.hadoop.yarn.api.records.QueueInfo queueInfo = - Mockito.mock(org.apache.hadoop.yarn.api.records.QueueInfo.class); - Mockito.when(response.getQueueInfo()).thenReturn(queueInfo); + mock(org.apache.hadoop.yarn.api.records.QueueInfo.class); + when(response.getQueueInfo()).thenReturn(queueInfo); try { - Mockito.when(applicationsManager.getQueueInfo(Mockito.any( + when(applicationsManager.getQueueInfo(any( GetQueueInfoRequest.class))).thenReturn(response); } catch (YarnException e) { throw new IOException(e); @@ -69,7 +73,7 @@ public void testGetRootQueues() throws IOException, InterruptedException { new YarnConfiguration()) { @Override protected void serviceStart() throws Exception { - Assert.assertTrue(this.client instanceof YarnClientImpl); + assertTrue(this.client instanceof YarnClientImpl); ((YarnClientImpl) this.client).setRMClient(applicationsManager); } }; @@ -78,21 +82,22 @@ protected void serviceStart() throws Exception { ArgumentCaptor argument = ArgumentCaptor.forClass(GetQueueInfoRequest.class); try { - Mockito.verify(applicationsManager).getQueueInfo( + verify(applicationsManager).getQueueInfo( argument.capture()); } catch (YarnException e) { throw new IOException(e); } - Assert.assertTrue("Children of root queue not requested", - argument.getValue().getIncludeChildQueues()); - Assert.assertTrue("Request wasn't to recurse through children", - argument.getValue().getRecursive()); + assertTrue(argument.getValue().getIncludeChildQueues(), + "Children of root queue not requested"); + assertTrue(argument.getValue().getRecursive(), + "Request wasn't to recurse through children"); } @Test public void tesAllJobs() throws Exception { - final ApplicationClientProtocol applicationsManager = Mockito.mock(ApplicationClientProtocol.class); + final ApplicationClientProtocol applicationsManager = + mock(ApplicationClientProtocol.class); GetApplicationsResponse allApplicationsResponse = Records .newRecord(GetApplicationsResponse.class); List applications = new ArrayList(); @@ -105,45 +110,42 @@ public void tesAllJobs() throws Exception { applications.add(getApplicationReport(YarnApplicationState.FAILED, FinalApplicationStatus.FAILED)); allApplicationsResponse.setApplicationList(applications); - Mockito.when( - applicationsManager.getApplications(Mockito - .any(GetApplicationsRequest.class))).thenReturn( - allApplicationsResponse); + when(applicationsManager.getApplications(any(GetApplicationsRequest.class))) + .thenReturn(allApplicationsResponse); ResourceMgrDelegate resourceMgrDelegate = new ResourceMgrDelegate( new YarnConfiguration()) { @Override protected void serviceStart() throws Exception { - Assert.assertTrue(this.client instanceof YarnClientImpl); + assertTrue(this.client instanceof YarnClientImpl); ((YarnClientImpl) this.client).setRMClient(applicationsManager); } }; JobStatus[] allJobs = resourceMgrDelegate.getAllJobs(); - Assert.assertEquals(State.FAILED, allJobs[0].getState()); - Assert.assertEquals(State.SUCCEEDED, allJobs[1].getState()); - Assert.assertEquals(State.KILLED, allJobs[2].getState()); - Assert.assertEquals(State.FAILED, allJobs[3].getState()); + assertEquals(State.FAILED, allJobs[0].getState()); + assertEquals(State.SUCCEEDED, allJobs[1].getState()); + assertEquals(State.KILLED, allJobs[2].getState()); + assertEquals(State.FAILED, allJobs[3].getState()); } private ApplicationReport getApplicationReport( YarnApplicationState yarnApplicationState, FinalApplicationStatus finalApplicationStatus) { - ApplicationReport appReport = Mockito.mock(ApplicationReport.class); - ApplicationResourceUsageReport appResources = Mockito - .mock(ApplicationResourceUsageReport.class); - Mockito.when(appReport.getApplicationId()).thenReturn( + ApplicationReport appReport = mock(ApplicationReport.class); + ApplicationResourceUsageReport appResources = mock(ApplicationResourceUsageReport.class); + when(appReport.getApplicationId()).thenReturn( ApplicationId.newInstance(0, 0)); - Mockito.when(appResources.getNeededResources()).thenReturn( + when(appResources.getNeededResources()).thenReturn( Records.newRecord(Resource.class)); - Mockito.when(appResources.getReservedResources()).thenReturn( + when(appResources.getReservedResources()).thenReturn( Records.newRecord(Resource.class)); - Mockito.when(appResources.getUsedResources()).thenReturn( + when(appResources.getUsedResources()).thenReturn( Records.newRecord(Resource.class)); - Mockito.when(appReport.getApplicationResourceUsageReport()).thenReturn( + when(appReport.getApplicationResourceUsageReport()).thenReturn( appResources); - Mockito.when(appReport.getYarnApplicationState()).thenReturn( + when(appReport.getYarnApplicationState()).thenReturn( yarnApplicationState); - Mockito.when(appReport.getFinalApplicationStatus()).thenReturn( + when(appReport.getFinalApplicationStatus()).thenReturn( finalApplicationStatus); return appReport; diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileAsBinaryInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileAsBinaryInputFormat.java index 45788cff03972..76349356e2142 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileAsBinaryInputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileAsBinaryInputFormat.java @@ -25,13 +25,13 @@ import org.apache.hadoop.io.SequenceFile; import org.apache.hadoop.io.Text; import org.slf4j.Logger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Random; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestSequenceFileAsBinaryInputFormat { private static final Logger LOG = FileInputFormat.LOG; @@ -88,21 +88,17 @@ public void testBinary() throws IOException { cmpkey.readFields(buf); buf.reset(bval.getBytes(), bval.getLength()); cmpval.readFields(buf); - assertTrue( - "Keys don't match: " + "*" + cmpkey.toString() + ":" + - tkey.toString() + "*", - cmpkey.toString().equals(tkey.toString())); - assertTrue( - "Vals don't match: " + "*" + cmpval.toString() + ":" + - tval.toString() + "*", - cmpval.toString().equals(tval.toString())); + assertTrue(cmpkey.toString().equals(tkey.toString()), + "Keys don't match: " + "*" + cmpkey.toString() + ":" + tkey.toString() + "*"); + assertTrue(cmpval.toString().equals(tval.toString()), + "Vals don't match: " + "*" + cmpval.toString() + ":" + tval.toString() + "*"); ++count; } } finally { reader.close(); } } - assertEquals("Some records not found", RECORDS, count); + assertEquals(RECORDS, count, "Some records not found"); } } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileAsBinaryOutputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileAsBinaryOutputFormat.java index 92b15131bb205..17095da8a0aad 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileAsBinaryOutputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileAsBinaryOutputFormat.java @@ -30,13 +30,13 @@ import org.apache.hadoop.io.FloatWritable; import org.apache.hadoop.io.IntWritable; import org.apache.hadoop.io.SequenceFile.CompressionType; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; public class TestSequenceFileAsBinaryOutputFormat { private static final Logger LOG = @@ -122,10 +122,8 @@ public void testBinary() throws IOException { while (reader.next(iwritable, dwritable)) { sourceInt = r.nextInt(); sourceDouble = r.nextDouble(); - assertEquals( - "Keys don't match: " + "*" + iwritable.get() + ":" + - sourceInt + "*", - sourceInt, iwritable.get()); + assertEquals(sourceInt, iwritable.get(), + "Keys don't match: " + "*" + iwritable.get() + ":" + sourceInt + "*"); assertThat(dwritable.get()).withFailMessage( "Vals don't match: " + "*" + dwritable.get() + ":" + sourceDouble + "*") @@ -136,7 +134,7 @@ public void testBinary() throws IOException { reader.close(); } } - assertEquals("Some records not found", RECORDS, count); + assertEquals(RECORDS, count, "Some records not found"); } @Test @@ -149,29 +147,24 @@ public void testSequenceOutputClassDefaultsToMapRedOutputClass() job.setOutputKeyClass(FloatWritable.class); job.setOutputValueClass(BooleanWritable.class); - assertEquals("SequenceFileOutputKeyClass should default to ouputKeyClass", - FloatWritable.class, - SequenceFileAsBinaryOutputFormat.getSequenceFileOutputKeyClass( - job)); - assertEquals("SequenceFileOutputValueClass should default to " - + "ouputValueClass", - BooleanWritable.class, - SequenceFileAsBinaryOutputFormat.getSequenceFileOutputValueClass( - job)); + assertEquals(FloatWritable.class, + SequenceFileAsBinaryOutputFormat.getSequenceFileOutputKeyClass(job), + "SequenceFileOutputKeyClass should default to ouputKeyClass"); + assertEquals(BooleanWritable.class, + SequenceFileAsBinaryOutputFormat.getSequenceFileOutputValueClass(job), + "SequenceFileOutputValueClass should default to ouputValueClass"); SequenceFileAsBinaryOutputFormat.setSequenceFileOutputKeyClass(job, IntWritable.class ); SequenceFileAsBinaryOutputFormat.setSequenceFileOutputValueClass(job, DoubleWritable.class ); - assertEquals("SequenceFileOutputKeyClass not updated", - IntWritable.class, - SequenceFileAsBinaryOutputFormat.getSequenceFileOutputKeyClass( - job)); - assertEquals("SequenceFileOutputValueClass not updated", - DoubleWritable.class, - SequenceFileAsBinaryOutputFormat.getSequenceFileOutputValueClass( - job)); + assertEquals(IntWritable.class, + SequenceFileAsBinaryOutputFormat.getSequenceFileOutputKeyClass(job), + "SequenceFileOutputKeyClass not updated"); + assertEquals(DoubleWritable.class, + SequenceFileAsBinaryOutputFormat.getSequenceFileOutputValueClass(job), + "SequenceFileOutputValueClass not updated"); } @Test diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileAsTextInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileAsTextInputFormat.java index aa62caedb1178..f72ac99df8185 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileAsTextInputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileAsTextInputFormat.java @@ -26,13 +26,13 @@ import org.apache.hadoop.io.SequenceFile; import org.apache.hadoop.io.Text; import org.slf4j.Logger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.BitSet; import java.util.Random; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; public class TestSequenceFileAsTextInputFormat { private static final Logger LOG = FileInputFormat.LOG; @@ -94,7 +94,8 @@ public void testFormat() throws Exception { RecordReader reader = format.getRecordReader(splits[j], job, reporter); Class readerClass = reader.getClass(); - assertEquals("reader class is SequenceFileAsTextRecordReader.", SequenceFileAsTextRecordReader.class, readerClass); + assertEquals(SequenceFileAsTextRecordReader.class, readerClass, + "reader class is SequenceFileAsTextRecordReader."); Text value = reader.createValue(); Text key = reader.createKey(); try { @@ -105,7 +106,7 @@ public void testFormat() throws Exception { // LOG.info("@"+reader.getPos()); // } int keyInt = Integer.parseInt(key.toString()); - assertFalse("Key in multiple partitions.", bits.get(keyInt)); + assertFalse(bits.get(keyInt), "Key in multiple partitions."); bits.set(keyInt); count++; } @@ -114,7 +115,7 @@ public void testFormat() throws Exception { reader.close(); } } - assertEquals("Some keys in no partition.", length, bits.cardinality()); + assertEquals(length, bits.cardinality(), "Some keys in no partition."); } } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileInputFilter.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileInputFilter.java index b3a0b8b6cd723..f21a88bd9466b 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileInputFilter.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileInputFilter.java @@ -25,13 +25,13 @@ import org.apache.hadoop.io.SequenceFile; import org.apache.hadoop.io.Text; import org.slf4j.Logger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Random; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestSequenceFileInputFilter { private static final Logger LOG = FileInputFormat.LOG; diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileInputFormat.java index 3af1647d6ca40..30be72155d140 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileInputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileInputFormat.java @@ -25,13 +25,13 @@ import org.apache.hadoop.io.IntWritable; import org.apache.hadoop.io.SequenceFile; import org.slf4j.Logger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.BitSet; import java.util.Random; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; public class TestSequenceFileInputFormat { private static final Logger LOG = FileInputFormat.LOG; @@ -102,7 +102,7 @@ public void testFormat() throws Exception { // LOG.info("splits["+j+"]="+splits[j]+" : " + key.get()); // LOG.info("@"+reader.getPos()); // } - assertFalse("Key in multiple partitions.", bits.get(key.get())); + assertFalse(bits.get(key.get()), "Key in multiple partitions."); bits.set(key.get()); count++; } @@ -111,7 +111,7 @@ public void testFormat() throws Exception { reader.close(); } } - assertEquals("Some keys in no partition.", length, bits.cardinality()); + assertEquals(length, bits.cardinality(), "Some keys in no partition."); } } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSortedRanges.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSortedRanges.java index ffa42e4f4e811..cb1f5cd57fe72 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSortedRanges.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSortedRanges.java @@ -18,13 +18,13 @@ package org.apache.hadoop.mapred; import org.apache.hadoop.mapred.SortedRanges.Range; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.Iterator; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestSortedRanges { private static final Logger LOG = diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSpecialCharactersInOutputPath.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSpecialCharactersInOutputPath.java index 5b4a14131fd81..cb532b9a26f97 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSpecialCharactersInOutputPath.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSpecialCharactersInOutputPath.java @@ -30,12 +30,12 @@ import org.apache.hadoop.mapred.lib.IdentityMapper; import org.apache.hadoop.mapred.lib.IdentityReducer; import org.apache.hadoop.util.Progressable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * A JUnit test to test that jobs' output filenames are not HTML-encoded (cf HADOOP-1795). @@ -85,7 +85,8 @@ public static boolean launchJob(URI fileSys, try { assertTrue(runningJob.isComplete()); assertTrue(runningJob.isSuccessful()); - assertTrue("Output folder not found!", fs.exists(new Path("/testing/output/" + OUTPUT_FILENAME))); + assertTrue(fs.exists(new Path("/testing/output/" + OUTPUT_FILENAME)), + "Output folder not found!"); } catch (NullPointerException npe) { // This NPE should no more happens fail("A NPE should not have happened."); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestStatisticsCollector.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestStatisticsCollector.java index d9b94e43268a6..81fec8056943f 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestStatisticsCollector.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestStatisticsCollector.java @@ -21,12 +21,12 @@ import org.apache.hadoop.mapred.StatisticsCollector.TimeWindow; import org.apache.hadoop.mapred.StatisticsCollector.Stat; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class TestStatisticsCollector { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestTaskCommit.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestTaskCommit.java index a534cfaff0bda..fe4952579cd02 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestTaskCommit.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestTaskCommit.java @@ -25,16 +25,16 @@ import org.apache.hadoop.mapred.SortedRanges.Range; import org.apache.hadoop.mapreduce.TaskType; import org.apache.hadoop.mapreduce.checkpoint.TaskCheckpointID; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import java.io.File; import java.io.IOException; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; @@ -86,7 +86,7 @@ public TestTaskCommit() throws IOException { super(LOCAL_MR, LOCAL_FS, 1, 1); } - @After + @AfterEach public void tearDown() throws Exception { super.tearDown(); FileUtil.fullyDelete(new File(rootDir.toString())); @@ -250,43 +250,43 @@ public void testTaskCleanupDoesNotCommit() throws Exception { task.setTaskCleanupTask(); MyUmbilical umbilical = new MyUmbilical(); task.run(job, umbilical); - assertTrue("Task did not succeed", umbilical.taskDone); + assertTrue(umbilical.taskDone, "Task did not succeed"); } @Test public void testCommitRequiredForMapTask() throws Exception { Task testTask = createDummyTask(TaskType.MAP); - assertTrue("MapTask should need commit", testTask.isCommitRequired()); + assertTrue(testTask.isCommitRequired(), "MapTask should need commit"); } @Test public void testCommitRequiredForReduceTask() throws Exception { Task testTask = createDummyTask(TaskType.REDUCE); - assertTrue("ReduceTask should need commit", testTask.isCommitRequired()); + assertTrue(testTask.isCommitRequired(), "ReduceTask should need commit"); } @Test public void testCommitNotRequiredForJobSetup() throws Exception { Task testTask = createDummyTask(TaskType.MAP); testTask.setJobSetupTask(); - assertFalse("Job setup task should not need commit", - testTask.isCommitRequired()); + assertFalse(testTask.isCommitRequired(), + "Job setup task should not need commit"); } @Test public void testCommitNotRequiredForJobCleanup() throws Exception { Task testTask = createDummyTask(TaskType.MAP); testTask.setJobCleanupTask(); - assertFalse("Job cleanup task should not need commit", - testTask.isCommitRequired()); + assertFalse(testTask.isCommitRequired(), + "Job cleanup task should not need commit"); } @Test public void testCommitNotRequiredForTaskCleanup() throws Exception { Task testTask = createDummyTask(TaskType.REDUCE); testTask.setTaskCleanupTask(); - assertFalse("Task cleanup task should not need commit", - testTask.isCommitRequired()); + assertFalse(testTask.isCommitRequired(), + "Task cleanup task should not need commit"); } private Task createDummyTask(TaskType type) throws IOException, ClassNotFoundException, diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestTaskPerformanceSplits.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestTaskPerformanceSplits.java index 1260b148c18e1..f14cf03500365 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestTaskPerformanceSplits.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestTaskPerformanceSplits.java @@ -18,8 +18,8 @@ package org.apache.hadoop.mapred; -import org.junit.Test; -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestTaskPerformanceSplits { @Test @@ -40,15 +40,15 @@ public void testPeriodStatsets() { System.err.println("segment i = " + results[i]); } - assertEquals("Bad interpolation in cumulative segment 0", 200, results[0]); - assertEquals("Bad interpolation in cumulative segment 1", 200, results[1]); - assertEquals("Bad interpolation in cumulative segment 2", 200, results[2]); - assertEquals("Bad interpolation in cumulative segment 3", 300, results[3]); - assertEquals("Bad interpolation in cumulative segment 4", 400, results[4]); - assertEquals("Bad interpolation in cumulative segment 5", 2200, results[5]); + assertEquals(200, results[0], "Bad interpolation in cumulative segment 0"); + assertEquals(200, results[1], "Bad interpolation in cumulative segment 1"); + assertEquals(200, results[2], "Bad interpolation in cumulative segment 2"); + assertEquals(300, results[3], "Bad interpolation in cumulative segment 3"); + assertEquals(400, results[4], "Bad interpolation in cumulative segment 4"); + assertEquals(2200, results[5], "Bad interpolation in cumulative segment 5"); // these are rounded down - assertEquals("Bad interpolation in cumulative segment 6", 2200, results[6]); - assertEquals("Bad interpolation in cumulative segment 7", 2201, results[7]); + assertEquals(2200, results[6], "Bad interpolation in cumulative segment 6"); + assertEquals(2201, results[7], "Bad interpolation in cumulative segment 7"); status.extend(0.0D, 0); status.extend(1.0D/16.0D, 300); // + 75 for bucket 0 @@ -59,13 +59,13 @@ public void testPeriodStatsets() { results = status.getValues(); - assertEquals("Bad interpolation in status segment 0", 275, results[0]); - assertEquals("Bad interpolation in status segment 1", 750, results[1]); - assertEquals("Bad interpolation in status segment 2", 1500, results[2]); - assertEquals("Bad interpolation in status segment 3", 2175, results[3]); - assertEquals("Bad interpolation in status segment 4", 2100, results[4]); - assertEquals("Bad interpolation in status segment 5", 1900, results[5]); - assertEquals("Bad interpolation in status segment 6", 1700, results[6]); - assertEquals("Bad interpolation in status segment 7", 1500, results[7]); + assertEquals(275, results[0], "Bad interpolation in status segment 0"); + assertEquals(750, results[1], "Bad interpolation in status segment 1"); + assertEquals(1500, results[2], "Bad interpolation in status segment 2"); + assertEquals(2175, results[3], "Bad interpolation in status segment 3"); + assertEquals(2100, results[4], "Bad interpolation in status segment 4"); + assertEquals(1900, results[5], "Bad interpolation in status segment 5"); + assertEquals(1700, results[6], "Bad interpolation in status segment 6"); + assertEquals(1500, results[7], "Bad interpolation in status segment 7"); } } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestTaskStatus.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestTaskStatus.java index 94299b6363d7c..9a6395f3a4065 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestTaskStatus.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestTaskStatus.java @@ -17,9 +17,9 @@ */ package org.apache.hadoop.mapred; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestTaskStatus { @@ -52,25 +52,24 @@ private void checkTaskStatues(boolean isMap) { // first try to set the finish time before // start time is set. status.setFinishTime(currentTime); - assertEquals("Finish time of the task status set without start time", 0, - status.getFinishTime()); + assertEquals(0, + status.getFinishTime(), "Finish time of the task status set without start time"); // Now set the start time to right time. status.setStartTime(currentTime); - assertEquals("Start time of the task status not set correctly.", - currentTime, status.getStartTime()); + assertEquals(currentTime, status.getStartTime(), + "Start time of the task status not set correctly."); // try setting wrong start time to task status. long wrongTime = -1; status.setStartTime(wrongTime); - assertEquals( - "Start time of the task status is set to wrong negative value", - currentTime, status.getStartTime()); + assertEquals(currentTime, status.getStartTime(), + "Start time of the task status is set to wrong negative value"); // finally try setting wrong finish time i.e. negative value. status.setFinishTime(wrongTime); - assertEquals("Finish time of task status is set to wrong negative value", - 0, status.getFinishTime()); + assertEquals(0, status.getFinishTime(), + "Finish time of task status is set to wrong negative value"); status.setFinishTime(currentTime); - assertEquals("Finish time of the task status not set correctly.", - currentTime, status.getFinishTime()); + assertEquals(currentTime, status.getFinishTime(), + "Finish time of the task status not set correctly."); // test with null task-diagnostics TaskStatus ts = ((TaskStatus)status.clone()); @@ -117,19 +116,19 @@ public boolean getIsMap() { return false; } }; - assertEquals("Small diagnostic info test failed", - status.getDiagnosticInfo(), test); - assertEquals("Small state string test failed", status.getStateString(), - test); + assertEquals(status.getDiagnosticInfo(), test, + "Small diagnostic info test failed"); + assertEquals(status.getStateString(), test, + "Small state string test failed"); // now append some small string and check String newDInfo = test.concat(test); status.setDiagnosticInfo(test); status.setStateString(newDInfo); - assertEquals("Small diagnostic info append failed", - newDInfo, status.getDiagnosticInfo()); - assertEquals("Small state-string append failed", - newDInfo, status.getStateString()); + assertEquals(newDInfo, status.getDiagnosticInfo(), + "Small diagnostic info append failed"); + assertEquals(newDInfo, status.getStateString(), + "Small state-string append failed"); // update the status with small state strings TaskStatus newStatus = (TaskStatus)status.clone(); @@ -138,47 +137,47 @@ public boolean getIsMap() { status.statusUpdate(newStatus); newDInfo = newDInfo.concat(newStatus.getDiagnosticInfo()); - assertEquals("Status-update on diagnostic-info failed", - newDInfo, status.getDiagnosticInfo()); - assertEquals("Status-update on state-string failed", - newSInfo, status.getStateString()); + assertEquals(newDInfo, status.getDiagnosticInfo(), + "Status-update on diagnostic-info failed"); + assertEquals(newSInfo, status.getStateString(), + "Status-update on state-string failed"); newSInfo = "hi2"; status.statusUpdate(0, newSInfo, null); - assertEquals("Status-update on state-string failed", - newSInfo, status.getStateString()); + assertEquals(newSInfo, status.getStateString(), + "Status-update on state-string failed"); newSInfo = "hi3"; status.statusUpdate(null, 0, newSInfo, null, 0); - assertEquals("Status-update on state-string failed", - newSInfo, status.getStateString()); + assertEquals(newSInfo, status.getStateString(), + "Status-update on state-string failed"); // now append each with large string String large = "hihihihihihihihihihi"; // 20 chars status.setDiagnosticInfo(large); status.setStateString(large); - assertEquals("Large diagnostic info append test failed", - maxSize, status.getDiagnosticInfo().length()); - assertEquals("Large state-string append test failed", - maxSize, status.getStateString().length()); + assertEquals(maxSize, status.getDiagnosticInfo().length(), + "Large diagnostic info append test failed"); + assertEquals(maxSize, status.getStateString().length(), + "Large state-string append test failed"); // update a large status with large strings newStatus.setDiagnosticInfo(large + "0"); newStatus.setStateString(large + "1"); status.statusUpdate(newStatus); - assertEquals("Status-update on diagnostic info failed", - maxSize, status.getDiagnosticInfo().length()); - assertEquals("Status-update on state-string failed", - maxSize, status.getStateString().length()); + assertEquals(maxSize, status.getDiagnosticInfo().length(), + "Status-update on diagnostic info failed"); + assertEquals(maxSize, status.getStateString().length(), + "Status-update on state-string failed"); status.statusUpdate(0, large + "2", null); - assertEquals("Status-update on state-string failed", - maxSize, status.getStateString().length()); + assertEquals(maxSize, status.getStateString().length(), + "Status-update on state-string failed"); status.statusUpdate(null, 0, large + "3", null, 0); - assertEquals("Status-update on state-string failed", - maxSize, status.getStateString().length()); + assertEquals(maxSize, status.getStateString().length(), + "Status-update on state-string failed"); // test passing large string in constructor status = new TaskStatus(null, 0, 0, null, large, large, null, null, @@ -197,9 +196,9 @@ public boolean getIsMap() { return false; } }; - assertEquals("Large diagnostic info test failed", - maxSize, status.getDiagnosticInfo().length()); - assertEquals("Large state-string test failed", - maxSize, status.getStateString().length()); + assertEquals(maxSize, status.getDiagnosticInfo().length(), + "Large diagnostic info test failed"); + assertEquals(maxSize, status.getStateString().length(), + "Large state-string test failed"); } } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestTextInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestTextInputFormat.java index 29a370de7c333..dd9d6b5037d21 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestTextInputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestTextInputFormat.java @@ -38,12 +38,15 @@ import org.apache.hadoop.io.compress.*; import org.apache.hadoop.util.LineReader; import org.apache.hadoop.util.ReflectionUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestTextInputFormat { private static final Logger LOG = @@ -66,7 +69,8 @@ public class TestTextInputFormat { System.getProperty("test.build.data", "/tmp"), "TestTextInputFormat")); - @Test (timeout=500000) + @Test + @Timeout(value = 500) public void testFormat() throws Exception { JobConf job = new JobConf(defaultConf); Path file = new Path(workDir, "test.txt"); @@ -110,9 +114,9 @@ public void testFormat() throws Exception { LOG.debug("splitting: got = " + splits.length); if (length == 0) { - assertEquals("Files of length 0 are not returned from FileInputFormat.getSplits().", - 1, splits.length); - assertEquals("Empty file length == 0", 0, splits[0].getLength()); + assertEquals(1, splits.length, + "Files of length 0 are not returned from FileInputFormat.getSplits()."); + assertEquals(0, splits[0].getLength(), "Empty file length == 0"); } // check each split @@ -131,7 +135,7 @@ public void testFormat() throws Exception { " in split " + j + " at position "+reader.getPos()); } - assertFalse("Key in multiple partitions.", bits.get(v)); + assertFalse(bits.get(v), "Key in multiple partitions."); bits.set(v); count++; } @@ -140,13 +144,14 @@ public void testFormat() throws Exception { reader.close(); } } - assertEquals("Some keys in no partition.", length, bits.cardinality()); + assertEquals(length, bits.cardinality(), "Some keys in no partition."); } } } - @Test (timeout=900000) + @Test + @Timeout(value = 900) public void testSplitableCodecs() throws IOException { JobConf conf = new JobConf(defaultConf); int seed = new Random().nextInt(); @@ -195,7 +200,8 @@ public void testSplitableCodecs() throws IOException { } // Test a corner case when position of stream is right after BZip2 marker - @Test (timeout=900000) + @Test + @Timeout(value = 900) public void testSplitableCodecs2() throws IOException { JobConf conf = new JobConf(defaultConf); // Create the codec @@ -253,7 +259,7 @@ public void testSplitableCodecs2() throws IOException { LOG.warn("conflict with " + v + " in split " + j + " at position " + reader.getPos()); } - assertFalse("Key in multiple partitions.", bits.get(v)); + assertFalse(bits.get(v), "Key in multiple partitions."); bits.set(v); counter++; } @@ -266,7 +272,7 @@ public void testSplitableCodecs2() throws IOException { reader.close(); } } - assertEquals("Some keys in no partition.", length, bits.cardinality()); + assertEquals(length, bits.cardinality(), "Some keys in no partition."); } } @@ -314,7 +320,7 @@ private void verifyPartitions(int length, int numSplits, Path file, " in split " + j + " at position "+reader.getPos()); } - assertFalse("Key in multiple partitions.", bits.get(v)); + assertFalse(bits.get(v), "Key in multiple partitions."); bits.set(v); counter++; } @@ -327,7 +333,7 @@ private void verifyPartitions(int length, int numSplits, Path file, reader.close(); } } - assertEquals("Some keys in no partition.", length, bits.cardinality()); + assertEquals(length, bits.cardinality(), "Some keys in no partition."); } private static LineReader makeStream(String str) throws IOException { @@ -337,16 +343,17 @@ private static LineReader makeStream(String str, int bufsz) throws IOException { return new LineReader(new ByteArrayInputStream(str.getBytes(UTF_8)), bufsz); } - @Test (timeout=5000) + @Test + @Timeout(value = 5) public void testUTF8() throws Exception { LineReader in = makeStream("abcd\u20acbdcd\u20ac"); Text line = new Text(); in.readLine(line); - assertEquals("readLine changed utf8 characters", - "abcd\u20acbdcd\u20ac", line.toString()); + assertEquals("abcd\u20acbdcd\u20ac", line.toString(), + "readLine changed utf8 characters"); in = makeStream("abc\u200axyz"); in.readLine(line); - assertEquals("split on fake newline", "abc\u200axyz", line.toString()); + assertEquals("abc\u200axyz", line.toString(), "split on fake newline"); } /** @@ -356,7 +363,8 @@ public void testUTF8() throws Exception { * * @throws Exception */ - @Test (timeout=5000) + @Test + @Timeout(value = 5) public void testNewLines() throws Exception { final String STR = "a\nbb\n\nccc\rdddd\r\r\r\n\r\neeeee"; final int STRLENBYTES = STR.getBytes().length; @@ -365,25 +373,25 @@ public void testNewLines() throws Exception { LineReader in = makeStream(STR, bufsz); int c = 0; c += in.readLine(out); //"a"\n - assertEquals("line1 length, bufsz:"+bufsz, 1, out.getLength()); + assertEquals(1, out.getLength(), "line1 length, bufsz:"+bufsz); c += in.readLine(out); //"bb"\n - assertEquals("line2 length, bufsz:"+bufsz, 2, out.getLength()); + assertEquals(2, out.getLength(), "line2 length, bufsz:"+bufsz); c += in.readLine(out); //""\n - assertEquals("line3 length, bufsz:"+bufsz, 0, out.getLength()); + assertEquals(0, out.getLength(), "line3 length, bufsz:"+bufsz); c += in.readLine(out); //"ccc"\r - assertEquals("line4 length, bufsz:"+bufsz, 3, out.getLength()); + assertEquals(3, out.getLength(), "line4 length, bufsz:"+bufsz); c += in.readLine(out); //dddd\r - assertEquals("line5 length, bufsz:"+bufsz, 4, out.getLength()); + assertEquals(4, out.getLength(), "line5 length, bufsz:"+bufsz); c += in.readLine(out); //""\r - assertEquals("line6 length, bufsz:"+bufsz, 0, out.getLength()); + assertEquals(0, out.getLength(), "line6 length, bufsz:"+bufsz); c += in.readLine(out); //""\r\n - assertEquals("line7 length, bufsz:"+bufsz, 0, out.getLength()); + assertEquals(0, out.getLength(), "line7 length, bufsz:"+bufsz); c += in.readLine(out); //""\r\n - assertEquals("line8 length, bufsz:"+bufsz, 0, out.getLength()); + assertEquals(0, out.getLength(), "line8 length, bufsz:"+bufsz); c += in.readLine(out); //"eeeee"EOF - assertEquals("line9 length, bufsz:"+bufsz, 5, out.getLength()); - assertEquals("end of file, bufsz: "+bufsz, 0, in.readLine(out)); - assertEquals("total bytes, bufsz: "+bufsz, c, STRLENBYTES); + assertEquals(5, out.getLength(), "line9 length, bufsz:"+bufsz); + assertEquals(0, in.readLine(out), "end of file, bufsz: "+bufsz); + assertEquals(c, STRLENBYTES, "total bytes, bufsz: "+bufsz); } } @@ -396,7 +404,8 @@ public void testNewLines() throws Exception { * * @throws Exception */ - @Test (timeout=5000) + @Test + @Timeout(value = 5) public void testMaxLineLength() throws Exception { final String STR = "a\nbb\n\nccc\rdddd\r\neeeee"; final int STRLENBYTES = STR.getBytes().length; @@ -405,23 +414,24 @@ public void testMaxLineLength() throws Exception { LineReader in = makeStream(STR, bufsz); int c = 0; c += in.readLine(out, 1); - assertEquals("line1 length, bufsz: "+bufsz, 1, out.getLength()); + assertEquals(1, out.getLength(), "line1 length, bufsz: "+bufsz); c += in.readLine(out, 1); - assertEquals("line2 length, bufsz: "+bufsz, 1, out.getLength()); + assertEquals(1, out.getLength(), "line2 length, bufsz: "+bufsz); c += in.readLine(out, 1); - assertEquals("line3 length, bufsz: "+bufsz, 0, out.getLength()); + assertEquals(0, out.getLength(), "line3 length, bufsz: "+bufsz); c += in.readLine(out, 3); - assertEquals("line4 length, bufsz: "+bufsz, 3, out.getLength()); + assertEquals(3, out.getLength(), "line4 length, bufsz: "+bufsz); c += in.readLine(out, 10); - assertEquals("line5 length, bufsz: "+bufsz, 4, out.getLength()); + assertEquals(4, out.getLength(), "line5 length, bufsz: "+bufsz); c += in.readLine(out, 8); - assertEquals("line5 length, bufsz: "+bufsz, 5, out.getLength()); - assertEquals("end of file, bufsz: " +bufsz, 0, in.readLine(out)); - assertEquals("total bytes, bufsz: "+bufsz, c, STRLENBYTES); + assertEquals(5, out.getLength(), "line5 length, bufsz: "+bufsz); + assertEquals(0, in.readLine(out), "end of file, bufsz: " +bufsz); + assertEquals(c, STRLENBYTES, "total bytes, bufsz: "+bufsz); } } - @Test (timeout=5000) + @Test + @Timeout(value = 5) public void testMRMaxLine() throws Exception { final int MAXPOS = 1024 * 1024; final int MAXLINE = 10 * 1024; @@ -436,7 +446,7 @@ public int read() { } @Override public int read(byte[] b) { - assertTrue("Read too many bytes from the stream", position < MAXPOSBUF); + assertTrue(position < MAXPOSBUF, "Read too many bytes from the stream"); Arrays.fill(b, (byte) 0); position += b.length; return b.length; @@ -454,10 +464,10 @@ public void reset() { conf.setInt("io.file.buffer.size", BUF); // used by LRR // test another constructor LineRecordReader lrr = new LineRecordReader(infNull, 0, MAXPOS, conf); - assertFalse("Read a line from null", lrr.next(key, val)); + assertFalse(lrr.next(key, val), "Read a line from null"); infNull.reset(); lrr = new LineRecordReader(infNull, 0L, MAXLINE, MAXPOS); - assertFalse("Read a line from null", lrr.next(key, val)); + assertFalse(lrr.next(key, val), "Read a line from null"); } @@ -496,7 +506,8 @@ private static List readSplit(TextInputFormat format, /** * Test using the gzip codec for reading */ - @Test (timeout=5000) + @Test + @Timeout(value = 5) public void testGzip() throws IOException { JobConf job = new JobConf(defaultConf); CompressionCodec gzip = new GzipCodec(); @@ -510,27 +521,27 @@ public void testGzip() throws IOException { TextInputFormat format = new TextInputFormat(); format.configure(job); InputSplit[] splits = format.getSplits(job, 100); - assertEquals("compressed splits == 2", 2, splits.length); + assertEquals(2, splits.length, "compressed splits == 2"); FileSplit tmp = (FileSplit) splits[0]; if (tmp.getPath().getName().equals("part2.txt.gz")) { splits[0] = splits[1]; splits[1] = tmp; } List results = readSplit(format, splits[0], job); - assertEquals("splits[0] length", 6, results.size()); - assertEquals("splits[0][5]", " dog", results.get(5).toString()); + assertEquals(6, results.size(), "splits[0] length"); + assertEquals(" dog", results.get(5).toString(), "splits[0][5]"); results = readSplit(format, splits[1], job); - assertEquals("splits[1] length", 2, results.size()); - assertEquals("splits[1][0]", "this is a test", - results.get(0).toString()); - assertEquals("splits[1][1]", "of gzip", - results.get(1).toString()); + assertEquals(2, results.size(), "splits[1] length"); + assertEquals("this is a test", results.get(0).toString(), "splits[1][0]"); + assertEquals("of gzip", + results.get(1).toString(), "splits[1][1]"); } /** * Test using the gzip codec and an empty input file */ - @Test (timeout=5000) + @Test + @Timeout(value = 5) public void testGzipEmpty() throws IOException { JobConf job = new JobConf(defaultConf); CompressionCodec gzip = new GzipCodec(); @@ -541,10 +552,10 @@ public void testGzipEmpty() throws IOException { TextInputFormat format = new TextInputFormat(); format.configure(job); InputSplit[] splits = format.getSplits(job, 100); - assertEquals("Compressed files of length 0 are not returned from FileInputFormat.getSplits().", - 1, splits.length); + assertEquals(1, splits.length, + "Compressed files of length 0 are not returned from FileInputFormat.getSplits()."); List results = readSplit(format, splits[0], job); - assertEquals("Compressed empty file length == 0", 0, results.size()); + assertEquals(0, results.size(), "Compressed empty file length == 0"); } private static String unquote(String in) { @@ -576,7 +587,7 @@ private static String unquote(String in) { * @param args * @throws Exception */ - public static void main(String[] args) throws Exception { + /*public static void main(String[] args) throws Exception { for(String arg: args) { System.out.println("Working on " + arg); LineReader reader = makeStream(unquote(arg)); @@ -588,5 +599,5 @@ public static void main(String[] args) throws Exception { } reader.close(); } - } + }*/ } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestTextOutputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestTextOutputFormat.java index 1a090386bbd31..694aceebb59de 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestTextOutputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestTextOutputFormat.java @@ -22,10 +22,10 @@ import java.io.FileInputStream; import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestUserDefinedCounters.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestUserDefinedCounters.java index 2d67edc581aaa..60b7799f666b6 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestUserDefinedCounters.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestUserDefinedCounters.java @@ -24,7 +24,7 @@ import org.apache.hadoop.io.Text; import org.apache.hadoop.mapred.lib.IdentityMapper; import org.apache.hadoop.mapred.lib.IdentityReducer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.BufferedReader; import java.io.File; @@ -35,8 +35,8 @@ import java.io.OutputStreamWriter; import java.io.Writer; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestUserDefinedCounters { private static String TEST_ROOT_DIR = diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestUtils.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestUtils.java index 0c4370487ad55..caba53a14a8e0 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestUtils.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestUtils.java @@ -20,8 +20,9 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.PathFilter; -import org.junit.Test; -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestUtils { private static final Path[] LOG_PATHS = new Path[] { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestWritableJobConf.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestWritableJobConf.java index 82c68db30c551..e90fcc287dd0a 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestWritableJobConf.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestWritableJobConf.java @@ -25,13 +25,13 @@ import org.apache.hadoop.io.serializer.SerializationFactory; import org.apache.hadoop.io.serializer.Serializer; import org.apache.hadoop.util.GenericsUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestWritableJobConf { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestYARNRunner.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestYARNRunner.java index 0bdc72121799b..6e81b11c94a78 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestYARNRunner.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestYARNRunner.java @@ -20,11 +20,11 @@ import static org.apache.hadoop.test.PlatformAssumptions.assumeNotWindows; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; @@ -117,11 +117,11 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.WriterAppender; import org.apache.log4j.spi.LoggingEvent; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.slf4j.Logger; @@ -179,12 +179,12 @@ private List getLogEvents() { private ClientServiceDelegate clientDelegate; private static final String failString = "Rejected job"; - @BeforeClass + @BeforeAll public static void setupBeforeClass() { ResourceUtils.resetResourceTypes(new Configuration()); } - @Before + @BeforeEach public void setUp() throws Exception { resourceMgrDelegate = mock(ResourceMgrDelegate.class); conf = new YarnConfiguration(); @@ -213,13 +213,14 @@ public ApplicationSubmissionContext answer(InvocationOnMock invocation) testWorkDir.mkdirs(); } - @After + @AfterEach public void cleanup() { FileUtil.fullyDelete(testWorkDir); ResourceUtils.resetResourceTypes(new Configuration()); } - @Test(timeout=20000) + @Test + @Timeout(value = 20) public void testJobKill() throws Exception { clientDelegate = mock(ClientServiceDelegate.class); when(clientDelegate.getJobStatus(any(JobID.class))).thenReturn(new @@ -255,7 +256,8 @@ public ClientServiceDelegate answer(InvocationOnMock invocation) verify(clientDelegate).killJob(jobId); } - @Test(timeout=60000) + @Test + @Timeout(value = 60) public void testJobKillTimeout() throws Exception { long timeToWaitBeforeHardKill = 10000 + MRJobConfig.DEFAULT_MR_AM_HARD_KILL_TIMEOUT_MS; @@ -276,12 +278,14 @@ public ClientServiceDelegate answer(InvocationOnMock invocation) State.RUNNING, JobPriority.HIGH, "tmp", "tmp", "tmp", "tmp")); long startTimeMillis = System.currentTimeMillis(); yarnRunner.killJob(jobId); - assertTrue("killJob should have waited at least " + timeToWaitBeforeHardKill - + " ms.", System.currentTimeMillis() - startTimeMillis - >= timeToWaitBeforeHardKill); + assertTrue(System.currentTimeMillis() - startTimeMillis + >= timeToWaitBeforeHardKill, + "killJob should have waited at least " + timeToWaitBeforeHardKill + + " ms."); } - @Test(timeout=20000) + @Test + @Timeout(value = 20) public void testJobSubmissionFailure() throws Exception { when(resourceMgrDelegate.submitApplication(any(ApplicationSubmissionContext.class))). thenReturn(appId); @@ -303,7 +307,8 @@ public void testJobSubmissionFailure() throws Exception { } } - @Test(timeout=20000) + @Test + @Timeout(value = 20) public void testResourceMgrDelegate() throws Exception { /* we not want a mock of resource mgr delegate */ final ApplicationClientProtocol clientRMProtocol = mock(ApplicationClientProtocol.class); @@ -371,7 +376,8 @@ protected void serviceStart() throws Exception { verify(clientRMProtocol).getQueueUserAcls(any(GetQueueUserAclsInfoRequest.class)); } - @Test(timeout=20000) + @Test + @Timeout(value = 20) public void testGetHSDelegationToken() throws Exception { try { Configuration conf = new Configuration(); @@ -452,7 +458,8 @@ public void testGetHSDelegationToken() throws Exception { } } - @Test(timeout=20000) + @Test + @Timeout(value = 20) public void testHistoryServerToken() throws Exception { //Set the master principal in the config conf.set(YarnConfiguration.RM_PRINCIPAL,"foo@LOCAL"); @@ -495,7 +502,8 @@ public Void run() throws Exception { }); } - @Test(timeout=20000) + @Test + @Timeout(value = 20) public void testAMAdminCommandOpts() throws Exception { JobConf jobConf = new JobConf(); @@ -519,8 +527,8 @@ public void testAMAdminCommandOpts() throws Exception { for(String command : commands) { if(command != null) { - assertFalse("Profiler should be disabled by default", - command.contains(PROFILE_PARAMS)); + assertFalse(command.contains(PROFILE_PARAMS), + "Profiler should be disabled by default"); adminPos = command.indexOf("-Djava.net.preferIPv4Stack=true"); if(adminPos >= 0) adminIndex = index; @@ -536,20 +544,21 @@ public void testAMAdminCommandOpts() throws Exception { } // Check java.io.tmpdir opts are set in the commands - assertTrue("java.io.tmpdir is not set for AM", tmpDirPos > 0); + assertTrue(tmpDirPos > 0, "java.io.tmpdir is not set for AM"); // Check both admin java opts and user java opts are in the commands - assertTrue("AM admin command opts not in the commands.", adminPos > 0); - assertTrue("AM user command opts not in the commands.", userPos > 0); + assertTrue(adminPos > 0, "AM admin command opts not in the commands."); + assertTrue(userPos > 0, "AM user command opts not in the commands."); // Check the admin java opts is before user java opts in the commands if(adminIndex == userIndex) { - assertTrue("AM admin command opts is after user command opts.", adminPos < userPos); + assertTrue(adminPos < userPos, "AM admin command opts is after user command opts."); } else { - assertTrue("AM admin command opts is after user command opts.", adminIndex < userIndex); + assertTrue(adminIndex < userIndex, "AM admin command opts is after user command opts."); } } - @Test(timeout=20000) + @Test + @Timeout(value = 20) public void testWarnCommandOpts() throws Exception { org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(YARNRunner.class); @@ -583,7 +592,8 @@ public void testWarnCommandOpts() throws Exception { "using yarn.app.mapreduce.am.env config settings.")); } - @Test(timeout=20000) + @Test + @Timeout(value = 20) public void testAMProfiler() throws Exception { JobConf jobConf = new JobConf(); @@ -837,7 +847,7 @@ private void testAMStandardEnv(boolean customLibPath, ContainerLaunchContext clc = appSubCtx.getAMContainerSpec(); Map env = clc.getEnvironment(); String libPath = env.get(pathKey); - assertNotNull(pathKey + " not set", libPath); + assertNotNull(libPath, pathKey + " not set"); String cps = jobConf.getBoolean( MRConfig.MAPREDUCE_APP_SUBMISSION_CROSS_PLATFORM, MRConfig.DEFAULT_MAPREDUCE_APP_SUBMISSION_CROSS_PLATFORM) @@ -852,12 +862,12 @@ private void testAMStandardEnv(boolean customLibPath, MRJobConfig.DEFAULT_MR_AM_ADMIN_USER_ENV.substring( pathKey.length() + 1); } - assertEquals("Bad AM " + pathKey + " setting", expectedLibPath, libPath); + assertEquals(expectedLibPath, libPath, "Bad AM " + pathKey + " setting"); // make sure SHELL is set String shell = env.get(Environment.SHELL.name()); - assertNotNull("SHELL not set", shell); - assertEquals("Bad SHELL setting", USER_SHELL, shell); + assertNotNull(shell, "SHELL not set"); + assertEquals(USER_SHELL, shell, "Bad SHELL setting"); } @Test @@ -929,13 +939,13 @@ public void testSendJobConf() throws IOException { Configuration confSent = BuilderUtils.parseTokensConf(submissionContext); // configs that match regex should be included - Assert.assertEquals("123.0.0.1", + assertEquals("123.0.0.1", confSent.get("dfs.namenode.rpc-address.mycluster2.nn1")); - Assert.assertEquals("123.0.0.2", + assertEquals("123.0.0.2", confSent.get("dfs.namenode.rpc-address.mycluster2.nn2")); // configs that aren't matching regex should not be included - Assert.assertTrue(confSent.get("hadoop.tmp.dir") == null || !confSent + assertTrue(confSent.get("hadoop.tmp.dir") == null || !confSent .get("hadoop.tmp.dir").equals("testconfdir")); UserGroupInformation.reset(); } @@ -957,15 +967,15 @@ public void testCustomAMRMResourceType() throws Exception { List resourceRequests = submissionContext.getAMContainerResourceRequests(); - Assert.assertEquals(1, resourceRequests.size()); + assertEquals(1, resourceRequests.size()); ResourceRequest resourceRequest = resourceRequests.get(0); ResourceInformation resourceInformation = resourceRequest.getCapability() .getResourceInformation(CUSTOM_RESOURCE_NAME); - Assert.assertEquals("Expecting the default unit (G)", - "G", resourceInformation.getUnits()); - Assert.assertEquals(5L, resourceInformation.getValue()); - Assert.assertEquals(3, resourceRequest.getCapability().getVirtualCores()); + assertEquals("G", resourceInformation.getUnits(), + "Expecting the default unit (G)"); + assertEquals(5L, resourceInformation.getValue()); + assertEquals(3, resourceRequest.getCapability().getVirtualCores()); } @Test @@ -983,11 +993,11 @@ public void testAMRMemoryRequest() throws Exception { List resourceRequests = submissionContext.getAMContainerResourceRequests(); - Assert.assertEquals(1, resourceRequests.size()); + assertEquals(1, resourceRequests.size()); ResourceRequest resourceRequest = resourceRequests.get(0); long memorySize = resourceRequest.getCapability().getMemorySize(); - Assert.assertEquals(3072, memorySize); + assertEquals(3072, memorySize); } } @@ -1012,11 +1022,11 @@ public void testAMRMemoryRequestOverriding() throws Exception { List resourceRequests = submissionContext.getAMContainerResourceRequests(); - Assert.assertEquals(1, resourceRequests.size()); + assertEquals(1, resourceRequests.size()); ResourceRequest resourceRequest = resourceRequests.get(0); long memorySize = resourceRequest.getCapability().getMemorySize(); - Assert.assertEquals(3072, memorySize); + assertEquals(3072, memorySize); assertTrue(testAppender.getLogEvents().stream().anyMatch( e -> e.getLevel() == Level.WARN && ("Configuration " + "yarn.app.mapreduce.am.resource." + memoryName + "=3Gi is " + diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/jobcontrol/TestJobControl.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/jobcontrol/TestJobControl.java index 96954d5dcc0c9..7f26bb33e8179 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/jobcontrol/TestJobControl.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/jobcontrol/TestJobControl.java @@ -24,15 +24,18 @@ import java.util.ArrayList; -import org.junit.Assert; - import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.mapred.JobConf; import org.apache.hadoop.mapred.JobID; import org.apache.hadoop.mapreduce.lib.jobcontrol.ControlledJob; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * This class performs unit test for Job/JobControl classes. @@ -198,14 +201,15 @@ public static void doJobControlTest() throws Exception { } @SuppressWarnings("deprecation") - @Test(timeout = 30000) + @Test + @Timeout(value = 30) public void testJobState() throws Exception { Job job_1 = getCopyJob(); JobControl jc = new JobControl("Test"); jc.addJob(job_1); - Assert.assertEquals(Job.WAITING, job_1.getState()); + assertEquals(Job.WAITING, job_1.getState()); job_1.setState(Job.SUCCESS); - Assert.assertEquals(Job.WAITING, job_1.getState()); + assertEquals(Job.WAITING, job_1.getState()); org.apache.hadoop.mapreduce.Job mockjob = mock(org.apache.hadoop.mapreduce.Job.class); @@ -213,20 +217,21 @@ public void testJobState() throws Exception { new org.apache.hadoop.mapreduce.JobID("test", 0); when(mockjob.getJobID()).thenReturn(jid); job_1.setJob(mockjob); - Assert.assertEquals("job_test_0000", job_1.getMapredJobID()); + assertEquals("job_test_0000", job_1.getMapredJobID()); job_1.setMapredJobID("job_test_0001"); - Assert.assertEquals("job_test_0000", job_1.getMapredJobID()); + assertEquals("job_test_0000", job_1.getMapredJobID()); jc.stop(); } - @Test(timeout = 30000) + @Test + @Timeout(value = 30) public void testAddingDependingJob() throws Exception { Job job_1 = getCopyJob(); ArrayList dependingJobs = new ArrayList(); JobControl jc = new JobControl("Test"); jc.addJob(job_1); - Assert.assertEquals(Job.WAITING, job_1.getState()); - Assert.assertTrue(job_1.addDependingJob(new Job(job_1.getJobConf(), + assertEquals(Job.WAITING, job_1.getState()); + assertTrue(job_1.addDependingJob(new Job(job_1.getJobConf(), dependingJobs))); } @@ -253,23 +258,25 @@ public Job getCopyJob() throws Exception { return job_1; } - @Test (timeout = 30000) + @Test + @Timeout(value = 30) public void testJobControl() throws Exception { doJobControlTest(); } - @Test (timeout = 30000) + @Test + @Timeout(value = 30) public void testGetAssignedJobId() throws Exception { JobConf jc = new JobConf(); Job j = new Job(jc); //Just make sure no exception is thrown - Assert.assertNull(j.getAssignedJobID()); + assertNull(j.getAssignedJobID()); org.apache.hadoop.mapreduce.Job mockjob = mock(org.apache.hadoop.mapreduce.Job.class); org.apache.hadoop.mapreduce.JobID jid = new org.apache.hadoop.mapreduce.JobID("test",0); when(mockjob.getJobID()).thenReturn(jid); j.setJob(mockjob); JobID expected = new JobID("test",0); - Assert.assertEquals(expected, j.getAssignedJobID()); + assertEquals(expected, j.getAssignedJobID()); verify(mockjob).getJobID(); } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/jobcontrol/TestLocalJobControl.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/jobcontrol/TestLocalJobControl.java index 3cd9c24db2dcd..92a5868a56b9a 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/jobcontrol/TestLocalJobControl.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/jobcontrol/TestLocalJobControl.java @@ -25,11 +25,11 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.mapred.HadoopTestCase; import org.apache.hadoop.mapred.JobConf; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * HadoopTestCase that tests the local job runner. @@ -132,7 +132,7 @@ public void testLocalJobControlDataCopy() throws Exception { } } - assertEquals("Some jobs failed", 0, theControl.getFailedJobs().size()); + assertEquals(0, theControl.getFailedJobs().size(), "Some jobs failed"); theControl.stop(); } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/join/TestDatamerge.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/join/TestDatamerge.java index a3066765ec008..3d11d823f627d 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/join/TestDatamerge.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/join/TestDatamerge.java @@ -49,23 +49,24 @@ import org.apache.hadoop.mapred.lib.IdentityMapper; import org.apache.hadoop.mapred.lib.IdentityReducer; import org.apache.hadoop.util.ReflectionUtils; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertFalse; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestDatamerge { private static MiniDFSCluster cluster = null; - @Before + @BeforeEach public void setUp() throws Exception { Configuration conf = new Configuration(); cluster = new MiniDFSCluster.Builder(conf).numDataNodes(2).build(); } - @After + @AfterEach public void tearDown() throws Exception { if (cluster != null) { cluster.shutdown(); @@ -131,7 +132,7 @@ private static abstract class SimpleCheckerBase public void close() { } public void configure(JobConf job) { srcs = job.getInt("testdatamerge.sources", 0); - assertTrue("Invalid src count: " + srcs, srcs > 0); + assertTrue(srcs > 0, "Invalid src count: " + srcs); } public abstract void map(IntWritable key, V val, OutputCollector out, Reporter reporter) @@ -143,7 +144,7 @@ public void reduce(IntWritable key, Iterator values, while (values.hasNext()) { seen += values.next().get(); } - assertTrue("Bad count for " + key.get(), verify(key.get(), seen)); + assertTrue(verify(key.get(), seen), "Bad count for " + key.get()); } public abstract boolean verify(int key, int occ); } @@ -155,10 +156,10 @@ public void map(IntWritable key, TupleWritable val, throws IOException { int k = key.get(); final String kvstr = "Unexpected tuple: " + stringify(key, val); - assertTrue(kvstr, 0 == k % (srcs * srcs)); + assertEquals(0, k % (srcs * srcs), kvstr); for (int i = 0; i < val.size(); ++i) { final int vali = ((IntWritable)val.get(i)).get(); - assertTrue(kvstr, (vali - i) * srcs == 10 * k); + assertEquals((vali - i) * srcs, 10 * k, kvstr); } out.collect(key, one); } @@ -177,18 +178,18 @@ public void map(IntWritable key, TupleWritable val, final String kvstr = "Unexpected tuple: " + stringify(key, val); if (0 == k % (srcs * srcs)) { for (int i = 0; i < val.size(); ++i) { - assertTrue(kvstr, val.get(i) instanceof IntWritable); + assertTrue(val.get(i) instanceof IntWritable, kvstr); final int vali = ((IntWritable)val.get(i)).get(); - assertTrue(kvstr, (vali - i) * srcs == 10 * k); + assertEquals((vali - i) * srcs, 10 * k, kvstr); } } else { for (int i = 0; i < val.size(); ++i) { if (i == k % srcs) { - assertTrue(kvstr, val.get(i) instanceof IntWritable); + assertTrue(val.get(i) instanceof IntWritable, kvstr); final int vali = ((IntWritable)val.get(i)).get(); - assertTrue(kvstr, srcs * (vali - i) == 10 * (k - i)); + assertEquals(srcs * (vali - i), 10 * (k - i), kvstr); } else { - assertTrue(kvstr, !val.has(i)); + assertFalse(val.has(i), kvstr); } } } @@ -210,10 +211,10 @@ public void map(IntWritable key, IntWritable val, final int vali = val.get(); final String kvstr = "Unexpected tuple: " + stringify(key, val); if (0 == k % (srcs * srcs)) { - assertTrue(kvstr, vali == k * 10 / srcs + srcs - 1); + assertEquals(vali, k * 10 / srcs + srcs - 1, kvstr); } else { final int i = k % srcs; - assertTrue(kvstr, srcs * (vali - i) == 10 * (k - i)); + assertEquals(srcs * (vali - i), 10 * (k - i), kvstr); } out.collect(key, one); } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/join/TestTupleWritable.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/join/TestTupleWritable.java index 56871550dc9ae..c54fb306ff45e 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/join/TestTupleWritable.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/join/TestTupleWritable.java @@ -34,10 +34,10 @@ import org.apache.hadoop.io.Text; import org.apache.hadoop.io.Writable; import org.apache.hadoop.io.WritableUtils; -import org.junit.Test; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; public class TestTupleWritable { @@ -97,7 +97,7 @@ private int verifIter(Writable[] writs, TupleWritable t, int i) { i = verifIter(writs, ((TupleWritable)w), i); continue; } - assertTrue("Bad value", w.equals(writs[i++])); + assertEquals(w, writs[i++], "Bad value"); } return i; } @@ -140,7 +140,7 @@ public void testNestedIterable() throws Exception { new IntWritable(r.nextInt()) }; TupleWritable sTuple = makeTuple(writs); - assertTrue("Bad count", writs.length == verifIter(writs, sTuple, 0)); + assertEquals(writs.length, verifIter(writs, sTuple, 0), "Bad count"); } @Test @@ -164,7 +164,7 @@ public void testWritable() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); TupleWritable dTuple = new TupleWritable(); dTuple.readFields(new DataInputStream(in)); - assertTrue("Failed to write/read tuple", sTuple.equals(dTuple)); + assertEquals(sTuple, dTuple, "Failed to write/read tuple"); } @Test @@ -183,8 +183,8 @@ public void testWideWritable() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); TupleWritable dTuple = new TupleWritable(); dTuple.readFields(new DataInputStream(in)); - assertTrue("Failed to write/read tuple", sTuple.equals(dTuple)); - assertEquals("All tuple data has not been read from the stream",-1,in.read()); + assertEquals(sTuple, dTuple, "Failed to write/read tuple"); + assertEquals(-1, in.read(), "All tuple data has not been read from the stream"); } @Test @@ -201,8 +201,8 @@ public void testWideWritable2() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); TupleWritable dTuple = new TupleWritable(); dTuple.readFields(new DataInputStream(in)); - assertTrue("Failed to write/read tuple", sTuple.equals(dTuple)); - assertEquals("All tuple data has not been read from the stream",-1,in.read()); + assertEquals(sTuple, dTuple, "Failed to write/read tuple"); + assertEquals(-1, in.read(), "All tuple data has not been read from the stream"); } /** @@ -225,8 +225,8 @@ public void testSparseWideWritable() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); TupleWritable dTuple = new TupleWritable(); dTuple.readFields(new DataInputStream(in)); - assertTrue("Failed to write/read tuple", sTuple.equals(dTuple)); - assertEquals("All tuple data has not been read from the stream",-1,in.read()); + assertEquals(sTuple, dTuple, "Failed to write/read tuple"); + assertEquals(-1, in.read(), "All tuple data has not been read from the stream"); } @Test public void testWideTuple() throws Exception { @@ -244,7 +244,7 @@ public void testWideTuple() throws Exception { assertTrue(has); } else { - assertFalse("Tuple position is incorrectly labelled as set: " + pos, has); + assertFalse(has, "Tuple position is incorrectly labelled as set: " + pos); } } } @@ -264,7 +264,7 @@ public void testWideTuple2() throws Exception { assertTrue(has); } else { - assertFalse("Tuple position is incorrectly labelled as set: " + pos, has); + assertFalse(has, "Tuple position is incorrectly labelled as set: " + pos); } } } @@ -288,7 +288,7 @@ public void testWideTupleBoundary() throws Exception { assertTrue(has); } else { - assertFalse("Tuple position is incorrectly labelled as set: " + pos, has); + assertFalse(has, "Tuple position is incorrectly labelled as set: " + pos); } } } @@ -311,8 +311,10 @@ public void testPreVersion21Compatibility() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); TupleWritable dTuple = new TupleWritable(); dTuple.readFields(new DataInputStream(in)); - assertTrue("Tuple writable is unable to read pre-0.21 versions of TupleWritable", oldTuple.isCompatible(dTuple)); - assertEquals("All tuple data has not been read from the stream",-1,in.read()); + assertTrue(oldTuple.isCompatible(dTuple), + "Tuple writable is unable to read pre-0.21 versions of TupleWritable"); + assertEquals(-1, in.read(), + "All tuple data has not been read from the stream"); } @Test public void testPreVersion21CompatibilityEmptyTuple() throws Exception { @@ -324,8 +326,10 @@ public void testPreVersion21CompatibilityEmptyTuple() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); TupleWritable dTuple = new TupleWritable(); dTuple.readFields(new DataInputStream(in)); - assertTrue("Tuple writable is unable to read pre-0.21 versions of TupleWritable", oldTuple.isCompatible(dTuple)); - assertEquals("All tuple data has not been read from the stream",-1,in.read()); + assertTrue(oldTuple.isCompatible(dTuple), + "Tuple writable is unable to read pre-0.21 versions of TupleWritable"); + assertEquals(-1, in.read(), + "All tuple data has not been read from the stream"); } /** @@ -335,7 +339,7 @@ public void testPreVersion21CompatibilityEmptyTuple() throws Exception { private static class PreVersion21TupleWritable { private Writable[] values; - private long written = 0L; + private long written; private PreVersion21TupleWritable(Writable[] vals) { written = 0L; diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/join/TestWrappedRecordReaderClassloader.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/join/TestWrappedRecordReaderClassloader.java index 785898d33ede0..4d64ceeec7fb6 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/join/TestWrappedRecordReaderClassloader.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/join/TestWrappedRecordReaderClassloader.java @@ -33,8 +33,8 @@ import org.apache.hadoop.mapred.RecordReader; import org.apache.hadoop.mapred.Reporter; import org.apache.hadoop.util.ReflectionUtils; -import org.junit.Test; -import static org.junit.Assert.assertTrue; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestWrappedRecordReaderClassloader { /** @@ -123,9 +123,9 @@ public static class RR_ClassLoaderChecker implements RecordReader { @SuppressWarnings("unchecked") public RR_ClassLoaderChecker(JobConf job) { - assertTrue("The class loader has not been inherited from " - + CompositeRecordReader.class.getSimpleName(), - job.getClassLoader() instanceof Fake_ClassLoader); + assertTrue(job.getClassLoader() instanceof Fake_ClassLoader, + "The class loader has not been inherited from " + + CompositeRecordReader.class.getSimpleName()); keyclass = (Class) job.getClass("test.fakeif.keyclass", NullWritable.class, WritableComparable.class); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestChain.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestChain.java index ddefcd09d8080..8fe481b0427e1 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestChain.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestChain.java @@ -19,7 +19,7 @@ import org.apache.hadoop.mapred.JobConf; import org.apache.hadoop.mapred.Reducer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestChainMapReduce.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestChainMapReduce.java index 0933ecef941fe..a5f34ed517445 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestChainMapReduce.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestChainMapReduce.java @@ -33,16 +33,16 @@ import org.apache.hadoop.mapred.RunningJob; import org.apache.hadoop.mapred.TextInputFormat; import org.apache.hadoop.mapred.TextOutputFormat; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.DataOutputStream; import java.io.IOException; import java.util.Iterator; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class TestChainMapReduce extends HadoopTestCase { @@ -108,7 +108,7 @@ public void testChain() throws Exception { fs.delete(outDir, true); if (!fs.mkdirs(inDir)) { - throw new IOException("Mkdirs failed to create " + inDir.toString()); + throw new IOException("Mkdirs failed to create " + inDir); } DataOutputStream file = fs.create(new Path(inDir, "part-0")); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestDelegatingInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestDelegatingInputFormat.java index b916026272e3f..5a6641fed5088 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestDelegatingInputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestDelegatingInputFormat.java @@ -30,9 +30,10 @@ import org.apache.hadoop.mapred.OutputCollector; import org.apache.hadoop.mapred.Reporter; import org.apache.hadoop.mapred.TextInputFormat; -import org.junit.Test; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertEquals; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestDelegatingInputFormat { @Test diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestKeyFieldBasedComparator.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestKeyFieldBasedComparator.java index 3f31546c789d5..695b9397f4ae4 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestKeyFieldBasedComparator.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestKeyFieldBasedComparator.java @@ -34,10 +34,10 @@ import org.apache.hadoop.mapred.TextInputFormat; import org.apache.hadoop.mapred.TextOutputFormat; import org.apache.hadoop.mapred.Utils; -import org.junit.After; -import org.junit.Test; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.io.BufferedReader; import java.io.File; @@ -133,7 +133,7 @@ public void configure(String keySpec, int expect) throws Exception { } } - @After + @AfterEach public void cleanup() { FileUtil.fullyDelete(TEST_DIR); } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestKeyFieldBasedPartitioner.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestKeyFieldBasedPartitioner.java index 02b0507742a71..c13631840589d 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestKeyFieldBasedPartitioner.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestKeyFieldBasedPartitioner.java @@ -17,11 +17,11 @@ */ package org.apache.hadoop.mapred.lib; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapred.JobConf; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestKeyFieldBasedPartitioner { @@ -35,8 +35,8 @@ public void testEmptyKey() throws Exception { JobConf conf = new JobConf(); conf.setInt("num.key.fields.for.partition", 10); kfbp.configure(conf); - assertEquals("Empty key should map to 0th partition", - 0, kfbp.getPartition(new Text(), new Text(), 10)); + assertEquals(0, kfbp.getPartition(new Text(), new Text(), 10), + "Empty key should map to 0th partition"); } @Test diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestLineInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestLineInputFormat.java index 388de0fb88d14..c5f73586c56d1 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestLineInputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestLineInputFormat.java @@ -24,8 +24,8 @@ import org.apache.hadoop.fs.*; import org.apache.hadoop.io.*; import org.apache.hadoop.mapred.*; -import org.junit.Test; -import static org.junit.Assert.assertEquals; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestLineInputFormat { private static int MAX_LENGTH = 200; @@ -84,21 +84,21 @@ void checkFormat(JobConf job, int expectedN) throws IOException{ InputSplit[] splits = format.getSplits(job, ignoredNumSplits); // check all splits except last one - int count = 0; + int count; for (int j = 0; j < splits.length -1; j++) { - assertEquals("There are no split locations", 0, - splits[j].getLocations().length); + assertEquals(0, splits[j].getLocations().length, + "There are no split locations"); RecordReader reader = format.getRecordReader(splits[j], job, voidReporter); Class readerClass = reader.getClass(); - assertEquals("reader class is LineRecordReader.", - LineRecordReader.class, readerClass); + assertEquals(LineRecordReader.class, readerClass, + "reader class is LineRecordReader."); LongWritable key = reader.createKey(); Class keyClass = key.getClass(); - assertEquals("Key class is LongWritable.", LongWritable.class, keyClass); + assertEquals(LongWritable.class, keyClass, "Key class is LongWritable."); Text value = reader.createValue(); Class valueClass = value.getClass(); - assertEquals("Value class is Text.", Text.class, valueClass); + assertEquals(Text.class, valueClass, "Value class is Text."); try { count = 0; @@ -108,8 +108,8 @@ void checkFormat(JobConf job, int expectedN) throws IOException{ } finally { reader.close(); } - assertEquals("number of lines in split is " + expectedN , - expectedN, count); + assertEquals(expectedN, count, + "number of lines in split is " + expectedN); } } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestMultipleInputs.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestMultipleInputs.java index 115a6f70d0820..e388b0c6c84b0 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestMultipleInputs.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestMultipleInputs.java @@ -25,12 +25,12 @@ import org.apache.hadoop.mapred.OutputCollector; import org.apache.hadoop.mapred.Reporter; import org.apache.hadoop.mapred.TextInputFormat; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @see TestDelegatingInputFormat diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestMultipleOutputs.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestMultipleOutputs.java index 8829a093b13bd..41cd160025428 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestMultipleOutputs.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestMultipleOutputs.java @@ -39,9 +39,9 @@ import org.apache.hadoop.mapred.SequenceFileOutputFormat; import org.apache.hadoop.mapred.TextInputFormat; import org.apache.hadoop.mapred.TextOutputFormat; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.BufferedReader; import java.io.DataOutputStream; @@ -51,9 +51,10 @@ import java.util.Iterator; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -77,16 +78,18 @@ public void testWithCounters() throws Exception { } @SuppressWarnings("unchecked") - @Test(expected = IOException.class) + @Test public void testParallelCloseIOException() throws IOException { - RecordWriter writer = mock(RecordWriter.class); - Map recordWriters = mock(Map.class); - when(recordWriters.values()).thenReturn(Arrays.asList(writer, writer)); - doThrow(new IOException("test IO exception")).when(writer).close(null); - JobConf conf = createJobConf(); - MultipleOutputs mos = new MultipleOutputs(conf); - mos.setRecordWriters(recordWriters); - mos.close(); + assertThrows(IOException.class, () -> { + RecordWriter writer = mock(RecordWriter.class); + Map recordWriters = mock(Map.class); + when(recordWriters.values()).thenReturn(Arrays.asList(writer, writer)); + doThrow(new IOException("test IO exception")).when(writer).close(null); + JobConf conf = createJobConf(); + MultipleOutputs mos = new MultipleOutputs(conf); + mos.setRecordWriters(recordWriters); + mos.close(); + }); } private static final Path ROOT_DIR = new Path("testing/mo"); @@ -103,7 +106,7 @@ private Path getDir(Path dir) { return dir; } - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); Path rootDir = getDir(ROOT_DIR); @@ -117,7 +120,7 @@ public void setUp() throws Exception { } } - @After + @AfterEach public void tearDown() throws Exception { Path rootDir = getDir(ROOT_DIR); @@ -202,7 +205,7 @@ protected void _testMOWithJavaSerialization(boolean withCounters) throws Excepti count++; } reader.close(); - assertFalse(count == 0); + assertNotEquals(0, count); Counters.Group counters = job.getCounters().getGroup(MultipleOutputs.class.getName()); @@ -290,7 +293,7 @@ protected void _testMultipleOutputs(boolean withCounters) throws Exception { count++; } reader.close(); - assertFalse(count == 0); + assertNotEquals(0, count); // assert SequenceOutputFormat files correctness SequenceFile.Reader seqReader = @@ -308,7 +311,7 @@ protected void _testMultipleOutputs(boolean withCounters) throws Exception { count++; } seqReader.close(); - assertFalse(count == 0); + assertNotEquals(0, count); Counters.Group counters = job.getCounters().getGroup(MultipleOutputs.class.getName()); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestMultithreadedMapRunner.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestMultithreadedMapRunner.java index 1059d29ee911d..7406a34a9b91a 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestMultithreadedMapRunner.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestMultithreadedMapRunner.java @@ -35,14 +35,14 @@ import org.apache.hadoop.mapred.TextInputFormat; import org.apache.hadoop.mapred.TextOutputFormat; import org.apache.hadoop.mapreduce.lib.map.MultithreadedMapper; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.DataOutputStream; import java.io.IOException; import java.util.Iterator; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestMultithreadedMapRunner extends HadoopTestCase { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/aggregate/TestAggregates.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/aggregate/TestAggregates.java index 845139bf35b7a..aa50755be52f0 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/aggregate/TestAggregates.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/aggregate/TestAggregates.java @@ -22,8 +22,8 @@ import org.apache.hadoop.mapred.*; import org.apache.hadoop.mapred.lib.*; import org.apache.hadoop.mapreduce.MapReduceTestUtil; -import org.junit.Test; -import static org.junit.Assert.assertEquals; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.*; import java.nio.charset.StandardCharsets; diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/db/TestConstructQuery.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/db/TestConstructQuery.java index 203da4e0b7c6a..3a3b13d586abe 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/db/TestConstructQuery.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/db/TestConstructQuery.java @@ -21,9 +21,9 @@ import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.mapred.JobConf; -import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class TestConstructQuery { private String[] fieldNames = new String[] { "id", "name", "value" }; @@ -31,7 +31,7 @@ public class TestConstructQuery { private String expected = "INSERT INTO hadoop_output (id,name,value) VALUES (?,?,?);"; private String nullExpected = "INSERT INTO hadoop_output VALUES (?,?,?);"; - private DBOutputFormat format + private DBOutputFormat format = new DBOutputFormat(); @Test public void testConstructQuery() { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java index 79c0bc12222c5..cc3a92031d83c 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java @@ -68,10 +68,12 @@ import org.apache.hadoop.util.ExitUtil; import org.apache.hadoop.util.Progressable; import org.apache.hadoop.yarn.security.AMRMTokenIdentifier; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class TestPipeApplication { private static File workSpace = new File("target", @@ -82,7 +84,7 @@ public class TestPipeApplication { /** * test PipesMapRunner test the transfer data from reader * - * @throws Exception + * @throws Exception The exception thrown during unit testing. */ @Test public void testRunner() throws Exception { @@ -284,7 +286,7 @@ public void testSubmitter() throws Exception { } catch (ExitUtil.ExitException e) { // System.exit prohibited! output message test assertTrue(out.toString().contains("")); - assertTrue(out.toString(), out.toString().contains("pipes")); + assertTrue(out.toString().contains("pipes"), out.toString()); assertTrue(out.toString().contains("[-input ] // Input directory")); assertTrue(out.toString() .contains("[-output ] // Output directory")); @@ -343,7 +345,7 @@ public void testSubmitter() throws Exception { String[] args = new String[22]; File input = new File(workSpace + File.separator + "input"); if (!input.exists()) { - Assert.assertTrue(input.createNewFile()); + assertTrue(input.createNewFile()); } File outPut = new File(workSpace + File.separator + "output"); FileUtil.fullyDelete(outPut); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipes.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipes.java index f7ef958a443d8..83a958fb5192a 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipes.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipes.java @@ -41,16 +41,16 @@ import org.apache.hadoop.mapreduce.MapReduceTestUtil; import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.util.ToolRunner; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -@Ignore +@Disabled public class TestPipes { private static final Logger LOG = LoggerFactory.getLogger(TestPipes.class); @@ -67,7 +67,7 @@ public class TestPipes { static void cleanup(FileSystem fs, Path p) throws IOException { fs.delete(p, true); - assertFalse("output not cleaned up", fs.exists(p)); + assertFalse(fs.exists(p), "output not cleaned up"); } @Test public void testPipes() throws IOException { @@ -188,7 +188,7 @@ static void runProgram(MiniMRCluster mr, MiniDFSCluster dfs, } else { rJob = Submitter.runJob(job); } - assertTrue("pipes job failed", rJob.isSuccessful()); + assertTrue(rJob.isSuccessful(), "pipes job failed"); Counters counters = rJob.getCounters(); Counters.Group wordCountCounters = counters.getGroup("WORDCOUNT"); @@ -197,7 +197,7 @@ static void runProgram(MiniMRCluster mr, MiniDFSCluster dfs, System.out.println(c); ++numCounters; } - assertTrue("No counters found!", (numCounters > 0)); + assertTrue((numCounters > 0), "No counters found!"); } List results = new ArrayList(); @@ -206,11 +206,10 @@ static void runProgram(MiniMRCluster mr, MiniDFSCluster dfs, .OutputFilesFilter()))) { results.add(MapReduceTestUtil.readOutput(p, job)); } - assertEquals("number of reduces is wrong", - expectedResults.length, results.size()); + assertEquals(expectedResults.length, results.size(), "number of reduces is wrong"); for(int i=0; i < results.size(); i++) { - assertEquals("pipes program " + program + " output " + i + " wrong", - expectedResults[i], results.get(i)); + assertEquals(expectedResults[i], results.get(i), + "pipes program " + program + " output " + i + " wrong"); } } @@ -278,7 +277,7 @@ static void runNonPipedProgram(MiniMRCluster mr, MiniDFSCluster dfs, "-reduces", "2"}); assertEquals(0, ret); } catch (Exception e) { - assertTrue("got exception: " + StringUtils.stringifyException(e), false); + assertTrue(false, "got exception: " + StringUtils.stringifyException(e)); } } } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipesNonJavaInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipesNonJavaInputFormat.java index ce1f4f579046f..6e32bf9fc6bd5 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipesNonJavaInputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipesNonJavaInputFormat.java @@ -29,11 +29,11 @@ import org.apache.hadoop.mapred.Reporter; import org.apache.hadoop.mapred.pipes.TestPipeApplication.FakeSplit; import org.apache.hadoop.util.StringUtils; -import org.junit.Assert; -import org.junit.Test; -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; - +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.mock; public class TestPipesNonJavaInputFormat { private static File workSpace = new File("target", @@ -57,16 +57,16 @@ public void testFormat() throws IOException { // input and output files File input1 = new File(workSpace + File.separator + "input1"); if (!input1.getParentFile().exists()) { - Assert.assertTrue(input1.getParentFile().mkdirs()); + assertTrue(input1.getParentFile().mkdirs()); } if (!input1.exists()) { - Assert.assertTrue(input1.createNewFile()); + assertTrue(input1.createNewFile()); } File input2 = new File(workSpace + File.separator + "input2"); if (!input2.exists()) { - Assert.assertTrue(input2.createNewFile()); + assertTrue(input2.createNewFile()); } // set data for splits conf.set(org.apache.hadoop.mapreduce.lib.input.FileInputFormat.INPUT_DIR, diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestChild.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestChild.java index 338f1172b04f0..9ea112afed85e 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestChild.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestChild.java @@ -30,13 +30,12 @@ import org.apache.hadoop.mapred.HadoopTestCase; import org.apache.hadoop.mapred.JobConf; import org.apache.log4j.Level; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; public class TestChild extends HadoopTestCase { private static String TEST_ROOT_DIR = @@ -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(JobConf.MAPRED_TASK_JAVA_OPTS + " is null!", - javaOpts); - assertEquals(JobConf.MAPRED_TASK_JAVA_OPTS + " has value of: " + - javaOpts, - javaOpts, TASK_OPTS_VAL); + 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(JobConf.MAPRED_MAP_TASK_JAVA_OPTS + " is null!", - mapJavaOpts); - assertEquals(JobConf.MAPRED_MAP_TASK_JAVA_OPTS + " has value of: " + - mapJavaOpts, - mapJavaOpts, MAP_OPTS_VAL); + 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(JobConf.MAPRED_MAP_TASK_LOG_LEVEL + "has value of " + - logLevel, logLevel, Level.OFF); + assertEquals(logLevel, Level.OFF, + JobConf.MAPRED_MAP_TASK_LOG_LEVEL + "has value of " + logLevel); } } @@ -95,25 +90,22 @@ protected void setup(Context context) boolean oldConfigs = conf.getBoolean(OLD_CONFIGS, false); if (oldConfigs) { String javaOpts = conf.get(JobConf.MAPRED_TASK_JAVA_OPTS); - assertNotNull(JobConf.MAPRED_TASK_JAVA_OPTS + " is null!", - javaOpts); - assertEquals(JobConf.MAPRED_TASK_JAVA_OPTS + " has value of: " + - javaOpts, - javaOpts, TASK_OPTS_VAL); + 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(JobConf.MAPRED_REDUCE_TASK_JAVA_OPTS + " is null!", - reduceJavaOpts); - assertEquals(JobConf.MAPRED_REDUCE_TASK_JAVA_OPTS + " has value of: " + - reduceJavaOpts, - reduceJavaOpts, REDUCE_OPTS_VAL); + 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 = Level.toLevel(conf.get(JobConf.MAPRED_REDUCE_TASK_LOG_LEVEL, Level.INFO.toString())); - assertEquals(JobConf.MAPRED_REDUCE_TASK_LOG_LEVEL + "has value of " + - logLevel, logLevel, Level.OFF); + assertEquals(logLevel, Level.OFF, + JobConf.MAPRED_REDUCE_TASK_LOG_LEVEL + "has value of " + logLevel); } } @@ -135,21 +127,21 @@ private Job submitAndValidateJob(JobConf conf, int numMaps, int numReds, numMaps, numReds); job.setMapperClass(MyMapper.class); job.setReducerClass(MyReducer.class); - assertFalse("Job already has a job tracker connection, before it's submitted", - job.isConnected()); + assertFalse(job.isConnected(), + "Job already has a job tracker connection, before it's submitted"); job.submit(); - assertTrue("Job doesn't have a job tracker connection, even though it's been submitted", - job.isConnected()); + assertTrue(job.isConnected(), + "Job doesn't have a job tracker connection, even though it's been submitted"); job.waitForCompletion(true); assertTrue(job.isSuccessful()); // Check output directory FileSystem fs = FileSystem.get(conf); - assertTrue("Job output directory doesn't exit!", fs.exists(outDir)); + assertTrue(fs.exists(outDir), "Job output directory doesn't exit!"); FileStatus[] list = fs.listStatus(outDir, new OutputFilter()); int numPartFiles = numReds == 0 ? numMaps : numReds; - assertTrue("Number of part-files is " + list.length + " and not " - + numPartFiles, list.length == numPartFiles); + assertTrue(list.length == numPartFiles, "Number of part-files is " + list.length + " and not " + + numPartFiles); return job; } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMRJobClient.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMRJobClient.java index 17cd5bfaace33..308b069adffe4 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMRJobClient.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMRJobClient.java @@ -30,8 +30,8 @@ import org.apache.hadoop.util.ToolRunner; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -50,11 +50,11 @@ import java.nio.charset.StandardCharsets; import java.util.Arrays; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** test CLI class. CLI class implemented the Tool interface. @@ -65,7 +65,7 @@ public class TestMRJobClient extends ClusterMapReduceTestCase { private static final Logger LOG = LoggerFactory.getLogger(TestMRJobClient.class); - @BeforeClass + @BeforeAll public static void setupClass() throws Exception { setupClassBase(TestMRJobClient.class); } @@ -133,8 +133,8 @@ public void testJobSubmissionSpecsAndFiles() throws Exception { job.getConfiguration()); Path submitJobDir = new Path(jobStagingArea, "JobId"); Path submitJobFile = JobSubmissionFiles.getJobConfPath(submitJobDir); - assertFalse("Shouldn't have created a job file if job specs failed.", - FileSystem.get(conf).exists(submitJobFile)); + assertFalse(FileSystem.get(conf).exists(submitJobFile), + "Shouldn't have created a job file if job specs failed."); } /** @@ -191,7 +191,7 @@ private void testfailTask(Configuration conf) throws Exception { ByteArrayOutputStream out = new ByteArrayOutputStream(); // TaskAttemptId is not set int exitCode = runTool(conf, jc, new String[] { "-fail-task" }, out); - assertEquals("Exit code", -1, exitCode); + assertEquals(-1, exitCode, "Exit code"); runTool(conf, jc, new String[] { "-fail-task", taid.toString() }, out); String answer = new String(out.toByteArray(), StandardCharsets.UTF_8); @@ -209,7 +209,7 @@ private void testKillTask(Configuration conf) throws Exception { ByteArrayOutputStream out = new ByteArrayOutputStream(); // bad parameters int exitCode = runTool(conf, jc, new String[] { "-kill-task" }, out); - assertEquals("Exit code", -1, exitCode); + assertEquals(-1, exitCode, "Exit code"); runTool(conf, jc, new String[] { "-kill-task", taid.toString() }, out); String answer = new String(out.toByteArray(), StandardCharsets.UTF_8); @@ -227,10 +227,10 @@ private void testKillJob(Configuration conf) throws Exception { ByteArrayOutputStream out = new ByteArrayOutputStream(); // without jobId int exitCode = runTool(conf, jc, new String[] { "-kill" }, out); - assertEquals("Exit code", -1, exitCode); + assertEquals(-1, exitCode, "Exit code"); // good parameters exitCode = runTool(conf, jc, new String[] { "-kill", jobId }, out); - assertEquals("Exit code", 0, exitCode); + assertEquals(0, exitCode, "Exit code"); String answer = new String(out.toByteArray(), StandardCharsets.UTF_8); assertTrue(answer.contains("Killed job " + jobId)); @@ -257,12 +257,12 @@ private void testSubmit(Configuration conf) throws Exception { ByteArrayOutputStream out = new ByteArrayOutputStream(); // bad parameters int exitCode = runTool(conf, jc, new String[] { "-submit" }, out); - assertEquals("Exit code", -1, exitCode); + assertEquals(-1, exitCode, "Exit code"); exitCode = runTool(conf, jc, new String[] { "-submit", fconUri }, out); - assertEquals("Exit code", 0, exitCode); + assertEquals(0, exitCode, "Exit code"); String answer = new String(out.toByteArray()); // in console was written assertTrue(answer.contains("Created job ")); @@ -312,10 +312,10 @@ private void testListBlackList(Configuration conf) throws Exception { ByteArrayOutputStream out = new ByteArrayOutputStream(); int exitCode = runTool(conf, jc, new String[] { "-list-blacklisted-trackers", "second in" }, out); - assertEquals("Exit code", -1, exitCode); + assertEquals(-1, exitCode, "Exit code"); exitCode = runTool(conf, jc, new String[] { "-list-blacklisted-trackers" }, out); - assertEquals("Exit code", 0, exitCode); + assertEquals(0, exitCode, "Exit code"); String line; BufferedReader br = new BufferedReader(new InputStreamReader( new ByteArrayInputStream(out.toByteArray()))); @@ -334,10 +334,10 @@ private void testListAttemptIds(String jobId, Configuration conf) CLI jc = createJobClient(); ByteArrayOutputStream out = new ByteArrayOutputStream(); int exitCode = runTool(conf, jc, new String[] { "-list-attempt-ids" }, out); - assertEquals("Exit code", -1, exitCode); + assertEquals(-1, exitCode, "Exit code"); exitCode = runTool(conf, jc, new String[] { "-list-attempt-ids", jobId, "MAP", "completed" }, out); - assertEquals("Exit code", 0, exitCode); + assertEquals(0, exitCode, "Exit code"); String line; BufferedReader br = new BufferedReader(new InputStreamReader( new ByteArrayInputStream(out.toByteArray()))); @@ -356,9 +356,9 @@ private void testListTrackers(Configuration conf) throws Exception { ByteArrayOutputStream out = new ByteArrayOutputStream(); int exitCode = runTool(conf, jc, new String[] { "-list-active-trackers", "second parameter" }, out); - assertEquals("Exit code", -1, exitCode); + assertEquals(-1, exitCode, "Exit code"); exitCode = runTool(conf, jc, new String[] { "-list-active-trackers" }, out); - assertEquals("Exit code", 0, exitCode); + assertEquals(0, exitCode, "Exit code"); String line; BufferedReader br = new BufferedReader(new InputStreamReader( new ByteArrayInputStream(out.toByteArray()))); @@ -387,7 +387,7 @@ private void testJobHistory(String jobId, Configuration conf) historyFileUri = file.getPath().toUri().toString(); } } - assertNotNull("Could not find jhist file", historyFileUri); + assertNotNull(historyFileUri, "Could not find jhist file"); for (String historyFileOrJobId : new String[]{historyFileUri, jobId}) { // Try a bunch of different valid combinations of the command @@ -396,7 +396,7 @@ private void testJobHistory(String jobId, Configuration conf) "all", historyFileOrJobId, }, out); - assertEquals("Exit code", 0, exitCode); + assertEquals(0, exitCode, "Exit code"); checkHistoryHumanOutput(jobId, out); File outFile = File.createTempFile("myout", ".txt"); exitCode = runTool(conf, jc, new String[]{ @@ -406,7 +406,7 @@ private void testJobHistory(String jobId, Configuration conf) "-outfile", outFile.getAbsolutePath() }, out); - assertEquals("Exit code", 0, exitCode); + assertEquals(0, exitCode, "Exit code"); checkHistoryHumanFileOutput(jobId, out, outFile); outFile = File.createTempFile("myout", ".txt"); exitCode = runTool(conf, jc, new String[]{ @@ -418,7 +418,7 @@ private void testJobHistory(String jobId, Configuration conf) "-format", "human" }, out); - assertEquals("Exit code", 0, exitCode); + assertEquals(0, exitCode, "Exit code"); checkHistoryHumanFileOutput(jobId, out, outFile); exitCode = runTool(conf, jc, new String[]{ "-history", @@ -426,7 +426,7 @@ private void testJobHistory(String jobId, Configuration conf) "-format", "human" }, out); - assertEquals("Exit code", 0, exitCode); + assertEquals(0, exitCode, "Exit code"); checkHistoryHumanOutput(jobId, out); exitCode = runTool(conf, jc, new String[]{ "-history", @@ -435,7 +435,7 @@ private void testJobHistory(String jobId, Configuration conf) "-format", "json" }, out); - assertEquals("Exit code", 0, exitCode); + assertEquals(0, exitCode, "Exit code"); checkHistoryJSONOutput(jobId, out); outFile = File.createTempFile("myout", ".txt"); exitCode = runTool(conf, jc, new String[]{ @@ -447,7 +447,7 @@ private void testJobHistory(String jobId, Configuration conf) "-format", "json" }, out); - assertEquals("Exit code", 0, exitCode); + assertEquals(0, exitCode, "Exit code"); checkHistoryJSONFileOutput(jobId, out, outFile); exitCode = runTool(conf, jc, new String[]{ "-history", @@ -455,7 +455,7 @@ private void testJobHistory(String jobId, Configuration conf) "-format", "json" }, out); - assertEquals("Exit code", 0, exitCode); + assertEquals(0, exitCode, "Exit code"); checkHistoryJSONOutput(jobId, out); // Check some bad arguments @@ -464,19 +464,19 @@ private void testJobHistory(String jobId, Configuration conf) historyFileOrJobId, "foo" }, out); - assertEquals("Exit code", -1, exitCode); + assertEquals(-1, exitCode, "Exit code"); exitCode = runTool(conf, jc, new String[]{ "-history", historyFileOrJobId, "-format" }, out); - assertEquals("Exit code", -1, exitCode); + assertEquals(-1, exitCode, "Exit code"); exitCode = runTool(conf, jc, new String[]{ "-history", historyFileOrJobId, "-outfile", }, out); - assertEquals("Exit code", -1, exitCode); + assertEquals(-1, exitCode, "Exit code"); try { runTool(conf, jc, new String[]{ "-history", @@ -553,16 +553,16 @@ private void testConfig(String jobId, Configuration conf) throws Exception { // bad arguments int exitCode = runTool(conf, jc, new String[] { "-config" }, out); - assertEquals("Exit code", -1, exitCode); + assertEquals(-1, exitCode, "Exit code"); exitCode = runTool(conf, jc, new String[] { "-config job_invalid foo.xml" }, out); - assertEquals("Exit code", -1, exitCode); + assertEquals(-1, exitCode, "Exit code"); // good arguments File outFile = File.createTempFile("config", ".xml"); exitCode = runTool(conf, jc, new String[] { "-config", jobId, outFile.toString()}, out); - assertEquals("Exit code", 0, exitCode); + assertEquals(0, exitCode, "Exit code"); BufferedReader br = new BufferedReader(new FileReader(outFile)); String line = br.readLine(); br.close(); @@ -577,11 +577,11 @@ private void testJobEvents(String jobId, Configuration conf) throws Exception { CLI jc = createJobClient(); ByteArrayOutputStream out = new ByteArrayOutputStream(); int exitCode = runTool(conf, jc, new String[] { "-events" }, out); - assertEquals("Exit code", -1, exitCode); + assertEquals(-1, exitCode, "Exit code"); exitCode = runTool(conf, jc, new String[] { "-events", jobId, "0", "100" }, out); - assertEquals("Exit code", 0, exitCode); + assertEquals(0, exitCode, "Exit code"); String line; BufferedReader br = new BufferedReader(new InputStreamReader( new ByteArrayInputStream(out.toByteArray()))); @@ -603,10 +603,10 @@ private void testJobStatus(String jobId, Configuration conf) throws Exception { ByteArrayOutputStream out = new ByteArrayOutputStream(); // bad options int exitCode = runTool(conf, jc, new String[] { "-status" }, out); - assertEquals("Exit code", -1, exitCode); + assertEquals(-1, exitCode, "Exit code"); exitCode = runTool(conf, jc, new String[] { "-status", jobId }, out); - assertEquals("Exit code", 0, exitCode); + assertEquals(0, exitCode, "Exit code"); String line; BufferedReader br = new BufferedReader(new InputStreamReader( new ByteArrayInputStream(out.toByteArray()))); @@ -629,14 +629,14 @@ public void testGetCounter(String jobId, Configuration conf) throws Exception { // bad command int exitCode = runTool(conf, createJobClient(), new String[] { "-counter", }, out); - assertEquals("Exit code", -1, exitCode); + assertEquals(-1, exitCode, "Exit code"); exitCode = runTool(conf, createJobClient(), new String[] { "-counter", jobId, "org.apache.hadoop.mapreduce.TaskCounter", "MAP_INPUT_RECORDS" }, out); - assertEquals("Exit code", 0, exitCode); - assertEquals("Counter", "3", out.toString().trim()); + assertEquals(0, exitCode, "Exit code"); + assertEquals("3", out.toString().trim(), "Counter"); } /** * print a job list @@ -648,11 +648,11 @@ protected void testAllJobList(String jobId, Configuration conf) int exitCode = runTool(conf, createJobClient(), new String[] { "-list", "alldata" }, out); - assertEquals("Exit code", -1, exitCode); + assertEquals(-1, exitCode, "Exit code"); exitCode = runTool(conf, createJobClient(), // all jobs new String[] { "-list", "all" }, out); - assertEquals("Exit code", 0, exitCode); + assertEquals(0, exitCode, "Exit code"); BufferedReader br = new BufferedReader(new InputStreamReader( new ByteArrayInputStream(out.toByteArray()))); String line; @@ -675,7 +675,7 @@ protected void testSubmittedJobList(Configuration conf) throws Exception { // only submitted int exitCode = runTool(conf, createJobClient(), new String[] { "-list" }, out); - assertEquals("Exit code", 0, exitCode); + assertEquals(0, exitCode, "Exit code"); BufferedReader br = new BufferedReader(new InputStreamReader(new ByteArrayInputStream( out.toByteArray()))); @@ -695,7 +695,7 @@ protected void verifyJobPriority(String jobId, String priority, PipedInputStream pis = new PipedInputStream(); PipedOutputStream pos = new PipedOutputStream(pis); int exitCode = runTool(conf, jc, new String[] { "-list", "all" }, pos); - assertEquals("Exit code", 0, exitCode); + assertEquals(0, exitCode, "Exit code"); BufferedReader br = new BufferedReader(new InputStreamReader(pis)); String line; while ((line = br.readLine()) != null) { @@ -713,10 +713,10 @@ public void testChangingJobPriority(String jobId, Configuration conf) throws Exception { int exitCode = runTool(conf, createJobClient(), new String[] { "-set-priority" }, new ByteArrayOutputStream()); - assertEquals("Exit code", -1, exitCode); + assertEquals(-1, exitCode, "Exit code"); exitCode = runTool(conf, createJobClient(), new String[] { "-set-priority", jobId, "VERY_LOW" }, new ByteArrayOutputStream()); - assertEquals("Exit code", 0, exitCode); + assertEquals(0, exitCode, "Exit code"); // set-priority is fired after job is completed in YARN, hence need not // have to update the priority. verifyJobPriority(jobId, "DEFAULT", conf, createJobClient()); @@ -752,7 +752,7 @@ protected void verifyJobName(String jobId, String name, PipedOutputStream pos = new PipedOutputStream(pis); int exitCode = runTool(conf, jc, new String[] { "-list", "all" }, pos); - assertEquals("Exit code", 0, exitCode); + assertEquals(0, exitCode, "Exit code"); BufferedReader br = new BufferedReader(new InputStreamReader(pis)); String line = null; while ((line = br.readLine()) != null) { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/partition/TestMRKeyFieldBasedComparator.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/partition/TestMRKeyFieldBasedComparator.java index 889137c20e5f6..a17d3c2762d52 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/partition/TestMRKeyFieldBasedComparator.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/partition/TestMRKeyFieldBasedComparator.java @@ -30,15 +30,15 @@ import org.apache.hadoop.mapreduce.MapReduceTestUtil; import org.apache.hadoop.mapreduce.Reducer; import org.apache.hadoop.mapreduce.lib.map.InverseMapper; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class TestMRKeyFieldBasedComparator extends HadoopTestCase {