svn commit: r1410461 - in /cxf/trunk/rt/databinding/xmlbeans: pom.xml src/test/java/org/apache/cxf/xmlbeans/WrappedStyleTest.java

[dkulp]

Author: dkulp
Date: Fri Nov 16 16:49:49 2012
New Revision: 1410461

URL: http://svn.apache.org/viewvc?rev=1410461&view=rev
Log:
Another potential failing test with IBM JDK

Modified:
    cxf/trunk/rt/databinding/xmlbeans/pom.xml
    
cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/WrappedStyleTest.java

Modified: cxf/trunk/rt/databinding/xmlbeans/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/xmlbeans/pom.xml?rev=1410461&r1=1410460&r2=1410461&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/xmlbeans/pom.xml (original)
+++ cxf/trunk/rt/databinding/xmlbeans/pom.xml Fri Nov 16 16:49:49 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/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/WrappedStyleTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/WrappedStyleTest.java?rev=1410461&r1=1410460&r2=1410461&view=diff
==============================================================================
--- 
cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/WrappedStyleTest.java
 (original)
+++ 
cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/WrappedStyleTest.java
 Fri Nov 16 16:49:49 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);