You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mrunit.apache.org by jd...@apache.org on 2012/03/26 03:14:57 UTC
svn commit: r1305187 - in
/incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit: ./ mapreduce/
Author: jdonofrio
Date: Mon Mar 26 01:14:56 2012
New Revision: 1305187
URL: http://svn.apache.org/viewvc?rev=1305187&view=rev
Log:
MRUNIT-46: Tests should use *Driver.new*Driver factory methods for cleaner code
Modified:
incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestCounters.java
incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapDriver.java
incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapReduceDriver.java
incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestPipelineMapReduceDriver.java
incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestReduceDriver.java
incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapDriver.java
incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapReduceDriver.java
incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestReduceDriver.java
Modified: incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestCounters.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestCounters.java?rev=1305187&r1=1305186&r2=1305187&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestCounters.java (original)
+++ incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestCounters.java Mon Mar 26 01:14:56 2012
@@ -105,7 +105,7 @@ public class TestCounters {
public void testPipeline() throws IOException {
final Mapper<Text, Text, Text, Text> mapper = new CounterMapper();
final Reducer<Text, Text, Text, Text> reducer = new CounterReducer();
- final PipelineMapReduceDriver<Text, Text, Text, Text> driver = new PipelineMapReduceDriver<Text, Text, Text, Text>();
+ final PipelineMapReduceDriver<Text, Text, Text, Text> driver = PipelineMapReduceDriver.newPipelineMapReduceDriver();
driver.withMapReduce(mapper, reducer).withMapReduce(mapper, reducer)
.withInput(new Text("foo"), new Text("bar")).run();
Modified: incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapDriver.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapDriver.java?rev=1305187&r1=1305186&r2=1305187&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapDriver.java (original)
+++ incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapDriver.java Mon Mar 26 01:14:56 2012
@@ -169,7 +169,7 @@ public class TestMapDriver {
@Test
public void testWithCounter() {
- MapDriver<Text, Text, Text, Text> driver = new MapDriver<Text, Text, Text, Text>();
+ MapDriver<Text, Text, Text, Text> driver = MapDriver.newMapDriver();
driver.withMapper(new MapperWithCounters<Text, Text, Text, Text>())
.withInput(new Text("hie"), new Text("Hi"))
@@ -180,7 +180,7 @@ public class TestMapDriver {
@Test
public void testWithFailedCounter() {
- MapDriver<Text, Text, Text, Text> driver = new MapDriver<Text, Text, Text, Text>();
+ MapDriver<Text, Text, Text, Text> driver = MapDriver.newMapDriver();
thrown.expectAssertionErrorMessage("2 Error(s): (" +
"Counter org.apache.hadoop.mrunit.TestMapDriver.MapperWithCounters.Counters.X have value 1 instead of expected 4, " +
Modified: incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapReduceDriver.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapReduceDriver.java?rev=1305187&r1=1305186&r2=1305187&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapReduceDriver.java (original)
+++ incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapReduceDriver.java Mon Mar 26 01:14:56 2012
@@ -341,7 +341,7 @@ public class TestMapReduceDriver {
@Test
public void testWithCounter() {
- MapReduceDriver<Text, Text, Text, Text, Text, Text> driver = new MapReduceDriver<Text, Text, Text, Text, Text, Text>();
+ MapReduceDriver<Text, Text, Text, Text, Text, Text> driver = MapReduceDriver.newMapReduceDriver();
driver
.withMapper(new TestMapDriver.MapperWithCounters<Text, Text, Text, Text>())
@@ -359,7 +359,7 @@ public class TestMapReduceDriver {
@Test
public void testWithFailedCounter() {
- MapReduceDriver<Text, Text, Text, Text, Text, Text> driver = new MapReduceDriver<Text, Text, Text, Text, Text, Text>();
+ MapReduceDriver<Text, Text, Text, Text, Text, Text> driver = MapReduceDriver.newMapReduceDriver();
thrown.expectAssertionErrorMessage("2 Error(s): (" +
"Counter org.apache.hadoop.mrunit.TestMapDriver.MapperWithCounters.Counters.X have value 1 instead of expected 20, " +
Modified: incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestPipelineMapReduceDriver.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestPipelineMapReduceDriver.java?rev=1305187&r1=1305186&r2=1305187&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestPipelineMapReduceDriver.java (original)
+++ incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestPipelineMapReduceDriver.java Mon Mar 26 01:14:56 2012
@@ -51,21 +51,21 @@ public class TestPipelineMapReduceDriver
public void testEmptyPipeline() throws IOException {
thrown.expectMessage(IllegalStateException.class,
"No Mappers or Reducers in pipeline");
- final PipelineMapReduceDriver<Text, Text, Text, Text> driver = new PipelineMapReduceDriver<Text, Text, Text, Text>();
+ final PipelineMapReduceDriver<Text, Text, Text, Text> driver = PipelineMapReduceDriver.newPipelineMapReduceDriver();
driver.withInput(new Text("foo"), new Text("bar")).runTest();
}
@Test
public void testNoInput() {
thrown.expectMessage(IllegalStateException.class, "No input was provided");
- final PipelineMapReduceDriver<Text, Text, Text, Text> driver = new PipelineMapReduceDriver<Text, Text, Text, Text>();
+ final PipelineMapReduceDriver<Text, Text, Text, Text> driver = PipelineMapReduceDriver.newPipelineMapReduceDriver();
driver.runTest();
}
@Test
public void testSingleIdentity() {
// Test that an identity mapper and identity reducer work
- final PipelineMapReduceDriver<Text, Text, Text, Text> driver = new PipelineMapReduceDriver<Text, Text, Text, Text>();
+ final PipelineMapReduceDriver<Text, Text, Text, Text> driver = PipelineMapReduceDriver.newPipelineMapReduceDriver();
driver
.withMapReduce(new IdentityMapper<Text, Text>(),
new IdentityReducer<Text, Text>())
@@ -76,7 +76,7 @@ public class TestPipelineMapReduceDriver
@Test
public void testMultipleIdentities() {
// Test that a pipeline of identity mapper and reducers work
- final PipelineMapReduceDriver<Text, Text, Text, Text> driver = new PipelineMapReduceDriver<Text, Text, Text, Text>();
+ final PipelineMapReduceDriver<Text, Text, Text, Text> driver = PipelineMapReduceDriver.newPipelineMapReduceDriver();
driver
.withMapReduce(new IdentityMapper<Text, Text>(),
new IdentityReducer<Text, Text>())
@@ -90,7 +90,7 @@ public class TestPipelineMapReduceDriver
@Test
public void testSumAtEnd() {
- final PipelineMapReduceDriver<Text, LongWritable, Text, LongWritable> driver = new PipelineMapReduceDriver<Text, LongWritable, Text, LongWritable>();
+ final PipelineMapReduceDriver<Text, LongWritable, Text, LongWritable> driver = PipelineMapReduceDriver.newPipelineMapReduceDriver();
driver
.withMapReduce(new IdentityMapper<Text, LongWritable>(),
new IdentityReducer<Text, LongWritable>())
@@ -107,7 +107,7 @@ public class TestPipelineMapReduceDriver
@Test
public void testSumInMiddle() {
- final PipelineMapReduceDriver<Text, LongWritable, Text, LongWritable> driver = new PipelineMapReduceDriver<Text, LongWritable, Text, LongWritable>();
+ final PipelineMapReduceDriver<Text, LongWritable, Text, LongWritable> driver = PipelineMapReduceDriver.newPipelineMapReduceDriver();
driver
.withMapReduce(new IdentityMapper<Text, LongWritable>(),
new IdentityReducer<Text, LongWritable>())
@@ -124,7 +124,7 @@ public class TestPipelineMapReduceDriver
@Test
public void testNoMapper() {
- final PipelineMapReduceDriver<Text, Text, Text, Text> driver = new PipelineMapReduceDriver<Text, Text, Text, Text>();
+ final PipelineMapReduceDriver<Text, Text, Text, Text> driver = PipelineMapReduceDriver.newPipelineMapReduceDriver();
thrown.expect(NullPointerException.class);
driver.addMapReduce(null, new IdentityReducer<Text, Text>());
driver.addInput(new Text("a"), new Text("b"));
@@ -148,7 +148,7 @@ public class TestPipelineMapReduceDriver
@Test
public void testWithCounter() {
- final PipelineMapReduceDriver<Text, Text, Text, Text> driver = new PipelineMapReduceDriver<Text, Text, Text, Text>();
+ final PipelineMapReduceDriver<Text, Text, Text, Text> driver = PipelineMapReduceDriver.newPipelineMapReduceDriver();
driver.addMapReduce(
new TestMapDriver.MapperWithCounters<Text, Text, Text, Text>(),
@@ -169,7 +169,7 @@ public class TestPipelineMapReduceDriver
@Test
public void testWithFailedCounter() {
- final PipelineMapReduceDriver<Text, Text, Text, Text> driver = new PipelineMapReduceDriver<Text, Text, Text, Text>();
+ final PipelineMapReduceDriver<Text, Text, Text, Text> driver = PipelineMapReduceDriver.newPipelineMapReduceDriver();
driver.addMapReduce(
new TestMapDriver.MapperWithCounters<Text, Text, Text, Text>(),
Modified: incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestReduceDriver.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestReduceDriver.java?rev=1305187&r1=1305186&r2=1305187&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestReduceDriver.java (original)
+++ incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestReduceDriver.java Mon Mar 26 01:14:56 2012
@@ -223,7 +223,7 @@ public class TestReduceDriver {
@Test
public void testWithCounter() {
- ReduceDriver<Text, Text, Text, Text> driver = new ReduceDriver<Text, Text, Text, Text>();
+ ReduceDriver<Text, Text, Text, Text> driver = ReduceDriver.newReduceDriver();
LinkedList<Text> values = new LinkedList<Text>();
values.add(new Text("a"));
@@ -241,7 +241,7 @@ public class TestReduceDriver {
@Test
public void testWithFailedEnumCounter() {
- ReduceDriver<Text, Text, Text, Text> driver = new ReduceDriver<Text, Text, Text, Text>();
+ ReduceDriver<Text, Text, Text, Text> driver = ReduceDriver.newReduceDriver();
LinkedList<Text> inputValues = new LinkedList<Text>();
inputValues.add(new Text("Hi"));
Modified: incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapDriver.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapDriver.java?rev=1305187&r1=1305186&r2=1305187&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapDriver.java (original)
+++ incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapDriver.java Mon Mar 26 01:14:56 2012
@@ -146,7 +146,7 @@ public class TestMapDriver {
@Test
public void testWithCounter() {
- MapDriver<Text, Text, Text, Text> driver = new MapDriver<Text, Text, Text, Text>();
+ MapDriver<Text, Text, Text, Text> driver = MapDriver.newMapDriver();
driver.withMapper(new MapperWithCounters<Text, Text, Text, Text>())
.withInput(new Text("hie"), new Text("Hi"))
@@ -157,7 +157,7 @@ public class TestMapDriver {
@Test
public void testWithFailedCounter() {
- MapDriver<Text, Text, Text, Text> driver = new MapDriver<Text, Text, Text, Text>();
+ MapDriver<Text, Text, Text, Text> driver = MapDriver.newMapDriver();
thrown.expectAssertionErrorMessage("2 Error(s): (" +
"Counter org.apache.hadoop.mrunit.mapreduce.TestMapDriver.MapperWithCounters.Counters.X have value 1 instead of expected 4, " +
Modified: incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapReduceDriver.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapReduceDriver.java?rev=1305187&r1=1305186&r2=1305187&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapReduceDriver.java (original)
+++ incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapReduceDriver.java Mon Mar 26 01:14:56 2012
@@ -352,7 +352,7 @@ public class TestMapReduceDriver {
@Test
public void testWithCounter() {
- MapReduceDriver<Text, Text, Text, Text, Text, Text> driver = new MapReduceDriver<Text, Text, Text, Text, Text, Text>();
+ MapReduceDriver<Text, Text, Text, Text, Text, Text> driver = MapReduceDriver.newMapReduceDriver();
driver
.withMapper(
@@ -370,7 +370,7 @@ public class TestMapReduceDriver {
@Test
public void testWithFailedCounter() {
- MapReduceDriver<Text, Text, Text, Text, Text, Text> driver = new MapReduceDriver<Text, Text, Text, Text, Text, Text>();
+ MapReduceDriver<Text, Text, Text, Text, Text, Text> driver = MapReduceDriver.newMapReduceDriver();
thrown.expectAssertionErrorMessage("2 Error(s): (" +
"Counter org.apache.hadoop.mrunit.mapreduce.TestMapDriver.MapperWithCounters.Counters.X have value 1 instead of expected 20, " +
Modified: incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestReduceDriver.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestReduceDriver.java?rev=1305187&r1=1305186&r2=1305187&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestReduceDriver.java (original)
+++ incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestReduceDriver.java Mon Mar 26 01:14:56 2012
@@ -214,7 +214,7 @@ public class TestReduceDriver {
@Test
public void testWithCounter() {
- ReduceDriver<Text, Text, Text, Text> driver = new ReduceDriver<Text, Text, Text, Text>();
+ ReduceDriver<Text, Text, Text, Text> driver = ReduceDriver.newReduceDriver();
LinkedList<Text> values = new LinkedList<Text>();
values.add(new Text("a"));
@@ -230,7 +230,7 @@ public class TestReduceDriver {
@Test
public void testWithFailedCounter() {
- ReduceDriver<Text, Text, Text, Text> driver = new ReduceDriver<Text, Text, Text, Text>();
+ ReduceDriver<Text, Text, Text, Text> driver = ReduceDriver.newReduceDriver();
thrown.expectAssertionErrorMessage("2 Error(s): (" +
"Counter org.apache.hadoop.mrunit.mapreduce.TestReduceDriver.ReducerWithCounters.Counters.SUM have value 1 instead of expected 4, " +