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/04/18 03:39:18 UTC

svn commit: r1327353 - in /incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit: TestMapDriver.java TestMapReduceDriver.java TestPipelineMapReduceDriver.java TestReduceDriver.java

Author: jdonofrio
Date: Wed Apr 18 01:39:17 2012
New Revision: 1327353

URL: http://svn.apache.org/viewvc?rev=1327353&view=rev
Log:
MRUNIT-95: use Serialization framework to change all set/add input/output methods to serialize, deserialize to do defensive copying

Modified:
    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

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=1327353&r1=1327352&r2=1327353&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 Wed Apr 18 01:39:17 2012
@@ -410,4 +410,20 @@ public class TestMapDriver {
     driver.addOutput(1, new IntWritable(2));
     driver.runTest();
   }
+
+  @Test
+  public void testCopy() {
+    driver = MapDriver.newMapDriver(new DuplicatingMapper());
+    final Text input = new Text("a");
+    driver.withInputKey(input);
+    input.set("b");
+    driver.withInputValue(input);
+    input.set("c");
+
+    final Text output = new Text("a");
+    driver.withOutput(output, new Text("b"));
+    output.set("b");
+    driver.withOutput(new Text("a"), output);
+    driver.runTest();
+  }
 }

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=1327353&r1=1327352&r2=1327353&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 Wed Apr 18 01:39:17 2012
@@ -408,4 +408,22 @@ public class TestMapReduceDriver {
     driver.addOutput(1, new IntWritable(2));
     driver.runTest();
   }
+
+  @Test
+  public void testCopy() {
+    final Text key = new Text("a");
+    final LongWritable value = new LongWritable(1);
+    driver.addInput(key, value);
+    key.set("b");
+    value.set(2);
+    driver.addInput(key, value);
+
+    key.set("a");
+    value.set(1);
+    driver.addOutput(key, value);
+    key.set("b");
+    value.set(2);
+    driver.addOutput(key, value);
+    driver.runTest();
+  }
 }

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=1327353&r1=1327352&r2=1327353&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 Wed Apr 18 01:39:17 2012
@@ -206,4 +206,26 @@ public class TestPipelineMapReduceDriver
     driver.addOutput(1, new IntWritable(2));
     driver.runTest();
   }
+
+  @Test
+  public void testCopy() {
+    final PipelineMapReduceDriver<Text, Text, Text, Text> driver = PipelineMapReduceDriver
+        .newPipelineMapReduceDriver();
+    driver.withMapReduce(new IdentityMapper<Text, Text>(),
+        new IdentityReducer<Text, Text>());
+    final Text key = new Text("a");
+    final Text value = new Text("b");
+    driver.addInput(key, value);
+    key.set("c");
+    value.set("d");
+    driver.addInput(key, value);
+
+    key.set("a");
+    value.set("b");
+    driver.addOutput(key, value);
+    key.set("c");
+    value.set("d");
+    driver.addOutput(key, value);
+    driver.runTest();
+  }
 }

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=1327353&r1=1327352&r2=1327353&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 Wed Apr 18 01:39:17 2012
@@ -343,6 +343,24 @@ public class TestReduceDriver {
         .withCounter("category", "sum", 4).runTest();
   }
 
+  @Test
+  public void testCopy() {
+    final ReduceDriver<Text, Text, Text, Text> driver = ReduceDriver
+        .newReduceDriver(new IdentityReducer<Text, Text>());
+    final Text input = new Text("a");
+    driver.withInputKey(input);
+    input.set("b");
+    driver.withInputValue(input);
+    input.set("c");
+    driver.withInputValue(input);
+
+    final Text output = new Text("a");
+    driver.withOutput(output, new Text("b"));
+    output.set("c");
+    driver.withOutput(new Text("a"), output);
+    driver.runTest();
+  }
+
   /**
    * Simple reducer that have custom counters that are increased each map() call
    */