http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOpenshiftTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOpenshiftTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOpenshiftTest.java index 0ee8cd6..ebd23df 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOpenshiftTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOpenshiftTest.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 CamelOpenshiftTest 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/CamelOptaplannerTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOptaplannerTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOptaplannerTest.java index 1a975ba..811f82c 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOptaplannerTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOptaplannerTest.java @@ -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 CamelOptaplannerTest 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/CamelPahoTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPahoTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPahoTest.java index 9ec0e81..e385c84 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPahoTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPahoTest.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 CamelPahoTest 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/CamelPaxloggingTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPaxloggingTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPaxloggingTest.java index cbbfec1..86cf30f 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPaxloggingTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPaxloggingTest.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 CamelPaxloggingTest 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/CamelPdfTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPdfTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPdfTest.java index 2432750..c5d73e2 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPdfTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPdfTest.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 CamelPdfTest 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/CamelPgeventTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPgeventTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPgeventTest.java index 56e0599..36ace86 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPgeventTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPgeventTest.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 CamelPgeventTest 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/CamelPrinterTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPrinterTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPrinterTest.java index ff8ee68..99f6fc3 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPrinterTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelPrinterTest.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 CamelPrinterTest extends AbstractFeatureTest { @Test public void test() throws Exception { - testComponent("lpr"); + testComponent(COMPONENT, "lpr"); } - @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/CamelProtobufTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelProtobufTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelProtobufTest.java index ffa78ad..ae2eb58 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelProtobufTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelProtobufTest.java @@ -16,12 +16,8 @@ */ package org.apache.camel.itest.karaf; -import org.apache.camel.model.DataFormatDefinition; -import org.apache.camel.model.dataformat.ProtobufDataFormat; 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 CamelProtobufTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelProtobufTest.class); - protected DataFormatDefinition createDataformatDefinition(String format) { - return new ProtobufDataFormat(); - } - @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/CamelQuartz2Test.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuartz2Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuartz2Test.java index 830f3c6..077fb4f 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuartz2Test.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuartz2Test.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 CamelQuartz2Test 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/CamelQuartzTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuartzTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuartzTest.java index 2acbf10..d2c0296 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuartzTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuartzTest.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 CamelQuartzTest 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/CamelQuickFixTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuickFixTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuickFixTest.java index 9390be9..82bf53d 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuickFixTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuickFixTest.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 CamelQuickFixTest 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/CamelRabbitmqTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRabbitmqTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRabbitmqTest.java index ecae39d..f761fc3 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRabbitmqTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRabbitmqTest.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,10 +30,5 @@ public class CamelRabbitmqTest 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/CamelRestletTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRestletTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRestletTest.java index a8cfa0b..350fa60 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRestletTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRestletTest.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 CamelRestletTest 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/CamelRmiTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRmiTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRmiTest.java index 1e4e066..e69eea0 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRmiTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRmiTest.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 CamelRmiTest 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/CamelRouteboxTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRouteboxTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRouteboxTest.java index f793d0c..6419712 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRouteboxTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRouteboxTest.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 CamelRouteboxTest 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/CamelRssTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRssTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRssTest.java index a778cf5..775f371 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRssTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRssTest.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 CamelRssTest 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/CamelRxTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRxTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRxTest.java index 0bbd815..60e9125 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRxTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRxTest.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 CamelRxTest extends AbstractFeatureTest { @Test public void test() throws Exception { - // noop + 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/CamelSalesforceTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSalesforceTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSalesforceTest.java index b231b14..84aa9ea 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSalesforceTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSalesforceTest.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 CamelSalesforceTest 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/CamelSapNetweaverTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSapNetweaverTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSapNetweaverTest.java index 1b503ae..a41d17b 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSapNetweaverTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSapNetweaverTest.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 CamelSapNetweaverTest 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/CamelSaxonTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSaxonTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSaxonTest.java index 521a952..95ddf90 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSaxonTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSaxonTest.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,13 +27,9 @@ public class CamelSaxonTest extends AbstractFeatureTest { @Test public void test() throws Exception { - testComponent("xquery"); - testLanguage("xquery"); + testComponent(COMPONENT, "xquery"); + testLanguage(COMPONENT, "xquery"); } - @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/CamelScalaTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelScalaTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelScalaTest.java index 16d422b..c79623d 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelScalaTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelScalaTest.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,13 +27,8 @@ public class CamelScalaTest extends AbstractFeatureTest { @Test public void test() throws Exception { - //TODO need to find a way to test scala - //testLanguage(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/CamelSchematronTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSchematronTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSchematronTest.java index 7f51d1d..59c00cc 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSchematronTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSchematronTest.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 CamelSchematronTest 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/CamelScriptTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelScriptTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelScriptTest.java index 3e43264..aa8f100 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelScriptTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelScriptTest.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 CamelScriptTest extends AbstractFeatureTest { @Test public void test() throws Exception { - testLanguage("Groovy"); - } - - @Configuration - public static Option[] configure() { - return configure(COMPONENT, "script-groovy"); + installCamelFeature("script-groovy"); + testLanguage(COMPONENT, "Groovy"); } } \ 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/CamelServicenowTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelServicenowTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelServicenowTest.java index f275161..e65ec5d 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelServicenowTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelServicenowTest.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 CamelServicenowTest 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/CamelServletTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelServletTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelServletTest.java index 5f8d4bd..8858711 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelServletTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelServletTest.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 CamelServletTest 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/CamelSipTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSipTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSipTest.java index 223db22..ab93348 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSipTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSipTest.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 CamelSipTest 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/CamelSjmsTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSjmsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSjmsTest.java index 9cbf842..01dbc50 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSjmsTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSjmsTest.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 CamelSjmsTest 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/CamelSlackTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSlackTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSlackTest.java index 8c39d8d..06dbd23 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSlackTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSlackTest.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 CamelSlackTest 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/CamelSmppTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSmppTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSmppTest.java index 4264957..1d250e4 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSmppTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSmppTest.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 CamelSmppTest 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/CamelSnakeyamlTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSnakeyamlTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSnakeyamlTest.java index 2a8c416..02188dc 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSnakeyamlTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSnakeyamlTest.java @@ -18,23 +18,14 @@ 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 CamelSnakeyamlTest extends AbstractFeatureTest { - public static final String COMPONENT = extractName(CamelSnakeyamlTest.class); - @Test public void test() throws Exception { - testComponent(COMPONENT); - } - - @Configuration - public static Option[] configure() { - return configure(COMPONENT); + testComponent("camel-snakeyaml", "yaml-snakeyaml"); } } http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSnmpTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSnmpTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSnmpTest.java index c1b98df..c51d46b 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSnmpTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSnmpTest.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 CamelSnmpTest 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/CamelSoapTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSoapTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSoapTest.java index c53c832..ed22e30 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSoapTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSoapTest.java @@ -16,12 +16,8 @@ */ package org.apache.camel.itest.karaf; -import org.apache.camel.model.DataFormatDefinition; -import org.apache.camel.model.dataformat.SoapJaxbDataFormat; 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 CamelSoapTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelSoapTest.class); - protected DataFormatDefinition createDataformatDefinition(String format) { - return new SoapJaxbDataFormat(); - } - @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/CamelSolrTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSolrTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSolrTest.java index 4c6b979..d2d392a 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSolrTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSolrTest.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 CamelSolrTest 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/CamelSplunkTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSplunkTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSplunkTest.java index 17b5b19..ccdaaef 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSplunkTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSplunkTest.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 CamelSplunkTest 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/CamelSpringBatchTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringBatchTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringBatchTest.java index 8cd6e04..6b492f6 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringBatchTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringBatchTest.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 CamelSpringBatchTest 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/CamelSpringJavaconfigTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringJavaconfigTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringJavaconfigTest.java index da24479..fa21995 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringJavaconfigTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringJavaconfigTest.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 CamelSpringJavaconfigTest extends AbstractFeatureTest { @Test public void test() throws Exception { - // TODO: spring javaconfig is being removed in Camel 3.0 - } - - @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/CamelSpringLdapTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringLdapTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringLdapTest.java index f96917d..a1ab931 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringLdapTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringLdapTest.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 CamelSpringLdapTest 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/CamelSpringRedisTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringRedisTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringRedisTest.java index 3bd1785..a086691 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringRedisTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringRedisTest.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 CamelSpringRedisTest 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/CamelSpringWebServiceTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringWebServiceTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringWebServiceTest.java index 927d675..2f817db 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringWebServiceTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringWebServiceTest.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 CamelSpringWebServiceTest 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/CamelSqlTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSqlTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSqlTest.java index c6fbcdb..a93cf26 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSqlTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSqlTest.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 CamelSqlTest 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/CamelSshTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSshTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSshTest.java index 6332ebc..10e0133 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSshTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSshTest.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 CamelSshTest 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/CamelStAXTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStAXTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStAXTest.java index c593de2..f9f78a1 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStAXTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStAXTest.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 CamelStAXTest 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/CamelStompTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStompTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStompTest.java index 81149b3..5879ca5 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStompTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStompTest.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 CamelStompTest 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/CamelStreamTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStreamTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStreamTest.java index 11f1e5a..9725568 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStreamTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStreamTest.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 CamelStreamTest 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/CamelStringTemplateTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStringTemplateTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStringTemplateTest.java index 3abfc15..666848f 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStringTemplateTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStringTemplateTest.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 CamelStringTemplateTest 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/CamelSwaggerJavaTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSwaggerJavaTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSwaggerJavaTest.java index b586aa5..9c982ef 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSwaggerJavaTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSwaggerJavaTest.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 CamelSwaggerJavaTest 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/CamelSwaggerTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSwaggerTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSwaggerTest.java index 6a6fc51..4f47fa1 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSwaggerTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSwaggerTest.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 CamelSwaggerTest 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/CamelSyslogTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSyslogTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSyslogTest.java index d1c0321..80e887d 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSyslogTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSyslogTest.java @@ -16,12 +16,8 @@ */ package org.apache.camel.itest.karaf; -import org.apache.camel.model.DataFormatDefinition; -import org.apache.camel.model.dataformat.SyslogDataFormat; 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 CamelSyslogTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelSyslogTest.class); - protected DataFormatDefinition createDataformatDefinition(String format) { - return new SyslogDataFormat(); - } - @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/CamelTagsoupTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTagsoupTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTagsoupTest.java index a71fe4d..dc5fec7 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTagsoupTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTagsoupTest.java @@ -16,12 +16,8 @@ */ package org.apache.camel.itest.karaf; -import org.apache.camel.model.DataFormatDefinition; -import org.apache.camel.model.dataformat.TidyMarkupDataFormat; 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 CamelTagsoupTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelTagsoupTest.class); - protected DataFormatDefinition createDataformatDefinition(String format) { - return new TidyMarkupDataFormat(); - } - @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/CamelTarfileTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTarfileTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTarfileTest.java index d41b90d..a7e261c 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTarfileTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTarfileTest.java @@ -16,31 +16,19 @@ */ package org.apache.camel.itest.karaf; -import org.apache.camel.model.DataFormatDefinition; -import org.apache.camel.model.dataformat.TarFileDataFormat; 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 CamelTarfileTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelTarfileTest.class); - - protected DataFormatDefinition createDataformatDefinition(String format) { - return new TarFileDataFormat(); - } @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/CamelTestSpringTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestSpringTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestSpringTest.java index a7de65d..a1df584 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestSpringTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestSpringTest.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 CamelTestSpringTest extends AbstractFeatureTest { @Test public void test() throws Exception { - // noop + 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/CamelTestTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestTest.java index 17df5c1..c980b6d 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestTest.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 CamelTestTest extends AbstractFeatureTest { @Test public void test() throws Exception { - // noop + 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/CamelTwitterTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTwitterTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTwitterTest.java index c3a1446..9bc6a6a 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTwitterTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTwitterTest.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 CamelTwitterTest 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/CamelUndertowTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUndertowTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUndertowTest.java index a8950b2..309ec11 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUndertowTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUndertowTest.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 CamelUndertowTest extends AbstractFeatureTest { + public static final String COMPONENT = extractName(CamelUndertowTest.class); @Test @@ -31,9 +30,5 @@ public class CamelUndertowTest 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/CamelUrlrewriteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUrlrewriteTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUrlrewriteTest.java index a7532ca..0af37db 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUrlrewriteTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUrlrewriteTest.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 CamelUrlrewriteTest extends AbstractFeatureTest { @Test public void test() throws Exception { - // urlrewrite is not a Camel 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/CamelVelocityTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVelocityTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVelocityTest.java index 787d030..d3e7bcf 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVelocityTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVelocityTest.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 CamelVelocityTest 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/CamelVertxTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVertxTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVertxTest.java index 72dd6ba..77195af 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVertxTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVertxTest.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,16 +27,8 @@ public class CamelVertxTest extends AbstractFeatureTest { @Test public void test() throws Exception { - // vertx requires Java 1.8 - String javaVersion = System.getProperty("java.version"); - if (javaVersion.startsWith("1.8")) { - testComponent(COMPONENT); - } + 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/CamelWeatherTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelWeatherTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelWeatherTest.java index 70cd238..1beb867 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelWeatherTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelWeatherTest.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 CamelWeatherTest 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/CamelWebsocketTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelWebsocketTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelWebsocketTest.java index 458d7dd..e9baf45 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelWebsocketTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelWebsocketTest.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 CamelWebsocketTest 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/CamelXmlbeansTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlbeansTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlbeansTest.java index 6113762..0bff5f3 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlbeansTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlbeansTest.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 CamelXmlbeansTest extends AbstractFeatureTest { @Test public void test() throws Exception { - // xmlbeans is just a converter + 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/CamelXmljsonTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmljsonTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmljsonTest.java index 78c4e4b..d702ac6 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmljsonTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmljsonTest.java @@ -16,31 +16,19 @@ */ package org.apache.camel.itest.karaf; -import org.apache.camel.model.DataFormatDefinition; -import org.apache.camel.model.dataformat.XmlJsonDataFormat; 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 CamelXmljsonTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelXmljsonTest.class); - - protected DataFormatDefinition createDataformatDefinition(String format) { - return new XmlJsonDataFormat(); - } @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/CamelXmlrpcTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlrpcTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlrpcTest.java index 4cc0773..8bd7132 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlrpcTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlrpcTest.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 CamelXmlrpcTest 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/CamelXmlsecurityTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlsecurityTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlsecurityTest.java index e819630..3ab75fd 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlsecurityTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlsecurityTest.java @@ -16,31 +16,19 @@ */ package org.apache.camel.itest.karaf; -import org.apache.camel.model.DataFormatDefinition; -import org.apache.camel.model.dataformat.XMLSecurityDataFormat; 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 CamelXmlsecurityTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelXmlsecurityTest.class); - - protected DataFormatDefinition createDataformatDefinition(String format) { - return new XMLSecurityDataFormat(); - } @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/CamelXmppTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmppTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmppTest.java index 712ab1a..c93964a 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmppTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmppTest.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 CamelXmppTest 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/CamelXstreamTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXstreamTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXstreamTest.java index 035fd4e..12fccad 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXstreamTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXstreamTest.java @@ -16,37 +16,20 @@ */ 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.XStreamDataFormat; 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 CamelXstreamTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelXstreamTest.class); - - protected DataFormatDefinition createDataformatDefinition(String format) { - if (format.equals("xstream")) { - return new XStreamDataFormat(); - } else { - return new JsonDataFormat(); - } - } @Test public void test() throws Exception { - testDataFormat(COMPONENT); - testDataFormat("json"); + testDataFormat(COMPONENT, "xstream"); + testDataFormat(COMPONENT, "json"); } - @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/CamelYamlTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelYamlTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelYamlTest.java index 4990b4f..7e1b18a 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelYamlTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelYamlTest.java @@ -16,32 +16,19 @@ */ package org.apache.camel.itest.karaf; -import org.apache.camel.model.DataFormatDefinition; -import org.apache.camel.model.dataformat.YAMLDataFormat; -import org.apache.camel.model.dataformat.YAMLLibrary; 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 CamelYamlTest extends AbstractFeatureTest { - public static final String COMPONENT = extractName(CamelYamlTest.class); - - protected DataFormatDefinition createDataformatDefinition(String format) { - return new YAMLDataFormat(YAMLLibrary.SnakeYAML); - } + public static final String COMPONENT = "snakeyaml"; @Test public void test() throws Exception { - testDataFormat(COMPONENT); + testDataFormat(COMPONENT, "yaml"); } - @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/CamelYammerTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelYammerTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelYammerTest.java index c96bdf0..f8b700c 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelYammerTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelYammerTest.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 CamelYammerTest 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/CamelZipfileTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZipfileTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZipfileTest.java index d4ca423..5c53692 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZipfileTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZipfileTest.java @@ -16,31 +16,19 @@ */ package org.apache.camel.itest.karaf; -import org.apache.camel.model.DataFormatDefinition; -import org.apache.camel.model.dataformat.ZipFileDataFormat; 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 CamelZipfileTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelZipfileTest.class); - - protected DataFormatDefinition createDataformatDefinition(String format) { - return new ZipFileDataFormat(); - } @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/CamelZookeeperTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZookeeperTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZookeeperTest.java index db02a39..0938f3c 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZookeeperTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZookeeperTest.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 CamelZookeeperTest extends AbstractFeatureTest { testComponent(COMPONENT); } - @Configuration - public static Option[] configure() { - return configure(COMPONENT); - } }