MAPREDUCE-5640. Rename TestLineRecordReader in jobclient module (Jason Lowe via jeagles)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1547157 13f79535-47bb-0310-9956-ffa450edef68

hadoop-mapreduce-project/CHANGES.txt

@@ -8,6 +8,9 @@ Release 0.23.10 - UNRELEASED
 
   IMPROVEMENTS
 
+    MAPREDUCE-5640. Rename TestLineRecordReader in jobclient module (Jason Lowe
+    via jeagles)
+
   OPTIMIZATIONS
 
     MAPREDUCE-1981. Improve getSplits performance by using listLocatedStatus

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestLineRecordReader.java → hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestLineRecordReaderJobs.java

@@ -17,22 +17,20 @@
 
 package org.apache.hadoop.mapred;
 
+import static org.junit.Assert.assertEquals;
+
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 
-import junit.framework.TestCase;
-
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.mapred.Mapper;
-import org.apache.hadoop.mapred.Reducer;
 import org.apache.hadoop.mapred.lib.IdentityMapper;
 import org.apache.hadoop.mapred.lib.IdentityReducer;
 import org.junit.Test;
 
-public class TestLineRecordReader extends TestCase {
+public class TestLineRecordReaderJobs {
 
   private static Path workDir = new Path(new Path(System.getProperty(
       "test.build.data", "."), "data"), "TestTextInputFormat");
@@ -77,7 +75,7 @@ public class TestLineRecordReader extends TestCase {
   public void createAndRunJob(Configuration conf) throws IOException,
       InterruptedException, ClassNotFoundException {
     JobConf job = new JobConf(conf);
-    job.setJarByClass(TestLineRecordReader.class);
+    job.setJarByClass(TestLineRecordReaderJobs.class);
     job.setMapperClass(IdentityMapper.class);
     job.setReducerClass(IdentityReducer.class);
     FileInputFormat.addInputPath(job, inputDir);
@@ -98,6 +96,7 @@ public class TestLineRecordReader extends TestCase {
       InterruptedException, ClassNotFoundException {
     Configuration conf = new Configuration();
     conf.set("textinputformat.record.delimiter", "\t\n");
+    conf.setInt("mapreduce.job.maps", 1);
     FileSystem localFs = FileSystem.getLocal(conf);
     // cleanup
     localFs.delete(workDir, true);
@@ -105,7 +104,7 @@ public class TestLineRecordReader extends TestCase {
     createInputFile(conf);
     createAndRunJob(conf);
     String expected = "0\tabc\ndef\n9\tghi\njkl\n";
-    this.assertEquals(expected, readOutputFile(conf));
+    assertEquals(expected, readOutputFile(conf));
   }
 
   /**
@@ -127,7 +126,7 @@ public class TestLineRecordReader extends TestCase {
     createInputFile(conf);
     createAndRunJob(conf);
     String expected = "0\tabc\n4\tdef\t\n9\tghi\n13\tjkl\n";
-    this.assertEquals(expected, readOutputFile(conf));
+    assertEquals(expected, readOutputFile(conf));
   }
 
 }

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestLineRecordReader.java → hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestLineRecordReaderJobs.java

@@ -18,12 +18,12 @@
 
 package org.apache.hadoop.mapreduce.lib.input;
 
+import static org.junit.Assert.assertEquals;
+
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 
-import junit.framework.TestCase;
-
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
@@ -34,7 +34,7 @@ import org.apache.hadoop.mapreduce.Reducer;
 import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
 import org.junit.Test;
 
-public class TestLineRecordReader extends TestCase {
+public class TestLineRecordReaderJobs {
 
   private static Path workDir = new Path(new Path(System.getProperty(
       "test.build.data", "."), "data"), "TestTextInputFormat");
@@ -79,7 +79,7 @@ public class TestLineRecordReader extends TestCase {
   public void createAndRunJob(Configuration conf) throws IOException,
       InterruptedException, ClassNotFoundException {
     Job job = Job.getInstance(conf);
-    job.setJarByClass(TestLineRecordReader.class);
+    job.setJarByClass(TestLineRecordReaderJobs.class);
     job.setMapperClass(Mapper.class);
     job.setReducerClass(Reducer.class);
     FileInputFormat.addInputPath(job, inputDir);
@@ -107,7 +107,7 @@ public class TestLineRecordReader extends TestCase {
     createInputFile(conf);
     createAndRunJob(conf);
     String expected = "0\tabc\ndef\n9\tghi\njkl\n";
-    this.assertEquals(expected, readOutputFile(conf));
+    assertEquals(expected, readOutputFile(conf));
   }
 
   /**
@@ -129,7 +129,7 @@ public class TestLineRecordReader extends TestCase {
     createInputFile(conf);
     createAndRunJob(conf);
     String expected = "0\tabc\n4\tdef\t\n9\tghi\n13\tjkl\n";
-    this.assertEquals(expected, readOutputFile(conf));
+    assertEquals(expected, readOutputFile(conf));
   }
 
 }