From 097a03fb6d9b0250600dffabb0056d8445bdd23a Mon Sep 17 00:00:00 2001 From: Akira Ajisaka Date: Fri, 11 Mar 2016 22:55:01 +0900 Subject: [PATCH] Revert "MAPREDUCE-6520. Migrate MR Client test cases part 1." This reverts commit 70e232f36e8400b99551ce6f4f4fc48b44e28518. --- .../hadoop/conf/TestNoDefaultsJobConf.java | 28 +++-------- .../apache/hadoop/mapred/HadoopTestCase.java | 17 +++---- .../hadoop/mapred/NotificationTestCase.java | 15 ++---- .../hadoop/mapred/TestFileOutputFormat.java | 4 -- .../apache/hadoop/mapred/TestTaskCommit.java | 28 +++-------- .../jobcontrol/TestLocalJobControl.java | 3 -- .../hadoop/mapred/lib/TestChainMapReduce.java | 20 +------- .../lib/TestKeyFieldBasedComparator.java | 2 - .../hadoop/mapred/lib/TestMultipleInputs.java | 17 +++---- .../mapred/lib/TestMultipleOutputs.java | 26 +---------- .../lib/TestMultithreadedMapRunner.java | 21 +-------- .../apache/hadoop/mapreduce/TestChild.java | 10 +--- .../mapreduce/TestNoJobSetupCleanup.java | 6 +-- .../hadoop/mapreduce/TestTaskContext.java | 2 - .../mapreduce/lib/chain/TestChainErrors.java | 9 ---- .../lib/chain/TestMapReduceChain.java | 6 --- .../lib/chain/TestSingleElementChain.java | 4 -- .../lib/db/TestDataDrivenDBInputFormat.java | 46 ++++++------------- .../lib/input/TestMultipleInputs.java | 6 +-- .../jobcontrol/TestMapReduceJobControl.java | 8 +--- .../lib/map/TestMultithreadedMapper.java | 12 +---- .../lib/output/TestJobOutputCommitter.java | 16 ++----- .../lib/output/TestMRMultipleOutputs.java | 17 +------ .../TestMRKeyFieldBasedComparator.java | 20 +++----- .../examples/terasort/TestTeraSort.java | 11 +---- 25 files changed, 68 insertions(+), 286 deletions(-) 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 e2d75ab268a..b47d5efc7e5 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 @@ -17,30 +17,17 @@ */ package org.apache.hadoop.conf; -import org.apache.hadoop.fs.FileUtil; +import org.junit.Assert; + +import org.apache.hadoop.mapred.*; +import org.apache.hadoop.mapreduce.MRConfig; +import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.fs.FileUtil; import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.Text; -import org.apache.hadoop.mapred.FileInputFormat; -import org.apache.hadoop.mapred.FileOutputFormat; -import org.apache.hadoop.mapred.HadoopTestCase; -import org.apache.hadoop.mapred.JobClient; -import org.apache.hadoop.mapred.JobConf; -import org.apache.hadoop.mapred.TextInputFormat; -import org.apache.hadoop.mapred.TextOutputFormat; -import org.apache.hadoop.mapred.Utils; -import org.junit.Test; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.io.Writer; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import java.io.*; /** * This testcase tests that a JobConf without default values submits jobs @@ -53,7 +40,6 @@ public class TestNoDefaultsJobConf extends HadoopTestCase { super(HadoopTestCase.CLUSTER_MR, HadoopTestCase.DFS_FS, 1, 1); } - @Test public void testNoDefaults() throws Exception { JobConf configuration = new JobConf(); assertTrue(configuration.get("hadoop.tmp.dir", null) != null); 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 277c0fd4b0a..3cd0668fe43 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 @@ -18,12 +18,13 @@ package org.apache.hadoop.mapred; -import org.apache.hadoop.fs.FileSystem; +import junit.framework.TestCase; import org.apache.hadoop.hdfs.MiniDFSCluster; +import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.Path; import org.apache.hadoop.mapreduce.MRConfig; -import org.junit.After; -import org.junit.Before; +import java.io.File; import java.io.IOException; /** @@ -37,7 +38,7 @@ import java.io.IOException; * Job Configurations should be created using a configuration returned by the * 'createJobConf()' method. */ -public abstract class HadoopTestCase { +public abstract class HadoopTestCase extends TestCase { public static final int LOCAL_MR = 1; public static final int CLUSTER_MR = 2; public static final int LOCAL_FS = 4; @@ -139,8 +140,8 @@ public abstract class HadoopTestCase { * * @throws Exception */ - @Before - public void setUp() throws Exception { + protected void setUp() throws Exception { + super.setUp(); if (localFS) { fileSystem = FileSystem.getLocal(new JobConf()); } @@ -163,8 +164,7 @@ public abstract class HadoopTestCase { * * @throws Exception */ - @After - public void tearDown() throws Exception { + protected void tearDown() throws Exception { try { if (mrCluster != null) { mrCluster.shutdown(); @@ -181,6 +181,7 @@ public abstract class HadoopTestCase { catch (Exception ex) { System.out.println(ex); } + super.tearDown(); } /** 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 1f657cfc1ed..d2ea74e6940 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 @@ -34,13 +34,6 @@ import javax.servlet.ServletException; 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; - - /** * Base class to test Job end notification in local and cluster mode. * @@ -147,19 +140,17 @@ public abstract class NotificationTestCase extends HadoopTestCase { return conf; } - @Before - public void setUp() throws Exception { + + protected void setUp() throws Exception { super.setUp(); startHttpServer(); } - @After - public void tearDown() throws Exception { + protected void tearDown() throws Exception { stopHttpServer(); super.tearDown(); } - @Test public void testMR() throws Exception { System.out.println(launchWordCount(this.createJobConf(), 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 314123567fa..81b53cc3b32 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,16 +30,12 @@ import java.io.IOException; import java.io.OutputStream; import java.util.Iterator; -import org.junit.Test; -import static org.junit.Assert.assertTrue; - public class TestFileOutputFormat extends HadoopTestCase { public TestFileOutputFormat() throws IOException { super(HadoopTestCase.LOCAL_MR, HadoopTestCase.LOCAL_FS, 1, 1); } - @Test public void testCustomFile() throws Exception { Path inDir = new Path("testing/fileoutputformat/input"); Path outDir = new Path("testing/fileoutputformat/output"); 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 f326916325f..ea0f88c7a65 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 @@ -17,6 +17,9 @@ */ package org.apache.hadoop.mapred; +import java.io.File; +import java.io.IOException; + import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.FileUtil; import org.apache.hadoop.fs.Path; @@ -24,16 +27,6 @@ import org.apache.hadoop.io.Text; import org.apache.hadoop.ipc.ProtocolSignature; import org.apache.hadoop.mapred.SortedRanges.Range; import org.apache.hadoop.mapreduce.TaskType; -import org.junit.After; -import org.junit.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; public class TestTaskCommit extends HadoopTestCase { Path rootDir = @@ -83,13 +76,12 @@ public class TestTaskCommit extends HadoopTestCase { super(LOCAL_MR, LOCAL_FS, 1, 1); } - @After + @Override public void tearDown() throws Exception { super.tearDown(); FileUtil.fullyDelete(new File(rootDir.toString())); } - - @Test + public void testCommitFail() throws IOException { final Path inDir = new Path(rootDir, "./input"); final Path outDir = new Path(rootDir, "./output"); @@ -190,7 +182,6 @@ public class TestTaskCommit extends HadoopTestCase { * * @throws Exception */ - @Test public void testTaskCleanupDoesNotCommit() throws Exception { // Mimic a job with a special committer that does not cleanup // files when a task fails. @@ -237,27 +228,23 @@ public class TestTaskCommit extends HadoopTestCase { assertTrue("Task did not succeed", umbilical.taskDone); } - @Test public void testCommitRequiredForMapTask() throws Exception { Task testTask = createDummyTask(TaskType.MAP); assertTrue("MapTask should need commit", testTask.isCommitRequired()); } - @Test public void testCommitRequiredForReduceTask() throws Exception { Task testTask = createDummyTask(TaskType.REDUCE); assertTrue("ReduceTask should need commit", testTask.isCommitRequired()); } - - @Test + public void testCommitNotRequiredForJobSetup() throws Exception { Task testTask = createDummyTask(TaskType.MAP); testTask.setJobSetupTask(); assertFalse("Job setup task should not need commit", testTask.isCommitRequired()); } - - @Test + public void testCommitNotRequiredForJobCleanup() throws Exception { Task testTask = createDummyTask(TaskType.MAP); testTask.setJobCleanupTask(); @@ -265,7 +252,6 @@ public class TestTaskCommit extends HadoopTestCase { testTask.isCommitRequired()); } - @Test public void testCommitNotRequiredForTaskCleanup() throws Exception { Task testTask = createDummyTask(TaskType.REDUCE); testTask.setTaskCleanupTask(); 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 07b1306513c..8d35dcf4046 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 @@ -27,8 +27,6 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.mapred.HadoopTestCase; import org.apache.hadoop.mapred.JobConf; -import org.junit.Test; -import static org.junit.Assert.assertEquals; /** * HadoopTestCase that tests the local job runner. @@ -61,7 +59,6 @@ public class TestLocalJobControl extends HadoopTestCase { * object. Finally, it creates a thread to run the JobControl object and * monitors/reports the job states. */ - @Test public void testLocalJobControlDataCopy() throws Exception { FileSystem fs = FileSystem.get(createJobConf()); 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 0933ecef941..37cb91f023b 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 @@ -21,29 +21,12 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.Text; -import org.apache.hadoop.mapred.FileInputFormat; -import org.apache.hadoop.mapred.FileOutputFormat; -import org.apache.hadoop.mapred.HadoopTestCase; -import org.apache.hadoop.mapred.JobClient; -import org.apache.hadoop.mapred.JobConf; -import org.apache.hadoop.mapred.Mapper; -import org.apache.hadoop.mapred.OutputCollector; -import org.apache.hadoop.mapred.Reducer; -import org.apache.hadoop.mapred.Reporter; -import org.apache.hadoop.mapred.RunningJob; -import org.apache.hadoop.mapred.TextInputFormat; -import org.apache.hadoop.mapred.TextOutputFormat; -import org.junit.Test; +import org.apache.hadoop.mapred.*; 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; - public class TestChainMapReduce extends HadoopTestCase { private static Path getFlagDir(boolean local) { @@ -84,7 +67,6 @@ public class TestChainMapReduce extends HadoopTestCase { super(HadoopTestCase.LOCAL_MR, HadoopTestCase.LOCAL_FS, 1, 1); } - @Test public void testChain() throws Exception { Path inDir = new Path("testing/chain/input"); Path outDir = new Path("testing/chain/output"); 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 35b3f243c7f..34a4d2c6c92 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 @@ -36,8 +36,6 @@ 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 java.io.BufferedReader; import java.io.File; 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 3a9cb9ec337..e5c6d75a041 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 @@ -17,6 +17,11 @@ */ package org.apache.hadoop.mapred.lib; +import java.io.IOException; +import java.util.Map; + +import junit.framework.TestCase; + import org.apache.hadoop.fs.Path; import org.apache.hadoop.mapred.InputFormat; import org.apache.hadoop.mapred.JobConf; @@ -25,19 +30,12 @@ import org.apache.hadoop.mapred.Mapper; import org.apache.hadoop.mapred.OutputCollector; import org.apache.hadoop.mapred.Reporter; import org.apache.hadoop.mapred.TextInputFormat; -import org.junit.Test; - -import java.io.IOException; -import java.util.Map; - -import static org.junit.Assert.assertEquals; /** * @see TestDelegatingInputFormat */ -public class TestMultipleInputs { - - @Test +public class TestMultipleInputs extends TestCase { + public void testAddInputPathWithFormat() { final JobConf conf = new JobConf(); MultipleInputs.addInputPath(conf, new Path("/foo"), TextInputFormat.class); @@ -50,7 +48,6 @@ public class TestMultipleInputs { .getClass()); } - @Test public void testAddInputPathWithMapper() { final JobConf conf = new JobConf(); MultipleInputs.addInputPath(conf, new Path("/foo"), TextInputFormat.class, 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 f3e58930eac..59c0a97b3bf 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 @@ -24,23 +24,7 @@ import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.SequenceFile; import org.apache.hadoop.io.Text; import org.apache.hadoop.io.serializer.JavaSerializationComparator; -import org.apache.hadoop.mapred.Counters; -import org.apache.hadoop.mapred.FileInputFormat; -import org.apache.hadoop.mapred.FileOutputFormat; -import org.apache.hadoop.mapred.HadoopTestCase; -import org.apache.hadoop.mapred.JobClient; -import org.apache.hadoop.mapred.JobConf; -import org.apache.hadoop.mapred.Mapper; -import org.apache.hadoop.mapred.OutputCollector; -import org.apache.hadoop.mapred.Reducer; -import org.apache.hadoop.mapred.Reporter; -import org.apache.hadoop.mapred.RunningJob; -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.apache.hadoop.mapred.*; import java.io.BufferedReader; import java.io.DataOutputStream; @@ -48,23 +32,17 @@ import java.io.IOException; import java.io.InputStreamReader; import java.util.Iterator; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - public class TestMultipleOutputs extends HadoopTestCase { public TestMultipleOutputs() throws IOException { super(HadoopTestCase.LOCAL_MR, HadoopTestCase.LOCAL_FS, 1, 1); } - @Test public void testWithoutCounters() throws Exception { _testMultipleOutputs(false); _testMOWithJavaSerialization(false); } - @Test public void testWithCounters() throws Exception { _testMultipleOutputs(true); _testMOWithJavaSerialization(true); @@ -84,7 +62,6 @@ public class TestMultipleOutputs extends HadoopTestCase { return dir; } - @Before public void setUp() throws Exception { super.setUp(); Path rootDir = getDir(ROOT_DIR); @@ -98,7 +75,6 @@ public class TestMultipleOutputs extends HadoopTestCase { } } - @After public void tearDown() throws Exception { Path rootDir = getDir(ROOT_DIR); 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 1059d29ee91..7e224cdda31 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 @@ -22,45 +22,26 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.Text; -import org.apache.hadoop.mapred.FileInputFormat; -import org.apache.hadoop.mapred.FileOutputFormat; -import org.apache.hadoop.mapred.HadoopTestCase; -import org.apache.hadoop.mapred.JobClient; -import org.apache.hadoop.mapred.JobConf; -import org.apache.hadoop.mapred.Mapper; -import org.apache.hadoop.mapred.OutputCollector; -import org.apache.hadoop.mapred.Reducer; -import org.apache.hadoop.mapred.Reporter; -import org.apache.hadoop.mapred.RunningJob; -import org.apache.hadoop.mapred.TextInputFormat; -import org.apache.hadoop.mapred.TextOutputFormat; +import org.apache.hadoop.mapred.*; import org.apache.hadoop.mapreduce.lib.map.MultithreadedMapper; -import org.junit.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; - public class TestMultithreadedMapRunner extends HadoopTestCase { public TestMultithreadedMapRunner() throws IOException { super(HadoopTestCase.LOCAL_MR, HadoopTestCase.LOCAL_FS, 1, 1); } - @Test public void testOKRun() throws Exception { run(false, false); } - @Test public void testIOExRun() throws Exception { run(true, false); } - - @Test public void testRuntimeExRun() throws Exception { run(false, true); } 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 338f1172b04..d5afe63c2ee 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,6 @@ import org.apache.hadoop.io.Text; 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 static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; public class TestChild extends HadoopTestCase { private static String TEST_ROOT_DIR = @@ -152,8 +145,7 @@ public class TestChild extends HadoopTestCase { + numPartFiles, list.length == numPartFiles); return job; } - - @Test + public void testChild() throws Exception { try { submitAndValidateJob(createJobConf(), 1, 1, true); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestNoJobSetupCleanup.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestNoJobSetupCleanup.java index 7520f389e14..5d36c92e420 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestNoJobSetupCleanup.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestNoJobSetupCleanup.java @@ -30,9 +30,6 @@ import org.apache.hadoop.mapred.HadoopTestCase; import org.apache.hadoop.mapreduce.lib.output.TextOutputFormat; import org.apache.hadoop.mapreduce.task.TaskAttemptContextImpl; import org.junit.Ignore; -import org.junit.Test; -import static org.junit.Assert.assertTrue; - @Ignore public class TestNoJobSetupCleanup extends HadoopTestCase { private static String TEST_ROOT_DIR = @@ -71,8 +68,7 @@ public class TestNoJobSetupCleanup extends HadoopTestCase { + numPartFiles, list.length == numPartFiles); return job; } - - @Test + public void testNoJobSetupCleanup() throws Exception { try { Configuration conf = createJobConf(); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestTaskContext.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestTaskContext.java index 67daaa443d0..bf742c46169 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestTaskContext.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestTaskContext.java @@ -33,8 +33,6 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; /** * Tests context api and {@link StatusReporter#getProgress()} via diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/chain/TestChainErrors.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/chain/TestChainErrors.java index 46024bc46de..2dfcf415bb0 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/chain/TestChainErrors.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/chain/TestChainErrors.java @@ -29,10 +29,6 @@ import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.MapReduceTestUtil; import org.apache.hadoop.mapreduce.Mapper; import org.apache.hadoop.mapreduce.Reducer; -import org.junit.Test; - -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertEquals; /** * Tests error conditions in ChainMapper/ChainReducer. @@ -55,7 +51,6 @@ public class TestChainErrors extends HadoopTestCase { * * @throws Exception */ - @Test public void testChainSubmission() throws Exception { Configuration conf = createJobConf(); @@ -94,7 +89,6 @@ public class TestChainErrors extends HadoopTestCase { * * @throws Exception */ - @Test public void testChainFail() throws Exception { Configuration conf = createJobConf(); @@ -120,7 +114,6 @@ public class TestChainErrors extends HadoopTestCase { * * @throws Exception */ - @Test public void testReducerFail() throws Exception { Configuration conf = createJobConf(); @@ -146,7 +139,6 @@ public class TestChainErrors extends HadoopTestCase { * * @throws Exception */ - @Test public void testChainMapNoOuptut() throws Exception { Configuration conf = createJobConf(); String expectedOutput = ""; @@ -171,7 +163,6 @@ public class TestChainErrors extends HadoopTestCase { * * @throws Exception */ - @Test public void testChainReduceNoOuptut() throws Exception { Configuration conf = createJobConf(); String expectedOutput = ""; diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/chain/TestMapReduceChain.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/chain/TestMapReduceChain.java index aaaaf5193d4..971ea6862c5 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/chain/TestMapReduceChain.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/chain/TestMapReduceChain.java @@ -30,11 +30,6 @@ import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.MapReduceTestUtil; import org.apache.hadoop.mapreduce.Mapper; import org.apache.hadoop.mapreduce.Reducer; -import org.junit.Test; - -import static org.junit.Assert.fail; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; public class TestMapReduceChain extends HadoopTestCase { @@ -68,7 +63,6 @@ public class TestMapReduceChain extends HadoopTestCase { super(HadoopTestCase.LOCAL_MR, HadoopTestCase.LOCAL_FS, 1, 1); } - @Test public void testChain() throws Exception { Path inDir = new Path(localPathRoot, "testing/chain/input"); Path outDir = new Path(localPathRoot, "testing/chain/output"); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/chain/TestSingleElementChain.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/chain/TestSingleElementChain.java index f78ac70e46d..06cfe1cb92b 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/chain/TestSingleElementChain.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/chain/TestSingleElementChain.java @@ -26,9 +26,6 @@ import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.MapReduceTestUtil; import org.apache.hadoop.mapreduce.lib.map.TokenCounterMapper; import org.apache.hadoop.mapreduce.lib.reduce.IntSumReducer; -import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import java.io.IOException; @@ -45,7 +42,6 @@ public class TestSingleElementChain extends HadoopTestCase { } // test chain mapper and reducer by adding single mapper and reducer to chain - @Test public void testNoChain() throws Exception { Path inDir = new Path(localPathRoot, "testing/chain/input"); Path outDir = new Path(localPathRoot, "testing/chain/output"); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/db/TestDataDrivenDBInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/db/TestDataDrivenDBInputFormat.java index 81a32498d6c..37f93645c1e 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/db/TestDataDrivenDBInputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/db/TestDataDrivenDBInputFormat.java @@ -18,40 +18,25 @@ package org.apache.hadoop.mapreduce.lib.db; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.fs.FileSystem; -import org.apache.hadoop.fs.Path; -import org.apache.hadoop.io.NullWritable; -import org.apache.hadoop.io.WritableComparable; -import org.apache.hadoop.mapred.HadoopTestCase; -import org.apache.hadoop.mapreduce.Job; -import org.apache.hadoop.mapreduce.Mapper; -import org.apache.hadoop.mapreduce.Reducer; -import org.apache.hadoop.mapreduce.TaskCounter; -import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; -import org.apache.hadoop.util.StringUtils; -import org.hsqldb.server.Server; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - +import java.sql.*; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import java.sql.Connection; -import java.sql.Date; -import java.sql.DriverManager; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; //import org.apache.hadoop.examples.DBCountPageView; +import org.apache.hadoop.fs.*; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.io.NullWritable; +import org.apache.hadoop.io.WritableComparable; +import org.apache.hadoop.mapred.HadoopTestCase; +import org.apache.hadoop.mapreduce.*; +import org.apache.hadoop.mapreduce.lib.db.*; +import org.apache.hadoop.mapreduce.lib.input.*; +import org.apache.hadoop.mapreduce.lib.output.*; +import org.apache.hadoop.util.StringUtils; +import org.hsqldb.server.Server; /** * Test aspects of DataDrivenDBInputFormat @@ -124,13 +109,11 @@ public class TestDataDrivenDBInputFormat extends HadoopTestCase { createConnection(driverClassName, url); } - @Before public void setUp() throws Exception { initialize(DRIVER_CLASS, DB_URL); super.setUp(); } - @After public void tearDown() throws Exception { super.tearDown(); shutdown(); @@ -187,7 +170,6 @@ public class TestDataDrivenDBInputFormat extends HadoopTestCase { } } - @Test public void testDateSplits() throws Exception { Statement s = connection.createStatement(); final String DATE_TABLE = "datetable"; diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestMultipleInputs.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestMultipleInputs.java index 632c40e3407..c8680508df8 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestMultipleInputs.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestMultipleInputs.java @@ -38,8 +38,6 @@ import org.apache.hadoop.mapreduce.Mapper; import org.apache.hadoop.mapreduce.Reducer; import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; /** * @see TestDelegatingInputFormat @@ -141,7 +139,7 @@ public class TestMultipleInputs extends HadoopTestCase { assertTrue(output.readLine().equals("e 2")); } - @Test + @SuppressWarnings("unchecked") public void testAddInputPathWithFormat() throws IOException { final Job conf = Job.getInstance(); MultipleInputs.addInputPath(conf, new Path("/foo"), TextInputFormat.class); @@ -154,7 +152,7 @@ public class TestMultipleInputs extends HadoopTestCase { .getClass()); } - @Test + @SuppressWarnings("unchecked") public void testAddInputPathWithMapper() throws IOException { final Job conf = Job.getInstance(); MultipleInputs.addInputPath(conf, new Path("/foo"), TextInputFormat.class, diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/jobcontrol/TestMapReduceJobControl.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/jobcontrol/TestMapReduceJobControl.java index d86ddd0c523..14c64bdc7d9 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/jobcontrol/TestMapReduceJobControl.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/jobcontrol/TestMapReduceJobControl.java @@ -33,9 +33,6 @@ import org.apache.hadoop.mapred.HadoopTestCase; import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.MapReduceTestUtil; import org.junit.Test; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; /** * This class performs unit test for Job/JobControl classes. @@ -123,8 +120,7 @@ public class TestMapReduceJobControl extends HadoopTestCase { } catch (Exception e) {} } } - - @Test + public void testJobControlWithFailJob() throws Exception { LOG.info("Starting testJobControlWithFailJob"); Configuration conf = createJobConf(); @@ -148,7 +144,6 @@ public class TestMapReduceJobControl extends HadoopTestCase { theControl.stop(); } - @Test public void testJobControlWithKillJob() throws Exception { LOG.info("Starting testJobControlWithKillJob"); @@ -187,7 +182,6 @@ public class TestMapReduceJobControl extends HadoopTestCase { theControl.stop(); } - @Test public void testJobControl() throws Exception { LOG.info("Starting testJobControl"); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/map/TestMultithreadedMapper.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/map/TestMultithreadedMapper.java index 5096192e11c..52b0e709de3 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/map/TestMultithreadedMapper.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/map/TestMultithreadedMapper.java @@ -23,33 +23,23 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapred.HadoopTestCase; -import org.apache.hadoop.mapreduce.Job; -import org.apache.hadoop.mapreduce.MapReduceTestUtil; -import org.apache.hadoop.mapreduce.Mapper; -import org.apache.hadoop.mapreduce.Reducer; -import org.junit.Test; +import org.apache.hadoop.mapreduce.*; import java.io.IOException; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - public class TestMultithreadedMapper extends HadoopTestCase { public TestMultithreadedMapper() throws IOException { super(HadoopTestCase.LOCAL_MR, HadoopTestCase.LOCAL_FS, 1, 1); } - @Test public void testOKRun() throws Exception { run(false, false); } - @Test public void testIOExRun() throws Exception { run(true, false); } - @Test public void testRuntimeExRun() throws Exception { run(false, true); } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestJobOutputCommitter.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestJobOutputCommitter.java index 19b712f3da1..49b59cacfe4 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestJobOutputCommitter.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestJobOutputCommitter.java @@ -33,11 +33,6 @@ import org.apache.hadoop.mapreduce.MapReduceTestUtil; import org.apache.hadoop.mapreduce.OutputCommitter; import org.apache.hadoop.mapreduce.OutputFormat; import org.apache.hadoop.mapreduce.TaskAttemptContext; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertFalse; /** * A JUnit test to test Map-Reduce job committer. @@ -59,15 +54,15 @@ public class TestJobOutputCommitter extends HadoopTestCase { private FileSystem fs; private Configuration conf = null; - @Before - public void setUp() throws Exception { + @Override + protected void setUp() throws Exception { super.setUp(); conf = createJobConf(); fs = getFileSystem(); } - @After - public void tearDown() throws Exception { + @Override + protected void tearDown() throws Exception { fs.delete(new Path(TEST_ROOT_DIR), true); super.tearDown(); } @@ -224,7 +219,6 @@ public class TestJobOutputCommitter extends HadoopTestCase { * * @throws Exception */ - @Test public void testDefaultCleanupAndAbort() throws Exception { // check with a successful job testSuccessfulJob(FileOutputCommitter.SUCCEEDED_FILE_NAME, @@ -244,7 +238,6 @@ public class TestJobOutputCommitter extends HadoopTestCase { * * @throws Exception */ - @Test public void testCustomAbort() throws Exception { // check with a successful job testSuccessfulJob(FileOutputCommitter.SUCCEEDED_FILE_NAME, @@ -271,7 +264,6 @@ public class TestJobOutputCommitter extends HadoopTestCase { * compatibility testing. * @throws Exception */ - @Test public void testCustomCleanup() throws Exception { // check with a successful job testSuccessfulJob(CUSTOM_CLEANUP_FILE_NAME, diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestMRMultipleOutputs.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestMRMultipleOutputs.java index babd20e66c4..6c432ddfc7f 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestMRMultipleOutputs.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestMRMultipleOutputs.java @@ -27,36 +27,23 @@ import org.apache.hadoop.io.SequenceFile; import org.apache.hadoop.io.Text; import org.apache.hadoop.io.serializer.JavaSerializationComparator; import org.apache.hadoop.mapred.HadoopTestCase; -import org.apache.hadoop.mapreduce.CounterGroup; -import org.apache.hadoop.mapreduce.Job; -import org.apache.hadoop.mapreduce.MapReduceTestUtil; -import org.apache.hadoop.mapreduce.Mapper; -import org.apache.hadoop.mapreduce.Reducer; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.apache.hadoop.mapreduce.*; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - public class TestMRMultipleOutputs extends HadoopTestCase { public TestMRMultipleOutputs() throws IOException { super(HadoopTestCase.LOCAL_MR, HadoopTestCase.LOCAL_FS, 1, 1); } - @Test public void testWithoutCounters() throws Exception { _testMultipleOutputs(false); _testMOWithJavaSerialization(false); } - @Test public void testWithCounters() throws Exception { _testMultipleOutputs(true); _testMOWithJavaSerialization(true); @@ -70,7 +57,6 @@ public class TestMRMultipleOutputs extends HadoopTestCase { private static String TEXT = "text"; private static String SEQUENCE = "sequence"; - @Before public void setUp() throws Exception { super.setUp(); Configuration conf = createJobConf(); @@ -78,7 +64,6 @@ public class TestMRMultipleOutputs extends HadoopTestCase { fs.delete(ROOT_DIR, true); } - @After public void tearDown() throws Exception { Configuration conf = createJobConf(); FileSystem fs = FileSystem.get(conf); 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 0d75d2fe9ea..3a2b8312bda 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 @@ -18,6 +18,8 @@ package org.apache.hadoop.mapreduce.lib.partition; +import java.io.*; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileUtil; import org.apache.hadoop.fs.Path; @@ -30,15 +32,6 @@ import org.apache.hadoop.mapreduce.MRJobConfig; 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 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; public class TestMRKeyFieldBasedComparator extends HadoopTestCase { @@ -52,8 +45,8 @@ public class TestMRKeyFieldBasedComparator extends HadoopTestCase { conf = createJobConf(); conf.set(MRJobConfig.MAP_OUTPUT_KEY_FIELD_SEPERATOR, " "); } - - private void testComparator(String keySpec, int expect) + + private void testComparator(String keySpec, int expect) throws Exception { String root = System.getProperty("test.build.data", "/tmp"); Path inDir = new Path(root, "test_cmp/in"); @@ -100,8 +93,7 @@ public class TestMRKeyFieldBasedComparator extends HadoopTestCase { reader.close(); } } - - @Test + public void testBasicUnixComparator() throws Exception { testComparator("-k1,1n", 1); testComparator("-k2,2n", 1); @@ -125,7 +117,7 @@ public class TestMRKeyFieldBasedComparator extends HadoopTestCase { byte[] line1_bytes = line1.getBytes(); byte[] line2_bytes = line2.getBytes(); - private void testWithoutMRJob(String keySpec, int expect) throws Exception { + public void testWithoutMRJob(String keySpec, int expect) throws Exception { KeyFieldBasedComparator keyFieldCmp = new KeyFieldBasedComparator(); conf.set("mapreduce.partition.keycomparator.options", keySpec); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/terasort/TestTeraSort.java b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/terasort/TestTeraSort.java index 391e482c193..349208999d3 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/terasort/TestTeraSort.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/terasort/TestTeraSort.java @@ -27,12 +27,6 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.mapred.FileAlreadyExistsException; import org.apache.hadoop.mapred.HadoopTestCase; import org.apache.hadoop.util.ToolRunner; -import org.junit.After; -import org.junit.Test; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - public class TestTeraSort extends HadoopTestCase { private static Log LOG = LogFactory.getLog(TestTeraSort.class); @@ -41,8 +35,7 @@ public class TestTeraSort extends HadoopTestCase { super(LOCAL_MR, LOCAL_FS, 1, 1); } - @After - public void tearDown() throws Exception { + protected void tearDown() throws Exception { getFileSystem().delete(new Path(TEST_DIR), true); super.tearDown(); } @@ -83,7 +76,6 @@ public class TestTeraSort extends HadoopTestCase { assertEquals(ToolRunner.run(job, new TeraValidate(), svArgs), 0); } - @Test public void testTeraSort() throws Exception { // Run TeraGen to generate input for 'terasort' runTeraGen(createJobConf(), SORT_INPUT_PATH); @@ -112,7 +104,6 @@ public class TestTeraSort extends HadoopTestCase { TERA_OUTPUT_PATH); } - @Test public void testTeraSortWithLessThanTwoArgs() throws Exception { String[] args = new String[1]; assertEquals(new TeraSort().run(args), 2);