You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by he...@apache.org on 2014/04/16 16:36:27 UTC
git commit: Improved Karaf testing API.
Repository: camel
Updated Branches:
refs/heads/master b4bd1a861 -> d95d7d759
Improved Karaf testing API.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d95d7d75
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d95d7d75
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d95d7d75
Branch: refs/heads/master
Commit: d95d7d7593cd053feca445c4093e0517410b365b
Parents: b4bd1a8
Author: Henryk Konsek <he...@gmail.com>
Authored: Wed Apr 16 16:36:03 2014 +0200
Committer: Henryk Konsek <he...@gmail.com>
Committed: Wed Apr 16 16:36:03 2014 +0200
----------------------------------------------------------------------
.../org/apache/camel/itest/karaf/AbstractFeatureTest.java | 8 ++++++++
.../java/org/apache/camel/itest/karaf/CamelDropboxTest.java | 8 +++-----
2 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d95d7d75/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
index 14b89e4..f0de40a 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
@@ -74,6 +74,10 @@ public abstract class AbstractFeatureTest {
}
}
+ protected void testComponent() throws Exception {
+ testComponent(extractName(getClass()));
+ }
+
protected void testDataFormat(String format) throws Exception {
long max = System.currentTimeMillis() + 10000;
while (true) {
@@ -180,4 +184,8 @@ public abstract class AbstractFeatureTest {
return options;
}
+ protected Option[] configureComponent() {
+ return configure(extractName(getClass()));
+ }
+
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d95d7d75/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDropboxTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDropboxTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDropboxTest.java
index 034b06d..36d7b49 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDropboxTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDropboxTest.java
@@ -25,16 +25,14 @@ import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@RunWith(JUnit4TestRunner.class)
public class CamelDropboxTest extends AbstractFeatureTest {
- public static final String COMPONENT = extractName(CamelDropboxTest.class);
-
@Test
public void test() throws Exception {
- testComponent(COMPONENT);
+ testComponent();
}
@Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
+ public Option[] configure() {
+ return configureComponent();
}
}
\ No newline at end of file