cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1365646 - in /cxf/branches/2.4.x-fixes/rt/bindings/xml/src/test: java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptorTest.java resources/message-bare-multi-param.xml
Date Wed, 25 Jul 2012 15:58:23 GMT
Author: dkulp
Date: Wed Jul 25 15:58:22 2012
New Revision: 1365646

URL: http://svn.apache.org/viewvc?rev=1365646&view=rev
Log:
Merged revisions 1365641 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes

........
  r1365641 | dkulp | 2012-07-25 11:56:22 -0400 (Wed, 25 Jul 2012) | 18 lines

  Merged revisions 1365611 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

  ........
    r1365611 | dkulp | 2012-07-25 10:57:24 -0400 (Wed, 25 Jul 2012) | 10 lines

    Merged revisions 1365609 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk

    ........
      r1365609 | dkulp | 2012-07-25 10:54:07 -0400 (Wed, 25 Jul 2012) | 2 lines

      Update test to actually match wsdl.

    ........

  ........

........

Modified:
    cxf/branches/2.4.x-fixes/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptorTest.java
    cxf/branches/2.4.x-fixes/rt/bindings/xml/src/test/resources/message-bare-multi-param.xml

Modified: cxf/branches/2.4.x-fixes/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptorTest.java?rev=1365646&r1=1365645&r2=1365646&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptorTest.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptorTest.java
Wed Jul 25 15:58:22 2012
@@ -52,8 +52,8 @@ public class XMLMessageInInterceptorTest
                         MyComplexStructType.class);
         
         OperationInfo op = serviceInfo.getInterface().getOperation(new QName(ns, "testMultiParamPart"));
-        op.getInput().getMessagePartByIndex(0).setTypeClass(MyComplexStructType.class);
-        op.getInput().getMessagePartByIndex(1).setTypeClass(String.class);
+        op.getInput().getMessagePartByIndex(0).setTypeClass(String.class);
+        op.getInput().getMessagePartByIndex(1).setTypeClass(MyComplexStructType.class);
         
         in.handleMessage(xmlMessage);
         docLitIn.handleMessage(xmlMessage);
@@ -61,8 +61,8 @@ public class XMLMessageInInterceptorTest
         assertNotNull(list);
         assertEquals("expect 2 param", 2, list.size());
         assertEquals("method input in2 is MyComplexStructType", true,
-                        list.get(0) instanceof MyComplexStructType);
-        assertEquals("method input in1 is String tli", true, ((String) list.get(1)).indexOf("tli")
>= 0);
+                        list.get(1) instanceof MyComplexStructType);
+        assertEquals("method input in1 is String tli", true, ((String) list.get(0)).indexOf("tli")
>= 0);
     }
 
     @Test

Modified: cxf/branches/2.4.x-fixes/rt/bindings/xml/src/test/resources/message-bare-multi-param.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/xml/src/test/resources/message-bare-multi-param.xml?rev=1365646&r1=1365645&r2=1365646&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/xml/src/test/resources/message-bare-multi-param.xml
(original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/xml/src/test/resources/message-bare-multi-param.xml
Wed Jul 25 15:58:22 2012
@@ -18,6 +18,12 @@
 -->
 <multiParamRootReq
 	xmlns="http://apache.org/hello_world_xml_http/bare">
+	<requestType
+		xmlns="http://apache.org/hello_world_xml_http/bare/types"
+		xmlns:ns2="http://www.w3.org/2005/02/addressing/wsdl"
+		xmlns:xs="http://www.w3.org/2001/XMLSchema">
+		tli
+	</requestType>
 	<myComplexStruct
 		xmlns="http://apache.org/hello_world_xml_http/bare/types"
 		xmlns:ns2="http://www.w3.org/2005/02/addressing/wsdl">
@@ -25,10 +31,4 @@
 		<elem2>this is element 2</elem2>
 		<elem3>42</elem3>
 	</myComplexStruct>
-	<requestType
-		xmlns="http://apache.org/hello_world_xml_http/bare/types"
-		xmlns:ns2="http://www.w3.org/2005/02/addressing/wsdl"
-		xmlns:xs="http://www.w3.org/2001/XMLSchema">
-		tli
-	</requestType>
 </multiParamRootReq>



Mime
View raw message