Improved the xpath parsing to handle multi-line xpath statements as m…

…ultiple statements when running on any OS. It would previously break when running on Windows.
tfredrich · Jul 15, 2010 · 0e8c035 · 0e8c035
1 parent af72e7f
commit 0e8c035
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/RestFixture/src/main/java/smartrics/rest/fitnesse/fixture/support/JSONBodyTypeAdapter.java b/RestFixture/src/main/java/smartrics/rest/fitnesse/fixture/support/JSONBodyTypeAdapter.java
@@ -117,7 +117,7 @@ public Object parse(String expectedListOfXpathsAsString) throws Exception {
 		if ("".equals(expectedListOfXpathsAsString.trim()))
 			return "no-body";
 		expStr = Tools.fromHtml(expStr);
-		String[] nvpArray = expStr.split(System.getProperty("line.separator"));
+		String[] nvpArray = expStr.split("\r?\n");
 		for (String nvp : nvpArray) {
 			if (!"".equals(nvp.trim()))
 				expectedXPathAsList.add(nvp.trim());

diff --git a/RestFixture/src/main/java/smartrics/rest/fitnesse/fixture/support/XPathBodyTypeAdapter.java b/RestFixture/src/main/java/smartrics/rest/fitnesse/fixture/support/XPathBodyTypeAdapter.java
@@ -117,7 +117,7 @@ public Object parse(String expectedListOfXpathsAsString) throws Exception {
 		if ("".equals(expectedListOfXpathsAsString.trim()))
 			return expectedXPathAsList;
 		expStr = Tools.fromHtml(expStr);
-		String[] nvpArray = expStr.split(System.getProperty("line.separator"));
+		String[] nvpArray = expStr.split("\r?\n");
 		for (String nvp : nvpArray) {
 			if (!"".equals(nvp.trim()))
 				expectedXPathAsList.add(nvp.trim());