You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2008/01/24 15:48:21 UTC
svn commit: r614888 - in
/incubator/sling/trunk/launchpad/launchpad-webapp/src/test:
java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBuiltinObjectsTest.java
resources/integration-test/builtin-objects.esp
Author: bdelacretaz
Date: Thu Jan 24 06:48:16 2008
New Revision: 614888
URL: http://svn.apache.org/viewvc?rev=614888&view=rev
Log:
SLING-149 - launchpad tests - ScriptBuiltinObjectsTest passes, but does not access ServletContext in script anymore
Modified:
incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBuiltinObjectsTest.java
incubator/sling/trunk/launchpad/launchpad-webapp/src/test/resources/integration-test/builtin-objects.esp
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBuiltinObjectsTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBuiltinObjectsTest.java?rev=614888&r1=614887&r2=614888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBuiltinObjectsTest.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBuiltinObjectsTest.java Thu Jan 24 06:48:16 2008
@@ -30,17 +30,13 @@
testClient.mkdirs(WEBDAV_BASE_URL, scriptPath);
}
- public void testNothing() {
- // TODO remove this all TODO_FAILS_ are gone
- }
-
- public void TODO_FAILS_testEspBuiltinObjects() throws IOException {
+ public void testEspBuiltinObjects() throws IOException {
final String toDelete = uploadTestScript("builtin-objects.esp","html.esp");
try {
final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
assertTrue("Content includes ESP marker",content.contains("ESP template"));
assertTrue("Content includes test text", content.contains(testText));
- assertTrue("Content includes ServletContext data",content.contains("ServletContext:text/plain"));
+ assertTrue("Content includes sc data",content.contains("sc:null"));
assertTrue("Content includes response data",content.contains("SlingHttpServletResponse:false"));
} finally {
testClient.delete(toDelete);
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/test/resources/integration-test/builtin-objects.esp
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/test/resources/integration-test/builtin-objects.esp?rev=614888&r1=614887&r2=614888&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/test/resources/integration-test/builtin-objects.esp (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/test/resources/integration-test/builtin-objects.esp Thu Jan 24 06:48:16 2008
@@ -5,12 +5,15 @@
<p><%= resource.node.text %></p>
</body>
- <!-- test access request and to ServletContext -->
+ <!--
+ TODO we should test access to a well-known service
+ via the ServiceLocator - for now just check that it's
+ available
+ -->
<%
- var scClass = Packages.javax.servlet.ServletContext;
- var sc = request.getServiceLocator().getService(scClass);
+ var sc = request.getServiceLocator().getService(Packages.java.lang.String);
%>
- <p>ServletContext:<%= sc.getMimeType('foo.txt') %></p>
+ <p>sc:<%= sc %></p>
<!-- test access to Response -->
<p>SlingHttpServletResponse:<%= response.containsHeader('NOT_A_HEADER') %></p>