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/05/19 16:33:20 UTC
svn commit: r776330 - in /camel/trunk/tests/camel-itest-osgi: pom.xml
src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java
Author: ningjiang
Date: Tue May 19 14:33:20 2009
New Revision: 776330
URL: http://svn.apache.org/viewvc?rev=776330&view=rev
Log:
Exculded the JAXB related OSGi tests for the Hudson build
Modified:
camel/trunk/tests/camel-itest-osgi/pom.xml
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java
Modified: camel/trunk/tests/camel-itest-osgi/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/pom.xml?rev=776330&r1=776329&r2=776330&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/pom.xml (original)
+++ camel/trunk/tests/camel-itest-osgi/pom.xml Tue May 19 14:33:20 2009
@@ -178,8 +178,9 @@
</includes>
<excludes>
<!--There are some conflicts of the JAXB OSGi bundle and Hudson System jar
- so I comment out this OSGiIntegrationSpringTest -->
- <exclude>**/OSGiIntegrationSpringTest.*</exclude> -->
+ so I comment out these JAXB related tests -->
+ <exclude>**/OSGiIntegrationSpringTest.*</exclude>
+ <exclude>**/JaxbFallbackConverterTest.*</exclude>
</excludes>
</configuration>
</plugin>
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java?rev=776330&r1=776329&r2=776330&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java Tue May 19 14:33:20 2009
@@ -19,9 +19,7 @@
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.impl.DefaultClassResolver;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
-import org.apache.camel.osgi.OsgiFactoryFinder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.junit.Test;
@@ -30,9 +28,7 @@
import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
import static org.ops4j.pax.exam.CoreOptions.felix;
-import static org.ops4j.pax.exam.CoreOptions.knopflerfish;
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.logProfile;
@@ -60,7 +56,9 @@
expected.setFirstName("FOO");
expected.setLastName("BAR");
mock.expectedBodiesReceived(expected);
- template.sendBody("direct:start", "<Person><firstName>FOO</firstName><lastName>BAR</lastName></Person>");
+ mock.expectedHeaderReceived("foo", "bar");
+ template.sendBodyAndHeader("direct:start", "<Person><firstName>FOO</firstName><lastName>BAR</lastName></Person>",
+ "foo", "bar");
assertMockEndpointsSatisfied();
}