You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/04/19 11:16:13 UTC
camel git commit: camel-itest-karaf to use base class and make it
work again due recent refactor.
Repository: camel
Updated Branches:
refs/heads/master 2bc61ae73 -> b7addb582
camel-itest-karaf to use base class and make it work again due recent refactor.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b7addb58
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b7addb58
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b7addb58
Branch: refs/heads/master
Commit: b7addb5828229b9ec738a46cd6b3c56cca427a35
Parents: 2bc61ae
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Apr 19 11:16:04 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Apr 19 11:16:04 2016 +0200
----------------------------------------------------------------------
.../src/test/java/org/apache/camel/itest/CamelCoreTest.java | 3 ++-
.../src/test/java/org/apache/camel/itest/CamelGroovyTest.java | 3 ++-
.../src/test/java/org/apache/camel/itest/CamelSpringTest.java | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b7addb58/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/CamelCoreTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/CamelCoreTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/CamelCoreTest.java
index 73fa62d..3c7297d 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/CamelCoreTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/CamelCoreTest.java
@@ -34,6 +34,7 @@ public class CamelCoreTest extends AbstractFeatureTest {
@Test
public void testCamelCore() throws Exception {
+ // install the camel blueprint xml file we use in this test
URL url = ObjectHelper.loadResourceAsURL("org/apache/camel/itest/CamelCoreTest.xml", CamelCoreTest.class.getClassLoader());
installBlueprintAsBundle("CamelCoreTest", url, true);
@@ -51,7 +52,7 @@ public class CamelCoreTest extends AbstractFeatureTest {
@Configuration
public Option[] configure() {
- return CamelKarafTestSupport.configure();
+ return CamelKarafTestSupport.configure("camel-test-karaf");
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/b7addb58/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/CamelGroovyTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/CamelGroovyTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/CamelGroovyTest.java
index 9e0b342..30a73cf 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/CamelGroovyTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/CamelGroovyTest.java
@@ -34,6 +34,7 @@ public class CamelGroovyTest extends AbstractFeatureTest {
@Test
public void testCamelGroovy() throws Exception {
+ // install the camel blueprint xml file we use in this test
URL url = ObjectHelper.loadResourceAsURL("org/apache/camel/itest/CamelGroovyTest.xml", CamelGroovyTest.class.getClassLoader());
installBlueprintAsBundle("CamelGroovyTest", url, true);
@@ -51,7 +52,7 @@ public class CamelGroovyTest extends AbstractFeatureTest {
@Configuration
public Option[] configure() {
- return CamelKarafTestSupport.configure("camel-script-groovy");
+ return CamelKarafTestSupport.configure("camel-test-karaf", "camel-script-groovy");
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/b7addb58/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/CamelSpringTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/CamelSpringTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/CamelSpringTest.java
index 29eb766..13fccee 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/CamelSpringTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/CamelSpringTest.java
@@ -34,6 +34,7 @@ public class CamelSpringTest extends AbstractFeatureTest {
@Test
public void testCamelSpring() throws Exception {
+ // install the camel blueprint xml file we use in this test
URL url = ObjectHelper.loadResourceAsURL("org/apache/camel/itest/CamelSpringTest.xml", CamelSpringTest.class.getClassLoader());
installSpringAsBundle("CamelSpringTest", url, true);
@@ -51,7 +52,7 @@ public class CamelSpringTest extends AbstractFeatureTest {
@Configuration
public Option[] configure() {
- return CamelKarafTestSupport.configure("camel-spring-dm");
+ return CamelKarafTestSupport.configure("camel-test-karaf", "camel-spring-dm");
}
}