Repository: camel Updated Branches: refs/heads/master 28586940f -> aa89a5b20
Fix and enable test. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/aa89a5b2 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/aa89a5b2 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/aa89a5b2 Branch: refs/heads/master Commit: aa89a5b200fe5e1350129f4630699baa408052ca Parents: 2858694 Author: Babak Vahdat <bvah...@apache.org> Authored: Tue Dec 2 10:56:43 2014 +0100 Committer: Babak Vahdat <bvah...@apache.org> Committed: Tue Dec 2 10:56:43 2014 +0100 ---------------------------------------------------------------------- tests/camel-itest-osgi/pom.xml | 1 - .../apache/camel/itest/osgi/blueprint/BlueprintTracerTest.java | 2 +- .../org/apache/camel/itest/osgi/blueprint/blueprint-29.xml | 4 +--- 3 files changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/aa89a5b2/tests/camel-itest-osgi/pom.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/pom.xml b/tests/camel-itest-osgi/pom.xml index c51f199..8a00c0c 100644 --- a/tests/camel-itest-osgi/pom.xml +++ b/tests/camel-itest-osgi/pom.xml @@ -504,7 +504,6 @@ <exclude>**/FtpConsumeTest.*</exclude> <exclude>**/BlobStoreRouteTest.*</exclude> <!-- CAMEL-6134 --> <exclude>**/BlobStoreBlueprintRouteTest.*</exclude> <!-- CAMEL-6134 --> - <exclude>**/BlueprintTracerTest.*</exclude> <!-- We get a Gave up waiting for service (&(objectClass=org.apache.camel.CamelContext) --> </excludes> <systemPropertyVariables> <karafVersion>${karaf-version}</karafVersion> http://git-wip-us.apache.org/repos/asf/camel/blob/aa89a5b2/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintTracerTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintTracerTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintTracerTest.java index 3640b3b..25b7282 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintTracerTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintTracerTest.java @@ -57,7 +57,7 @@ public class BlueprintTracerTest extends OSGiBlueprintTestSupport { result.assertIsSatisfied(); DefaultTraceEventMessage em = tracer.getReceivedExchanges().get(0).getIn().getBody(DefaultTraceEventMessage.class); - assertEquals("Hello Camel", em.getBody()); + assertEquals("Hello World", em.getBody()); assertEquals("String", em.getBodyType()); assertEquals(null, em.getCausedByException()); http://git-wip-us.apache.org/repos/asf/camel/blob/aa89a5b2/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/blueprint/blueprint-29.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/blueprint/blueprint-29.xml b/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/blueprint/blueprint-29.xml index 8dea9c8..7c3b93c 100644 --- a/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/blueprint/blueprint-29.xml +++ b/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/blueprint/blueprint-29.xml @@ -19,7 +19,6 @@ xmlns:camel="http://camel.apache.org/schema/blueprint";> <camelContext trace="true" xmlns="http://camel.apache.org/schema/blueprint";> - <endpoint id="traced" uri="mock:traced"/> <route> <from uri="direct:start"/> <to uri="mock:result"/> @@ -27,12 +26,11 @@ </camelContext> <bean id="camelTracer" class="org.apache.camel.processor.interceptor.Tracer"> - <property name="traceExceptions" value="false"/> <property name="traceInterceptors" value="true"/> <property name="traceExceptions" value="true"/> <property name="logLevel" value="INFO"/> <property name="logName" value="org.apache.camel.blueprint.log"/> - <property name="destination" ref="traced"/> + <property name="destinationUri" value="mock:traced"/> </bean> </blueprint>
