Repository: karaf Updated Branches: refs/heads/master abff43a79 -> 4a1f0020f
[KARAF-3304] Upgrade to Pax CDI 0.9.0 and add CDI features itests Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/4a1f0020 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/4a1f0020 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/4a1f0020 Branch: refs/heads/master Commit: 4a1f0020fc8e32766d10d49cd0f518f425af1758 Parents: abff43a Author: Jean-Baptiste Onofré <[email protected]> Authored: Fri Oct 17 18:12:37 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Fri Oct 17 18:12:37 2014 +0200 ---------------------------------------------------------------------- .../karaf/itests/features/CdiFeaturesTest.java | 107 +++++++++++++++++++ .../itests/features/EnterpriseFeaturesTest.java | 10 -- pom.xml | 2 +- 3 files changed, 108 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/4a1f0020/itests/src/test/java/org/apache/karaf/itests/features/CdiFeaturesTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/features/CdiFeaturesTest.java b/itests/src/test/java/org/apache/karaf/itests/features/CdiFeaturesTest.java new file mode 100644 index 0000000..b25b7c4 --- /dev/null +++ b/itests/src/test/java/org/apache/karaf/itests/features/CdiFeaturesTest.java @@ -0,0 +1,107 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.karaf.itests.features; + +import org.apache.karaf.itests.KarafTestSupport; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.ops4j.pax.exam.junit.PaxExam; +import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; +import org.ops4j.pax.exam.spi.reactors.PerClass; + +@RunWith(PaxExam.class) +@ExamReactorStrategy(PerClass.class) +public class CdiFeaturesTest extends KarafTestSupport { + + @Test + public void installOpenWebBeansFeature() throws Exception { + installAssertAndUninstallFeatures("openwebbeans"); + } + + @Test + public void installWeldFeature() throws Exception { + installAssertAndUninstallFeatures("weld"); + } + + @Test + public void installPaxCdiFeature() throws Exception { + installAssertAndUninstallFeatures("pax-cdi"); + } + + @Test + public void installPaxCdi11Feature() throws Exception { + installAssertAndUninstallFeatures("pax-cdi-1.1"); + } + + @Test + public void installPaxCdi12Feature() throws Exception { + installAssertAndUninstallFeatures("pax-cdi-1.2"); + } + + @Test + public void installPaxCdiWeldFeature() throws Exception { + installAssertAndUninstallFeatures("pax-cdi-weld"); + } + + @Test + public void installPaxCdi11WeldFeature() throws Exception { + installAssertAndUninstallFeatures("pax-cdi-1.1-weld"); + } + + @Test + public void installPaxCdi12WeldFeature() throws Exception { + installAssertAndUninstallFeatures("pax-cdi-1.2-weld"); + } + + @Test + public void installPaxCdiOpenwebbeansFeature() throws Exception { + installAssertAndUninstallFeatures("pax-cdi-openwebbeans"); + } + + @Test + public void installPaxCdiWebFeature() throws Exception { + installAssertAndUninstallFeatures("pax-cdi-web"); + } + + @Test + public void installPaxCdi11WebFeature() throws Exception { + installAssertAndUninstallFeatures("pax-cdi-1.1-web"); + } + + @Test + public void installPaxCdi12WebFeature() throws Exception { + installAssertAndUninstallFeatures("pax-cdi-1.2-web"); + } + + @Test + public void installPaxCdiWebWeldFeature() throws Exception { + installAssertAndUninstallFeatures("pax-cdi-web-weld"); + } + + @Test + public void installPaxCdi11WebWeldFeature() throws Exception { + installAssertAndUninstallFeatures("pax-cdi-1.1-web-weld"); + } + + @Test + public void installPaxCdi12WebWeldFeature() throws Exception { + installAssertAndUninstallFeatures("pax-cdi-1.2-web-weld"); + } + + @Test + public void installPaxCdiWebOpenwebbeansFeature() throws Exception { + installAssertAndUninstallFeatures("pax-cdi-web-openwebbeans"); + } + +} http://git-wip-us.apache.org/repos/asf/karaf/blob/4a1f0020/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java b/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java index a41a3c2..8177e7a 100644 --- a/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java @@ -110,16 +110,6 @@ public class EnterpriseFeaturesTest extends KarafTestSupport { } @Test - public void installOpenWebBeansFeature() throws Exception { - installAssertAndUninstallFeatures("openwebbeans"); - } - - @Test - public void installWeldFeature() throws Exception { - installAssertAndUninstallFeatures("weld"); - } - - @Test public void installApplicationWithoutIsolationFeature() throws Exception { installAssertAndUninstallFeatures("application-without-isolation"); } http://git-wip-us.apache.org/repos/asf/karaf/blob/4a1f0020/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4b21b3a..a297ca0 100644 --- a/pom.xml +++ b/pom.xml @@ -228,7 +228,7 @@ <osgi.version>5.0.0</osgi.version> <osgi.compendium.version>5.0.0</osgi.compendium.version> <org.json.version>20140107</org.json.version> - <pax.cdi.version>0.8.0</pax.cdi.version> + <pax.cdi.version>0.9.0</pax.cdi.version> <pax.exam.version>4.3.0</pax.exam.version> <pax.logging.version>1.8.0</pax.logging.version> <pax.base.version>1.5.0</pax.base.version>
