geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From upthewatersp...@apache.org
Subject geode git commit: Modified InstallerJUnitTest to run under windows
Date Thu, 02 Feb 2017 00:10:37 GMT
Repository: geode
Updated Branches:
  refs/heads/develop 87cef789c -> 88e701e03


Modified InstallerJUnitTest to run under windows

Previously failed due to line ending diffs

This closes #381


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/88e701e0
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/88e701e0
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/88e701e0

Branch: refs/heads/develop
Commit: 88e701e030dd5de1ce4c0a42b381d643caa2fa85
Parents: 87cef78
Author: Oleg Shvartsman <OSHVARTS@ford.com>
Authored: Wed Feb 1 16:35:21 2017 -0500
Committer: Dan Smith <upthewaterspout@apache.org>
Committed: Wed Feb 1 16:05:33 2017 -0800

----------------------------------------------------------------------
 .../geode/modules/session/installer/InstallerJUnitTest.java   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/88e701e0/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java
b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java
index 585b6c9..e51241b 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java
@@ -51,8 +51,11 @@ public class InstallerJUnitTest {
       new Installer(args).processWebXml(input, output);
     }
 
-    String expected = IOUtils.toString(getClass().getResource(name + ".expected"));
-    assertEquals(expected, output.toString());
+    String expected = IOUtils.toString(getClass().getResource(name + ".expected"))
+        .replaceAll(IOUtils.LINE_SEPARATOR_WINDOWS, "").replaceAll(IOUtils.LINE_SEPARATOR_UNIX,
"");
+    String actual = output.toString().replaceAll(IOUtils.LINE_SEPARATOR_WINDOWS, "")
+        .replaceAll(IOUtils.LINE_SEPARATOR_UNIX, "");
+    assertEquals(expected, actual);
   }
 
 }


Mime
View raw message