Repository: camel Updated Branches: refs/heads/master 909f7ddb6 -> f5c3e1735
CAMEL-9766: camel-itest-karaf to get working on karaf 4. Use a script to run the tests reliable. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9d838555 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9d838555 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9d838555 Branch: refs/heads/master Commit: 9d83855589bb8bfc3233433e21b3ce9c1f4d6d86 Parents: 909f7dd Author: Claus Ibsen <[email protected]> Authored: Sun Mar 27 17:47:11 2016 +0200 Committer: Claus Ibsen <[email protected]> Committed: Sun Mar 27 17:47:11 2016 +0200 ---------------------------------------------------------------------- .../features/src/main/resources/features.xml | 4 +++ tests/camel-itest-karaf/run-tests.sh | 6 ++-- .../camel/itest/karaf/CamelCmSmsTest.java | 2 +- .../apache/camel/itest/karaf/CamelGsonTest.java | 2 +- .../camel/itest/karaf/CamelGuiceTest.java | 2 ++ .../camel/itest/karaf/CamelIgniteTest.java | 3 ++ .../camel/itest/karaf/CamelJCacheTest.java | 2 +- .../camel/itest/karaf/CamelJacksonTest.java | 2 +- .../apache/camel/itest/karaf/CamelJbpmTest.java | 3 ++ .../camel/itest/karaf/CamelLuceneTest.java | 1 + .../camel/itest/karaf/CamelOptaplannerTest.java | 1 + .../camel/itest/karaf/CamelSnakeyamlTest.java | 2 +- .../apache/camel/itest/karaf/CamelSoapTest.java | 2 +- .../camel/itest/karaf/CamelTagsoupTest.java | 3 +- .../itest/karaf/CamelUnivocityParsersTest.java | 35 ++++++++++++++++++++ .../camel/itest/karaf/CamelXmlsecurityTest.java | 2 +- .../camel/itest/karaf/CamelXstreamTest.java | 2 +- 17 files changed, 62 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9d838555/platforms/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index bbba22e..b0f6c82 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -302,6 +302,10 @@ <bundle dependency='true'>mvn:org.jsoup/jsoup/${jsoup-version}</bundle> <bundle dependency='true'>mvn:javax.validation/validation-api/${validation-api-version}</bundle> <bundle dependency='true'>mvn:javax.el/javax.el-api/${javax.el-api-version}</bundle> + <bundle dependency='true'>mvn:org.glassfish.web/javax.el/${javax.el-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml/classmate/${classmate-version}</bundle> + <bundle dependency='true'>mvn:org.hibernate/hibernate-validator/${hibernate-validator-version}</bundle> + <bundle dependency='true'>mvn:org.jboss.logging/jboss-logging/${jboss-logging-version}</bundle> <bundle>mvn:org.apache.camel/camel-cm-sms/${project.version}</bundle> </feature> <feature name='camel-cmis' version='${project.version}' resolver='(obr)' start-level='50'> http://git-wip-us.apache.org/repos/asf/camel/blob/9d838555/tests/camel-itest-karaf/run-tests.sh ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/run-tests.sh b/tests/camel-itest-karaf/run-tests.sh index 88ed7cb..25f1145 100755 --- a/tests/camel-itest-karaf/run-tests.sh +++ b/tests/camel-itest-karaf/run-tests.sh @@ -24,7 +24,8 @@ echo "Running tests and kill karaf after each test" -FILES=src/test/java/org/apache/camel/itest/karaf/* +## directory where the karaf unit tests are +testdir='src/test/java/org/apache/camel/itest/karaf' ## you can pass in the test name to start from eg run-tests.sh CamelFtpTest ## to start testing from this test and onwards. @@ -35,7 +36,8 @@ else found=0 fi -for filename in $FILES +## ensure the files are sorted +for filename in $(ls -f $testdir/* | sort); do testname=$(basename ${filename%.*}) http://git-wip-us.apache.org/repos/asf/camel/blob/9d838555/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmSmsTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmSmsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmSmsTest.java index 0e29c11..5bca9a1 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmSmsTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmSmsTest.java @@ -27,8 +27,8 @@ public class CamelCmSmsTest extends AbstractFeatureTest { @Test public void test() throws Exception { + // TODO: fails as javax bean validator must be installed also testComponent(COMPONENT); } - } http://git-wip-us.apache.org/repos/asf/camel/blob/9d838555/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGsonTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGsonTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGsonTest.java index 2f4daaa..11ab80c 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGsonTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGsonTest.java @@ -27,7 +27,7 @@ public class CamelGsonTest extends AbstractFeatureTest { @Test public void test() throws Exception { - testDataFormat(COMPONENT); + testDataFormat(COMPONENT, "json-gson"); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9d838555/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuiceTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuiceTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuiceTest.java index 2cd1678..b249621 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuiceTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuiceTest.java @@ -16,11 +16,13 @@ */ package org.apache.camel.itest.karaf; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) +@Ignore("camel-guice does not work in OSGi") public class CamelGuiceTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelGuiceTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/9d838555/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIgniteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIgniteTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIgniteTest.java index fc40126..b28f6b3 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIgniteTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIgniteTest.java @@ -16,17 +16,20 @@ */ package org.apache.camel.itest.karaf; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) +@Ignore public class CamelIgniteTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelIgniteTest.class); @Test public void test() throws Exception { + // TODO: we need to install some ignite stuff first (see the info of camel feature) testComponent(COMPONENT); } http://git-wip-us.apache.org/repos/asf/camel/blob/9d838555/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJCacheTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJCacheTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJCacheTest.java index 10ea459..d47a0dd 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJCacheTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJCacheTest.java @@ -23,7 +23,7 @@ import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) public class CamelJCacheTest extends AbstractFeatureTest { - public static final String COMPONENT = extractName(CamelJCacheTest.class); + public static final String COMPONENT = "jcache"; @Test public void test() throws Exception { http://git-wip-us.apache.org/repos/asf/camel/blob/9d838555/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJacksonTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJacksonTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJacksonTest.java index ae47ec7..98df678 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJacksonTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJacksonTest.java @@ -27,7 +27,7 @@ public class CamelJacksonTest extends AbstractFeatureTest { @Test public void test() throws Exception { - testDataFormat(COMPONENT); + testDataFormat(COMPONENT, "json-jackson"); } http://git-wip-us.apache.org/repos/asf/camel/blob/9d838555/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJbpmTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJbpmTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJbpmTest.java index 743e527..6fe1411 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJbpmTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJbpmTest.java @@ -16,17 +16,20 @@ */ package org.apache.camel.itest.karaf; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) +@Ignore public class CamelJbpmTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelJbpmTest.class); @Test public void test() throws Exception { + // TODO: need to expose com.sun.tools.xjc in jre.properties testComponent(COMPONENT); } http://git-wip-us.apache.org/repos/asf/camel/blob/9d838555/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLuceneTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLuceneTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLuceneTest.java index 274fd24..81a1ff2b 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLuceneTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLuceneTest.java @@ -27,6 +27,7 @@ public class CamelLuceneTest extends AbstractFeatureTest { @Test public void test() throws Exception { + // TODO: the lucene bundle do not work - a new SMX bundle is on the way testComponent(COMPONENT); } http://git-wip-us.apache.org/repos/asf/camel/blob/9d838555/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOptaplannerTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOptaplannerTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOptaplannerTest.java index 811f82c..3828ddf 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOptaplannerTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOptaplannerTest.java @@ -27,6 +27,7 @@ public class CamelOptaplannerTest extends AbstractFeatureTest { @Test public void test() throws Exception { + // TODO: need to expose com.sun.source.tree in jre.properties testComponent(COMPONENT); } http://git-wip-us.apache.org/repos/asf/camel/blob/9d838555/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSnakeyamlTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSnakeyamlTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSnakeyamlTest.java index 02188dc..608516d 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSnakeyamlTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSnakeyamlTest.java @@ -25,7 +25,7 @@ public class CamelSnakeyamlTest extends AbstractFeatureTest { @Test public void test() throws Exception { - testComponent("camel-snakeyaml", "yaml-snakeyaml"); + testDataFormat("camel-snakeyaml", "yaml-snakeyaml"); } } http://git-wip-us.apache.org/repos/asf/camel/blob/9d838555/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSoapTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSoapTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSoapTest.java index ed22e30..193ecbb 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSoapTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSoapTest.java @@ -27,7 +27,7 @@ public class CamelSoapTest extends AbstractFeatureTest { @Test public void test() throws Exception { - testDataFormat(COMPONENT); + testDataFormat(COMPONENT, "soapjaxb"); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9d838555/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTagsoupTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTagsoupTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTagsoupTest.java index dc5fec7..e29ac1f 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTagsoupTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTagsoupTest.java @@ -27,8 +27,7 @@ public class CamelTagsoupTest extends AbstractFeatureTest { @Test public void test() throws Exception { - testDataFormat(COMPONENT); + testDataFormat(COMPONENT, "tidyMarkup"); } - } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9d838555/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUnivocityParsersTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUnivocityParsersTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUnivocityParsersTest.java new file mode 100644 index 0000000..4310797 --- /dev/null +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUnivocityParsersTest.java @@ -0,0 +1,35 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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.camel.itest.karaf; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.ops4j.pax.exam.junit.PaxExam; + +@RunWith(PaxExam.class) +public class CamelUnivocityParsersTest extends AbstractFeatureTest { + + public static final String COMPONENT = extractName(CamelUnivocityParsersTest.class); + + @Test + public void test() throws Exception { + testDataFormat(COMPONENT, "univocity-csv"); + testDataFormat(COMPONENT, "univocity-fixed"); + testDataFormat(COMPONENT, "univocity-tsv"); + } + +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9d838555/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlsecurityTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlsecurityTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlsecurityTest.java index 3ab75fd..5d5312f 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlsecurityTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlsecurityTest.java @@ -27,7 +27,7 @@ public class CamelXmlsecurityTest extends AbstractFeatureTest { @Test public void test() throws Exception { - testDataFormat(COMPONENT); + testDataFormat(COMPONENT, "secureXML"); } http://git-wip-us.apache.org/repos/asf/camel/blob/9d838555/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXstreamTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXstreamTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXstreamTest.java index 12fccad..7a89ed3 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXstreamTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXstreamTest.java @@ -27,8 +27,8 @@ public class CamelXstreamTest extends AbstractFeatureTest { @Test public void test() throws Exception { + testDataFormat(COMPONENT, "json-xstream"); testDataFormat(COMPONENT, "xstream"); - testDataFormat(COMPONENT, "json"); }
