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/02 12:53:33 UTC
[sling-org-apache-sling-testing-paxexam] 04/04: make common configuration option accessible
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-testing-paxexam.git
commit 46eeb1d97b817dac3ac306c391841bd8fa12e78d
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Sep 2 14:52:59 2022 +0200
make common configuration option accessible
---
src/main/java/org/apache/sling/testing/paxexam/TestSupport.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java b/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
index 4a36902..7d5356c 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
@@ -74,7 +74,8 @@ public abstract class TestSupport {
return when(Objects.nonNull(option)).useOptions(option);
}
- private ModifiableCompositeOption configuration() {
+ // commons options for both default and server mode
+ protected ModifiableCompositeOption commonConfiguration() {
return composite(
failOnUnresolvedBundles(),
keepCaches(),
@@ -89,15 +90,17 @@ public abstract class TestSupport {
);
}
+ // default mode
protected ModifiableCompositeOption baseConfiguration() {
return composite(
- configuration(),
+ commonConfiguration(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.testing.paxexam").versionAsInProject()
);
}
+ // server mode
protected ModifiableCompositeOption serverBaseConfiguration() {
- return configuration();
+ return commonConfiguration();
}
public static int findFreePort() {