You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by in...@apache.org on 2018/06/03 03:27:46 UTC
[4/6] hadoop git commit: MAPREDUCE-7102. Fix TestJavaSerialization
for Windows due a mismatch line separator. Contributed by Giovanni Matteo
Fumarola.
MAPREDUCE-7102. Fix TestJavaSerialization for Windows due a mismatch line separator. Contributed by Giovanni Matteo Fumarola.
(cherry picked from commit a804b7c9d2986556c91c1741c1ae7ac2b9c579f3)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/77d98ae1
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/77d98ae1
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/77d98ae1
Branch: refs/heads/branch-3.0
Commit: 77d98ae1e6e8c2db88891ebab3957e73d062ea8c
Parents: a274d21
Author: Inigo Goiri <in...@apache.org>
Authored: Sat Jun 2 20:25:42 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Sat Jun 2 20:26:38 2018 -0700
----------------------------------------------------------------------
.../hadoop/mapred/TestJavaSerialization.java | 23 +++++++++++---------
1 file changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/77d98ae1/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJavaSerialization.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJavaSerialization.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJavaSerialization.java
index a787e68..e5ef4d2 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJavaSerialization.java
+++ b/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.close();
}
+
+ @SuppressWarnings("deprecation")
@Test
public void testMapReduceJob() throws Exception {
@@ -131,16 +133,17 @@ public class TestJavaSerialization {
FileUtil.stat2Paths(fs.listStatus(OUTPUT_DIR,
new Utils.OutputFileUtils.OutputFilesFilter()));
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);
+ }
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org