Author: ningjiang
Date: Thu Dec 1 09:10:14 2011
New Revision: 1209011
URL: http://svn.apache.org/viewvc?rev=1209011&view=rev
Log:
Merged revisions 1209006-1209007 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1209006 | ningjiang | 2011-12-01 16:55:39 +0800 (Thu, 01 Dec 2011) | 1 line
Fix a unit test error with CXF 2.4.5-SNAPSHOT
........
r1209007 | ningjiang | 2011-12-01 16:56:48 +0800 (Thu, 01 Dec 2011) | 1 line
Fix the unit test of cxf blueprint
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsRouterTest.java
camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 1 09:10:14 2011
@@ -1 +1 @@
-/camel/trunk:1202148,1202167,1202204-1202206,1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965
+/camel/trunk:1202148,1202167,1202204-1202206,1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965,1209006-1209007
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsRouterTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsRouterTest.java?rev=1209011&r1=1209010&r2=1209011&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsRouterTest.java
(original)
+++
camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsRouterTest.java
Thu Dec 1 09:10:14 2011
@@ -97,8 +97,9 @@ public class CxfRsRouterTest extends Cam
assertEquals(200, response.getStatusLine().getStatusCode());
// order returned can differ on OS so match for both orders
String s = EntityUtils.toString(response.getEntity());
- boolean m1 =
"<Customers><Customer><id>123</id><name>John</name></Customer><Customer><id>113</id><name>Dan</name></Customer></Customers>".equals(s);
- boolean m2 =
"<Customers><Customer><id>113</id><name>Dan</name></Customer><Customer><id>123</id><name>John</name></Customer></Customers>".equals(s);
+ assertNotNull(s);
+ boolean m1 =
s.endsWith("<Customers><Customer><id>123</id><name>John</name></Customer><Customer><id>113</id><name>Dan</name></Customer></Customers>");
+ boolean m2 =
s.endsWith("<Customers><Customer><id>113</id><name>Dan</name></Customer><Customer><id>123</id><name>John</name></Customer></Customers>");
if (!m1 && !m2) {
fail("Not expected body returned: " + s);
Modified:
camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java?rev=1209011&r1=1209010&r2=1209011&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java
(original)
+++
camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java
Thu Dec 1 09:10:14 2011
@@ -115,8 +115,9 @@ public class CxfRsBlueprintRouterTest ex
assertEquals(200, response.getStatusLine().getStatusCode());
// order returned can differ on OS so match for both orders
String s = EntityUtils.toString(response.getEntity());
- boolean m1 =
"<Customers><Customer><id>123</id><name>John</name></Customer><Customer><id>113</id><name>Dan</name></Customer></Customers>".equals(s);
- boolean m2 =
"<Customers><Customer><id>113</id><name>Dan</name></Customer><Customer><id>123</id><name>John</name></Customer></Customers>".equals(s);
+ assertNotNull(s);
+ boolean m1 =
s.endsWith("<Customers><Customer><id>123</id><name>John</name></Customer><Customer><id>113</id><name>Dan</name></Customer></Customers>");
+ boolean m2 =
s.endsWith("<Customers><Customer><id>113</id><name>Dan</name></Customer><Customer><id>123</id><name>John</name></Customer></Customers>");
if (!m1 && !m2) {
fail("Not expected body returned: " + s);
