http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleCalendarTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleCalendarTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleCalendarTest.java index 58330f3..43e17c9 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleCalendarTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleCalendarTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,4 @@ public class CamelGoogleCalendarTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } - }
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleDriveTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleDriveTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleDriveTest.java index 5b64439..3ec7e84 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleDriveTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleDriveTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,4 @@ public class CamelGoogleDriveTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } - } http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleMailTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleMailTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleMailTest.java index c518625..ad0b93c 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleMailTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleMailTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,4 @@ public class CamelGoogleMailTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } - } http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGroovyTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGroovyTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGroovyTest.java index 0babdb1..a9e7ecb 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGroovyTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGroovyTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,4 @@ public class CamelGroovyTest extends AbstractFeatureTest { testLanguage(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } - } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/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 8c73c63..2f4daaa 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 @@ -16,13 +16,8 @@ */ package org.apache.camel.itest.karaf; -import org.apache.camel.model.DataFormatDefinition; -import org.apache.camel.model.dataformat.JsonDataFormat; -import org.apache.camel.model.dataformat.JsonLibrary; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -30,20 +25,9 @@ public class CamelGsonTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelGsonTest.class); - protected DataFormatDefinition createDataformatDefinition(String format) { - JsonDataFormat answer = new JsonDataFormat(); - answer.setLibrary(JsonLibrary.Gson); - return answer; - } - @Test public void test() throws Exception { testDataFormat(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } - } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuavaEventBusTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuavaEventBusTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuavaEventBusTest.java index 296342b..9f31f41 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuavaEventBusTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuavaEventBusTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,4 @@ public class CamelGuavaEventBusTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } - } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/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 002bac2..2cd1678 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 @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -29,12 +27,7 @@ public class CamelGuiceTest extends AbstractFeatureTest { @Test public void test() throws Exception { - // TODO: how to actually test ? - } - - @Configuration - public static Option[] configure() { - return configure(COMPONENT); + installCamelFeature(COMPONENT); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHazelcastTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHazelcastTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHazelcastTest.java index 429d0d3..5c6cd46 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHazelcastTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHazelcastTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,4 @@ public class CamelHazelcastTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } - } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHbaseTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHbaseTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHbaseTest.java index d941ff5..f436a78 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHbaseTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHbaseTest.java @@ -19,8 +19,6 @@ package org.apache.camel.itest.karaf; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -34,9 +32,4 @@ public class CamelHbaseTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } - } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfs2Test.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfs2Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfs2Test.java index 5cc649b..892b688 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfs2Test.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfs2Test.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,4 @@ public class CamelHdfs2Test extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } - } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfsTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfsTest.java index 8d35be9..b614a4e 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfsTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfsTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,4 @@ public class CamelHdfsTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } - } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHessianTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHessianTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHessianTest.java index ed1be84..bd65a2c 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHessianTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHessianTest.java @@ -16,31 +16,18 @@ */ package org.apache.camel.itest.karaf; -import org.apache.camel.model.DataFormatDefinition; -import org.apache.camel.model.dataformat.HessianDataFormat; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) public class CamelHessianTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelHessianTest.class); - - protected DataFormatDefinition createDataformatDefinition(String format) { - return new HessianDataFormat(); - } @Test public void test() throws Exception { testDataFormat(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } - } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHipchatTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHipchatTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHipchatTest.java index 7b008fb..f9ba468 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHipchatTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHipchatTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,4 @@ public class CamelHipchatTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } - } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHl7Test.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHl7Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHl7Test.java index 71bbf48..01a4d45 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHl7Test.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHl7Test.java @@ -16,12 +16,8 @@ */ package org.apache.camel.itest.karaf; -import org.apache.camel.model.DataFormatDefinition; -import org.apache.camel.model.dataformat.HL7DataFormat; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -29,18 +25,9 @@ public class CamelHl7Test extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelHl7Test.class); - protected DataFormatDefinition createDataformatDefinition(String format) { - return new HL7DataFormat(); - } - @Test public void test() throws Exception { testDataFormat(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } - } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttp4Test.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttp4Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttp4Test.java index 3a6b4e5..f0339f9 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttp4Test.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttp4Test.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,4 @@ public class CamelHttp4Test extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } - } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttpTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttpTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttpTest.java index 710e019..1d2c7bf 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttpTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttpTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,4 @@ public class CamelHttpTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } - } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIbatisTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIbatisTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIbatisTest.java index 672e6c7..60a4b40 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIbatisTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIbatisTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,4 @@ public class CamelIbatisTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } - } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIcalTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIcalTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIcalTest.java index 185b9ac..a19fd5c 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIcalTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIcalTest.java @@ -16,31 +16,18 @@ */ package org.apache.camel.itest.karaf; -import org.apache.camel.model.DataFormatDefinition; -import org.apache.camel.model.dataformat.IcalDataFormat; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) public class CamelIcalTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelIcalTest.class); - - protected DataFormatDefinition createDataformatDefinition(String format) { - return new IcalDataFormat(); - } @Test public void test() throws Exception { testDataFormat(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } - } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/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 f697ad2..fc40126 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 @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,4 @@ public class CamelIgniteTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } - } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelInfinispanTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelInfinispanTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelInfinispanTest.java index cb5743cb..fac0c48 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelInfinispanTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelInfinispanTest.java @@ -18,12 +18,11 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) public class CamelInfinispanTest extends AbstractFeatureTest { + public static final String COMPONENT = extractName(CamelInfinispanTest.class); @Test @@ -31,9 +30,4 @@ public class CamelInfinispanTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } - } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIrcTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIrcTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIrcTest.java index e27309d..1e53448 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIrcTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIrcTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,4 @@ public class CamelIrcTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } - } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/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 84ba7c1..10ea459 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 @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelJCacheTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/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 3aa7b43..ae47ec7 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 @@ -16,13 +16,8 @@ */ package org.apache.camel.itest.karaf; -import org.apache.camel.model.DataFormatDefinition; -import org.apache.camel.model.dataformat.JsonDataFormat; -import org.apache.camel.model.dataformat.JsonLibrary; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -30,18 +25,10 @@ public class CamelJacksonTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelJacksonTest.class); - protected DataFormatDefinition createDataformatDefinition(String format) { - return new JsonDataFormat(JsonLibrary.Jackson); - } - @Test public void test() throws Exception { testDataFormat(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJacksonxmlTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJacksonxmlTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJacksonxmlTest.java index a1a3655..ae1dee4 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJacksonxmlTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJacksonxmlTest.java @@ -16,12 +16,8 @@ */ package org.apache.camel.itest.karaf; -import org.apache.camel.model.DataFormatDefinition; -import org.apache.camel.model.dataformat.JacksonXMLDataFormat; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -29,18 +25,10 @@ public class CamelJacksonxmlTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelJacksonxmlTest.class); - protected DataFormatDefinition createDataformatDefinition(String format) { - return new JacksonXMLDataFormat(); - } - @Test public void test() throws Exception { testDataFormat(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJasyptTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJasyptTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJasyptTest.java index ce2b9d1..a7a8b0d 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJasyptTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJasyptTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -29,12 +27,8 @@ public class CamelJasyptTest extends AbstractFeatureTest { @Test public void test() throws Exception { - // not a component + installCamelFeature(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJaxbTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJaxbTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJaxbTest.java index 9aae8ba..4edca64 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJaxbTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJaxbTest.java @@ -16,31 +16,19 @@ */ package org.apache.camel.itest.karaf; -import org.apache.camel.model.DataFormatDefinition; -import org.apache.camel.model.dataformat.JaxbDataFormat; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) public class CamelJaxbTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelJaxbTest.class); - - protected DataFormatDefinition createDataformatDefinition(String format) { - return new JaxbDataFormat(); - } @Test public void test() throws Exception { testDataFormat(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/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 06a09ba..743e527 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 @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelJbpmTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJcloudsTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJcloudsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJcloudsTest.java index 87d7a55..1369400 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJcloudsTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJcloudsTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelJcloudsTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJcrTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJcrTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJcrTest.java index de660e3..5c358aa 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJcrTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJcrTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelJcrTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJdbcAggregatorTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJdbcAggregatorTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJdbcAggregatorTest.java deleted file mode 100644 index 4c3f227..0000000 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJdbcAggregatorTest.java +++ /dev/null @@ -1,41 +0,0 @@ -/** - * 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.Configuration; -import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.PaxExam; - -@RunWith(PaxExam.class) -public class CamelJdbcAggregatorTest extends AbstractFeatureTest { - - // the aggregator is included in the camel-sql artifact - public static final String COMPONENT = "sql"; - - @Test - public void test() throws Exception { - // its not a component - } - - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } - -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJdbcTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJdbcTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJdbcTest.java index b50d1cd..8d97e03 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJdbcTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJdbcTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelJdbcTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJetty8Test.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJetty8Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJetty8Test.java deleted file mode 100644 index 0a81006..0000000 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJetty8Test.java +++ /dev/null @@ -1,41 +0,0 @@ -/** - * 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.Configuration; -import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.PaxExam; - -@RunWith(PaxExam.class) -@Deprecated -public class CamelJetty8Test extends AbstractFeatureTest { - - public static final String COMPONENT = extractName(CamelJetty8Test.class); - - @Test - public void test() throws Exception { - testComponent("jetty"); - } - - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } - -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJetty9Test.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJetty9Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJetty9Test.java deleted file mode 100644 index 07b2681..0000000 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJetty9Test.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - * 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.Configuration; -import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.PaxExam; - -@RunWith(PaxExam.class) -public class CamelJetty9Test extends AbstractFeatureTest { - - public static final String COMPONENT = extractName(CamelJetty9Test.class); - - @Test - public void test() throws Exception { - testComponent("jetty"); - } - - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } - -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJettyTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJettyTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJettyTest.java index bed380e..81b0cb6 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJettyTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJettyTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelJettyTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJgroupsTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJgroupsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJgroupsTest.java index 34d3a9a..01b4e27 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJgroupsTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJgroupsTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelJgroupsTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJibxTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJibxTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJibxTest.java index ae9a33b..6b911ab 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJibxTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJibxTest.java @@ -16,31 +16,19 @@ */ package org.apache.camel.itest.karaf; -import org.apache.camel.model.DataFormatDefinition; -import org.apache.camel.model.dataformat.JibxDataFormat; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) public class CamelJibxTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelJibxTest.class); - - protected DataFormatDefinition createDataformatDefinition(String format) { - return new JibxDataFormat(); - } @Test public void test() throws Exception { testDataFormat(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJingTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJingTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJingTest.java index fe8f7d3..874a9ca 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJingTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJingTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelJingTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJmsTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJmsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJmsTest.java index 537ff6a..9dc30fd 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJmsTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJmsTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelJmsTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJmxTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJmxTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJmxTest.java index 2f34840..aa5be6b 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJmxTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJmxTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelJmxTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJoltTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJoltTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJoltTest.java index 6c69b4c..d8ed96f 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJoltTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJoltTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelJoltTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJosqlTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJosqlTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJosqlTest.java index 3a2e82f..265d35f 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJosqlTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJosqlTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -29,12 +27,8 @@ public class CamelJosqlTest extends AbstractFeatureTest { @Test public void test() throws Exception { - // TODO: how to test that? + testLanguage(COMPONENT, "sql"); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJpaTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJpaTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJpaTest.java index 5aa559c..9f17b39 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJpaTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJpaTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelJpaTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJsonpathTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJsonpathTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJsonpathTest.java index 4f78f5a..3d42991 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJsonpathTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJsonpathTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelJsonpathTest extends AbstractFeatureTest { testLanguage(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJt400Test.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJt400Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJt400Test.java index 6a5e58e..b06d263 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJt400Test.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJt400Test.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelJt400Test extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJuelTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJuelTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJuelTest.java index dc2d11c..2fd2caf 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJuelTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJuelTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -29,12 +27,8 @@ public class CamelJuelTest extends AbstractFeatureTest { @Test public void test() throws Exception { - testLanguage("el"); + testLanguage(COMPONENT, "el"); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJxpathTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJxpathTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJxpathTest.java index 4003a06..3ade6da 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJxpathTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJxpathTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelJxpathTest extends AbstractFeatureTest { testLanguage(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKafkaTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKafkaTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKafkaTest.java index fc13ec4..90aab5f 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKafkaTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKafkaTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelKafkaTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKratiTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKratiTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKratiTest.java index 05538ba..825e58a 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKratiTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKratiTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelKratiTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKubernetesTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKubernetesTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKubernetesTest.java index eda3cf2..3b863c7 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKubernetesTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKubernetesTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelKubernetesTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLdapTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLdapTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLdapTest.java index 6da6a95..0830fe0 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLdapTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLdapTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelLdapTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLinkedinTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLinkedinTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLinkedinTest.java index 091b918..1c8012e 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLinkedinTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLinkedinTest.java @@ -18,12 +18,11 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) public class CamelLinkedinTest extends AbstractFeatureTest { + public static final String COMPONENT = extractName(CamelLinkedinTest.class); @Test @@ -31,9 +30,4 @@ public class CamelLinkedinTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public Option[] configure() { - return configure(COMPONENT); - } - } http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/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 a4332ae..274fd24 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 @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelLuceneTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLzfTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLzfTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLzfTest.java index 55a7283..e0a021c 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLzfTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLzfTest.java @@ -16,31 +16,19 @@ */ package org.apache.camel.itest.karaf; -import org.apache.camel.model.DataFormatDefinition; -import org.apache.camel.model.dataformat.LZFDataFormat; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) public class CamelLzfTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelLzfTest.class); - - protected DataFormatDefinition createDataformatDefinition(String format) { - return new LZFDataFormat(); - } @Test public void test() throws Exception { testDataFormat(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMailTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMailTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMailTest.java index c6cf7b9..56d0539 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMailTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMailTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -29,12 +27,10 @@ public class CamelMailTest extends AbstractFeatureTest { @Test public void test() throws Exception { - testComponent("imap"); + testComponent(COMPONENT, "smtp"); + testComponent(COMPONENT, "imap"); + testComponent(COMPONENT, "pop3"); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMetricsTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMetricsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMetricsTest.java index 6700fbd..2f65bb0 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMetricsTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMetricsTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelMetricsTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMina2Test.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMina2Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMina2Test.java index 26ba8f8..7977518 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMina2Test.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMina2Test.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelMina2Test extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMinaTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMinaTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMinaTest.java index d267752..453cb40 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMinaTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMinaTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelMinaTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMllpTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMllpTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMllpTest.java index f467666..32b48ca 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMllpTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMllpTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelMllpTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMongodbTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMongodbTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMongodbTest.java index c0afeba..b9768be 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMongodbTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMongodbTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelMongodbTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMqttTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMqttTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMqttTest.java index c77b34f..6c6a3b7 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMqttTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMqttTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelMqttTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java index 961ef14..0a95fd9 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelMsvTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMustacheTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMustacheTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMustacheTest.java index 86508b5..d989ee6 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMustacheTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMustacheTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelMustacheTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMvelTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMvelTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMvelTest.java index 461214e..4ddc084 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMvelTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMvelTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelMvelTest extends AbstractFeatureTest { testLanguage(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMyBatisTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMyBatisTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMyBatisTest.java index 119239d..f0bdfb0 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMyBatisTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMyBatisTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelMyBatisTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNatsTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNatsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNatsTest.java index 32ae4ae..9d663c2 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNatsTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNatsTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelNatsTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNetty4HttpTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNetty4HttpTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNetty4HttpTest.java index e48bc21..ae12826 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNetty4HttpTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNetty4HttpTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelNetty4HttpTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNetty4Test.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNetty4Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNetty4Test.java index 438cf8e..1730c5e 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNetty4Test.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNetty4Test.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelNetty4Test extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyHttpTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyHttpTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyHttpTest.java index ace1c04..2598cd7 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyHttpTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyHttpTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelNettyHttpTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyTest.java index 2c590cb..20a14a2 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelNettyTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOgnlTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOgnlTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOgnlTest.java index 9cbdfc5..087b685 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOgnlTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOgnlTest.java @@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) @@ -32,9 +30,5 @@ public class CamelOgnlTest extends AbstractFeatureTest { testLanguage(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOlingo2Test.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOlingo2Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOlingo2Test.java index 3ca27e0..feaee45 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOlingo2Test.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOlingo2Test.java @@ -18,12 +18,11 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) public class CamelOlingo2Test extends AbstractFeatureTest { + public static final String COMPONENT = extractName(CamelOlingo2Test.class); @Test @@ -31,9 +30,4 @@ public class CamelOlingo2Test extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public Option[] configure() { - return configure(COMPONENT); - } - }
