You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2022/09/07 14:47:21 UTC
[sling-org-apache-sling-scripting-groovy] branch master updated: SLING-11480 Update Testing PaxExam to 4.0.0
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-groovy.git
The following commit(s) were added to refs/heads/master by this push:
new 285980e SLING-11480 Update Testing PaxExam to 4.0.0
285980e is described below
commit 285980e96675fb869b23b58ad8aa72995fa16d24
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Sep 7 16:47:02 2022 +0200
SLING-11480 Update Testing PaxExam to 4.0.0
use Testing PaxExam 4.0.0-SNAPSHOT
---
pom.xml | 2 +-
.../scripting/groovy/it/GroovyTestSupport.java | 23 +++++-----------------
2 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index f68645c..914dfeb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,7 +160,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.paxexam</artifactId>
- <version>3.1.0</version>
+ <version>4.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<!-- Groovy -->
diff --git a/src/test/java/org/apache/sling/scripting/groovy/it/GroovyTestSupport.java b/src/test/java/org/apache/sling/scripting/groovy/it/GroovyTestSupport.java
index 57548cd..87a0e5e 100644
--- a/src/test/java/org/apache/sling/scripting/groovy/it/GroovyTestSupport.java
+++ b/src/test/java/org/apache/sling/scripting/groovy/it/GroovyTestSupport.java
@@ -18,8 +18,6 @@
*/
package org.apache.sling.scripting.groovy.it;
-import java.util.Objects;
-
import javax.inject.Inject;
import javax.script.ScriptEngineFactory;
@@ -34,8 +32,6 @@ import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.ProbeBuilder;
import org.ops4j.pax.exam.TestProbeBuilder;
import org.ops4j.pax.exam.options.ModifiableCompositeOption;
-import org.ops4j.pax.exam.options.OptionalCompositeOption;
-import org.ops4j.pax.exam.options.extra.VMOption;
import org.ops4j.pax.exam.util.Filter;
import org.osgi.service.http.HttpService;
@@ -44,10 +40,8 @@ import static org.apache.sling.testing.paxexam.SlingOptions.slingQuickstartOakTa
import static org.apache.sling.testing.paxexam.SlingOptions.slingResourcePresence;
import static org.apache.sling.testing.paxexam.SlingOptions.slingScripting;
import static org.ops4j.pax.exam.CoreOptions.composite;
-import static org.ops4j.pax.exam.CoreOptions.junitBundles;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
-import static org.ops4j.pax.exam.CoreOptions.vmOption;
-import static org.ops4j.pax.exam.CoreOptions.when;
+import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfiguration;
public class GroovyTestSupport extends TestSupport {
@@ -86,20 +80,13 @@ public class GroovyTestSupport extends TestSupport {
mavenBundle().groupId("org.apache.groovy").artifactId("groovy-templates").versionAsInProject(),
// testing
slingResourcePresence(),
- mavenBundle().groupId("org.jsoup").artifactId("jsoup").versionAsInProject(),
- mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.hamcrest").versionAsInProject(),
- junitBundles(),
- jacoco() // remove with Testing PaxExam 4.0
+ factoryConfiguration("org.apache.sling.jcr.repoinit.RepositoryInitializer")
+ .put("scripts", new String[]{"create path (sling:OrderedFolder) /content/groovy\nset ACL for everyone\nallow jcr:read on /content/groovy\nend"})
+ .asOption(),
+ mavenBundle().groupId("org.jsoup").artifactId("jsoup").versionAsInProject()
);
}
- // remove with Testing PaxExam 4.0
- protected OptionalCompositeOption jacoco() {
- final String jacocoCommand = System.getProperty("jacoco.command");
- final VMOption option = Objects.nonNull(jacocoCommand) && !jacocoCommand.trim().isEmpty() ? vmOption(jacocoCommand) : null;
- return when(Objects.nonNull(option)).useOptions(option);
- }
-
@ProbeBuilder
public TestProbeBuilder probeConfiguration(final TestProbeBuilder testProbeBuilder) {
testProbeBuilder.setHeader(Constants.EXPORT_PACKAGE, "org.apache.sling.scripting.groovy.it.app");