cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1410473 - in /cxf/branches/2.6.x-fixes/rt/databinding/xmlbeans: pom.xml src/test/java/org/apache/cxf/xmlbeans/WrappedStyleTest.java
Date Fri, 16 Nov 2012 17:00:45 GMT
Author: dkulp
Date: Fri Nov 16 17:00:44 2012
New Revision: 1410473

URL: http://svn.apache.org/viewvc?rev=1410473&view=rev
Log:
Merged revisions 1410461 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1410461 | dkulp | 2012-11-16 11:49:49 -0500 (Fri, 16 Nov 2012) | 2 lines

  Another potential failing test with IBM JDK

........

Modified:
    cxf/branches/2.6.x-fixes/rt/databinding/xmlbeans/pom.xml
    cxf/branches/2.6.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/WrappedStyleTest.java

Modified: cxf/branches/2.6.x-fixes/rt/databinding/xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/databinding/xmlbeans/pom.xml?rev=1410473&r1=1410472&r2=1410473&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/databinding/xmlbeans/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/rt/databinding/xmlbeans/pom.xml Fri Nov 16 17:00:44 2012
@@ -107,7 +107,11 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-
+        <dependency>
+	    <groupId>org.slf4j</groupId>
+	    <artifactId>slf4j-jdk14</artifactId>
+	    <scope>test</scope>
+	</dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>

Modified: cxf/branches/2.6.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/WrappedStyleTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/WrappedStyleTest.java?rev=1410473&r1=1410472&r2=1410473&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/WrappedStyleTest.java
(original)
+++ cxf/branches/2.6.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/WrappedStyleTest.java
Fri Nov 16 17:00:44 2012
@@ -20,7 +20,9 @@ package org.apache.cxf.xmlbeans;
 
 import javax.xml.namespace.QName;
 
+import org.w3c.dom.Element;
 import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 
 import org.apache.cxf.common.util.SOAPConstants;
 import org.apache.cxf.endpoint.Server;
@@ -84,12 +86,19 @@ public class WrappedStyleTest extends Ab
         Node wsdl = getWSDLDocument("TestService");
 
         addNamespace("xsd", SOAPConstants.XSD);
+        addNamespace("ns0", "http://cxf.apache.org/xmlbeans");
         assertValid("//xsd:schema[@targetNamespace='urn:TestService']" 
                     + "/xsd:complexType[@name='mixedRequest']"
                     + "//xsd:element[@name='string'][@type='xsd:string']", wsdl);
-        assertValid("//xsd:schema[@targetNamespace='urn:TestService']" 
+        
+        NodeList list = assertValid("//xsd:schema[@targetNamespace='urn:TestService']" 
                     + "/xsd:complexType[@name='mixedRequest']"
-                    + "//xsd:element[@ref='ns0:request']", wsdl);
+                    + "//xsd:element[@ref]", wsdl);
+        for (int x = 0; x < list.getLength(); x++) {
+            Element el = (Element)list.item(x);
+            assertTrue(el.getAttribute("ref"), el.getAttribute("ref").contains("request"));
+        }
+        
         assertValid("//xsd:schema[@targetNamespace='urn:TestService']"
                     + "/xsd:element[@name='CustomFault'][@type='xsd:string']", wsdl);
 



Mime
View raw message