svn commit: r1235061 - in /avro/trunk: ./ lang/java/avro/src/test/java/org/apache/avro/ lang/java/ipc/src/test/java/org/apache/avro/ lang/java/mapred/src/test/java/org/apache/avro/mapred/

[cu...@apache.org]

Author: cutting
Date: Mon Jan 23 23:26:39 2012
New Revision: 1235061

URL: http://svn.apache.org/viewvc?rev=1235061&view=rev
Log:
AVRO-926. Java: Fix tests to pass under JDK 7.

Modified:
    avro/trunk/CHANGES.txt
    avro/trunk/lang/java/avro/src/test/java/org/apache/avro/TestDataFile.java
    avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolSpecific.java
    avro/trunk/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestWordCount.java

Modified: avro/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1235061&r1=1235060&r2=1235061&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Mon Jan 23 23:26:39 2012
@@ -36,6 +36,8 @@ Avro 1.6.2 (unreleased)
     AVRO-957. C: Codec support in C library.  (Michael Cooper and Lucas
     Martin-King via dcreager)
 
+    AVRO-926. Java: Fix tests to pass under JDK 7.  (cutting)
+
   BUG FIXES
 
     AVRO-962. Java: Fix Maven plugin to support string type override.

Modified: avro/trunk/lang/java/avro/src/test/java/org/apache/avro/TestDataFile.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/avro/src/test/java/org/apache/avro/TestDataFile.java?rev=1235061&r1=1235060&r2=1235061&view=diff
==============================================================================
--- avro/trunk/lang/java/avro/src/test/java/org/apache/avro/TestDataFile.java (original)
+++ avro/trunk/lang/java/avro/src/test/java/org/apache/avro/TestDataFile.java Mon Jan 23 23:26:39 2012
@@ -85,7 +85,15 @@ public class TestDataFile {
     return new File(DIR, "test-" + codec + ".avro");
   }
 
-  @Test
+  @Test public void runTestsInOrder() throws Exception {
+    testGenericWrite();
+    testGenericRead();
+    testSplits();
+    testSyncDiscovery();
+    testGenericAppend();
+    testReadWithHeader();
+  }
+
   public void testGenericWrite() throws IOException {
     DataFileWriter<Object> writer =
       new DataFileWriter<Object>(new GenericDatumWriter<Object>())
@@ -120,7 +128,6 @@ public class TestDataFile {
     }
   }
 
-  @Test
   public void testGenericRead() throws IOException {
     DataFileReader<Object> reader =
       new DataFileReader<Object>(makeFile(), new GenericDatumReader<Object>());
@@ -141,7 +148,6 @@ public class TestDataFile {
     }
   }
 
-  @Test
   public void testSplits() throws IOException {
     File file = makeFile();
     DataFileReader<Object> reader =
@@ -169,7 +175,6 @@ public class TestDataFile {
     }
   }
 
-  @Test
   public void testSyncDiscovery() throws IOException {
     File file = makeFile();
     DataFileReader<Object> reader =
@@ -198,7 +203,6 @@ public class TestDataFile {
     }
   }
 
-  @Test
   public void testGenericAppend() throws IOException {
     File file = makeFile();
     long start = file.length();
@@ -232,7 +236,6 @@ public class TestDataFile {
     }
   }  
 
-  @Test
   public void testReadWithHeader() throws IOException {
     File file = makeFile();
     DataFileReader<Object> reader =

Modified: avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolSpecific.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolSpecific.java?rev=1235061&r1=1235060&r2=1235061&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolSpecific.java (original)
+++ avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolSpecific.java Mon Jan 23 23:26:39 2012
@@ -249,7 +249,6 @@ public class TestProtocolSpecific {
       assertEquals("goodbye", response);
     } finally {
       t.close();
-      server.close();
     }
   }
 

Modified: avro/trunk/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestWordCount.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestWordCount.java?rev=1235061&r1=1235060&r2=1235061&view=diff
==============================================================================
--- avro/trunk/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestWordCount.java (original)
+++ avro/trunk/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestWordCount.java Mon Jan 23 23:26:39 2012
@@ -63,7 +63,11 @@ public class TestWordCount {
     }
   }    
 
-  @Test
+  @Test public void runTestsInOrder() throws Exception {
+    testJob();
+    testProjection();
+  }
+
   @SuppressWarnings("deprecation")
   public void testJob() throws Exception {
     JobConf job = new JobConf();
@@ -94,7 +98,6 @@ public class TestWordCount {
     WordCountUtil.validateCountsFile();
   }
   
-  @Test
   @SuppressWarnings("deprecation")
   public void testProjection() throws Exception {
     JobConf job = new JobConf();