Author: veithen
Date: Sat Jun 20 10:48:08 2015
New Revision: 1686553
URL: http://svn.apache.org/r1686553
Log:
Disable an invalid assertion that was somehow satisfied on Java 6, but that
fails on Java 7.
Modified:
axis/axis2/java/core/trunk/modules/integration/test-resources/generics/generics.wsdl
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/generics/GenericService.java
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/generics/GenericWSDLGenerationTest.java
Modified:
axis/axis2/java/core/trunk/modules/integration/test-resources/generics/generics.wsdl
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test-resources/generics/generics.wsdl?rev=1686553&r1=1686552&r2=1686553&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/integration/test-resources/generics/generics.wsdl
(original)
+++
axis/axis2/java/core/trunk/modules/integration/test-resources/generics/generics.wsdl
Sat Jun 20 10:48:08 2015
@@ -17,11 +17,12 @@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="processStringArray">
+ <!-- TODO: This isn't correct; the processStringArray method has
an argument -->
+ <!-- xs:element name="processStringArray">
<xs:complexType>
<xs:sequence/>
</xs:complexType>
- </xs:element>
+ </xs:element -->
<xs:element name="processPersonList">
<xs:complexType>
<xs:sequence>
@@ -58,9 +59,9 @@
</xs:complexType>
</xs:schema>
</wsdl:types>
- <wsdl:message name="processStringArrayRequest">
+ <!-- wsdl:message name="processStringArrayRequest">
<wsdl:part name="parameters" element="ns:processStringArray"/>
- </wsdl:message>
+ </wsdl:message -->
<wsdl:message name="processStringListRequest">
<wsdl:part name="parameters" element="ns:processStringList"/>
</wsdl:message>
@@ -80,9 +81,9 @@
<wsdl:part name="parameters" element="ns:getStringListResponse"/>
</wsdl:message>
<wsdl:portType name="GenericServicePortType">
- <wsdl:operation name="processStringArray">
+ <!-- wsdl:operation name="processStringArray">
<wsdl:input message="ns:processStringArrayRequest"
wsaw:Action="urn:processStringArray"/>
- </wsdl:operation>
+ </wsdl:operation -->
<wsdl:operation name="processStringList">
<wsdl:input message="ns:processStringListRequest"
wsaw:Action="urn:processStringList"/>
<wsdl:output message="ns:processStringListResponse"
wsaw:Action="urn:processStringListResponse"/>
@@ -98,12 +99,12 @@
</wsdl:portType>
<wsdl:binding name="GenericServiceSoap11Binding"
type="ns:GenericServicePortType">
<soap:binding transport="http://schemas.xmlsoap.org/soap/http";
style="document"/>
- <wsdl:operation name="processStringArray">
+ <!-- wsdl:operation name="processStringArray">
<soap:operation soapAction="urn:processStringArray"
style="document"/>
<wsdl:input>
<soap:body use="literal"/>
</wsdl:input>
- </wsdl:operation>
+ </wsdl:operation -->
<wsdl:operation name="processStringList">
<soap:operation soapAction="urn:processStringList"
style="document"/>
<wsdl:input>
@@ -134,12 +135,12 @@
</wsdl:binding>
<wsdl:binding name="GenericServiceSoap12Binding"
type="ns:GenericServicePortType">
<soap12:binding transport="http://schemas.xmlsoap.org/soap/http";
style="document"/>
- <wsdl:operation name="processStringArray">
+ <!-- wsdl:operation name="processStringArray">
<soap12:operation soapAction="urn:processStringArray"
style="document"/>
<wsdl:input>
<soap12:body use="literal"/>
</wsdl:input>
- </wsdl:operation>
+ </wsdl:operation -->
<wsdl:operation name="processStringList">
<soap12:operation soapAction="urn:processStringList"
style="document"/>
<wsdl:input>
@@ -170,12 +171,12 @@
</wsdl:binding>
<wsdl:binding name="GenericServiceHttpBinding"
type="ns:GenericServicePortType">
<http:binding verb="POST"/>
- <wsdl:operation name="processStringArray">
+ <!-- wsdl:operation name="processStringArray">
<http:operation location="processStringArray"/>
<wsdl:input>
<mime:content type="application/xml" part="parameters"/>
</wsdl:input>
- </wsdl:operation>
+ </wsdl:operation -->
<wsdl:operation name="processStringList">
<http:operation location="processStringList"/>
<wsdl:input>
Modified:
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/generics/GenericService.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/generics/GenericService.java?rev=1686553&r1=1686552&r2=1686553&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/generics/GenericService.java
(original)
+++
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/generics/GenericService.java
Sat Jun 20 10:48:08 2015
@@ -40,7 +40,10 @@ public class GenericService {
return persons.get(0);
}
+// See generics.wsdl
+/*
public void processStringArray(List<String[]> values) {
}
+*/
}
Modified:
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/generics/GenericWSDLGenerationTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/generics/GenericWSDLGenerationTest.java?rev=1686553&r1=1686552&r2=1686553&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/generics/GenericWSDLGenerationTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/generics/GenericWSDLGenerationTest.java
Sat Jun 20 10:48:08 2015
@@ -39,6 +39,7 @@ public class GenericWSDLGenerationTest
public void test1() throws Exception {
XMLUnit.setIgnoreWhitespace(true);
+ XMLUnit.setIgnoreComments(true);
try {
ByteArrayOutputStream out = new ByteArrayOutputStream();
Java2WSDLBuilder builder = new Java2WSDLBuilder(out,
GenericService.class.getName(), GenericService.class.getClassLoader());
@@ -52,6 +53,7 @@ public class GenericWSDLGenerationTest
fail(myDiff.toString());
} finally {
XMLUnit.setIgnoreWhitespace(false);
+ XMLUnit.setIgnoreComments(false);
}
}
}
\ No newline at end of file
