This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch extract-common-itests-options in repository https://gitbox.apache.org/repos/asf/aries.git
commit 441ecacdd9cbdf72bebe03c4ba7a5c8f951f6fea Author: Dominik Przybysz <[email protected]> AuthorDate: Sat Feb 15 14:16:34 2025 +0100 [MAINTENANCE] Update pax-exam tests for modules supporting pax-exam 4.x --- .../runtime/itests/BasicAppManagerTest.java | 5 +- .../runtime/itests/BasicNoOpResolverTest.java | 5 +- .../itests/IsolatedCfgAdminRuntimeTest.java | 5 +- .../runtime/itests/IsolatedRuntimeTest.java | 5 +- .../runtime/itests/MinimumImportsTest.java | 5 +- .../runtime/itests/OBRAppManagerTest.java | 6 +- .../runtime/itests/OBRResolverAdvancedTest.java | 5 +- .../runtime/itests/OBRResolverTest.java | 5 +- .../application/runtime/itests/UpdateAppTest.java | 5 +- .../cm/itest/ConfigurationPostResolverTest.java | 11 +--- .../itests/AbstractBlueprintIntegrationTest.java | 40 ++++++------- .../ParserServiceImportAndIncludeXSDsTest.java | 2 +- ...eImportCmAndIncorrectNamespaceHandlersTest.java | 2 +- ...viceImportXSDsBetweenNamespaceHandlersTest.java | 2 +- .../ejb/container/itest/EJBModellingTest.java | 52 ++++++---------- .../extender/itest/AbstractOpenEJBTest.java | 12 +--- .../apache/aries/jmx/AbstractIntegrationTest.java | 10 +--- .../aries/jmx/framework/BundleStateMBeanTest.java | 5 +- .../aries/jmx/framework/FrameworkMBeanTest.java | 69 +++++++++++----------- .../aries/jmx/framework/ServiceStateMBeanTest.java | 7 +-- .../wiring/BundleWiringStateMBeanTest.java | 16 +++-- .../permissionadmin/PermissionAdminMBeanTest.java | 20 +++---- .../integration/helper/IntegrationTestBase.java | 3 - .../aries/jndi/itests/JndiUrlIntegrationTest.java | 19 ++---- .../quiesce/manager/itest/QuiesceManagerTest.java | 12 +--- .../aries/subsystem/itests/SubsystemTest.java | 14 ++--- .../web/converter/itest/WabConverterITest.java | 48 +++++++-------- 27 files changed, 151 insertions(+), 239 deletions(-) diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java index 892bc6329..0e2db743d 100644 --- a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java +++ b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java @@ -149,11 +149,10 @@ public class BasicAppManagerTest extends AbstractIntegrationTest { // framework / core bundles mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(), mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(), - mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(), - mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(), // Logging - systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"), + addPaxLoggingBundles(), + setPaxExamLogLevel("DEBUG"), // Bundles junitBundles(), diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java index 1cc5382d6..aec09e68e 100644 --- a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java +++ b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java @@ -125,11 +125,10 @@ public class BasicNoOpResolverTest extends AbstractIntegrationTest { // framework / core bundles mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(), mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(), - mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(), - mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(), // Logging - systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"), + addPaxLoggingBundles(), + setPaxExamLogLevel("INFO"), // Bundles junitBundles(), diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedCfgAdminRuntimeTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedCfgAdminRuntimeTest.java index ef915a8b2..e1842d28c 100644 --- a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedCfgAdminRuntimeTest.java +++ b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedCfgAdminRuntimeTest.java @@ -368,14 +368,13 @@ public class IsolatedCfgAdminRuntimeTest extends AbstractIntegrationTest { // framework / core bundles mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(), mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(), - mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(), - mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(), // Repository repository("http://repository.ops4j.org/maven2";), // Logging - systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"), + addPaxLoggingBundles(), + setPaxExamLogLevel("INFO"), // Bundles junitBundles(), diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java index 6d5f6a36e..09d6a7036 100644 --- a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java +++ b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java @@ -316,14 +316,13 @@ public class IsolatedRuntimeTest extends AbstractIntegrationTest { // framework / core bundles mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(), mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(), - mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(), - mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(), // Repository repository("http://repository.ops4j.org/maven2";), // Logging - systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"), + addPaxLoggingBundles(), + setPaxExamLogLevel("INFO"), // Bundles junitBundles(), diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java index cf0a80540..4f0c0852c 100644 --- a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java +++ b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java @@ -175,11 +175,10 @@ public class MinimumImportsTest extends AbstractIntegrationTest { // framework / core bundles mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(), mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(), - mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(), - mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(), // Logging - systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"), + addPaxLoggingBundles(), + setPaxExamLogLevel("INFO"), // Bundles junitBundles(), diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java index ea1a052b2..9167c458e 100644 --- a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java +++ b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java @@ -156,11 +156,11 @@ public class OBRAppManagerTest extends AbstractIntegrationTest { // framework / core bundles mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(), mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(), - mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(), - mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(), + // Logging - systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"), + addPaxLoggingBundles(), + setPaxExamLogLevel("INFO"), // Bundles junitBundles(), diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java index d1191f319..ece04a0b2 100644 --- a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java +++ b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java @@ -533,11 +533,10 @@ public class OBRResolverAdvancedTest extends AbstractIntegrationTest { // framework / core bundles mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(), mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(), - mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(), - mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(), // Logging - systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"), + addPaxLoggingBundles(), + setPaxExamLogLevel("INFO"), // Bundles junitBundles(), diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java index db6ce8efb..8bec78337 100644 --- a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java +++ b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java @@ -319,11 +319,10 @@ public class OBRResolverTest extends AbstractIntegrationTest { // framework / core bundles mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(), mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(), - mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(), - mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(), // Logging - systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"), + addPaxLoggingBundles(), + setPaxExamLogLevel("INFO"), // Bundles junitBundles(), diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java index 7115d87c9..88ef0bc34 100644 --- a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java +++ b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java @@ -257,11 +257,10 @@ public class UpdateAppTest extends AbstractIntegrationTest { // framework / core bundles mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(), mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(), - mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(), - mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(), // Logging - systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"), + addPaxLoggingBundles(), + setPaxExamLogLevel("INFO"), // do not provision against the local runtime systemProperty(AppConstants.PROVISON_EXCLUDE_LOCAL_REPO_SYSPROP).value("true"), diff --git a/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/resolve/transform/cm/itest/ConfigurationPostResolverTest.java b/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/resolve/transform/cm/itest/ConfigurationPostResolverTest.java index 05ddcedb2..348ba9017 100644 --- a/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/resolve/transform/cm/itest/ConfigurationPostResolverTest.java +++ b/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/resolve/transform/cm/itest/ConfigurationPostResolverTest.java @@ -125,16 +125,11 @@ public class ConfigurationPostResolverTest extends AbstractIntegrationTest { } public Option baseOptions() { - String localRepo = System.getProperty("maven.repo.local"); - if (localRepo == null) { - localRepo = System.getProperty("org.ops4j.pax.url.mvn.localRepository"); - } return composite( junitBundles(), - systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"), - when(localRepo != null).useOptions(vmOption("-Dorg.ops4j.pax.url.mvn.localRepository=" + localRepo)), - mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(), - mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject() + setPaxExamLogLevel("INFO"), + addPaxLoggingBundles(), + configurePaxUrlLocalMavenRepoIfNeeded() ); } 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 9a250a53b..a6bdfa57d 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 @@ -18,17 +18,6 @@ */ package org.apache.aries.blueprint.itests; -import static org.apache.aries.blueprint.itests.Helper.mvnBundle; -import static org.junit.Assert.assertNotNull; -import static org.ops4j.pax.exam.CoreOptions.composite; -import static org.ops4j.pax.exam.CoreOptions.junitBundles; -import static org.ops4j.pax.exam.CoreOptions.systemProperty; -import static org.ops4j.pax.exam.CoreOptions.vmOption; -import static org.ops4j.pax.exam.CoreOptions.when; - -import java.io.InputStream; -import java.util.Hashtable; - import org.apache.aries.itest.AbstractIntegrationTest; import org.apache.aries.itest.RichBundleContext; import org.junit.runner.RunWith; @@ -45,6 +34,15 @@ import org.osgi.service.blueprint.container.BlueprintContainer; import org.osgi.service.cm.Configuration; import org.osgi.service.cm.ConfigurationAdmin; +import java.io.InputStream; +import java.util.Hashtable; + +import static org.apache.aries.blueprint.itests.Helper.mvnBundle; +import static org.junit.Assert.assertNotNull; +import static org.ops4j.pax.exam.CoreOptions.composite; +import static org.ops4j.pax.exam.CoreOptions.junitBundles; +import static org.ops4j.pax.exam.CoreOptions.systemProperty; + /** * Base class for Pax Exam 1.2.x based unit tests Contains the injection point and various utilities used in * most tests @@ -64,18 +62,14 @@ public abstract class AbstractBlueprintIntegrationTest extends AbstractIntegrati } public Option baseOptions() { - String localRepo = System.getProperty("maven.repo.local"); - if (localRepo == null) { - localRepo = System.getProperty("org.ops4j.pax.url.mvn.localRepository"); - } - return composite(junitBundles(), - systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"), - when(localRepo != null) - .useOptions(vmOption("-Dorg.ops4j.pax.url.mvn.localRepository=" + localRepo)), - mvnBundle("org.ops4j.pax.logging", "pax-logging-api"), - mvnBundle("org.ops4j.pax.logging", "pax-logging-service"), - systemProperty("pax.exam.osgi.unresolved.fail").value("true") - ); + return composite( + junitBundles(), + setPaxExamLogLevel("INFO"), + mvnBundle("org.ops4j.pax.logging", "pax-logging-api"), + mvnBundle("org.ops4j.pax.logging", "pax-logging-service"), + configurePaxUrlLocalMavenRepoIfNeeded(), + systemProperty("pax.exam.osgi.unresolved.fail").value("true") + ); } public InputStream getResource(String path) { diff --git a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ParserServiceImportAndIncludeXSDsTest.java b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ParserServiceImportAndIncludeXSDsTest.java index af77a3647..19a4a6a28 100644 --- a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ParserServiceImportAndIncludeXSDsTest.java +++ b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ParserServiceImportAndIncludeXSDsTest.java @@ -48,7 +48,7 @@ public class ParserServiceImportAndIncludeXSDsTest extends AbstractBlueprintInte public Option[] config() { return new Option[] { baseOptions(), - systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"), + setPaxExamLogLevel("DEBUG"), blueprintBundles(), keepCaches(), streamBundle(createAries1682NamespaceHandlerBundle()), diff --git a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ParserServiceImportCmAndIncorrectNamespaceHandlersTest.java b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ParserServiceImportCmAndIncorrectNamespaceHandlersTest.java index e959b2110..3c3747aac 100644 --- a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ParserServiceImportCmAndIncorrectNamespaceHandlersTest.java +++ b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ParserServiceImportCmAndIncorrectNamespaceHandlersTest.java @@ -50,7 +50,7 @@ public class ParserServiceImportCmAndIncorrectNamespaceHandlersTest extends Abst public Option[] config() { return new Option[] { baseOptions(), - systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"), + setPaxExamLogLevel("INFO"), blueprintBundles(), keepCaches(), streamBundle(createIncorrectNamespaceHandlerBundle()), diff --git a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ParserServiceImportXSDsBetweenNamespaceHandlersTest.java b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ParserServiceImportXSDsBetweenNamespaceHandlersTest.java index 562b93209..44d25a794 100644 --- a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ParserServiceImportXSDsBetweenNamespaceHandlersTest.java +++ b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ParserServiceImportXSDsBetweenNamespaceHandlersTest.java @@ -50,7 +50,7 @@ public class ParserServiceImportXSDsBetweenNamespaceHandlersTest extends Abstrac public Option[] config() { return new Option[] { baseOptions(), - systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"), + setPaxExamLogLevel("INFO"), blueprintBundles(), keepCaches(), streamBundle(createAries1503aNamespaceHandlerBundle()).noStart(), diff --git a/ejb/ejb-modeller-itest/src/test/java/org/apache/aries/ejb/container/itest/EJBModellingTest.java b/ejb/ejb-modeller-itest/src/test/java/org/apache/aries/ejb/container/itest/EJBModellingTest.java index 1d887d768..c03512cac 100644 --- a/ejb/ejb-modeller-itest/src/test/java/org/apache/aries/ejb/container/itest/EJBModellingTest.java +++ b/ejb/ejb-modeller-itest/src/test/java/org/apache/aries/ejb/container/itest/EJBModellingTest.java @@ -15,14 +15,6 @@ */ package org.apache.aries.ejb.container.itest; -import static org.ops4j.pax.exam.CoreOptions.composite; -import static org.ops4j.pax.exam.CoreOptions.frameworkProperty; -import static org.ops4j.pax.exam.CoreOptions.junitBundles; -import static org.ops4j.pax.exam.CoreOptions.mavenBundle; -import static org.ops4j.pax.exam.CoreOptions.systemProperty; -import static org.ops4j.pax.exam.CoreOptions.vmOption; -import static org.ops4j.pax.exam.CoreOptions.when; - import org.apache.aries.application.modelling.ModelledResourceManager; import org.apache.aries.application.modelling.ModellingManager; import org.apache.aries.application.modelling.ServiceModeller; @@ -36,6 +28,11 @@ import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; import org.ops4j.pax.exam.spi.reactors.PerClass; import org.osgi.framework.BundleException; +import static org.ops4j.pax.exam.CoreOptions.composite; +import static org.ops4j.pax.exam.CoreOptions.frameworkProperty; +import static org.ops4j.pax.exam.CoreOptions.junitBundles; +import static org.ops4j.pax.exam.CoreOptions.mavenBundle; + @RunWith(PaxExam.class) @ExamReactorStrategy(PerClass.class) public class EJBModellingTest extends AbstractEJBModellerTest { @@ -49,21 +46,14 @@ public class EJBModellingTest extends AbstractEJBModellerTest { } protected Option baseOptions() { - String localRepo = System.getProperty("maven.repo.local"); - - if (localRepo == null) { - localRepo = System.getProperty("org.ops4j.pax.url.mvn.localRepository"); - } - return composite( - junitBundles(), - mavenBundle("org.ops4j.pax.logging", "pax-logging-api", "1.7.2"), - mavenBundle("org.ops4j.pax.logging", "pax-logging-service", "1.7.2"), - mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(), - // this is how you set the default log level when using pax - // logging (logProfile) - systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"), - when(localRepo != null).useOptions(vmOption("-Dorg.ops4j.pax.url.mvn.localRepository=" + localRepo)) - ); + return composite( + junitBundles(), + mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(), + addPaxLoggingBundles(), + setPaxExamLogLevel("INFO"), + configurePaxUrlLocalMavenRepoIfNeeded(), + setupRemoteDebugging() + ); } @Configuration @@ -98,20 +88,17 @@ public class EJBModellingTest extends AbstractEJBModellerTest { mavenBundle("org.apache.geronimo.specs", "geronimo-jaxb_2.2_spec").versionAsInProject(), mavenBundle("org.apache.geronimo.specs", "geronimo-stax-api_1.2_spec").versionAsInProject(), mavenBundle("org.apache.geronimo.specs", "geronimo-jaxws_2.2_spec").versionAsInProject(), - + mavenBundle("commons-cli", "commons-cli").versionAsInProject(), mavenBundle("org.apache.commons", "commons-lang3").versionAsInProject(), mavenBundle("commons-lang", "commons-lang").versionAsInProject(), mavenBundle("commons-beanutils", "commons-beanutils").versionAsInProject(), mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.commons-collections").versionAsInProject(), - + mavenBundle("org.apache.aries", "org.apache.aries.util").versionAsInProject(), mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject(), mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").versionAsInProject(), - mavenBundle("org.ow2.asm", "asm").versionAsInProject(), - mavenBundle("org.ow2.asm", "asm-commons").versionAsInProject(), - mavenBundle("org.ow2.asm", "asm-tree").versionAsInProject(), - mavenBundle("org.ow2.asm", "asm-analysis").versionAsInProject(), + addAsmBundles(), mavenBundle("org.apache.aries.application", "org.apache.aries.application.api").versionAsInProject(), mavenBundle("org.apache.aries.application", "org.apache.aries.application.modeller").versionAsInProject(), @@ -123,7 +110,7 @@ public class EJBModellingTest extends AbstractEJBModellerTest { mavenBundle("org.apache.openejb", "openejb-javaagent").versionAsInProject(), mavenBundle("org.apache.openejb", "openejb-jee").versionAsInProject(), mavenBundle("org.apache.openejb", "openejb-loader").versionAsInProject(), - + mavenBundle("org.apache.openwebbeans", "openwebbeans-impl").versionAsInProject(), mavenBundle("org.apache.openwebbeans", "openwebbeans-spi").versionAsInProject(), mavenBundle("org.apache.openwebbeans", "openwebbeans-ee").versionAsInProject(), @@ -133,8 +120,7 @@ public class EJBModellingTest extends AbstractEJBModellerTest { mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.javassist").versionAsInProject(), mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.wsdl4j-1.6.1").versionAsInProject(), mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jaxb-impl").versionAsInProject(), - - + mavenBundle("org.apache.geronimo.components", "geronimo-connector").versionAsInProject(), mavenBundle("org.apache.geronimo.components", "geronimo-transaction").versionAsInProject(), mavenBundle("org.apache.geronimo.bundles", "scannotation").versionAsInProject(), @@ -144,8 +130,6 @@ public class EJBModellingTest extends AbstractEJBModellerTest { mavenBundle("org.apache.xbean", "xbean-reflect").versionAsInProject(), mavenBundle("org.hsqldb", "hsqldb").versionAsInProject() ); - // vmOption ("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006"), - // waitForFrameworkStartup(), } } diff --git a/ejb/openejb-extender-itest/src/test/java/org/apache/aries/ejb/openejb/extender/itest/AbstractOpenEJBTest.java b/ejb/openejb-extender-itest/src/test/java/org/apache/aries/ejb/openejb/extender/itest/AbstractOpenEJBTest.java index 26df23678..7f802bfb6 100644 --- a/ejb/openejb-extender-itest/src/test/java/org/apache/aries/ejb/openejb/extender/itest/AbstractOpenEJBTest.java +++ b/ejb/openejb-extender-itest/src/test/java/org/apache/aries/ejb/openejb/extender/itest/AbstractOpenEJBTest.java @@ -24,7 +24,6 @@ import java.util.zip.ZipOutputStream; import org.apache.aries.itest.AbstractIntegrationTest; import org.apache.aries.util.io.IOUtils; - import org.ops4j.pax.exam.Option; public abstract class AbstractOpenEJBTest extends AbstractIntegrationTest { @@ -32,21 +31,16 @@ public abstract class AbstractOpenEJBTest extends AbstractIntegrationTest { public static Option baseConfiguration() { return composite( junitBundles(), - mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(), - mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(), - frameworkProperty("org.osgi.framework.system.packages") .value("javax.accessibility,javax.activation,javax.activity,javax.annotation,javax.annotation.processing,javax.crypto,javax.crypto.interfaces,javax.crypto.spec,javax.imageio,javax.imageio.event,javax.imageio.metadata,javax.imageio.plugins.bmp,javax.imageio.plugins.jpeg,javax.imageio.spi,javax.imageio.stream,javax.jws,javax.jws.soap,javax.lang.model,javax.lang.model.element,javax.lang.model.type,javax.lang.model.util,javax.management,javax.management.loading,javax. [...] - systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"), + addPaxLoggingBundles(), + setPaxExamLogLevel("INFO"), // Bundles mavenBundle("org.apache.aries", "org.apache.aries.util").versionAsInProject(), mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").versionAsInProject(), - mavenBundle("org.ow2.asm", "asm").versionAsInProject(), - mavenBundle("org.ow2.asm", "asm-commons").versionAsInProject(), - mavenBundle("org.ow2.asm", "asm-tree").versionAsInProject(), - mavenBundle("org.ow2.asm", "asm-analysis").versionAsInProject(), + addAsmBundles(), mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject(), mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.manager").versionAsInProject(), mavenBundle("org.osgi", "org.osgi.enterprise").versionAsInProject(), 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 0bf23b953..73a5712bd 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 @@ -61,16 +61,10 @@ public abstract class AbstractIntegrationTest extends org.apache.aries.itest.Abs protected MBeanServer mbeanServer; public Option baseOptions() { - String localRepo = System.getProperty("maven.repo.local"); - if (localRepo == null) { - localRepo = System.getProperty("org.ops4j.pax.url.mvn.localRepository"); - } return composite( junitBundles(), - // this is how you set the default log level when using pax - // logging (logProfile) - systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"), - when(localRepo != null).useOptions(vmOption("-Dorg.ops4j.pax.url.mvn.localRepository=" + localRepo)) + setPaxExamLogLevel("INFO"), + configurePaxUrlLocalMavenRepoIfNeeded() ); } diff --git a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleStateMBeanTest.java b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleStateMBeanTest.java index 4d6cd511e..321df2128 100644 --- a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleStateMBeanTest.java +++ b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleStateMBeanTest.java @@ -77,9 +77,8 @@ public class BundleStateMBeanTest extends AbstractIntegrationTest { @Configuration public Option[] configuration() { return options( - // new VMOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"), - // new TimeoutOption( 0 ), - jmxRuntime(), + setupRemoteDebugging(), + jmxRuntime(), bundlea(), bundleb(), fragmentc(), diff --git a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java index 729e69057..736e3d739 100644 --- a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java +++ b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java @@ -16,15 +16,28 @@ */ package org.apache.aries.jmx.framework; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.ops4j.pax.exam.CoreOptions.provision; -import static org.ops4j.pax.tinybundles.core.TinyBundles.bundle; -import static org.ops4j.pax.tinybundles.core.TinyBundles.withBnd; +import org.apache.aries.jmx.AbstractIntegrationTest; +import org.apache.aries.jmx.codec.BatchActionResult; +import org.junit.Before; +import org.junit.Test; +import org.ops4j.pax.exam.Configuration; +import org.ops4j.pax.exam.CoreOptions; +import org.ops4j.pax.exam.Option; +import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; +import org.ops4j.pax.exam.spi.reactors.PerMethod; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleException; +import org.osgi.framework.Constants; +import org.osgi.framework.Version; +import org.osgi.framework.wiring.BundleRevision; +import org.osgi.framework.wiring.BundleRevisions; +import org.osgi.framework.wiring.BundleWire; +import org.osgi.framework.wiring.BundleWiring; +import org.osgi.framework.wiring.FrameworkWiring; +import org.osgi.jmx.framework.FrameworkMBean; +import javax.management.ObjectName; +import javax.management.openmbean.CompositeData; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; @@ -45,28 +58,14 @@ import java.util.jar.JarEntry; import java.util.jar.JarOutputStream; import java.util.jar.Manifest; -import javax.management.ObjectName; -import javax.management.openmbean.CompositeData; - -import org.apache.aries.jmx.AbstractIntegrationTest; -import org.apache.aries.jmx.codec.BatchActionResult; -import org.junit.Before; -import org.junit.Test; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.CoreOptions; -import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; -import org.ops4j.pax.exam.spi.reactors.PerMethod; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleException; -import org.osgi.framework.Constants; -import org.osgi.framework.Version; -import org.osgi.framework.wiring.BundleRevision; -import org.osgi.framework.wiring.BundleRevisions; -import org.osgi.framework.wiring.BundleWire; -import org.osgi.framework.wiring.BundleWiring; -import org.osgi.framework.wiring.FrameworkWiring; -import org.osgi.jmx.framework.FrameworkMBean; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.ops4j.pax.exam.CoreOptions.provision; +import static org.ops4j.pax.tinybundles.core.TinyBundles.bundle; +import static org.ops4j.pax.tinybundles.core.TinyBundles.withBnd; /** * @version $Rev$ $Date$ @@ -79,12 +78,10 @@ public class FrameworkMBeanTest extends AbstractIntegrationTest { @Configuration public Option[] configuration() { return CoreOptions.options( - // new VMOption( "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000" ), - // new TimeoutOption( 0 ), - - jmxRuntime(), - bundlea1(), - bundleb1() + setupRemoteDebugging(), + jmxRuntime(), + bundlea1(), + bundleb1() ); } diff --git a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanTest.java b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanTest.java index 3e38a5288..e165c582a 100644 --- a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanTest.java +++ b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanTest.java @@ -75,10 +75,9 @@ public class ServiceStateMBeanTest extends AbstractIntegrationTest { @Configuration public Option[] configuration() { return options( - // new VMOption( "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000" ), - // new TimeoutOption( 0 ), - jmxRuntime(), - bundlea(), + setupRemoteDebugging(), + jmxRuntime(), + bundlea(), bundleb() ); } diff --git a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/wiring/BundleWiringStateMBeanTest.java b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/wiring/BundleWiringStateMBeanTest.java index 876ed779d..5f15c9f66 100644 --- a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/wiring/BundleWiringStateMBeanTest.java +++ b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/wiring/BundleWiringStateMBeanTest.java @@ -57,15 +57,13 @@ public class BundleWiringStateMBeanTest extends AbstractIntegrationTest { @Configuration public Option[] configuration() { return CoreOptions.options( - // new VMOption( "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000" ), - // new TimeoutOption( 0 ), - - jmxRuntime(), - bundlea(), - bundleb(), - fragmentc(), - bundled() - ); + setupRemoteDebugging(), + jmxRuntime(), + bundlea(), + bundleb(), + fragmentc(), + bundled() + ); } @Before diff --git a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/permissionadmin/PermissionAdminMBeanTest.java b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/permissionadmin/PermissionAdminMBeanTest.java index b616ae6f7..55b678d99 100644 --- a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/permissionadmin/PermissionAdminMBeanTest.java +++ b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/permissionadmin/PermissionAdminMBeanTest.java @@ -16,12 +16,6 @@ */ package org.apache.aries.jmx.permissionadmin; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertNotNull; -import static org.ops4j.pax.exam.CoreOptions.options; - -import java.io.IOException; - import org.apache.aries.jmx.AbstractIntegrationTest; import org.junit.Test; import org.ops4j.pax.exam.Configuration; @@ -31,6 +25,12 @@ import org.osgi.jmx.service.permissionadmin.PermissionAdminMBean; import org.osgi.service.permissionadmin.PermissionAdmin; import org.osgi.service.permissionadmin.PermissionInfo; +import java.io.IOException; + +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertNotNull; +import static org.ops4j.pax.exam.CoreOptions.options; + /** * * @@ -41,11 +41,9 @@ public class PermissionAdminMBeanTest extends AbstractIntegrationTest { @Configuration public Option[] configuration() { return options( - jmxRuntime(), - bundlea() - /* For debugging, uncomment the next two lines */ -// vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=7778"), -// waitForFrameworkStartup() + jmxRuntime(), + bundlea(), + setupRemoteDebugging() ); } diff --git a/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/IntegrationTestBase.java b/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/IntegrationTestBase.java index a6759aaa9..18a14e1d3 100644 --- a/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/IntegrationTestBase.java +++ b/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/IntegrationTestBase.java @@ -51,9 +51,6 @@ public class IntegrationTestBase { // the default bundle jar file name protected static final String BUNDLE_JAR_DEFAULT = "target/jmx-whiteboard.jar"; - // the JVM option to set to enable remote debugging - protected static final String DEBUG_VM_OPTION = "-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=30303"; - private static MBeanServer staticServer; private MBeanServer server; 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 1f1dc07e7..67d5b7048 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 @@ -130,16 +130,11 @@ public class JndiUrlIntegrationTest extends AbstractIntegrationTest { } public Option baseOptions() { - String localRepo = System.getProperty("maven.repo.local"); - if (localRepo == null) { - localRepo = System.getProperty("org.ops4j.pax.url.mvn.localRepository"); - } return composite( junitBundles(), - // this is how you set the default log level when using pax - // logging (logProfile) - systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"), - when(localRepo != null).useOptions(vmOption("-Dorg.ops4j.pax.url.mvn.localRepository=" + localRepo)) + addPaxLoggingBundles(), + setPaxExamLogLevel("INFO"), + configurePaxUrlLocalMavenRepoIfNeeded() ); } @@ -172,13 +167,7 @@ public class JndiUrlIntegrationTest extends AbstractIntegrationTest { mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.url.itest.web").versionAsInProject(), mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.url.itest.biz").versionAsInProject(), mavenBundle("org.ow2.asm", "asm-debug-all").versionAsInProject(), - mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(), - - mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(), - mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject() + mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject() ); - - // org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=7777"), - // org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartup(), } } 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 3653fff19..7707f4edc 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 @@ -278,13 +278,11 @@ public class QuiesceManagerTest extends AbstractIntegrationTest { } public Option baseOptions() { - String localRepo = getLocalRepo(); return composite( junitBundles(), - // this is how you set the default log level when using pax - // logging (logProfile) - systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"), - when(localRepo != null).useOptions(vmOption("-Dorg.ops4j.pax.url.mvn.localRepository=" + localRepo)) + setPaxExamLogLevel("INFO"), + configurePaxUrlLocalMavenRepoIfNeeded(), + setupRemoteDebugging() ); } @@ -298,10 +296,6 @@ public class QuiesceManagerTest extends AbstractIntegrationTest { mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.api").versionAsInProject(), mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.manager").versionAsInProject(), mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(), - - //new VMOption( "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000" ), - //new TimeoutOption( 0 ), - }; } } 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 0abd3fee5..dd2459cab 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 @@ -115,13 +115,12 @@ public abstract class SubsystemTest extends AbstractIntegrationTest { } public Option baseOptions() { - String localRepo = getLocalRepo(); return composite( junitBundles(), - // this is how you set the default log level when using pax - // logging (logProfile) - systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"), - when(localRepo != null).useOptions(vmOption("-Dorg.ops4j.pax.url.mvn.localRepository=" + localRepo)) + addPaxLoggingBundles(), + setPaxExamLogLevel("INFO"), + configurePaxUrlLocalMavenRepoIfNeeded(), + setupRemoteDebugging() ); } @@ -151,13 +150,10 @@ public abstract class SubsystemTest extends AbstractIntegrationTest { mavenBundle("org.eclipse.equinox", "org.eclipse.equinox.region").version("1.1.0.v20120522-1841"), mavenBundle("org.osgi", "org.osgi.enterprise").versionAsInProject(), mavenBundle("org.easymock", "easymock").versionAsInProject(), - mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(), - mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(), mavenBundle("org.ops4j.pax.tinybundles", "tinybundles").versionAsInProject(), mavenBundle("biz.aQute.bnd", "bndlib").versionAsInProject(), mavenBundle("org.apache.aries.subsystem", "org.apache.aries.subsystem.obr").versionAsInProject(), - mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository").versionAsInProject(), -// org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=7777"), + mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository").versionAsInProject(), }; } 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 3280e5a80..53da3d14d 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 @@ -16,25 +16,6 @@ */ package org.apache.aries.web.converter.itest; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.ops4j.pax.exam.CoreOptions.composite; -import static org.ops4j.pax.exam.CoreOptions.junitBundles; -import static org.ops4j.pax.exam.CoreOptions.options; -import static org.ops4j.pax.exam.CoreOptions.systemProperty; -import static org.ops4j.pax.exam.CoreOptions.vmOption; -import static org.ops4j.pax.exam.CoreOptions.when; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Dictionary; - -import javax.inject.Inject; - import org.apache.aries.itest.AbstractIntegrationTest; import org.apache.aries.unittest.fixture.ArchiveFixture; import org.apache.aries.unittest.fixture.ArchiveFixture.ZipFixture; @@ -51,6 +32,21 @@ import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; +import javax.inject.Inject; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Dictionary; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.ops4j.pax.exam.CoreOptions.composite; +import static org.ops4j.pax.exam.CoreOptions.junitBundles; +import static org.ops4j.pax.exam.CoreOptions.options; + @RunWith(PaxExam.class) @ExamReactorStrategy(PerClass.class) public class WabConverterITest extends AbstractIntegrationTest { @@ -107,12 +103,11 @@ public class WabConverterITest extends AbstractIntegrationTest { } public Option baseOptions() { - String localRepo = getLocalRepo(); return composite( - junitBundles(), - systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"), - when(localRepo != null).useOptions( - vmOption("-Dorg.ops4j.pax.url.mvn.localRepository=" + localRepo))); + junitBundles(), + setPaxExamLogLevel("INFO"), + configurePaxUrlLocalMavenRepoIfNeeded() + ); } @Configuration @@ -126,10 +121,7 @@ public class WabConverterITest extends AbstractIntegrationTest { // Bundles mavenBundle("org.apache.aries.web", "org.apache.aries.web.urlhandler"), mavenBundle("org.apache.aries", "org.apache.aries.util"), - mavenBundle("org.ow2.asm", "asm"), - mavenBundle("org.ow2.asm", "asm-commons"), - mavenBundle("org.ow2.asm", "asm-tree"), - mavenBundle("org.ow2.asm", "asm-analysis"), + addAsmBundles(), mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit")); }
