You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2010/06/30 07:31:49 UTC
svn commit: r959195 - in /camel/trunk/camel-core/src/test:
java/org/apache/camel/impl/ java/org/apache/camel/model/
resources/org/apache/camel/model/
Author: davsclaus
Date: Wed Jun 30 05:31:49 2010
New Revision: 959195
URL: http://svn.apache.org/viewvc?rev=959195&view=rev
Log:
Fixed tests
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateWithCustomCacheMaxSizeTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java
camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routingSlip.xml
camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routingSlipHeaderAndDelimiterSet.xml
camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routingSlipHeaderSet.xml
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateWithCustomCacheMaxSizeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateWithCustomCacheMaxSizeTest.java?rev=959195&r1=959194&r2=959195&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateWithCustomCacheMaxSizeTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateWithCustomCacheMaxSizeTest.java Wed Jun 30 05:31:49 2010
@@ -41,7 +41,7 @@ public class DefaultProducerTemplateWith
// test that we cache at most 500 producers to avoid it eating to much memory
for (int i = 0; i < 203; i++) {
- Endpoint e = context.getEndpoint("direct:queue:" + i);
+ Endpoint e = context.getEndpoint("seda:queue:" + i);
template.sendBody(e, "Hello");
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java?rev=959195&r1=959194&r2=959195&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java Wed Jun 30 05:31:49 2010
@@ -148,7 +148,7 @@ public class XmlParseTest extends XmlTes
RouteDefinition route = assertOneRoute("routingSlip.xml");
assertFrom(route, "seda:a");
RoutingSlipDefinition node = assertOneProcessorInstanceOf(RoutingSlipDefinition.class, route);
- assertEquals("destinations", node.getHeaderName());
+ assertEquals("destinations", node.getExpression().getExpression());
assertEquals(RoutingSlipDefinition.DEFAULT_DELIMITER, node.getUriDelimiter());
}
@@ -156,7 +156,7 @@ public class XmlParseTest extends XmlTes
RouteDefinition route = assertOneRoute("routingSlipHeaderSet.xml");
assertFrom(route, "seda:a");
RoutingSlipDefinition node = assertOneProcessorInstanceOf(RoutingSlipDefinition.class, route);
- assertEquals("theRoutingSlipHeader", node.getHeaderName());
+ assertEquals("theRoutingSlipHeader", node.getExpression().getExpression());
assertEquals(RoutingSlipDefinition.DEFAULT_DELIMITER, node.getUriDelimiter());
}
@@ -164,7 +164,7 @@ public class XmlParseTest extends XmlTes
RouteDefinition route = assertOneRoute("routingSlipHeaderAndDelimiterSet.xml");
assertFrom(route, "seda:a");
RoutingSlipDefinition node = assertOneProcessorInstanceOf(RoutingSlipDefinition.class, route);
- assertEquals("theRoutingSlipHeader", node.getHeaderName());
+ assertEquals("theRoutingSlipHeader", node.getExpression().getExpression());
assertEquals("#", node.getUriDelimiter());
}
Modified: camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routingSlip.xml
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routingSlip.xml?rev=959195&r1=959194&r2=959195&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routingSlip.xml (original)
+++ camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routingSlip.xml Wed Jun 30 05:31:49 2010
@@ -18,6 +18,8 @@
<routes id="camel" xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="seda:a"/>
- <routingSlip headerName="destinations"/>
+ <routingSlip>
+ <header>destinations</header>
+ </routingSlip>
</route>
</routes>
Modified: camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routingSlipHeaderAndDelimiterSet.xml
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routingSlipHeaderAndDelimiterSet.xml?rev=959195&r1=959194&r2=959195&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routingSlipHeaderAndDelimiterSet.xml (original)
+++ camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routingSlipHeaderAndDelimiterSet.xml Wed Jun 30 05:31:49 2010
@@ -18,6 +18,8 @@
<routes id="camel" xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="seda:a"/>
- <routingSlip headerName="theRoutingSlipHeader" uriDelimiter="#"/>
+ <routingSlip uriDelimiter="#">
+ <header>theRoutingSlipHeader</header>
+ </routingSlip>
</route>
</routes>
Modified: camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routingSlipHeaderSet.xml
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routingSlipHeaderSet.xml?rev=959195&r1=959194&r2=959195&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routingSlipHeaderSet.xml (original)
+++ camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routingSlipHeaderSet.xml Wed Jun 30 05:31:49 2010
@@ -18,6 +18,8 @@
<routes id="camel" xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="seda:a"/>
- <routingSlip headerName="theRoutingSlipHeader"/>
+ <routingSlip>
+ <header>theRoutingSlipHeader</header>
+ </routingSlip>
</route>
</routes>