svn commit: r1348413 - in /mrunit/trunk/src/main/java/org/apache/hadoop/mrunit: MapDriver.java ReduceDriver.java

[db...@apache.org]

Author: dbeech
Date: Sat Jun  9 14:07:43 2012
New Revision: 1348413

URL: http://svn.apache.org/viewvc?rev=1348413&view=rev
Log:
MRUNIT-116: Setting of configuration on Mappers/Reducers in MapDriver and ReduceDriver is inconsistent

Modified:
    mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapDriver.java
    mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/ReduceDriver.java

Modified: mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapDriver.java
URL: http://svn.apache.org/viewvc/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapDriver.java?rev=1348413&r1=1348412&r2=1348413&view=diff
==============================================================================
--- mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapDriver.java (original)
+++ mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapDriver.java Sat Jun  9 14:07:43 2012
@@ -24,7 +24,6 @@ import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.conf.Configurable;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.mapred.Counters;
 import org.apache.hadoop.mapred.InputFormat;
@@ -36,6 +35,7 @@ import org.apache.hadoop.mrunit.internal
 import org.apache.hadoop.mrunit.internal.output.MockOutputCreator;
 import org.apache.hadoop.mrunit.internal.output.OutputCollectable;
 import org.apache.hadoop.mrunit.types.Pair;
+import org.apache.hadoop.util.ReflectionUtils;
 
 /**
  * Harness that allows you to test a Mapper instance. You provide the input key
@@ -245,10 +245,8 @@ public class MapDriver<K1, V1, K2, V2> e
     final MockReporter reporter = new MockReporter(
         MockReporter.ReporterType.Mapper, getCounters());
 
-    if (myMapper instanceof Configurable) {
-      ((Configurable) myMapper).setConf(getConfiguration());
-    }
-    myMapper.configure(new JobConf(getConfiguration()));
+    ReflectionUtils.setConf(myMapper, new JobConf(getConfiguration()));
+
     myMapper.map(inputKey, inputVal, outputCollectable, reporter);
     myMapper.close();
     return outputCollectable.getOutputs();

Modified: mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/ReduceDriver.java
URL: http://svn.apache.org/viewvc/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/ReduceDriver.java?rev=1348413&r1=1348412&r2=1348413&view=diff
==============================================================================
--- mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/ReduceDriver.java (original)
+++ mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/ReduceDriver.java Sat Jun  9 14:07:43 2012
@@ -35,6 +35,7 @@ import org.apache.hadoop.mrunit.internal
 import org.apache.hadoop.mrunit.internal.output.MockOutputCreator;
 import org.apache.hadoop.mrunit.internal.output.OutputCollectable;
 import org.apache.hadoop.mrunit.types.Pair;
+import org.apache.hadoop.util.ReflectionUtils;
 
 /**
  * Harness that allows you to test a Reducer instance. You provide a key and a
@@ -255,7 +256,8 @@ public class ReduceDriver<K1, V1, K2, V2
     final MockReporter reporter = new MockReporter(
         MockReporter.ReporterType.Reducer, getCounters());
 
-    myReducer.configure(new JobConf(getConfiguration()));
+    ReflectionUtils.setConf(myReducer, new JobConf(getConfiguration()));
+
     myReducer.reduce(inputKey, getInputValues().iterator(), outputCollectable,
         reporter);
     myReducer.close();