You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mrunit.apache.org by db...@apache.org on 2012/08/13 22:29:17 UTC
svn commit: r1372586 - in /mrunit/trunk/src:
main/java/org/apache/hadoop/mrunit/ test/java/org/apache/hadoop/mrunit/
test/java/org/apache/hadoop/mrunit/mapreduce/
Author: dbeech
Date: Mon Aug 13 20:29:16 2012
New Revision: 1372586
URL: http://svn.apache.org/viewvc?rev=1372586&view=rev
Log:
MRUNIT-141: Fix grammatical errors in counter log messages
Modified:
mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/TestDriver.java
mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapDriver.java
mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapReduceDriver.java
mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestPipelineMapReduceDriver.java
mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestReduceDriver.java
mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapDriver.java
mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapReduceDriver.java
mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestReduceDriver.java
Modified: mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/TestDriver.java
URL: http://svn.apache.org/viewvc/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/TestDriver.java?rev=1372586&r1=1372585&r2=1372586&view=diff
==============================================================================
--- mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/TestDriver.java (original)
+++ mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/TestDriver.java Mon Aug 13 20:29:16 2012
@@ -784,7 +784,7 @@ public abstract class TestDriver<K1, V1,
if (actualValue != expected.getSecond()) {
final String msg = "Counter "
+ expected.getFirst().getDeclaringClass().getCanonicalName() + "."
- + expected.getFirst().toString() + " have value " + actualValue
+ + expected.getFirst().toString() + " has value " + actualValue
+ " instead of expected " + expected.getSecond();
logError(errors, msg);
@@ -801,7 +801,7 @@ public abstract class TestDriver<K1, V1,
if (actualValue != expected.getSecond()) {
final String msg = "Counter with category " + counter.getFirst()
- + " and name " + counter.getSecond() + " have value " + actualValue
+ + " and name " + counter.getSecond() + " has value " + actualValue
+ " instead of expected " + expected.getSecond();
logError(errors, msg);
Modified: mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapDriver.java
URL: http://svn.apache.org/viewvc/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapDriver.java?rev=1372586&r1=1372585&r2=1372586&view=diff
==============================================================================
--- mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapDriver.java (original)
+++ mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapDriver.java Mon Aug 13 20:29:16 2012
@@ -376,8 +376,8 @@ public class TestMapDriver {
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, " +
- "Counter with category category and name name have value 1 instead of expected 4)");
+ "Counter org.apache.hadoop.mrunit.TestMapDriver.MapperWithCounters.Counters.X has value 1 instead of expected 4, " +
+ "Counter with category category and name name has value 1 instead of expected 4)");
driver.withMapper(new MapperWithCounters<Text, Text, Text, Text>())
.withInput(new Text("hie"), new Text("Hi"))
Modified: mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapReduceDriver.java
URL: http://svn.apache.org/viewvc/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapReduceDriver.java?rev=1372586&r1=1372585&r2=1372586&view=diff
==============================================================================
--- mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapReduceDriver.java (original)
+++ mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapReduceDriver.java Mon Aug 13 20:29:16 2012
@@ -483,8 +483,8 @@ public class TestMapReduceDriver {
thrown
.expectAssertionErrorMessage("2 Error(s): ("
- + "Counter org.apache.hadoop.mrunit.TestMapDriver.MapperWithCounters.Counters.X have value 1 instead of expected 20, "
- + "Counter with category category and name name have value 1 instead of expected 20)");
+ + "Counter org.apache.hadoop.mrunit.TestMapDriver.MapperWithCounters.Counters.X has value 1 instead of expected 20, "
+ + "Counter with category category and name name has value 1 instead of expected 20)");
driver
.withMapper(
Modified: mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestPipelineMapReduceDriver.java
URL: http://svn.apache.org/viewvc/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestPipelineMapReduceDriver.java?rev=1372586&r1=1372585&r2=1372586&view=diff
==============================================================================
--- mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestPipelineMapReduceDriver.java (original)
+++ mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestPipelineMapReduceDriver.java Mon Aug 13 20:29:16 2012
@@ -258,8 +258,8 @@ public class TestPipelineMapReduceDriver
thrown
.expectAssertionErrorMessage("2 Error(s): ("
- + "Counter org.apache.hadoop.mrunit.TestMapDriver.MapperWithCounters.Counters.X have value 2 instead of expected 20, "
- + "Counter with category category and name name have value 2 instead of expected 20)");
+ + "Counter org.apache.hadoop.mrunit.TestMapDriver.MapperWithCounters.Counters.X has value 2 instead of expected 20, "
+ + "Counter with category category and name name has value 2 instead of expected 20)");
driver.withInput(new Text("hie"), new Text("Hi"))
.withOutput(new Text("hie"), new Text("Hi"))
Modified: mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestReduceDriver.java
URL: http://svn.apache.org/viewvc/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestReduceDriver.java?rev=1372586&r1=1372585&r2=1372586&view=diff
==============================================================================
--- mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestReduceDriver.java (original)
+++ mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestReduceDriver.java Mon Aug 13 20:29:16 2012
@@ -416,8 +416,8 @@ public class TestReduceDriver {
thrown
.expectAssertionErrorMessage("2 Error(s): ("
- + "Counter org.apache.hadoop.mrunit.TestReduceDriver.ReducerWithCounters.Counters.SUM have value 1 instead of expected 4, "
- + "Counter with category category and name sum have value 1 instead of expected 4)");
+ + "Counter org.apache.hadoop.mrunit.TestReduceDriver.ReducerWithCounters.Counters.SUM has value 1 instead of expected 4, "
+ + "Counter with category category and name sum has value 1 instead of expected 4)");
driver.withReducer(new ReducerWithCounters<Text, Text, Text, Text>())
.withInput(new Text("hie"), inputValues)
Modified: mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapDriver.java
URL: http://svn.apache.org/viewvc/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapDriver.java?rev=1372586&r1=1372585&r2=1372586&view=diff
==============================================================================
--- mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapDriver.java (original)
+++ mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapDriver.java Mon Aug 13 20:29:16 2012
@@ -272,8 +272,8 @@ public class TestMapDriver {
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, " +
- "Counter with category category and name name have value 1 instead of expected 4)");
+ "Counter org.apache.hadoop.mrunit.mapreduce.TestMapDriver.MapperWithCounters.Counters.X has value 1 instead of expected 4, " +
+ "Counter with category category and name name has value 1 instead of expected 4)");
driver.withMapper(new MapperWithCounters<Text, Text, Text, Text>())
.withInput(new Text("hie"), new Text("Hi"))
Modified: mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapReduceDriver.java
URL: http://svn.apache.org/viewvc/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapReduceDriver.java?rev=1372586&r1=1372585&r2=1372586&view=diff
==============================================================================
--- mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapReduceDriver.java (original)
+++ mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapReduceDriver.java Mon Aug 13 20:29:16 2012
@@ -444,8 +444,8 @@ public class TestMapReduceDriver {
thrown
.expectAssertionErrorMessage("2 Error(s): ("
- + "Counter org.apache.hadoop.mrunit.mapreduce.TestMapDriver.MapperWithCounters.Counters.X have value 1 instead of expected 20, "
- + "Counter with category category and name name have value 1 instead of expected 20)");
+ + "Counter org.apache.hadoop.mrunit.mapreduce.TestMapDriver.MapperWithCounters.Counters.X has value 1 instead of expected 20, "
+ + "Counter with category category and name name has value 1 instead of expected 20)");
driver
.withMapper(
Modified: mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestReduceDriver.java
URL: http://svn.apache.org/viewvc/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestReduceDriver.java?rev=1372586&r1=1372585&r2=1372586&view=diff
==============================================================================
--- mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestReduceDriver.java (original)
+++ mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestReduceDriver.java Mon Aug 13 20:29:16 2012
@@ -386,8 +386,8 @@ public class TestReduceDriver {
thrown
.expectAssertionErrorMessage("2 Error(s): ("
- + "Counter org.apache.hadoop.mrunit.mapreduce.TestReduceDriver.ReducerWithCounters.Counters.SUM have value 1 instead of expected 4, "
- + "Counter with category category and name sum have value 1 instead of expected 4)");
+ + "Counter org.apache.hadoop.mrunit.mapreduce.TestReduceDriver.ReducerWithCounters.Counters.SUM has value 1 instead of expected 4, "
+ + "Counter with category category and name sum has value 1 instead of expected 4)");
driver.withReducer(new ReducerWithCounters<Text, Text, Text, Text>())
.withInputKey(new Text("hie")).withInputValue(new Text(""))