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/02/26 11:20:30 UTC
svn commit: r631158 - in /incubator/sling/trunk/launchpad/launchpad-webapp/src/test: java/org/apache/sling/launchpad/webapp/integrationtest/ resources/integration-test/

Author: fmeschbe
Date: Tue Feb 26 02:20:29 2008
New Revision: 631158

URL: http://svn.apache.org/viewvc?rev=631158&view=rev
Log:
SLING-272 Adapt integration tests to new server-side plain JavaScript extension

Added:
    incubator/sling/trunk/launchpad/launchpad-webapp/src/test/resources/integration-test/dump-resource.ecma
      - copied unchanged from r631106, incubator/sling/trunk/launchpad/launchpad-webapp/src/test/resources/integration-test/dump-resource.js
    incubator/sling/trunk/launchpad/launchpad-webapp/src/test/resources/integration-test/rendering-test.ecma
      - copied unchanged from r631106, incubator/sling/trunk/launchpad/launchpad-webapp/src/test/resources/integration-test/rendering-test.js
Removed:
    incubator/sling/trunk/launchpad/launchpad-webapp/src/test/resources/integration-test/dump-resource.js
    incubator/sling/trunk/launchpad/launchpad-webapp/src/test/resources/integration-test/rendering-test.js
Modified:
    incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JavascriptWrappersTest.java
    incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/NodetypeRenderingTest.java
    incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java

Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JavascriptWrappersTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JavascriptWrappersTest.java?rev=631158&r1=631157&r2=631158&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JavascriptWrappersTest.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JavascriptWrappersTest.java Tue Feb 26 02:20:29 2008
@@ -52,7 +52,7 @@
     }
 
     public void testRecursiveDump() throws IOException {
-        final String toDelete = uploadTestScript(testRootNode.scriptPath, "dump-resource.js", "html.js");
+        final String toDelete = uploadTestScript(testRootNode.scriptPath, "dump-resource.ecma", "html.ecma");
         try {
             final String content = getContent(testRootNode.nodeUrl + ".html", CONTENT_TYPE_HTML);
 

Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/NodetypeRenderingTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/NodetypeRenderingTest.java?rev=631158&r1=631157&r2=631158&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/NodetypeRenderingTest.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/NodetypeRenderingTest.java Tue Feb 26 02:20:29 2008
@@ -135,7 +135,7 @@
     }
 
     public void TODO_FAILS_testJsHtml() throws IOException {
-        final String toDelete = uploadTestScript("rendering-test.js","html.js");
+        final String toDelete = uploadTestScript("rendering-test.ecma","html.ecma");
         try {
             final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
             assertTrue("Content includes JS marker",content.contains("Raw javascript template"));

Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java?rev=631158&r1=631157&r2=631158&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java Tue Feb 26 02:20:29 2008
@@ -271,7 +271,7 @@
     }
 
     public void TODO_FAILS_testJsHtml() throws IOException {
-        final String toDelete = uploadTestScript("rendering-test.js","html.js");
+        final String toDelete = uploadTestScript("rendering-test.ecma","html.ecma");
         try {
             final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
             assertTrue("Content includes JS marker",content.contains("Raw javascript template"));