You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mrunit.apache.org by br...@apache.org on 2012/02/26 17:14:26 UTC

svn commit: r1293860 - in /incubator/mrunit/trunk: doc/ src/main/java/org/apache/hadoop/mrunit/ src/main/java/org/apache/hadoop/mrunit/mapreduce/ src/test/java/org/apache/hadoop/mrunit/ src/test/java/org/apache/hadoop/mrunit/mapreduce/ src/test/java/or...

Author: brock
Date: Sun Feb 26 16:14:25 2012
New Revision: 1293860

URL: http://svn.apache.org/viewvc?rev=1293860&view=rev
Log:
MRUNIT-46: Tests should use *Driver.new*Driver factory methods for cleaner code

Modified:
    incubator/mrunit/trunk/doc/overview.html
    incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapReduceDriver.java
    incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/PipelineMapReduceDriver.java
    incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/mapreduce/MapReduceDriver.java
    incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/package.html
    incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestConfigureClose.java
    incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestCounters.java
    incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestExample.java
    incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapReduceDriver.java
    incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestReduceDriver.java
    incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestCounters.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
    incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestReducerInputValueResuse.java
    incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mock/TestMockOutputCollector.java

Modified: incubator/mrunit/trunk/doc/overview.html
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/doc/overview.html?rev=1293860&r1=1293859&r2=1293860&view=diff
==============================================================================
--- incubator/mrunit/trunk/doc/overview.html (original)
+++ incubator/mrunit/trunk/doc/overview.html Sun Feb 26 16:14:25 2012
@@ -87,7 +87,7 @@ public class TestExample extends TestCas
   @Before
   public void setUp() {
     mapper = new IdentityMapper<Text, Text>();
-    driver = new MapDriver<Text, Text, Text, Text>(mapper);
+    driver = MapDriver.newMapDriver(mapper);
   }
 
   &#64;Test

Modified: incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapReduceDriver.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapReduceDriver.java?rev=1293860&r1=1293859&r2=1293860&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapReduceDriver.java (original)
+++ incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapReduceDriver.java Sun Feb 26 16:14:25 2012
@@ -245,7 +245,7 @@ public class MapReduceDriver<K1, V1, K2 
         LOG.debug("Reducing input (" + inputKey.toString() + ", "
             + sb.toString() + ")");
 
-        reduceOutputs.addAll(new ReduceDriver<K2, V2, OUTKEY, OUTVAL>(reducer)
+        reduceOutputs.addAll(ReduceDriver.newReduceDriver(reducer)
                 .withCounters(getCounters())
                 .withInputKey(inputKey)
                 .withInputValues(inputValues)
@@ -264,8 +264,8 @@ public class MapReduceDriver<K1, V1, K2 
     for (Pair<K1, V1> input : inputList) {
       LOG.debug("Mapping input " + input.toString() + ")");
 
-      mapOutputs.addAll(new MapDriver<K1, V1, K2, V2>(myMapper).withInput(
-              input).withCounters(getCounters()).run());
+      mapOutputs.addAll(MapDriver.newMapDriver(myMapper).withInput(input)
+              .withCounters(getCounters()).run());
     }
 
     if (myCombiner != null) {
@@ -332,10 +332,24 @@ public class MapReduceDriver<K1, V1, K2 
    * @param reducer passed to MapReduceDriver constructor
    * @return new MapReduceDriver
    */
-  public static <K1, V1, K2 extends Comparable, V2, K3, V3>  
-  MapReduceDriver<K1, V1, K2, V2, K3, V3> 
+  public static <K1, V1, K2 extends Comparable, V2, K3, V3> MapReduceDriver<K1, V1, K2, V2, K3, V3>
   newMapReduceDriver(final Mapper<K1, V1, K2, V2> mapper,
       final Reducer<K2, V2, K3, V3> reducer) {
     return new MapReduceDriver<K1, V1, K2, V2, K3, V3>(mapper, reducer);
   }
+  /**
+   * Returns a new MapReduceDriver without having to specify
+   * the generic types on the right hand side of the object create
+   * statement.
+   * 
+   * @param mapper passed to MapReduceDriver constructor
+   * @param reducer passed to MapReduceDriver constructor
+   * @param combiner passed to MapReduceDriver constructor
+   * @return new MapReduceDriver
+   */
+  public static <K1, V1, K2 extends Comparable, V2, K3, V3> MapReduceDriver<K1, V1, K2, V2, K3, V3>
+  newMapReduceDriver(final Mapper<K1, V1, K2, V2> mapper,
+      final Reducer<K2, V2, K3, V3> reducer, final Reducer<K2, V2, K2, V2> combiner) {
+    return new MapReduceDriver<K1, V1, K2, V2, K3, V3>(mapper, reducer, combiner);
+  }
 }

Modified: incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/PipelineMapReduceDriver.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/PipelineMapReduceDriver.java?rev=1293860&r1=1293859&r2=1293860&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/PipelineMapReduceDriver.java (original)
+++ incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/PipelineMapReduceDriver.java Sun Feb 26 16:14:25 2012
@@ -307,7 +307,7 @@ public class PipelineMapReduceDriver<K1,
 
     for (Pair<Mapper, Reducer> job : mapReducePipeline) {
       // Create a MapReduceDriver to run this phase of the pipeline.
-      MapReduceDriver mrDriver = new MapReduceDriver(job.getFirst(), job.getSecond());
+      MapReduceDriver mrDriver = MapReduceDriver.newMapReduceDriver(job.getFirst(), job.getSecond());
 
       mrDriver.setCounters(getCounters());
 

Modified: incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/mapreduce/MapReduceDriver.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/mapreduce/MapReduceDriver.java?rev=1293860&r1=1293859&r2=1293860&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/mapreduce/MapReduceDriver.java (original)
+++ incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/mapreduce/MapReduceDriver.java Sun Feb 26 16:14:25 2012
@@ -198,7 +198,7 @@ public class MapReduceDriver<K1, V1, K2 
     for (Pair<K1, V1> input : inputList) {
       LOG.debug("Mapping input " + input.toString() + ")");
 
-      mapOutputs.addAll(new MapDriver<K1, V1, K2, V2>(myMapper).withInput(
+      mapOutputs.addAll(MapDriver.newMapDriver(myMapper).withInput(
               input).withCounters(getCounters()).withConfiguration(configuration).run());
     }
 
@@ -213,7 +213,7 @@ public class MapReduceDriver<K1, V1, K2 
       LOG.debug("Reducing input (" + inputKey.toString() + ", "
           + sb.toString() + ")");
 
-      reduceOutputs.addAll(new ReduceDriver<K2, V2, K3, V3>(myReducer)
+      reduceOutputs.addAll(ReduceDriver.newReduceDriver(myReducer)
               .withCounters(getCounters()).withConfiguration(configuration)
               .withInputKey(inputKey).withInputValues(inputValues).run());
     }

Modified: incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/package.html
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/package.html?rev=1293860&r1=1293859&r2=1293860&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/package.html (original)
+++ incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/package.html Sun Feb 26 16:14:25 2012
@@ -68,7 +68,7 @@ public class TestExample extends TestCas
   {@literal @Before}
   public void setUp() {
     mapper = new IdentityMapper();
-    driver = new MapDriver(mapper);
+    driver = MapDriver.newMapDriver(mapper);
   }
 
   {@literal @Test}

Modified: incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestConfigureClose.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestConfigureClose.java?rev=1293860&r1=1293859&r2=1293860&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestConfigureClose.java (original)
+++ incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestConfigureClose.java Sun Feb 26 16:14:25 2012
@@ -53,7 +53,7 @@ public class TestConfigureClose {
           Reporter reporter) throws IOException { 
       }
     };    
-    MapDriver<Text, Text, Text, Text> driver = new MapDriver<Text, Text, Text, Text>(mapper);
+    MapDriver<Text, Text, Text, Text> driver = MapDriver.newMapDriver(mapper);
     driver.runTest();
     assertTrue(configureWasCalled.get());
     assertTrue(closeWasCalled.get());

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=1293860&r1=1293859&r2=1293860&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 Sun Feb 26 16:14:25 2012
@@ -65,7 +65,7 @@ public class TestCounters  {
   @Test
   public void testMapper() throws IOException {
     Mapper<Text, Text, Text, Text> mapper = new CounterMapper();
-    MapDriver<Text, Text, Text, Text> driver = new MapDriver<Text, Text, Text, Text>(mapper);
+    MapDriver<Text, Text, Text, Text> driver = MapDriver.newMapDriver(mapper);
     driver.withInput(new Text("foo"), new Text("bar")).run();
     assertEquals("Expected 1 counter increment", 1,
         driver.getCounters().findCounter(GROUP, ELEM).getValue());
@@ -74,7 +74,7 @@ public class TestCounters  {
   @Test
   public void testReducer() throws IOException {
     Reducer<Text, Text, Text, Text> reducer = new CounterReducer();
-    ReduceDriver<Text, Text, Text, Text> driver = new ReduceDriver<Text, Text, Text, Text>(reducer);
+    ReduceDriver<Text, Text, Text, Text> driver = ReduceDriver.newReduceDriver(reducer);
     driver.withInputKey(new Text("foo"))
           .withInputValue(new Text("bar"))
           .run();
@@ -87,7 +87,7 @@ public class TestCounters  {
     Mapper<Text, Text, Text, Text> mapper = new CounterMapper();
     Reducer<Text, Text, Text, Text> reducer = new CounterReducer();
     MapReduceDriver<Text, Text, Text, Text, Text, Text> driver =
-        new MapReduceDriver<Text, Text, Text, Text, Text, Text>(mapper, reducer);
+        MapReduceDriver.newMapReduceDriver(mapper, reducer);
 
     driver.withInput(new Text("foo"), new Text("bar"))
           .run();

Modified: incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestExample.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestExample.java?rev=1293860&r1=1293859&r2=1293860&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestExample.java (original)
+++ incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestExample.java Sun Feb 26 16:14:25 2012
@@ -38,7 +38,7 @@ public class TestExample {
   @Before
   public void setUp() {
     mapper = new IdentityMapper<Text, Text>();
-    driver = new MapDriver<Text, Text, Text, Text>(mapper);
+    driver = MapDriver.newMapDriver(mapper);
   }
 
   @Test

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=1293860&r1=1293859&r2=1293860&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 Sun Feb 26 16:14:25 2012
@@ -63,7 +63,7 @@ public class TestMapReduceDriver {
     reducer = new LongSumReducer<Text>();
     driver = MapReduceDriver.newMapReduceDriver(mapper, reducer);
     // for shuffle tests
-    driver2 = new MapReduceDriver<Text, Text, Text, Text, Text, Text>();
+    driver2 = MapReduceDriver.newMapReduceDriver();
   }
 
   @Test

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=1293860&r1=1293859&r2=1293860&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 Sun Feb 26 16:14:25 2012
@@ -253,8 +253,7 @@ public class TestReduceDriver {
   @Test
   public void testDoubleIteration() {
     reducer = new DoubleIterReducer<Text, LongWritable>();
-    driver = new ReduceDriver<Text, LongWritable, Text, LongWritable>(
-        reducer);
+    driver = ReduceDriver.newReduceDriver(reducer);
 
     driver
         .withInputKey(new Text("foo"))

Modified: incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestCounters.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestCounters.java?rev=1293860&r1=1293859&r2=1293860&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestCounters.java (original)
+++ incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestCounters.java Sun Feb 26 16:14:25 2012
@@ -60,7 +60,7 @@ public class TestCounters {
   @Test
   public void testMapper() throws IOException {
     Mapper<Text, Text, Text, Text> mapper = new CounterMapper();
-    MapDriver<Text, Text, Text, Text> driver = new MapDriver<Text, Text, Text, Text>(mapper);
+    MapDriver<Text, Text, Text, Text> driver = MapDriver.newMapDriver(mapper);
     driver.withInput(new Text("foo"), new Text("bar")).run();
     assertEquals("Expected 1 counter increment", 1,
         driver.getCounters().findCounter(GROUP, ELEM).getValue());
@@ -69,7 +69,7 @@ public class TestCounters {
   @Test
   public void testReducer() throws IOException {
     Reducer<Text, Text, Text, Text> reducer = new CounterReducer();
-    ReduceDriver<Text, Text, Text, Text> driver = new ReduceDriver<Text, Text, Text, Text>(reducer);
+    ReduceDriver<Text, Text, Text, Text> driver = ReduceDriver.newReduceDriver(reducer);
     driver.withInputKey(new Text("foo"))
           .withInputValue(new Text("bar"))
           .run();
@@ -82,7 +82,7 @@ public class TestCounters {
     Mapper<Text, Text, Text, Text> mapper = new CounterMapper();
     Reducer<Text, Text, Text, Text> reducer = new CounterReducer();
     MapReduceDriver<Text, Text, Text, Text, Text, Text> driver =
-        new MapReduceDriver<Text, Text, Text, Text, Text, Text>(mapper, reducer);
+        MapReduceDriver.newMapReduceDriver(mapper, reducer);
 
     driver.withInput(new Text("foo"), new Text("bar"))
           .run();

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=1293860&r1=1293859&r2=1293860&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 Sun Feb 26 16:14:25 2012
@@ -187,8 +187,7 @@ public class TestMapDriver  {
   public void testConfiguration() {
 	  Configuration conf = new Configuration();
 	  conf.set("TestKey", "TestValue");
-	  MapDriver<NullWritable, NullWritable, NullWritable, NullWritable> confDriver 
-	      = new MapDriver<NullWritable, NullWritable, NullWritable, NullWritable>();
+	  MapDriver<NullWritable, NullWritable, NullWritable, NullWritable> confDriver = MapDriver.newMapDriver();
 	  ConfigurationMapper<NullWritable, NullWritable, NullWritable, NullWritable> mapper 
 	      = new ConfigurationMapper<NullWritable, NullWritable, NullWritable, NullWritable>();
 	  confDriver.withMapper(mapper).withConfiguration(conf).

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=1293860&r1=1293859&r2=1293860&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 Sun Feb 26 16:14:25 2012
@@ -59,7 +59,7 @@ public class TestMapReduceDriver  {
     reducer = new LongSumReducer<Text>();
     driver = MapReduceDriver.newMapReduceDriver(mapper, reducer);
     // for shuffle tests
-    driver2 = new MapReduceDriver<Text, Text, Text, Text, Text, Text>();
+    driver2 = MapReduceDriver.newMapReduceDriver();
   }
 
   @Test
@@ -238,7 +238,7 @@ public class TestMapReduceDriver  {
 	  conf.set("TestKey", "TestValue");
 	  
 	  MapReduceDriver<NullWritable, NullWritable, NullWritable, NullWritable, NullWritable, NullWritable> confDriver 
-	      = new MapReduceDriver<NullWritable, NullWritable, NullWritable, NullWritable, NullWritable, NullWritable>();
+	      = MapReduceDriver.newMapReduceDriver();
 	  
 	  ConfigurationMapper<NullWritable, NullWritable, NullWritable, NullWritable> mapper 
 	      = new ConfigurationMapper<NullWritable, NullWritable, NullWritable, NullWritable>();

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=1293860&r1=1293859&r2=1293860&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 Sun Feb 26 16:14:25 2012
@@ -251,8 +251,7 @@ public class TestReduceDriver  {
   @Test
   public void testDoubleIteration() {
     reducer = new DoubleIterReducer<Text, LongWritable>();
-    driver = new ReduceDriver<Text, LongWritable, Text, LongWritable>(
-        reducer);
+    driver = ReduceDriver.newReduceDriver(reducer);
 
     driver
         .withInputKey(new Text("foo"))
@@ -269,7 +268,7 @@ public class TestReduceDriver  {
 	  Configuration conf = new Configuration();
 	  conf.set("TestKey", "TestValue");
 	  ReduceDriver<NullWritable, NullWritable, NullWritable, NullWritable> confDriver 
-	      = new ReduceDriver<NullWritable, NullWritable, NullWritable, NullWritable>();
+	      = ReduceDriver.newReduceDriver();
 	  ConfigurationReducer<NullWritable, NullWritable, NullWritable, NullWritable> reducer 
 	      = new ConfigurationReducer<NullWritable, NullWritable, NullWritable, NullWritable>();
 	  confDriver.withReducer(reducer).withConfiguration(conf).

Modified: incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestReducerInputValueResuse.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestReducerInputValueResuse.java?rev=1293860&r1=1293859&r2=1293860&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestReducerInputValueResuse.java (original)
+++ incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestReducerInputValueResuse.java Sun Feb 26 16:14:25 2012
@@ -60,8 +60,7 @@ public class TestReducerInputValueResuse
   @Test
   public void testReduce() throws IOException {
     TestReducer reducer = new TestReducer();
-    ReduceDriver<Text, LongWritable, Text, LongWritable> driver = 
-        new ReduceDriver<Text, LongWritable, Text, LongWritable>();
+    ReduceDriver<Text, LongWritable, Text, LongWritable> driver = ReduceDriver.newReduceDriver();
     driver.setReducer(reducer);
     List<LongWritable> values = new ArrayList<LongWritable>();
     values.add(new LongWritable(1));

Modified: incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mock/TestMockOutputCollector.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mock/TestMockOutputCollector.java?rev=1293860&r1=1293859&r2=1293860&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mock/TestMockOutputCollector.java (original)
+++ incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mock/TestMockOutputCollector.java Sun Feb 26 16:14:25 2012
@@ -57,7 +57,7 @@ public class TestMockOutputCollector  {
   @Test
   public void testRepeatedObjectUse() {
     Mapper<Text, Text, Text, Text> mapper = new RepeatMapper();
-    MapDriver<Text, Text, Text, Text> driver = new MapDriver<Text, Text, Text, Text>(mapper);
+    MapDriver<Text, Text, Text, Text> driver = MapDriver.newMapDriver(mapper);
 
     driver.withInput(new Text("inK"), new Text("inV"))
           .withOutput(new Text("1"), new Text("a"))