You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ju...@apache.org on 2010/01/25 20:32:40 UTC

svn commit: r902949 - in /sling/trunk/launchpad/testing/src/test: java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBindingsValuesProviderTest.java resources/integration-test/bindingsprovided.esp

Author: justin
Date: Mon Jan 25 19:32:39 2010
New Revision: 902949

URL: http://svn.apache.org/viewvc?rev=902949&view=rev
Log:
SLING-1303 - switching esp test to use typeof as we're testing for an undefined value

Modified:
    sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBindingsValuesProviderTest.java
    sling/trunk/launchpad/testing/src/test/resources/integration-test/bindingsprovided.esp

Modified: sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBindingsValuesProviderTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBindingsValuesProviderTest.java?rev=902949&r1=902948&r2=902949&view=diff
==============================================================================
--- sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBindingsValuesProviderTest.java (original)
+++ sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBindingsValuesProviderTest.java Mon Jan 25 19:32:39 2010
@@ -52,7 +52,7 @@
             final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
             assertTrue("Content includes ESP marker (" + content + ")",content.contains("ESP template"));
             assertTrue("Content includes test text (" + content + ")", content.contains("Hello World!"));
-            assertFalse("Content doesn't include Groovy-specific test text (" + content + ")", content.contains("Hello World from Groovy!"));
+            assertTrue("Content doesn't include Groovy-specific test text (" + content + ")", content.contains("groovyHelloWorld:undefined"));
         } finally {
             testClient.delete(toDelete);
         }

Modified: sling/trunk/launchpad/testing/src/test/resources/integration-test/bindingsprovided.esp
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/src/test/resources/integration-test/bindingsprovided.esp?rev=902949&r1=902948&r2=902949&view=diff
==============================================================================
--- sling/trunk/launchpad/testing/src/test/resources/integration-test/bindingsprovided.esp (original)
+++ sling/trunk/launchpad/testing/src/test/resources/integration-test/bindingsprovided.esp Mon Jan 25 19:32:39 2010
@@ -22,6 +22,6 @@
 	<body>
 		<h1>ESP template</h1>
 		<p>helloWorld:<%= helloWorld %></p>
-		<p>groovyHelloWorld:<%= groovyHelloWorld %></p>
+		<p>groovyHelloWorld:<%= typeof(groovyHelloWorld) %></p>
 	</body>
 </html>