Author: dkulp
Date: Tue Jan 4 19:33:52 2011
New Revision: 1055155
URL: http://svn.apache.org/viewvc?rev=1055155&view=rev
Log:
[CXF-3201] Attempt to fix the failing test on Windows
Patch from Jim Talbut applied.
Modified:
cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl
Modified:
cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java?rev=1055155&r1=1055154&r2=1055155&view=diff
==============================================================================
---
cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
(original)
+++
cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
Tue Jan 4 19:33:52 2011
@@ -1147,8 +1147,8 @@ public class CodeGenBugTest extends Abst
File f = new File(output,
"org/apache/cxf/testcase/cxf3105/Login.java");
assertTrue(f.exists());
String contents = IOUtils.readStringFromStream(new FileInputStream(f));
- assertTrue(contents.contains("Loginrequest loginRequest"));
- assertTrue(contents.contains("<Loginresponse> loginResponse"));
+ assertTrue(contents.contains("Loginrequesttype loginRequest"));
+ assertTrue(contents.contains("<Loginresponsetype> loginResponse"));
}
@Test
Modified:
cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl?rev=1055155&r1=1055154&r2=1055155&view=diff
==============================================================================
---
cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl
(original)
+++
cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl
Tue Jan 4 19:33:52 2011
@@ -2,13 +2,13 @@
<wsdl:definitions xmlns:fc="http://cxf.apache.org/testcase/cxf3105";
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; name="center"
targetNamespace="http://cxf.apache.org/testcase/cxf3105";>
<wsdl:types>
<xsd:schema targetNamespace="http://cxf.apache.org/testcase/cxf3105";>
- <xsd:complexType name="loginrequest">
+ <xsd:complexType name="loginrequesttype">
<xsd:sequence>
<xsd:element name="username" type="xsd:string"/>
<xsd:element name="password" type="xsd:string"/>
</xsd:sequence>
</xsd:complexType>
- <xsd:complexType name="loginresponse">
+ <xsd:complexType name="loginresponsetype">
<xsd:sequence>
<xsd:element name="userid" type="xsd:int"/>
<xsd:element name="groupid" type="xsd:int"/>
@@ -19,7 +19,7 @@
<xsd:element name="login">
<xsd:complexType>
<xsd:sequence>
- <xsd:element name="login" type="fc:loginrequest"/>
+ <xsd:element name="login" type="fc:loginrequesttype"/>
<xsd:element name="id" type="xsd:int" maxOccurs="1"
minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
@@ -27,7 +27,7 @@
<xsd:element name="loginResponse">
<xsd:complexType>
<xsd:sequence>
- <xsd:element name="login" type="fc:loginresponse"/>
+ <xsd:element name="login" type="fc:loginresponsetype"/>
<xsd:element name="password_temp" type="xsd:string"/>
</xsd:sequence>
</xsd:complexType>
