You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/09/29 16:02:29 UTC
svn commit: r819954 -
/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/
Author: ningjiang
Date: Tue Sep 29 14:02:27 2009
New Revision: 819954
URL: http://svn.apache.org/viewvc?rev=819954&view=rev
Log:
CAMEL-2043 Added the dataformat tests for the camel-itest-karaf
Modified:
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBindyTest.java
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCastorTest.java
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCsvTest.java
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFlatpackTest.java
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFtpTest.java
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJaxbTest.java
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTagsoupTest.java
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlsecurityTest.java
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXstreamTest.java
Modified: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java?rev=819954&r1=819953&r2=819954&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java (original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java Tue Sep 29 14:02:27 2009
@@ -18,7 +18,10 @@
import org.apache.camel.CamelContext;
+import org.apache.camel.impl.DefaultRouteContext;
+import org.apache.camel.model.DataFormatDefinition;
import org.apache.camel.osgi.CamelContextFactory;
+import org.apache.camel.spi.DataFormat;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.junit.After;
@@ -28,10 +31,11 @@
import org.osgi.framework.BundleContext;
import static org.junit.Assert.assertNotNull;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
+//import static org.ops4j.pax.exam.CoreOptions.equinox;
import static org.ops4j.pax.exam.CoreOptions.felix;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
+//import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.cleanCaches;
import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.profile;
import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
@@ -67,21 +71,27 @@
}
protected void testDataFormat(String format) throws Exception {
- // TODO: how to test data formats ?
-// long max = System.currentTimeMillis() + 10000;
-// while (true) {
-// try {
-// assertNotNull(createCamelContext().getDataFormats().get(format));
-// return;
-// } catch (Exception t) {
-// if (System.currentTimeMillis() < max) {
-// Thread.sleep(1000);
-// continue;
-// } else {
-// throw t;
-// }
-// }
-// }
+
+ long max = System.currentTimeMillis() + 10000;
+ while (true) {
+ try {
+ DataFormatDefinition dataFormatDefinition = createDataformatDefinition(format);
+ assertNotNull(dataFormatDefinition);
+ assertNotNull(dataFormatDefinition.getDataFormat(new DefaultRouteContext(createCamelContext())));
+ return;
+ } catch (Exception t) {
+ if (System.currentTimeMillis() < max) {
+ Thread.sleep(1000);
+ continue;
+ } else {
+ throw t;
+ }
+ }
+ }
+ }
+
+ protected DataFormatDefinition createDataformatDefinition(String format) {
+ return null;
}
protected void testLanguage(String lang) throws Exception {
@@ -152,8 +162,8 @@
"camel-osgi", "camel-" + feature),
//cleanCaches(),
- felix(),
- equinox());
+ felix());
+ //equinox());
return options;
}
Modified: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBindyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBindyTest.java?rev=819954&r1=819953&r2=819954&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBindyTest.java (original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBindyTest.java Tue Sep 29 14:02:27 2009
@@ -16,6 +16,9 @@
*/
package org.apache.camel.itest.karaf;
+import org.apache.camel.model.DataFormatDefinition;
+import org.apache.camel.model.dataformat.BindyDataFormat;
+import org.apache.camel.spi.DataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
@@ -26,6 +29,10 @@
public class CamelBindyTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelBindyTest.class);
+
+ protected DataFormatDefinition createDataformatDefinition(String format) {
+ return new BindyDataFormat();
+ }
@Test
public void test() throws Exception {
Modified: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCastorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCastorTest.java?rev=819954&r1=819953&r2=819954&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCastorTest.java (original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCastorTest.java Tue Sep 29 14:02:27 2009
@@ -16,6 +16,8 @@
*/
package org.apache.camel.itest.karaf;
+import org.apache.camel.model.DataFormatDefinition;
+import org.apache.camel.model.dataformat.CastorDataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
@@ -26,10 +28,14 @@
public class CamelCastorTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelCastorTest.class);
+
+ protected DataFormatDefinition createDataformatDefinition(String format) {
+ return new CastorDataFormat();
+ }
@Test
public void test() throws Exception {
- testComponent(COMPONENT);
+ testDataFormat(COMPONENT);
}
@Configuration
Modified: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCsvTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCsvTest.java?rev=819954&r1=819953&r2=819954&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCsvTest.java (original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCsvTest.java Tue Sep 29 14:02:27 2009
@@ -16,6 +16,8 @@
*/
package org.apache.camel.itest.karaf;
+import org.apache.camel.model.DataFormatDefinition;
+import org.apache.camel.model.dataformat.CsvDataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
@@ -27,6 +29,11 @@
public static final String COMPONENT = extractName(CamelCsvTest.class);
+ protected DataFormatDefinition createDataformatDefinition(String format) {
+ return new CsvDataFormat();
+ }
+
+
@Test
public void test() throws Exception {
testDataFormat(COMPONENT);
Modified: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java?rev=819954&r1=819953&r2=819954&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java (original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java Tue Sep 29 14:02:27 2009
@@ -30,6 +30,8 @@
@Test
public void test() throws Exception {
testComponent(COMPONENT);
+ testComponent("cxfrs");
+ testComponent("cxfbean");
}
@Configuration
Modified: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFlatpackTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFlatpackTest.java?rev=819954&r1=819953&r2=819954&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFlatpackTest.java (original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFlatpackTest.java Tue Sep 29 14:02:27 2009
@@ -16,6 +16,8 @@
*/
package org.apache.camel.itest.karaf;
+import org.apache.camel.model.DataFormatDefinition;
+import org.apache.camel.model.dataformat.FlatpackDataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
@@ -27,6 +29,11 @@
public static final String COMPONENT = extractName(CamelFlatpackTest.class);
+ protected DataFormatDefinition createDataformatDefinition(String format) {
+ return new FlatpackDataFormat();
+ }
+
+
@Test
public void test() throws Exception {
testDataFormat(COMPONENT);
Modified: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFtpTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFtpTest.java?rev=819954&r1=819953&r2=819954&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFtpTest.java (original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFtpTest.java Tue Sep 29 14:02:27 2009
@@ -30,6 +30,7 @@
@Test
public void test() throws Exception {
testComponent(COMPONENT);
+ testComponent("sftp");
}
@Configuration
Modified: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJaxbTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJaxbTest.java?rev=819954&r1=819953&r2=819954&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJaxbTest.java (original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJaxbTest.java Tue Sep 29 14:02:27 2009
@@ -16,6 +16,8 @@
*/
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.Option;
@@ -26,6 +28,10 @@
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 {
Modified: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java?rev=819954&r1=819953&r2=819954&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java (original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMsvTest.java Tue Sep 29 14:02:27 2009
@@ -29,7 +29,7 @@
@Test
public void test() throws Exception {
- testComponent(COMPONENT);
+ testComponent("msv");
}
@Configuration
Modified: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTagsoupTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTagsoupTest.java?rev=819954&r1=819953&r2=819954&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTagsoupTest.java (original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTagsoupTest.java Tue Sep 29 14:02:27 2009
@@ -16,6 +16,9 @@
*/
package org.apache.camel.itest.karaf;
+import org.apache.camel.model.DataFormatDefinition;
+import org.apache.camel.model.dataformat.JaxbDataFormat;
+import org.apache.camel.model.dataformat.TidyMarkupDataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
@@ -27,6 +30,10 @@
public static final String COMPONENT = extractName(CamelTagsoupTest.class);
+ protected DataFormatDefinition createDataformatDefinition(String format) {
+ return new TidyMarkupDataFormat();
+ }
+
@Test
public void test() throws Exception {
testDataFormat(COMPONENT);
Modified: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlsecurityTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlsecurityTest.java?rev=819954&r1=819953&r2=819954&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlsecurityTest.java (original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlsecurityTest.java Tue Sep 29 14:02:27 2009
@@ -16,6 +16,8 @@
*/
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.Option;
@@ -26,6 +28,10 @@
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 {
Modified: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXstreamTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXstreamTest.java?rev=819954&r1=819953&r2=819954&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXstreamTest.java (original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXstreamTest.java Tue Sep 29 14:02:27 2009
@@ -16,6 +16,10 @@
*/
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.XMLSecurityDataFormat;
+import org.apache.camel.model.dataformat.XStreamDataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
@@ -26,10 +30,19 @@
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 {
- testComponent(COMPONENT);
+ testDataFormat(COMPONENT);
+ testDataFormat("json");
}
@Configuration