浏览代码

MAPREDUCE-7102. Fix TestJavaSerialization for Windows due a mismatch line separator. Contributed by Giovanni Matteo Fumarola.

(cherry picked from commit a804b7c9d2986556c91c1741c1ae7ac2b9c579f3)
Inigo Goiri 7 年之前
父节点
当前提交
fce54631c5

+ 13 - 10
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJavaSerialization.java

@@ -91,6 +91,8 @@ public class TestJavaSerialization {
     wr.write("b a\n");
     wr.write("b a\n");
     wr.close();
     wr.close();
   }
   }
+
+  @SuppressWarnings("deprecation")
   @Test
   @Test
   public void testMapReduceJob() throws Exception {
   public void testMapReduceJob() throws Exception {
 
 
@@ -131,16 +133,17 @@ public class TestJavaSerialization {
         FileUtil.stat2Paths(fs.listStatus(OUTPUT_DIR,
         FileUtil.stat2Paths(fs.listStatus(OUTPUT_DIR,
           new Utils.OutputFileUtils.OutputFilesFilter()));
           new Utils.OutputFileUtils.OutputFilesFilter()));
     assertEquals(1, outputFiles.length);
     assertEquals(1, outputFiles.length);
-    InputStream is = fs.open(outputFiles[0]);
-    String reduceOutput = org.apache.commons.io.IOUtils.toString(is);
-    String[] lines = reduceOutput.split(System.getProperty("line.separator"));
-    assertEquals("Unexpected output; received output '" + reduceOutput + "'",
-      "a\t1", lines[0]);
-    assertEquals("Unexpected output; received output '" + reduceOutput + "'",
-      "b\t1", lines[1]);
-    assertEquals("Reduce output has extra lines; output is '" + reduceOutput
-        + "'", 2, lines.length);
-    is.close();
+    try (InputStream is = fs.open(outputFiles[0])) {
+      String reduceOutput = org.apache.commons.io.IOUtils.toString(is);
+      String[] lines = reduceOutput.split("\n");
+      assertEquals("Unexpected output; received output '" + reduceOutput + "'",
+          "a\t1", lines[0]);
+      assertEquals("Unexpected output; received output '" + reduceOutput + "'",
+          "b\t1", lines[1]);
+      assertEquals(
+          "Reduce output has extra lines; output is '" + reduceOutput + "'", 2,
+          lines.length);
+    }
   }
   }
 
 
   /**
   /**