This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.scripting.thymeleaf-1.1.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-thymeleaf.git
commit 5a19a4f43e1599af03828d5a1d9c77f798c68313 Author: Oliver Lietz <[email protected]> AuthorDate: Thu Jul 28 09:16:05 2016 +0000 SLING-5680 Add Integration Tests for Scripting Thymeleaf adjust to updates in Testing PaxExam git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf@1754371 13f79535-47bb-0310-9956-ffa450edef68 --- .../thymeleaf/it/tests/ThymeleafTestSupport.java | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java b/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java index 34de29a..693b94e 100644 --- a/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java +++ b/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java @@ -18,8 +18,6 @@ */ package org.apache.sling.scripting.thymeleaf.it.tests; -import java.io.File; - import javax.inject.Inject; import javax.script.ScriptEngineFactory; @@ -27,7 +25,6 @@ import org.apache.sling.api.servlets.ServletResolver; import org.apache.sling.auth.core.AuthenticationSupport; import org.apache.sling.engine.SlingRequestProcessor; import org.apache.sling.scripting.thymeleaf.it.app.Activator; -import org.apache.sling.testing.paxexam.SlingOptions; import org.apache.sling.testing.paxexam.TestSupport; import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; @@ -40,12 +37,9 @@ import org.thymeleaf.ITemplateEngine; import static org.apache.sling.testing.paxexam.SlingOptions.slingExtensionI18n; import static org.apache.sling.testing.paxexam.SlingOptions.slingExtensionModels; -import static org.apache.sling.testing.paxexam.SlingOptions.slingJcrOak; -import static org.apache.sling.testing.paxexam.SlingOptions.slingLaunchpadOak; -import static org.apache.sling.testing.paxexam.SlingOptions.slingLaunchpadOakTarConfiguration; +import static org.apache.sling.testing.paxexam.SlingOptions.slingLaunchpadOakTar; import static org.apache.sling.testing.paxexam.SlingOptions.slingScripting; import static org.apache.sling.testing.paxexam.SlingOptions.slingScriptingJsp; -import static org.ops4j.pax.exam.CoreOptions.bundle; import static org.ops4j.pax.exam.CoreOptions.composite; import static org.ops4j.pax.exam.CoreOptions.junitBundles; import static org.ops4j.pax.exam.CoreOptions.mavenBundle; @@ -73,13 +67,11 @@ public abstract class ThymeleafTestSupport extends TestSupport { @Configuration public Option[] configuration() { - final String filename = System.getProperty("bundle.filename"); - final File file = new File(filename); return new Option[]{ baseConfiguration(), launchpad(), // Sling Scripting Thymeleaf - bundle(file.toURI().toString()), + testBundle("bundle.filename"), mavenBundle().groupId("org.javassist").artifactId("javassist").versionAsInProject(), // testing mavenBundle().groupId("org.jsoup").artifactId("jsoup").versionAsInProject(), @@ -105,14 +97,11 @@ public abstract class ThymeleafTestSupport extends TestSupport { final int httpPort = findFreePort(); final String workingDirectory = workingDirectory(); return composite( - slingLaunchpadOakTarConfiguration(workingDirectory, httpPort), - slingJcrOak(), // TODO if slingJcrOak() is called elsewhere, ResourceResolverFactory will not be created - slingLaunchpadOak(), + slingLaunchpadOakTar(workingDirectory, httpPort), slingExtensionI18n(), slingExtensionModels(), slingScripting(), - slingScriptingJsp(), - mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-segment").version(SlingOptions.versionResolver) + slingScriptingJsp() ); } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
