You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by hs...@apache.org on 2014/11/14 00:24:28 UTC
flume git commit: FLUME-2538. TestResettableFileInputStream fails on
JDK 8.
Repository: flume
Updated Branches:
refs/heads/trunk 619e78fe6 -> 698f0ba2d
FLUME-2538. TestResettableFileInputStream fails on JDK 8.
(Johny Rufus via Hari)
Project: http://git-wip-us.apache.org/repos/asf/flume/repo
Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/698f0ba2
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/698f0ba2
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/698f0ba2
Branch: refs/heads/trunk
Commit: 698f0ba2de9c697ea9fe52134e36a694abc28d88
Parents: 619e78f
Author: Hari Shreedharan <hs...@apache.org>
Authored: Thu Nov 13 15:23:37 2014 -0800
Committer: Hari Shreedharan <hs...@apache.org>
Committed: Thu Nov 13 15:23:37 2014 -0800
----------------------------------------------------------------------
.../serialization/TestResettableFileInputStream.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flume/blob/698f0ba2/flume-ng-core/src/test/java/org/apache/flume/serialization/TestResettableFileInputStream.java
----------------------------------------------------------------------
diff --git a/flume-ng-core/src/test/java/org/apache/flume/serialization/TestResettableFileInputStream.java b/flume-ng-core/src/test/java/org/apache/flume/serialization/TestResettableFileInputStream.java
index 73df9c9..d1240fb 100644
--- a/flume-ng-core/src/test/java/org/apache/flume/serialization/TestResettableFileInputStream.java
+++ b/flume-ng-core/src/test/java/org/apache/flume/serialization/TestResettableFileInputStream.java
@@ -139,8 +139,16 @@ public class TestResettableFileInputStream {
while ((c = in.readChar()) != -1) {
sb.append((char)c);
}
- assertEquals("Latin1: (X)\nLong: (XXX)\nNonUnicode: (X)\n"
- .replaceAll("X", "\ufffd"), sb.toString());
+ String preJdk8ExpectedStr = "Latin1: (X)\nLong: (XXX)\nNonUnicode: (X)\n";
+ String expectedStr = "Latin1: (X)\nLong: (XXX)\nNonUnicode: (XXXXX)\n";
+ String javaVersionStr = System.getProperty("java.version");
+ double javaVersion = Double.parseDouble(javaVersionStr.substring(0, 3));
+
+ if(javaVersion < 1.8) {
+ assertTrue(preJdk8ExpectedStr.replaceAll("X", "\ufffd").equals(sb.toString()));
+ } else {
+ assertTrue(expectedStr.replaceAll("X", "\ufffd").equals(sb.toString()));
+ }
}
@Test(expected = MalformedInputException.class)