You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by pe...@apache.org on 2007/03/15 22:43:00 UTC

svn commit: r518761 - /incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotatorTest.java

Author: peterjones
Date: Thu Mar 15 14:42:59 2007
New Revision: 518761

URL: http://svn.apache.org/viewvc?view=rev&rev=518761
Log:
Small fix to a test for ibmjdk.
The order that attributes are appended to the string representation of
a WebParam annotation is different with the ibmjdk.  So comparing the
string in the test doesn't work.

Modified:
    incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotatorTest.java

Modified: incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotatorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotatorTest.java?view=diff&rev=518761&r1=518760&r2=518761
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotatorTest.java (original)
+++ incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotatorTest.java Thu Mar 15 14:42:59 2007
@@ -19,6 +19,8 @@
 
 package org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.internal.annotator;
 
+import java.util.Map;
+
 import javax.jws.soap.SOAPBinding;
 import javax.xml.namespace.QName;
 import junit.framework.TestCase;
@@ -53,9 +55,14 @@
         parameter.annotate(new WebParamAnnotator());
 
         JavaAnnotation annotation = parameter.getAnnotation();
-        assertEquals(2, annotation.getArguments().size());
-        assertEquals("@WebParam(targetNamespace = \"http://apache.org/cxf\", name = \"x\")",
-                     annotation.toString());
+        Map<String, String> args = annotation.getArguments();
+        assertEquals(2, args.size());
+        assertEquals("\"http://apache.org/cxf\"", args.get("targetNamespace"));
+        assertEquals("\"x\"", args.get("name"));
+        // XXX - order that attributes are appended to the string
+        //       differs with the ibmjdk...
+        //assertEquals("@WebParam(targetNamespace = \"http://apache.org/cxf\", name = \"x\")",
+        //             annotation.toString());
     }
 
     public void testAnnotateDOCBare() throws Exception {
@@ -64,9 +71,15 @@
         parameter.annotate(new WebParamAnnotator());
 
         JavaAnnotation annotation = parameter.getAnnotation();
-        assertEquals(3, annotation.getArguments().size());
-        assertEquals("@WebParam(targetNamespace = \"http://apache.org/cxf\", partName = \"y\", name = \"x\")",
-                     annotation.toString());
+        Map<String, String> args = annotation.getArguments();
+        assertEquals(3, args.size());
+        assertEquals("\"http://apache.org/cxf\"", args.get("targetNamespace"));
+        assertEquals("\"y\"", args.get("partName"));
+        assertEquals("\"x\"", args.get("name"));
+        // XXX - order that attributes are appended to the string
+        //       differs with the ibmjdk...
+        //assertEquals("@WebParam(targetNamespace = \"http://apache.org/cxf\", partName = \"y\", name = \"x\")",
+        //             annotation.toString());
     }
 
     public void testAnnotateRPC() throws Exception {