Repository: karaf Updated Branches: refs/heads/master 0be7b13b1 -> 889135364
Workaround for pax exam issue to be able to activate the tests again Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/f40ba93f Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f40ba93f Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f40ba93f Branch: refs/heads/master Commit: f40ba93fb06183a3bf2d8bcf1019849baa88a3ae Parents: 0be7b13 Author: Christian Schneider <[email protected]> Authored: Thu May 18 18:01:24 2017 +0200 Committer: Christian Schneider <[email protected]> Committed: Thu May 18 18:01:24 2017 +0200 ---------------------------------------------------------------------- .../mavenresolver/KarafMinimalMonitoredTestSupport.java | 9 +++++++-- .../MavenResolverRegisteredBeforeConfigAdminTest.java | 2 -- .../MavenResolverRegisteredOnlyAfterConfigAdminTest.java | 2 -- 3 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/f40ba93f/itests/src/test/java/org/apache/karaf/itests/mavenresolver/KarafMinimalMonitoredTestSupport.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/mavenresolver/KarafMinimalMonitoredTestSupport.java b/itests/src/test/java/org/apache/karaf/itests/mavenresolver/KarafMinimalMonitoredTestSupport.java index 6289522..8dfb59a 100644 --- a/itests/src/test/java/org/apache/karaf/itests/mavenresolver/KarafMinimalMonitoredTestSupport.java +++ b/itests/src/test/java/org/apache/karaf/itests/mavenresolver/KarafMinimalMonitoredTestSupport.java @@ -61,9 +61,14 @@ public abstract class KarafMinimalMonitoredTestSupport { @Inject protected ServiceMonitor serviceMonitor; - //@ProbeBuilder + @ProbeBuilder public TestProbeBuilder probeConfiguration(TestProbeBuilder probe) { - probe.setHeader(Constants.IMPORT_PACKAGE, ServiceMonitor.class.getPackage().getName()); + /** + * We need to import the package to be able to access the service inside the test. + * The optional import is necessary because of a bug in pax exam + */ + + probe.setHeader(Constants.IMPORT_PACKAGE, ServiceMonitor.class.getPackage().getName() + ";resolution:=optional"); return probe; } http://git-wip-us.apache.org/repos/asf/karaf/blob/f40ba93f/itests/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredBeforeConfigAdminTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredBeforeConfigAdminTest.java b/itests/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredBeforeConfigAdminTest.java index ae8d5e0..67fe43d 100644 --- a/itests/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredBeforeConfigAdminTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredBeforeConfigAdminTest.java @@ -23,7 +23,6 @@ import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.replaceCo import java.io.File; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.Configuration; @@ -54,7 +53,6 @@ public class MavenResolverRegisteredBeforeConfigAdminTest extends KarafMinimalMo }; } - @Ignore @Test public void mavenResolverAvailable() throws Exception { long count = numberOfServiceEventsFor("org.ops4j.pax.url.mvn.MavenResolver"); http://git-wip-us.apache.org/repos/asf/karaf/blob/f40ba93f/itests/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredOnlyAfterConfigAdminTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredOnlyAfterConfigAdminTest.java b/itests/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredOnlyAfterConfigAdminTest.java index 0d8928f..ac83196 100644 --- a/itests/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredOnlyAfterConfigAdminTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredOnlyAfterConfigAdminTest.java @@ -23,7 +23,6 @@ import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfi import java.io.File; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.Configuration; @@ -56,7 +55,6 @@ public class MavenResolverRegisteredOnlyAfterConfigAdminTest extends KarafMinima }; } - @Ignore @Test public void mavenResolverAvailable() throws Exception { long count = numberOfServiceEventsFor("org.ops4j.pax.url.mvn.MavenResolver");
