[KARAF-2111] Use karaf-pax-exam for itests. git-svn-id: https://svn.apache.org/repos/asf/karaf/cellar/branches/cellar-2.3.x@1483241 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/74fff0eb Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/74fff0eb Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/74fff0eb Branch: refs/heads/cellar-2.3.x Commit: 74fff0eb8a17803f35b0ad99b1f07985949e6954 Parents: 3f24cbb Author: jbonofre <jbonofre@13f79535-47bb-0310-9956-ffa450edef68> Authored: Thu May 16 08:31:50 2013 +0000 Committer: jbonofre <jbonofre@13f79535-47bb-0310-9956-ffa450edef68> Committed: Thu May 16 08:31:50 2013 +0000 ---------------------------------------------------------------------- itests/pom.xml | 21 ++++++++------------ .../karaf/cellar/itests/CellarBundleTest.java | 5 ----- .../cellar/itests/CellarChildNodesTest.java | 5 ----- .../cellar/itests/CellarConfigurationTest.java | 5 ----- .../karaf/cellar/itests/CellarFeaturesTest.java | 5 ----- .../karaf/cellar/itests/CellarGroupsTest.java | 5 ----- .../cellar/itests/CellarInstallationTest.java | 3 --- .../karaf/cellar/itests/CellarObrTest.java | 5 ----- .../itests/CellarSampleCamelHazelcastTest.java | 7 +------ .../itests/CellarSampleDosgiGreeterTest.java | 8 +------- .../karaf/cellar/itests/CellarTestSupport.java | 8 +++++--- pom.xml | 9 +-------- 12 files changed, 16 insertions(+), 70 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/74fff0eb/itests/pom.xml ---------------------------------------------------------------------- diff --git a/itests/pom.xml b/itests/pom.xml index 3a2d1aa..9598a26 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -35,16 +35,6 @@ <dependencies> <dependency> - <groupId>org.ops4j.pax.url</groupId> - <artifactId>pax-url-mvn</artifactId> - </dependency> - - <dependency> - <groupId>org.ops4j.pax.url</groupId> - <artifactId>pax-url-aether</artifactId> - </dependency> - - <dependency> <groupId>org.apache.karaf</groupId> <artifactId>apache-karaf</artifactId> <version>${karaf.version}</version> @@ -72,9 +62,14 @@ </dependency> <dependency> - <groupId>org.openengsb.labs.paxexam.karaf</groupId> - <artifactId>paxexam-karaf-container</artifactId> - <scope>test</scope> + <groupId>org.apache.karaf.tooling.exam</groupId> + <artifactId>org.apache.karaf.tooling.exam.container</artifactId> + <version>${karaf.version}</version> + </dependency> + <dependency> + <groupId>org.apache.karaf.tooling.exam</groupId> + <artifactId>org.apache.karaf.tooling.exam.options</artifactId> + <version>${karaf.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/74fff0eb/itests/src/test/java/org/apache/karaf/cellar/itests/CellarBundleTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/cellar/itests/CellarBundleTest.java b/itests/src/test/java/org/apache/karaf/cellar/itests/CellarBundleTest.java index d98e2e0..fb0af0a 100644 --- a/itests/src/test/java/org/apache/karaf/cellar/itests/CellarBundleTest.java +++ b/itests/src/test/java/org/apache/karaf/cellar/itests/CellarBundleTest.java @@ -18,16 +18,11 @@ import org.junit.After; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; -import org.openengsb.labs.paxexam.karaf.options.LogLevelOption; -import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; import org.ops4j.pax.exam.junit.ExamReactorStrategy; import org.ops4j.pax.exam.junit.JUnit4TestRunner; import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory; import static org.junit.Assert.assertNotNull; -import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.keepRuntimeFolder; -import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.logLevel; @RunWith(JUnit4TestRunner.class) @ExamReactorStrategy(AllConfinedStagedReactorFactory.class) http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/74fff0eb/itests/src/test/java/org/apache/karaf/cellar/itests/CellarChildNodesTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/cellar/itests/CellarChildNodesTest.java b/itests/src/test/java/org/apache/karaf/cellar/itests/CellarChildNodesTest.java index 7f2d07c..990e6ea 100644 --- a/itests/src/test/java/org/apache/karaf/cellar/itests/CellarChildNodesTest.java +++ b/itests/src/test/java/org/apache/karaf/cellar/itests/CellarChildNodesTest.java @@ -21,17 +21,12 @@ import org.junit.After; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; -import org.openengsb.labs.paxexam.karaf.options.LogLevelOption; -import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; import org.ops4j.pax.exam.junit.ExamReactorStrategy; import org.ops4j.pax.exam.junit.JUnit4TestRunner; import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory; import static org.junit.Assert.*; -import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.keepRuntimeFolder; -import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.logLevel; @RunWith(JUnit4TestRunner.class) @ExamReactorStrategy(AllConfinedStagedReactorFactory.class) http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/74fff0eb/itests/src/test/java/org/apache/karaf/cellar/itests/CellarConfigurationTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/cellar/itests/CellarConfigurationTest.java b/itests/src/test/java/org/apache/karaf/cellar/itests/CellarConfigurationTest.java index 4636dc8..a63a914 100644 --- a/itests/src/test/java/org/apache/karaf/cellar/itests/CellarConfigurationTest.java +++ b/itests/src/test/java/org/apache/karaf/cellar/itests/CellarConfigurationTest.java @@ -18,16 +18,11 @@ import org.junit.After; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; -import org.openengsb.labs.paxexam.karaf.options.LogLevelOption; -import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; import org.ops4j.pax.exam.junit.ExamReactorStrategy; import org.ops4j.pax.exam.junit.JUnit4TestRunner; import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory; import static org.junit.Assert.*; -import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.keepRuntimeFolder; -import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.logLevel; @RunWith(JUnit4TestRunner.class) @ExamReactorStrategy(AllConfinedStagedReactorFactory.class) http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/74fff0eb/itests/src/test/java/org/apache/karaf/cellar/itests/CellarFeaturesTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/cellar/itests/CellarFeaturesTest.java b/itests/src/test/java/org/apache/karaf/cellar/itests/CellarFeaturesTest.java index 602c697..2f1a5fe 100644 --- a/itests/src/test/java/org/apache/karaf/cellar/itests/CellarFeaturesTest.java +++ b/itests/src/test/java/org/apache/karaf/cellar/itests/CellarFeaturesTest.java @@ -21,9 +21,6 @@ import org.junit.After; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; -import org.openengsb.labs.paxexam.karaf.options.LogLevelOption; -import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; import org.ops4j.pax.exam.junit.ExamReactorStrategy; import org.ops4j.pax.exam.junit.JUnit4TestRunner; import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory; @@ -31,8 +28,6 @@ import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.keepRuntimeFolder; -import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.logLevel; @RunWith(JUnit4TestRunner.class) @ExamReactorStrategy(AllConfinedStagedReactorFactory.class) http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/74fff0eb/itests/src/test/java/org/apache/karaf/cellar/itests/CellarGroupsTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/cellar/itests/CellarGroupsTest.java b/itests/src/test/java/org/apache/karaf/cellar/itests/CellarGroupsTest.java index 25d8a9b..9dee8eb 100644 --- a/itests/src/test/java/org/apache/karaf/cellar/itests/CellarGroupsTest.java +++ b/itests/src/test/java/org/apache/karaf/cellar/itests/CellarGroupsTest.java @@ -23,9 +23,6 @@ import org.junit.After; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; -import org.openengsb.labs.paxexam.karaf.options.LogLevelOption; -import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; import org.ops4j.pax.exam.junit.ExamReactorStrategy; import org.ops4j.pax.exam.junit.JUnit4TestRunner; import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory; @@ -34,8 +31,6 @@ import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.keepRuntimeFolder; -import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.logLevel; @RunWith(JUnit4TestRunner.class) @ExamReactorStrategy(AllConfinedStagedReactorFactory.class) http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/74fff0eb/itests/src/test/java/org/apache/karaf/cellar/itests/CellarInstallationTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/cellar/itests/CellarInstallationTest.java b/itests/src/test/java/org/apache/karaf/cellar/itests/CellarInstallationTest.java index 34aa979..deba531 100644 --- a/itests/src/test/java/org/apache/karaf/cellar/itests/CellarInstallationTest.java +++ b/itests/src/test/java/org/apache/karaf/cellar/itests/CellarInstallationTest.java @@ -17,15 +17,12 @@ import org.apache.karaf.cellar.core.ClusterManager; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; import org.ops4j.pax.exam.junit.ExamReactorStrategy; import org.ops4j.pax.exam.junit.JUnit4TestRunner; import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory; import static org.junit.Assert.assertNotNull; -import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.keepRuntimeFolder; @RunWith(JUnit4TestRunner.class) @ExamReactorStrategy(AllConfinedStagedReactorFactory.class) http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/74fff0eb/itests/src/test/java/org/apache/karaf/cellar/itests/CellarObrTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/cellar/itests/CellarObrTest.java b/itests/src/test/java/org/apache/karaf/cellar/itests/CellarObrTest.java index 06a1b0e..9b2e5a8 100644 --- a/itests/src/test/java/org/apache/karaf/cellar/itests/CellarObrTest.java +++ b/itests/src/test/java/org/apache/karaf/cellar/itests/CellarObrTest.java @@ -18,16 +18,11 @@ import org.junit.After; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; -import org.openengsb.labs.paxexam.karaf.options.LogLevelOption; -import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; import org.ops4j.pax.exam.junit.ExamReactorStrategy; import org.ops4j.pax.exam.junit.JUnit4TestRunner; import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory; import static org.junit.Assert.assertNotNull; -import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.keepRuntimeFolder; -import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.logLevel; @RunWith(JUnit4TestRunner.class) @ExamReactorStrategy(AllConfinedStagedReactorFactory.class) http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/74fff0eb/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleCamelHazelcastTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleCamelHazelcastTest.java b/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleCamelHazelcastTest.java index 24e0fa4..e0e330a 100644 --- a/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleCamelHazelcastTest.java +++ b/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleCamelHazelcastTest.java @@ -19,9 +19,6 @@ import org.junit.After; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; -import org.openengsb.labs.paxexam.karaf.options.LogLevelOption; -import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; import org.ops4j.pax.exam.junit.ExamReactorStrategy; import org.ops4j.pax.exam.junit.JUnit4TestRunner; import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory; @@ -30,8 +27,6 @@ import java.util.Set; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.keepRuntimeFolder; -import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.logLevel; @RunWith(JUnit4TestRunner.class) @ExamReactorStrategy(AllConfinedStagedReactorFactory.class) @@ -47,7 +42,7 @@ public class CellarSampleCamelHazelcastTest extends CellarTestSupport { ClusterManager clusterManager = getOsgiService(ClusterManager.class); assertNotNull(clusterManager); - System.err.println(executeCommand("features:addurl mvn:org.apache.karaf.cellar.samples/camel-hazelcast-app/2.2.4-SNAPSHOT/xml/features")); + System.err.println(executeCommand("features:addurl mvn:org.apache.karaf.cellar.samples/camel-hazelcast-app/2.3.0-SNAPSHOT/xml/features")); System.err.println(executeCommand("admin:list")); http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/74fff0eb/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleDosgiGreeterTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleDosgiGreeterTest.java b/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleDosgiGreeterTest.java index 1631893..e07df00 100644 --- a/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleDosgiGreeterTest.java +++ b/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleDosgiGreeterTest.java @@ -21,9 +21,6 @@ import org.junit.After; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; -import org.openengsb.labs.paxexam.karaf.options.LogLevelOption; -import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; import org.ops4j.pax.exam.junit.ExamReactorStrategy; import org.ops4j.pax.exam.junit.JUnit4TestRunner; import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory; @@ -32,9 +29,6 @@ import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.debugConfiguration; -import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.keepRuntimeFolder; -import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.logLevel; @RunWith(JUnit4TestRunner.class) @ExamReactorStrategy(AllConfinedStagedReactorFactory.class) @@ -53,7 +47,7 @@ public class CellarSampleDosgiGreeterTest extends CellarTestSupport { ClusterManager clusterManager = getOsgiService(ClusterManager.class); assertNotNull(clusterManager); - System.err.println(executeCommand("features:addurl mvn:org.apache.karaf.cellar.samples/dosgi-greeter/2.2.4-SNAPSHOT/xml/features")); + System.err.println(executeCommand("features:addurl mvn:org.apache.karaf.cellar.samples/dosgi-greeter/2.3.0-SNAPSHOT/xml/features")); System.err.println(executeCommand("admin:list")); http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/74fff0eb/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java b/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java index 3882760..d07655b 100644 --- a/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java +++ b/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java @@ -15,7 +15,7 @@ package org.apache.karaf.cellar.itests; import org.apache.felix.service.command.CommandProcessor; import org.apache.felix.service.command.CommandSession; -import org.openengsb.labs.paxexam.karaf.options.LogLevelOption; +import org.apache.karaf.tooling.exam.options.LogLevelOption; import org.ops4j.pax.exam.MavenUtils; import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.TestProbeBuilder; @@ -34,7 +34,7 @@ import java.net.ServerSocket; import java.util.*; import java.util.concurrent.*; -import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.*; +import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.*; import static org.ops4j.pax.exam.CoreOptions.maven; public class CellarTestSupport { @@ -158,7 +158,9 @@ public class CellarTestSupport { public Option[] config() { return new Option[]{ cellarDistributionConfiguration(), keepRuntimeFolder(), logLevel(LogLevelOption.LogLevel.ERROR), - editConfigurationFileExtend("etc/system.properties", "cellar.feature.url", maven().groupId("org.apache.karaf.cellar").artifactId("apache-karaf-cellar").versionAsInProject().classifier("features").type("xml").getURL())}; + editConfigurationFileExtend("etc/system.properties", "cellar.feature.url", maven().groupId("org.apache.karaf.cellar").artifactId("apache-karaf-cellar").versionAsInProject().classifier("features").type("xml").getURL()), + editConfigurationFileExtend("etc/config.properties", "org.apache.aries.blueprint.synchronous", "true") + }; } /** http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/74fff0eb/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 85e3f65..816c7b3 100644 --- a/pom.xml +++ b/pom.xml @@ -44,10 +44,9 @@ <joda-time.version>2.1</joda-time.version> <junit.version>4.10</junit.version> <junit.bundle.version>4.10_1</junit.bundle.version> - <karaf.version>2.3.0</karaf.version> + <karaf.version>2.3.1</karaf.version> <osgi.version>4.3.1</osgi.version> <pax.exam.version>2.6.0</pax.exam.version> - <pax.exam.karaf.version>0.5.3</pax.exam.karaf.version> <pax.url.version>1.3.5</pax.url.version> <servlet.api.version>2.5</servlet.api.version> <slf4j.version>1.7.2</slf4j.version> @@ -319,12 +318,6 @@ <artifactId>pax-exam-junit4</artifactId> <version>${pax.exam.version}</version> </dependency> - <dependency> - <groupId>org.openengsb.labs.paxexam.karaf</groupId> - <artifactId>paxexam-karaf-container</artifactId> - <version>${pax.exam.karaf.version}</version> - <scope>test</scope> - </dependency> </dependencies> </dependencyManagement>
