Author: rombert
Date: Wed Jul 10 20:32:17 2013
New Revision: 1501974
URL: http://svn.apache.org/r1501974
Log:
SLING-2960 - Contrib integration tests fail: Sling services not
available. Already checked in earlier tests.
Remove obsolete workaround from ScalaScriptingTest.
Modified:
sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/scala/ScalaScriptingTest.java
Modified:
sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/scala/ScalaScriptingTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/scala/ScalaScriptingTest.java?rev=1501974&r1=1501973&r2=1501974&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/scala/ScalaScriptingTest.java
(original)
+++
sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/scala/ScalaScriptingTest.java
Wed Jul 10 20:32:17 2013
@@ -22,21 +22,6 @@ import org.apache.sling.commons.testing.
public class ScalaScriptingTest extends HttpTestBase {
- /**
- * The first request on a fresh Sling instance always fails with
- * javax.script.ScriptException: ERROR : error while loading ScriptHelper,
- * class file 'org/apache/sling/scripting/core/ScriptHelper.class' is
broken
- * (class org.osgi.framework.BundleContext not found.)
- *
- * For the time being this is a known issue. Until this is fixed this test
- * is here to catch this first request and make subsequent tests pass.
- * @throws IOException
- */
- public void testIgnore() throws IOException {
- String url = HTTP_BASE_URL + "/content/helloworld.html";
- getContent(url, CONTENT_TYPE_HTML, null, 500);
- }
-
public void testHelloWorldApp() throws IOException {
String url = HTTP_BASE_URL + "/content/helloworld.html";
String content = getContent(url, CONTENT_TYPE_HTML);
