You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2008/02/29 17:39:59 UTC

svn commit: r632378 - /incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GetWithSuffixTest.java

Author: cziegeler
Date: Fri Feb 29 08:39:54 2008
New Revision: 632378

URL: http://svn.apache.org/viewvc?rev=632378&view=rev
Log:
Fix test case.

Modified:
    incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GetWithSuffixTest.java

Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GetWithSuffixTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GetWithSuffixTest.java?rev=632378&r1=632377&r2=632378&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GetWithSuffixTest.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GetWithSuffixTest.java Fri Feb 29 08:39:54 2008
@@ -27,7 +27,7 @@
  *  content.
  */
 public class GetWithSuffixTest extends RenderingTestBase {
-    
+
     @Override
     protected void setUp() throws Exception {
         super.setUp();
@@ -45,7 +45,7 @@
         scriptPath = "/apps/nt/unstructured";
         testClient.mkdirs(WEBDAV_BASE_URL, scriptPath);
     }
-    
+
     public void testWithExactUrl() throws IOException {
         final String toDelete = uploadTestScript("rendering-test.esp","html.esp");
         try {
@@ -56,7 +56,7 @@
             testClient.delete(toDelete);
         }
     }
-    
+
     public void testGETScript() throws IOException {
         final String toDelete = uploadTestScript("rendering-test.esp","GET.esp");
         try {
@@ -65,8 +65,8 @@
             assertTrue("Content contains formatted test text",content.contains("<p>" + testText + "</p>"));
 
             final String content2 = getContent(displayUrl + ".txt", CONTENT_TYPE_PLAIN);
-            assertTrue("Content includes ESP marker",content.contains("ESP template"));
-            assertTrue("Content contains formatted test text",content.contains("<p>" + testText + "</p>"));
+            assertTrue("Content includes ESP marker",content2.contains("ESP template"));
+            assertTrue("Content contains formatted test text",content2.contains("<p>" + testText + "</p>"));
         } finally {
             testClient.delete(toDelete);
         }
@@ -83,7 +83,7 @@
             testClient.delete(toDelete);
         }
     }
-    
+
     /** behavior seems slightly different if using GET.esp vs. html.esp for the
      *  script name, verify that both give a 404
      */