svn commit: r918930 - in /sling/trunk/launchpad/testing/src/test: java/org/apache/sling/launchpad/webapp/integrationtest/scripting/ resources/integration-test/

[bdelacretaz]

Author: bdelacretaz
Date: Thu Mar  4 11:01:21 2010
New Revision: 918930

URL: http://svn.apache.org/viewvc?rev=918930&view=rev
Log:
SLING-1424, StandaloneScriptExecutionTest failed with JVM 1.5

Added:
    
sling/trunk/launchpad/testing/src/test/resources/integration-test/standalone-test.ecma
      - copied unchanged from r918890, 
sling/trunk/launchpad/testing/src/test/resources/integration-test/standalone-test.js
Removed:
    
sling/trunk/launchpad/testing/src/test/resources/integration-test/standalone-test.js
Modified:
    
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/scripting/StandaloneScriptExecutionTest.java

Modified: 
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/scripting/StandaloneScriptExecutionTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/scripting/StandaloneScriptExecutionTest.java?rev=918930&r1=918929&r2=918930&view=diff
==============================================================================
--- 
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/scripting/StandaloneScriptExecutionTest.java
 (original)
+++ 
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/scripting/StandaloneScriptExecutionTest.java
 Thu Mar  4 11:01:21 2010
@@ -24,12 +24,12 @@
         */
        public void testScriptExecution() throws Exception {
                final String scriptPath = TEST_PATH + "/" + 
getClass().getSimpleName();
-               final String script = "standalone-test.js";
+               final String script = "standalone-test.ecma";
                testClient.mkdirs(WEBDAV_BASE_URL, scriptPath);
                final String scriptUrl = uploadTestScript(scriptPath, script, 
script);
                
                {
-                       final String content = getContent(scriptUrl, 
"application/javascript");
+                       final String content = getContent(scriptUrl, 
CONTENT_TYPE_DONTCARE);
                        assertTrue("Expecting script URL to return raw script 
contents (" + content + ")", 
                                        content.contains("TEST_SCRIPT"));
                }