This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch fail-pax-exam-tests-on-unresolved-bundles in repository https://gitbox.apache.org/repos/asf/aries.git
commit d12e91bb0a96acf0f8f789438df136af7079242c Author: Dominik Przybysz <[email protected]> AuthorDate: Sat May 10 13:10:46 2025 +0200 [MAINTENANCE] Fail pax-exam tests on unresolved bundles --- .../aries/blueprint/itests/AbstractBlueprintIntegrationTest.java | 2 +- .../src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java | 1 + .../java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java | 3 ++- .../test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java | 1 + .../org/apache/aries/quiesce/manager/itest/QuiesceManagerTest.java | 3 ++- .../apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java | 1 + .../test/java/org/apache/aries/subsystem/itests/SubsystemTest.java | 3 ++- .../src/main/java/org/apache/aries/itest/AbstractIntegrationTest.java | 4 ++++ .../org/apache/aries/transaction/itests/AbstractIntegrationTest.java | 3 ++- .../java/org/apache/aries/web/converter/itest/WabConverterITest.java | 3 ++- 10 files changed, 18 insertions(+), 6 deletions(-) diff --git a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractBlueprintIntegrationTest.java b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractBlueprintIntegrationTest.java index ea5ad4e22..38d423ded 100644 --- a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractBlueprintIntegrationTest.java +++ b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractBlueprintIntegrationTest.java @@ -68,7 +68,7 @@ public abstract class AbstractBlueprintIntegrationTest extends AbstractIntegrati addPaxLoggingBundles(), addAsmBundles(), configurePaxUrlLocalMavenRepoIfNeeded(), - systemProperty("pax.exam.osgi.unresolved.fail").value("true") + failOnUnresolvableBundles() ); } diff --git a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java index 7ad6ae41d..ecada75b4 100644 --- a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java +++ b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java @@ -62,6 +62,7 @@ public abstract class AbstractIntegrationTest extends org.apache.aries.itest.Abs junitBundles(), setPaxExamLogLevel("INFO"), configurePaxUrlLocalMavenRepoIfNeeded() + // there could be unresolved bundles e.g. fragments ); } diff --git a/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java b/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java index 98a073bdd..ae69a4f01 100644 --- a/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java +++ b/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java @@ -134,7 +134,8 @@ public class JndiUrlIntegrationTest extends AbstractIntegrationTest { junitBundles(), addPaxLoggingBundles(), setPaxExamLogLevel("INFO"), - configurePaxUrlLocalMavenRepoIfNeeded() + configurePaxUrlLocalMavenRepoIfNeeded(), + failOnUnresolvableBundles() ); } diff --git a/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java b/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java index 3e9c4f29b..dc603d4f8 100644 --- a/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java +++ b/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java @@ -293,6 +293,7 @@ public abstract class AbstractProxyTest extends AbstractIntegrationTest { addPaxLoggingBundles(), setPaxExamLogLevel("INFO"), configurePaxUrlLocalMavenRepoIfNeeded(), + failOnUnresolvableBundles(), addAsmBundles(), mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(), mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.api").versionAsInProject(), diff --git a/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/QuiesceManagerTest.java b/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/QuiesceManagerTest.java index 941455d2a..67acc5973 100644 --- a/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/QuiesceManagerTest.java +++ b/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/QuiesceManagerTest.java @@ -283,7 +283,8 @@ public class QuiesceManagerTest extends AbstractIntegrationTest { setPaxExamLogLevel("INFO"), addPaxLoggingBundles(), configurePaxUrlLocalMavenRepoIfNeeded(), - setupRemoteDebugging() + setupRemoteDebugging(), + failOnUnresolvableBundles() ); } diff --git a/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java b/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java index e1885c7c5..05abc064e 100644 --- a/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java +++ b/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java @@ -121,6 +121,7 @@ public abstract class AbstractBlogIntegrationTest extends org.apache.aries.itest addPaxLoggingBundles(), setPaxExamLogLevel("INFO"), configurePaxUrlLocalMavenRepoIfNeeded(), + failOnUnresolvableBundles(), mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject() ); } diff --git a/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java b/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java index ff6ead266..e7f40a04c 100644 --- a/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java +++ b/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java @@ -120,7 +120,8 @@ public abstract class SubsystemTest extends AbstractIntegrationTest { addPaxLoggingBundles(), setPaxExamLogLevel("DEBUG"), configurePaxUrlLocalMavenRepoIfNeeded(), - setupRemoteDebugging() + setupRemoteDebugging(), + failOnUnresolvableBundles() ); } diff --git a/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/AbstractIntegrationTest.java b/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/AbstractIntegrationTest.java index e57d20317..1bd10fff0 100644 --- a/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/AbstractIntegrationTest.java +++ b/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/AbstractIntegrationTest.java @@ -126,4 +126,8 @@ public abstract class AbstractIntegrationTest { return when(localRepo != null) .useOptions(vmOption("-Dorg.ops4j.pax.url.mvn.localRepository=" + localRepo)); } + + protected Option failOnUnresolvableBundles() { + return systemProperty("pax.exam.osgi.unresolved.fail").value("true"); + } } diff --git a/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java b/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java index a4f119a74..e8f1b71e6 100644 --- a/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java +++ b/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java @@ -61,7 +61,8 @@ public abstract class AbstractIntegrationTest extends org.apache.aries.itest.Abs addPaxLoggingBundles(), setPaxExamLogLevel("INFO"), configurePaxUrlLocalMavenRepoIfNeeded(), - setupRemoteDebugging() + setupRemoteDebugging(), + failOnUnresolvableBundles() ); } diff --git a/web/web-itests/src/test/java/org/apache/aries/web/converter/itest/WabConverterITest.java b/web/web-itests/src/test/java/org/apache/aries/web/converter/itest/WabConverterITest.java index 3c37127b7..9c8f1a738 100644 --- a/web/web-itests/src/test/java/org/apache/aries/web/converter/itest/WabConverterITest.java +++ b/web/web-itests/src/test/java/org/apache/aries/web/converter/itest/WabConverterITest.java @@ -107,7 +107,8 @@ public class WabConverterITest extends AbstractIntegrationTest { junitBundles(), setPaxExamLogLevel("INFO"), addPaxLoggingBundles(), - configurePaxUrlLocalMavenRepoIfNeeded() + configurePaxUrlLocalMavenRepoIfNeeded(), + failOnUnresolvableBundles() ); }
