This is an automated email from the ASF dual-hosted git repository. robertlazarski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit 3a075dc95627147c64d0d20bfb89b02568d07616 Author: Robert Lazarski <[email protected]> AuthorDate: Sat Apr 11 10:54:04 2026 -1000 AXIS2-6102 Remove WSDL 2.0 test classes and test methods Deleted: - TestWSDL20Supplier.java - TestWSDL20SupplierTemplate.java Removed WSDL 2.0 test methods from: - WSDLToAllServicesBuilderTest.java (testWSDL20toAllAxisServices) - WSDLSupplierTest.java (testWSDLSupplierWSDL20, testWSDLSupplierWSDL2SupplierClass, testWSDL20SupplierTemplate, testWSDL11SupplierTemplateWSDL20SupplierClass) Kernel tests pass: 380 tests, 0 failures. Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]> --- .../axis2/description/TestWSDL20Supplier.java | 38 -------------- .../description/TestWSDL20SupplierTemplate.java | 56 -------------------- .../apache/axis2/description/WSDLSupplierTest.java | 61 +--------------------- .../description/WSDLToAllServicesBuilderTest.java | 27 +--------- 4 files changed, 3 insertions(+), 179 deletions(-) diff --git a/modules/kernel/test/org/apache/axis2/description/TestWSDL20Supplier.java b/modules/kernel/test/org/apache/axis2/description/TestWSDL20Supplier.java deleted file mode 100644 index 9147750b94..0000000000 --- a/modules/kernel/test/org/apache/axis2/description/TestWSDL20Supplier.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.axis2.description; - -import org.apache.axis2.AxisFault; -import org.apache.axis2.dataretrieval.WSDLSupplier; -import org.apache.woden.wsdl20.Description; - -class TestWSDL20Supplier implements WSDLSupplier { - public Description getWSDL(AxisService service) throws AxisFault { - Description des = null; - try { - des = org.apache.woden.WSDLFactory.newInstance().newEdDescription(); - - } catch (org.apache.woden.WSDLException e) { - e.printStackTrace(); - } - return des; - - } -} \ No newline at end of file diff --git a/modules/kernel/test/org/apache/axis2/description/TestWSDL20SupplierTemplate.java b/modules/kernel/test/org/apache/axis2/description/TestWSDL20SupplierTemplate.java deleted file mode 100644 index 27cc144b75..0000000000 --- a/modules/kernel/test/org/apache/axis2/description/TestWSDL20SupplierTemplate.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.axis2.description; - -import javax.xml.namespace.QName; - -import org.apache.axiom.om.OMAttribute; -import org.apache.axiom.om.OMElement; -import org.apache.axiom.om.OMFactory; -import org.apache.axis2.dataretrieval.WSDL20SupplierTemplate; - -class TestWSDL20SupplierTemplate extends WSDL20SupplierTemplate { - - - protected OMElement customizeDocumentation(OMElement documentation) { - OMFactory fac = documentation.getOMFactory(); - OMElement details = fac.createOMElement("detail", "http://axis.apache.org";, "ap"); - OMElement name = fac.createOMElement("name", "http://axis.apache.org";, "ap"); - name.setText("Apache Axis2"); - OMElement mail = fac.createOMElement("email", "http://axis.apache.org";, "ap"); - mail.setText("[email protected]"); - details.addChild(name); - details.addChild(mail); - documentation.addChild(details); - OMElement doc = documentation.getFirstChildWithName(new QName("documentation")); - doc.detach(); - return documentation; - } - - - protected OMElement customizeEndpoint(OMElement ep) { - OMAttribute location = ep.getAttribute(new QName("address")); - String url = location.getAttributeValue(); - url = url.replace("192.168.1.2", "localhost"); - location.setAttributeValue(url); - return ep; - } - -} \ No newline at end of file diff --git a/modules/kernel/test/org/apache/axis2/description/WSDLSupplierTest.java b/modules/kernel/test/org/apache/axis2/description/WSDLSupplierTest.java index dcaa85fe82..5140dec468 100644 --- a/modules/kernel/test/org/apache/axis2/description/WSDLSupplierTest.java +++ b/modules/kernel/test/org/apache/axis2/description/WSDLSupplierTest.java @@ -78,25 +78,7 @@ public class WSDLSupplierTest extends TestCase { assertTrue(wsdl.contains("</wsdl:definitions>")); } - public void testWSDLSupplierWSDL20() throws Exception { - String value = TestWSDL20Supplier.class.getName(); - axisService.addParameter(Constants.WSDL_20_SUPPLIER_CLASS_PARAM, value); - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - axisService.printWSDL2(outputStream); - String wsdl = outputStream.toString(); - assertTrue(wsdl.contains("<wsdl:description xmlns:wsdl=\"http://www.w3.org/ns/wsdl\";>")); - assertTrue(wsdl.contains("</wsdl:description>")); - } - - public void testWSDLSupplierWSDL2SupplierClass() throws Exception { - Object value = new TestWSDL20Supplier(); - axisService.addParameter(Constants.WSDL_SUPPLIER_PARAM, value); - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - axisService.printWSDL2(outputStream); - String wsdl = outputStream.toString(); - assertTrue(wsdl.contains("<wsdl:description xmlns:wsdl=\"http://www.w3.org/ns/wsdl\";>")); - assertTrue(wsdl.contains("</wsdl:description>")); - } + // testWSDLSupplierWSDL20, testWSDLSupplierWSDL2SupplierClass removed (AXIS2-6102) public void testWSDL11SupplierTemplate() throws Exception { WSDL11SupplierTemplate value = new TestWSDL11SupplierTemplate(); @@ -138,44 +120,5 @@ public class WSDLSupplierTest extends TestCase { assertFalse(wsdl.contains("<documentation/>")); } - public void testWSDL20SupplierTemplate() throws Exception { - TestWSDL20SupplierTemplate value = new TestWSDL20SupplierTemplate(); - axisService.addParameter(Constants.WSDL_SUPPLIER_PARAM, value); - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - axisService.printWSDL2(outputStream); - String wsdl = outputStream.toString(); - assertTrue(wsdl.contains("<wsdl2:description")); - assertTrue(wsdl.contains("xmlns:wsdl2=\"http://www.w3.org/ns/wsdl\"";)); - assertTrue(wsdl.contains("xmlns:wsaw=\"http://www.w3.org/2006/05/addressing/wsd";)); - assertTrue(wsdl.contains("xmlns:tns=\"http://ws.apache.org/axis2\"";)); - assertTrue(wsdl.contains("xmlns:wsoap=\"http://www.w3.org/ns/wsdl/soap\"; ")); - assertTrue(wsdl.contains("<wsdl2:documentation>")); - assertTrue(wsdl.contains("<ap:detail xmlns:ap=\"http://axis.apache.org\";>")); - assertTrue(wsdl.contains("<ap:name>Apache Axis2</ap:name>")); - assertTrue(wsdl.contains("<ap:email>[email protected]</ap:email>")); - assertTrue(wsdl.contains(" </ap:detail>")); - assertTrue(wsdl.contains("</wsdl2:documentation>")); - assertFalse(wsdl.contains("<documentation/>")); - } - - public void testWSDL11SupplierTemplateWSDL20SupplierClass() throws Exception { - String value = TestWSDL20SupplierTemplate.class.getName(); - axisService.addParameter(Constants.WSDL_20_SUPPLIER_CLASS_PARAM, value); - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - axisService.printWSDL2(outputStream); - String wsdl = outputStream.toString(); - assertTrue(wsdl.contains("<wsdl2:description")); - assertTrue(wsdl.contains("xmlns:wsdl2=\"http://www.w3.org/ns/wsdl\"";)); - assertTrue(wsdl.contains("xmlns:wsaw=\"http://www.w3.org/2006/05/addressing/wsd";)); - assertTrue(wsdl.contains("xmlns:tns=\"http://ws.apache.org/axis2\"";)); - assertTrue(wsdl.contains("xmlns:wsoap=\"http://www.w3.org/ns/wsdl/soap\"; ")); - assertTrue(wsdl.contains("<wsdl2:documentation>")); - assertTrue(wsdl.contains("<ap:detail xmlns:ap=\"http://axis.apache.org\";>")); - assertTrue(wsdl.contains("<ap:name>Apache Axis2</ap:name>")); - assertTrue(wsdl.contains("<ap:email>[email protected]</ap:email>")); - assertTrue(wsdl.contains(" </ap:detail>")); - assertTrue(wsdl.contains("</wsdl2:documentation>")); - assertFalse(wsdl.contains("<documentation/>")); - } - + // testWSDL20SupplierTemplate, testWSDL11SupplierTemplateWSDL20SupplierClass removed (AXIS2-6102) } diff --git a/modules/kernel/test/org/apache/axis2/description/WSDLToAllServicesBuilderTest.java b/modules/kernel/test/org/apache/axis2/description/WSDLToAllServicesBuilderTest.java index 708bacc520..92905a56b6 100644 --- a/modules/kernel/test/org/apache/axis2/description/WSDLToAllServicesBuilderTest.java +++ b/modules/kernel/test/org/apache/axis2/description/WSDLToAllServicesBuilderTest.java @@ -39,10 +39,6 @@ public class WSDLToAllServicesBuilderTest extends TestCase { "EchoServicePortOne", "EchoServicePortTwo", "EchoServicePortThree"}; - private static final String[] expectedService20 = { - "echoService1$echoServiceSOAPBinding_http", - "echoService1$echoServiceEndpoint2SOAPBinding_http", - "echoService2$echoServiceSOAPBinding_http"}; private ConfigurationContext configContext; ListenerManager lm; @@ -94,26 +90,5 @@ public class WSDLToAllServicesBuilderTest extends TestCase { } } - public void testWSDL20toAllAxisServices() throws Exception { - File testResourceFile = new File("target/test-classes/wsdl/EchoServiceWsdl20.wsdl"); - File outLocation = new File("target/test-resources"); - outLocation.mkdirs(); - if (testResourceFile.exists()) { - List axisServices = null; - try { - WSDL20ToAllAxisServicesBuilder builder = new WSDL20ToAllAxisServicesBuilder( - new FileInputStream(testResourceFile)); - axisServices = builder.populateAllServices(); - System.out.println("WSDL file: " + testResourceFile.getName()); - } catch (Exception e) { - System.out.println("Error in WSDL : " + testResourceFile.getName()); - System.out.println("Exception: " + e.toString()); - throw e; - } - checkResults(axisServices, expectedService20); - - } - } - - + // testWSDL20toAllAxisServices removed in 2.0.1 (AXIS2-6102) }
