cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r830974 - in /cxf/branches/2.2.x-fixes: ./ tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java
Date Thu, 29 Oct 2009 14:46:06 GMT
Author: dkulp
Date: Thu Oct 29 14:46:06 2009
New Revision: 830974

URL: http://svn.apache.org/viewvc?rev=830974&view=rev
Log:
Merged revisions 830688 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r830688 | dkulp | 2009-10-28 13:32:49 -0400 (Wed, 28 Oct 2009) | 1 line
  
  [CXF-1919] Update test to workaround issues in DOM
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.2.x-fixes/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java?rev=830974&r1=830973&r2=830974&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java
(original)
+++ cxf/branches/2.2.x-fixes/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java
Thu Oct 29 14:46:06 2009
@@ -48,6 +48,7 @@
 import org.apache.cxf.binding.corba.wsdl.TypeMappingType;
 import org.apache.cxf.binding.corba.wsdl.Union;
 import org.apache.cxf.binding.corba.wsdl.Unionbranch;
+import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.tools.corba.common.WSDLCorbaFactory;
 import org.apache.cxf.tools.corba.processors.wsdl.WSDLToCorbaBinding;
 import org.apache.cxf.tools.corba.processors.wsdl.WSDLToIDLAction;
@@ -95,10 +96,13 @@
 
             Element typemap = getElementNode(document, "corba:typeMapping");            
             assertNotNull(typemap);
-            assertEquals(1, typemap.getElementsByTagName("corba:sequence").getLength());
-            int objectCount = typemap.getElementsByTagName("corba:object").getLength();
-            // With XmlSchema 1.4.3, this comes out as 1, and it seems correct by examination
of the wsdl.
-            assertTrue(objectCount == 1 || objectCount == 2);
+            
+            assertEquals(1, DOMUtils.findAllElementsByTagNameNS(typemap, 
+                                                                "http://cxf.apache.org/bindings/corba",

+                                                                "sequence").size());
+            assertEquals(2, DOMUtils.findAllElementsByTagNameNS(typemap, 
+                                                                "http://cxf.apache.org/bindings/corba",

+                                                                "object").size());
 
             WSDLToIDLAction idlgen = new WSDLToIDLAction();
             idlgen.setBindingName("BankCORBABinding");



Mime
View raw message