You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2008/03/25 22:59:05 UTC
svn commit: r641034 -
/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/apt/SimpleAptRenderingTest.java
Author: fmeschbe
Date: Tue Mar 25 14:59:03 2008
New Revision: 641034
URL: http://svn.apache.org/viewvc?rev=641034&view=rev
Log:
Fix more EOL issues on Windows platform
Modified:
incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/apt/SimpleAptRenderingTest.java
Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/apt/SimpleAptRenderingTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/apt/SimpleAptRenderingTest.java?rev=641034&r1=641033&r2=641034&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/apt/SimpleAptRenderingTest.java (original)
+++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/apt/SimpleAptRenderingTest.java Tue Mar 25 14:59:03 2008
@@ -20,7 +20,9 @@
public class SimpleAptRenderingTest extends HttpTestBase {
- public void testAptDocument() throws Exception {
+ private final static String EOL = System.getProperty( "line.separator" );
+
+ public void testAptDocument() throws Exception {
testClient.mkdirs(WEBDAV_BASE_URL, "/apt-test");
final String toDelete = uploadTestScript("/apt-test", "apt/apt-test.apt", "apt-test.apt");
try {
@@ -30,10 +32,10 @@
// .apt.aptml converts APT to html
final String content = getContent(HTTP_BASE_URL + "/apt-test/apt-test.apt.aptml", CONTENT_TYPE_HTML);
assertTrue("HTML opening tag present (" + content + ")", content.startsWith("<html>"));
- assertTrue("HTML closing tag present (" + content + ")", content.endsWith("</html>\n"));
+ assertTrue("HTML closing tag present (" + content + ")", content.endsWith("</html>" + EOL));
assertTrue("title parsed as expected (" + content + ")", content.contains("<title>Simple APT file test</title>"));
- assertTrue("body opening tag is present (" + content + ")", content.contains("</head>\n<body>"));
- assertTrue("body closing tag is present (" + content + ")", content.endsWith("</body>\n</html>\n"));
+ assertTrue("body opening tag is present (" + content + ")", content.contains("</head>" + EOL + "<body>"));
+ assertTrue("body closing tag is present (" + content + ")", content.endsWith("</body>" + EOL + "</html>" + EOL));
assertTrue("h1 parsed as expected (" + content + ")", content.contains("<h1>h1 heading"));
assertTrue("h2 parsed as expected (" + content + ")", content.contains("<h2>h2 heading"));
assertTrue("h3 parsed as expected (" + content + ")", content.contains("<h3>h3 heading"));