You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by cu...@apache.org on 2013/02/21 22:08:31 UTC
svn commit: r1448804 - in
/avro/trunk/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/mapreduce:
TestKeyValueWordCount.java TestKeyWordCount.java
Author: cutting
Date: Thu Feb 21 21:08:30 2013
New Revision: 1448804
URL: http://svn.apache.org/r1448804
Log:
AVRO-1254. Fix Trevni mapreduce tests to not depend on order, which is no longer guaranteed under Java 7. Committed to the right place this time.
Modified:
avro/trunk/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/mapreduce/TestKeyValueWordCount.java
avro/trunk/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/mapreduce/TestKeyWordCount.java
Modified: avro/trunk/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/mapreduce/TestKeyValueWordCount.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/mapreduce/TestKeyValueWordCount.java?rev=1448804&r1=1448803&r2=1448804&view=diff
==============================================================================
--- avro/trunk/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/mapreduce/TestKeyValueWordCount.java (original)
+++ avro/trunk/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/mapreduce/TestKeyValueWordCount.java Thu Feb 21 21:08:30 2013
@@ -104,8 +104,12 @@ public class TestKeyValueWordCount {
}
}
- @Test
- public void testKeyOutputFormat() throws Exception {
+ @Test public void testIOFormat() throws Exception {
+ checkOutputFormat();
+ checkInputFormat();
+ }
+
+ public void checkOutputFormat() throws Exception {
Job job = new Job();
WordCountUtil wordCountUtil = new WordCountUtil("trevniMapReduceKeyValueTest", "part-r-00000");
@@ -134,8 +138,7 @@ public class TestKeyValueWordCount {
wordCountUtil.validateCountsFileGenericRecord();
}
- @Test
- public void testInputFormat() throws Exception {
+ public void checkInputFormat() throws Exception {
Job job = new Job();
WordCountUtil wordCountUtil = new WordCountUtil("trevniMapReduceKeyValueTest");
Modified: avro/trunk/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/mapreduce/TestKeyWordCount.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/mapreduce/TestKeyWordCount.java?rev=1448804&r1=1448803&r2=1448804&view=diff
==============================================================================
--- avro/trunk/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/mapreduce/TestKeyWordCount.java (original)
+++ avro/trunk/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/mapreduce/TestKeyWordCount.java Thu Feb 21 21:08:30 2013
@@ -116,8 +116,12 @@ public class TestKeyWordCount {
}
- @Test
- public void testKeyOutputFormat() throws Exception {
+ @Test public void testIOFormat() throws Exception {
+ checkOutputFormat();
+ checkInputFormat();
+ }
+
+ public void checkOutputFormat() throws Exception {
Job job = new Job();
WordCountUtil wordCountUtil = new WordCountUtil("trevniMapReduceKeyTest", "part-r-00000");
@@ -145,8 +149,7 @@ public class TestKeyWordCount {
wordCountUtil.validateCountsFile();
}
- @Test
- public void testInputFormat() throws Exception {
+ public void checkInputFormat() throws Exception {
Job job = new Job();
WordCountUtil wordCountUtil = new WordCountUtil("trevniMapReduceKeyTest");