Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2009-07-10 23:36:35 +0000
committerJoakim Erdfelt2009-07-10 23:36:35 +0000
commitd8006aaafdf4a545d14510f3b558005a550da113 (patch)
tree7df319ef2182065b29f810ac3561a45c558211de
parent90105841abc54843a4b24fef0ca030a6664c1371 (diff)
downloadorg.eclipse.jetty.project-d8006aaafdf4a545d14510f3b558005a550da113.tar.gz
org.eclipse.jetty.project-d8006aaafdf4a545d14510f3b558005a550da113.tar.xz
org.eclipse.jetty.project-d8006aaafdf4a545d14510f3b558005a550da113.zip
[BUG 283172] fix build on windows
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@547 7e9141cc-0065-0410-87d8-b60c137991c4
-rw-r--r--tests/test-integration/src/test/java/org/eclipse/jetty/test/AbstractJettyTestCase.java15
-rw-r--r--tests/test-integration/src/test/java/org/eclipse/jetty/test/support/rawhttp/HttpResponseTester.java15
2 files changed, 28 insertions, 2 deletions
diff --git a/tests/test-integration/src/test/java/org/eclipse/jetty/test/AbstractJettyTestCase.java b/tests/test-integration/src/test/java/org/eclipse/jetty/test/AbstractJettyTestCase.java
index f7d7722a98..aaafdd4e6e 100644
--- a/tests/test-integration/src/test/java/org/eclipse/jetty/test/AbstractJettyTestCase.java
+++ b/tests/test-integration/src/test/java/org/eclipse/jetty/test/AbstractJettyTestCase.java
@@ -103,6 +103,19 @@ public abstract class AbstractJettyTestCase extends TestCase
return str;
}
- return str.replaceAll("\n","\r\n");
+ StringBuffer ret = new StringBuffer();
+ for (char c : str.toCharArray())
+ {
+ switch (c)
+ {
+ case '\n':
+ ret.append("\r\n");
+ break;
+ default:
+ ret.append(c);
+ }
+ }
+
+ return ret.toString();
}
}
diff --git a/tests/test-integration/src/test/java/org/eclipse/jetty/test/support/rawhttp/HttpResponseTester.java b/tests/test-integration/src/test/java/org/eclipse/jetty/test/support/rawhttp/HttpResponseTester.java
index 7e1ac66456..a7b97d030e 100644
--- a/tests/test-integration/src/test/java/org/eclipse/jetty/test/support/rawhttp/HttpResponseTester.java
+++ b/tests/test-integration/src/test/java/org/eclipse/jetty/test/support/rawhttp/HttpResponseTester.java
@@ -366,8 +366,21 @@ public class HttpResponseTester
{
return str;
}
+
+ StringBuffer ret = new StringBuffer();
+ for (char c : str.toCharArray())
+ {
+ switch (c)
+ {
+ case '\n':
+ ret.append("\r\n");
+ break;
+ default:
+ ret.append(c);
+ }
+ }
- return str.replaceAll("\n","\r\n");
+ return ret.toString();
}
public void assertNoBody(String msg)

Back to the top