Repository: incubator-juneau Updated Branches: refs/heads/master 7b391d05b -> 23e888cb2
Fix testcase failure on Windows only. Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/23e888cb Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/23e888cb Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/23e888cb Branch: refs/heads/master Commit: 23e888cb254c1bce96ecb494a63a85541a4a0621 Parents: 7b391d0 Author: JamesBognar <[email protected]> Authored: Sun Sep 24 14:32:33 2017 -0400 Committer: JamesBognar <[email protected]> Committed: Sun Sep 24 14:32:33 2017 -0400 ---------------------------------------------------------------------- .../src/test/java/org/apache/juneau/TestUtils.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/23e888cb/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/TestUtils.java ---------------------------------------------------------------------- diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/TestUtils.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/TestUtils.java index 9356686..a94ba62 100755 --- a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/TestUtils.java +++ b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/TestUtils.java @@ -481,7 +481,8 @@ public class TestUtils { } public static void assertEqualsAfterSort(String expected, String actual, String msg, Object...args) { - String[] e = expected.trim().split("\n"), a = actual.trim().split("\n"); + // Must work for windows too. + String[] e = expected.trim().split("[\r\n]+"), a = actual.trim().split("[\r\n]+"); if (e.length != a.length) throw new ComparisonFailure(format(msg, args), expected, actual);
