You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:20:09 UTC
[sling-org-apache-sling-testing-paxexam] 29/48: use Option
failOnUnresolvedBundles in IT, reorder Options alphabetically
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.testing.paxexam-0.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git
commit cef65d51a807d87165bb2b5498be195397b61a02
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Jul 28 09:44:45 2016 +0000
use Option failOnUnresolvedBundles in IT, reorder Options alphabetically
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1754382 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/java/org/apache/sling/testing/paxexam/TestSupport.java | 2 +-
.../org/apache/sling/testing/paxexam/SlingOptionsTestSupport.java | 5 ++---
2 files changed, 3 insertions(+), 4 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 629768c..d8d457a 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
@@ -66,8 +66,8 @@ public abstract class TestSupport {
protected Option baseConfiguration() {
return composite(
failOnUnresolvedBundles(),
- localMavenRepo(),
keepCaches(),
+ localMavenRepo(),
CoreOptions.workingDirectory(workingDirectory()),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.testing.paxexam").versionAsInProject()
);
diff --git a/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsTestSupport.java b/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsTestSupport.java
index f682a30..d0e08b6 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsTestSupport.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsTestSupport.java
@@ -24,16 +24,15 @@ import org.ops4j.pax.exam.Option;
import static org.ops4j.pax.exam.CoreOptions.composite;
import static org.ops4j.pax.exam.CoreOptions.keepCaches;
-import static org.ops4j.pax.exam.CoreOptions.systemProperty;
public abstract class SlingOptionsTestSupport extends TestSupport {
@Override
protected Option baseConfiguration() {
return composite(
- localMavenRepo(),
- systemProperty("pax.exam.osgi.unresolved.fail").value("true"),
+ failOnUnresolvedBundles(),
keepCaches(),
+ localMavenRepo(),
CoreOptions.workingDirectory(workingDirectory()),
testBundle("bundle.filename")
);
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.