Author: thomas.diesler(a)jboss.com Date: 2006-11-04 16:52:47 -0500 (Sat, 04 Nov 2006) New Revision: 1372 Removed: trunk/src/test/java/org/jboss/test/ws/tools/JavaToWSDL20TestCase.java Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/wseventing/EventingTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPElementRPCTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/complex/client/JSR181ComplexTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/assertions/Jaxrpc20AssertionsTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/jbws_206/tests/Attachment/AttachmentWSDL2JavaTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/Attachment/AttachmentJava2WSDLTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/CustomHolders/CustomHolderJava2WSDLTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/jsr181/webservice/JavaToWSDLTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java Log: update fixmes Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -320,9 +320,11 @@ inObj.setMyString("String1"); inObj.setMyStringArray(new String[] { "String1", "String2" }); - System.out.println("FIXME: JBWS-485"); - //JavaBean retObj = port.javaBeanTest(inObj); - //assertEquals(inObj, retObj); + System.out.println("FIXME: [JBWS-485] SOAP encoded arrays as bean properties"); + if (true) return; + + JavaBean retObj = port.javaBeanTest(inObj); + assertEquals(inObj, retObj); } public void testLongArrayTest() throws Exception @@ -467,9 +469,11 @@ inObj.setMyString("String1"); inObj.setMyStringArray(new String[] { "String1", "String2" }); - System.out.println("FIXME: JBWS-485"); - //ValueType retObj = port.valueTypeTest(inObj); - //assertEquals(inObj, retObj); + System.out.println("FIXME: [JBWS-485] SOAP encoded arrays as bean properties"); + if (true) return; + + ValueType retObj = port.valueTypeTest(inObj); + assertEquals(inObj, retObj); } public void testVoidTest() throws Exception Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -57,7 +57,9 @@ public void testEndpoint() throws Exception { - System.out.println("FIXME: JBAS-3350"); - //port.performTest(); + System.out.println("[JBAS-3824] Fix ENC for EJB2.1 and Servlets"); + if (true) return; + + port.performTest(); } } Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -54,11 +54,8 @@ public void testSayHelloProxy() throws Exception { - if (true) - { - System.out.println("FIXME: JBWS-868"); - return; - } + System.out.println("FIXME: [JBWS-868] BPEL in jbossws-samples"); + if (true) return; Greeter proxy = service.getGreeterPort(); @@ -68,11 +65,9 @@ public void testSayHelloDII() throws Exception { - if (true) - { - System.out.println("FIXME: JBWS-868"); - return; - } + System.out.println("FIXME: [JBWS-868] BPEL in jbossws-samples"); + if (true) return; + String portTypeNS = "http://jbpm.org/examples/hello"; Call call = service.createCall(new QName(portTypeNS, "GreeterPort")); call.setOperationName(new QName(portTypeNS, "sayHello")); Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -76,10 +76,12 @@ public void testServletClient() throws Exception { + System.out.println("[JBAS-3824] Fix ENC for EJB2.1 and Servlets"); + if (true) return; + URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld"); - System.out.println("FIXME: JBAS-3350"); -// BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); -// String retStr = br.readLine(); -// assertEquals("HelloWorld", retStr); + BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); + String retStr = br.readLine(); + assertEquals("HelloWorld", retStr); } } Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/wseventing/EventingTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/wseventing/EventingTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/wseventing/EventingTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -231,7 +231,7 @@ // public void testSubscriptionEndMessage() { - System.out.println("FIXME: JBWS-798"); + System.out.println("FIXME: [JBWS-798] Complete EventingTestCase"); } // @@ -243,7 +243,7 @@ // public void testShutdownMessage() { - System.out.println("FIXME: JBWS-798"); + System.out.println("FIXME: [JBWS-798] Complete EventingTestCase"); } // @@ -253,7 +253,6 @@ // public void testCancelMessage() { - System.out.println("FIXME: JBWS-798"); + System.out.println("FIXME: [JBWS-798] Complete EventingTestCase"); } - } Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -48,10 +48,12 @@ */ public void testWebClient() throws Exception { + System.out.println("[JBAS-3824] Fix ENC for EJB2.1 and Servlets"); + if (true) return; + URL url = new URL("http://" + getServerHost() + ":8080/jaxrpc-wsse-rpc/RpcTestClientServlet?input=Hello"); - System.out.println("FIXME: JBAS-3350"); -// BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); -// String res = br.readLine(); -// assertEquals("Hello", res); + BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); + String res = br.readLine(); + assertEquals("Hello", res); } } Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPElementRPCTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPElementRPCTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPElementRPCTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -21,9 +21,17 @@ */ package org.jboss.test.ws.jaxrpc.xop; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; + +import javax.mail.internet.ContentType; import javax.xml.namespace.QName; import javax.xml.soap.MessageFactory; +import javax.xml.soap.MimeHeaders; +import javax.xml.soap.SOAPBody; import javax.xml.soap.SOAPBodyElement; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPEnvelope; import javax.xml.soap.SOAPMessage; import org.jboss.test.ws.JBossWSTest; @@ -37,6 +45,9 @@ import org.jboss.ws.soap.NameImpl; import org.jboss.ws.soap.SOAPBodyElementRpc; import org.jboss.ws.soap.SOAPContentElement; +import org.jboss.ws.soap.attachment.MimeConstants; +import org.jboss.ws.utils.DOMUtils; +import org.jboss.ws.utils.DOMWriter; /** * Test the SOAPElement @@ -85,8 +96,11 @@ public void testSOAPMessageRoundTrip() throws Exception { - /*String xopContent = "This is XOP content"; - xopElement.setXMimeContentType("text/plain"); + System.out.println("FIXME: [JBWS-1313] Fix XOP tests in trunk"); + if (true) return; + + String xopContent = "This is XOP content"; + //xopElement.setXMimeContentType("text/plain"); xopElement.setObjectValue(xopContent); // Write SOAP message as multipart/related @@ -108,14 +122,11 @@ SOAPBody soapBody = soapMessage.getSOAPBody(); SOAPElement rpcElement = (SOAPElement)DOMUtils.getFirstChildElement(soapBody); - assertEquals(new NameImpl(opMetaData.getXmlName()), rpcElement.getElementName()); + assertEquals(new NameImpl(opMetaData.getQName()), rpcElement.getElementName()); SOAPContentElement xopElement = (SOAPContentElement)DOMUtils.getFirstChildElement(rpcElement); assertEquals(new NameImpl(paramMetaData.getXmlName()), xopElement.getElementName()); xopElement.setParamMetaData(paramMetaData); Object retObj = xopElement.getObjectValue(); assertEquals(xopContent, retObj); - */ - - System.out.println("FIXME: JBXB-62"); } } \ No newline at end of file Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -92,28 +92,29 @@ public void testMSFTElementScan() throws Exception { - /* - SchemaUtils utils = SchemaUtils.getInstance(); - File f = new File(prefix +"resources/jaxrpc/xop/schema.xsd"); - assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists()); + System.out.println("FIXME: [JBWS-1313] Fix XOP tests in trunk"); + if (true) + return; - XSModel xsModel = utils.parseSchema(f.toURL()); - assertNotNull(xsModel); - WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://jboss.org/test/ws/xop/doclit"); - JBossXSModel schemaModel= wsUtil.getJBossXSModel(xsModel); + SchemaUtils utils = SchemaUtils.getInstance(); + File f = new File("resources/jaxrpc/xop/schema.xsd"); + assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists()); - XSTypeDefinition xsType = schemaModel.getTypeDefinition(">MSFTBinary", "http://jboss.org/test/ws/xop/doclit"); + XSModel xsModel = utils.parseSchema(f.toURL()); + assertNotNull(xsModel); + WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://jboss.org/test/ws/xop/doclit"); + JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel); - assertNotNull("Root type def not found", xsType); - XOPScanner scanner = new XOPScanner(); + XSTypeDefinition xsType = schemaModel.getTypeDefinition(">MSFTBinary", "http://jboss.org/test/ws/xop/doclit"); - if (xsType instanceof XSComplexTypeDefinition) - { - XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; - XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); - assertNotNull("Unable to find xop typedef in schema", resultType); - } - */ - System.out.println("FIXME: testMSFTElementScan"); + assertNotNull("Root type def not found", xsType); + XOPScanner scanner = new XOPScanner(); + + if (xsType instanceof XSComplexTypeDefinition) + { + XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; + XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); + assertNotNull("Unable to find xop typedef in schema", resultType); + } } } Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -65,30 +65,21 @@ //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-xop-doclit_handler"); } - /* (non-Javadoc) - * @see org.jboss.test.ws.jaxrpc.xop.rpclit.XOPBase#testRequestOptimized() - */ @Override public void testRequestOptimized() throws Exception { - System.out.println("FIXME: JBWS-1313"); + System.out.println("FIXME: [JBWS-1313] Fix XOP tests in trunk"); } - /* (non-Javadoc) - * @see org.jboss.test.ws.jaxrpc.xop.rpclit.XOPBase#testRequestResponseOptimized() - */ @Override public void testRequestResponseOptimized() throws Exception { - System.out.println("FIXME: JBWS-1313"); + System.out.println("FIXME: [JBWS-1313] Fix XOP tests in trunk"); } - /* (non-Javadoc) - * @see org.jboss.test.ws.jaxrpc.xop.rpclit.XOPBase#testResponseOptimized() - */ @Override public void testResponseOptimized() throws Exception { - System.out.println("FIXME: JBWS-1313"); + System.out.println("FIXME: [JBWS-1313] Fix XOP tests in trunk"); } } \ No newline at end of file Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -61,30 +61,21 @@ //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-xop-rpclit_handler"); } - /* (non-Javadoc) - * @see org.jboss.test.ws.jaxrpc.xop.rpclit.XOPBase#testRequestOptimized() - */ @Override public void testRequestOptimized() throws Exception { - System.out.println("FIXME: JBWS-1313"); + System.out.println("FIXME: [JBWS-1313] Fix XOP tests in trunk"); } - /* (non-Javadoc) - * @see org.jboss.test.ws.jaxrpc.xop.rpclit.XOPBase#testRequestResponseOptimized() - */ @Override public void testRequestResponseOptimized() throws Exception { - System.out.println("FIXME: JBWS-1313"); + System.out.println("FIXME: [JBWS-1313] Fix XOP tests in trunk"); } - /* (non-Javadoc) - * @see org.jboss.test.ws.jaxrpc.xop.rpclit.XOPBase#testResponseOptimized() - */ @Override public void testResponseOptimized() throws Exception { - System.out.println("FIXME: JBWS-1313"); + System.out.println("FIXME: [JBWS-1313] Fix XOP tests in trunk"); } } Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -1,24 +1,24 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.test.ws.jaxws.exception; import java.net.URL; @@ -58,7 +58,7 @@ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-exception/ExceptionEndpointService?wsdl"); Service service = Service.create(wsdlURL, serviceName); - proxy = (ExceptionEndpoint) service.getPort(ExceptionEndpoint.class); + proxy = (ExceptionEndpoint)service.getPort(ExceptionEndpoint.class); } /* @@ -80,11 +80,8 @@ */ public void testRuntimeException() throws Exception { - if (true) - { - System.out.println("FIXME: JBWS-1321"); - return; - } + System.out.println("FIXME: [JBWS-1297] Implement JAXB Fault Marshalling"); + if (true) return; try { @@ -103,7 +100,8 @@ public void testSoapFaultException() throws Exception { System.out.println("FIXME: [JBWS-1297] Implement JAXB Fault Marshalling"); - if (true) return; + if (true) + return; try { @@ -124,11 +122,11 @@ assertTrue("Expected SOAPFaultException", false); } - public void testApplicationException() throws Exception { System.out.println("FIXME: [JBWS-1297] Implement JAXB Fault Marshalling"); - if (true) return; + if (true) + return; try { Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/complex/client/JSR181ComplexTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/complex/client/JSR181ComplexTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/complex/client/JSR181ComplexTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -87,7 +87,7 @@ public void testInvoiceRegistration() throws Exception { - System.out.println("FIXME: JBWS-1297"); + System.out.println("FIXME: [JBWS-1297] Implement JAXB Fault Marshalling"); if (true) return; InvoiceCustomer customer = getInvoiceFredJackson(); @@ -98,7 +98,7 @@ public void testOtherPackage() throws Exception { - System.out.println("FIXME: JBWS-1297"); + System.out.println("FIXME: [JBWS-1297] Implement JAXB Fault Marshalling"); if (true) return; Statistics stats = port.getStatistics(getFredJackson()); @@ -111,7 +111,7 @@ public void testBulkRegistration() throws Exception { - System.out.println("FIXME: JBWS-1297"); + System.out.println("FIXME: [JBWS-1297] Implement JAXB Fault Marshalling"); if (true) return; Customer[] customers = new Customer[] {getFredJackson(), getJohnDoe()}; Deleted: trunk/src/test/java/org/jboss/test/ws/tools/JavaToWSDL20TestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/JavaToWSDL20TestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/tools/JavaToWSDL20TestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -1,122 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.tools; - -import org.jboss.test.ws.JBossWSTest; - -/** - * Test jbossws Java -> WSDL20 - * - * @author Thomas.Diesler(a)jboss.org - * @since 14-Oct-2004 - */ -public class JavaToWSDL20TestCase extends JBossWSTest -{ - public void testShowJBWS() - { - System.out.println("FIXME: JBWS-509"); - } -// /** Test a SEI that contains JAXRPC primitive types */ -// public void testPrimitiveTypes() throws Exception -// { -// Class seiClass = PrimitiveTypes.class; -// doWSDLTest(seiClass); -// } -// -// /** Test a SEI that contains JAXRPC java standard types */ -// public void testStandardJavaTypes() throws Exception -// { -// Class seiClass = StandardJavaTypes.class; -// doWSDLTest(seiClass); -// } -// -// /** Test a SEI that contains custom exceptions */ -// public void testCustomTypes() throws Exception -// { -// Class seiClass = CustomInterface.class; -// doWSDLTest(seiClass); -// } -// -// /** Test a SEI that contains custom exceptions */ -// public void testExceptionTypes() throws Exception -// { -// Class seiClass = ServiceException.class; -// doWSDLTest(seiClass); -// } -// -// /** Test a SEI that contains complex types */ -// public void testComplexTypes() throws Exception -// { -// Class seiClass = ComplexTypes.class; -// doWSDLTest(seiClass); -// } -// -// /** Test a SEI that contains array types */ -// public void testArrayTypes() throws Exception -// { -// Class seiClass = ArrayInterface.class; -// doWSDLTest(seiClass); -// } -// -// private void doWSDLTest(Class seiClass) throws Exception -// { -// this.setSystemProperties(); -// String wsdlDir = "tools/"; -// String sname = WSDLUtils.getInstance().getJustClassName(seiClass) + "Service"; -// String wsdlPath = wsdlDir+ "/" + sname + ".wsdl"; -// JavaToWSDL jwsdl = new JavaToWSDL(Constants.NS_WSDL20); -// jwsdl.setServiceName(sname); -// jwsdl.setTargetNamespace("http://org.jboss.ws/types"); -// jwsdl.addFeature(WSToolsConstants.WSTOOLS_FEATURE_RESTRICT_TO_TARGET_NS, true); //generate types to targetns -// WSDLDefinitions wsdl = jwsdl.generate(seiClass); -// -// FileWriter fw = new FileWriter(new File(wsdlPath)); -// wsdl.write(fw); -// fw.close(); -// -// System.out.println("FIXME: JBWS-212"); -// //TODO:Have fixture files for wsdl 2.0 -// //Validate the generated WSDL -// /*File wsdlfix = new File(fixturefile); -// Element exp = DOMUtils.parse(wsdlfix.toURL().openStream()); -// File wsdlFile = new File(wsdlPath); -// assertNotNull("Generated WSDL File exists?", wsdlFile); -// Element was = DOMUtils.parse(wsdlFile.toURL().openStream()); -// -// assertEquals(exp, was);*/ -// /* -// File wsdlFile = new File(config.getWsdlOutFile()); -// WSDLDefinitionsFactory wsdlFactory = WSDLDefinitionsFactory.newInstance(); -// WSDLDefinitions wsdl = wsdlFactory.parse(wsdlFile.toURL()); -// -// WSDLValidator validator = new WSDLValidator(); -// if (validator.validate(seiClass, wsdl) == false) -// fail(validator.getErrorList().toString()); -// */ -// } -// private void setSystemProperties() -// { -// //Set the XSDWriter to be used -// System.setProperty("jbossws.xsdwriter","org.jboss.ws.wsdl.xmlschema.WSXSDWriter"); -// System.setProperty("jbossws.primitiveNillableFlag","false"); -// } -} Modified: trunk/src/test/java/org/jboss/test/ws/tools/assertions/Jaxrpc20AssertionsTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/assertions/Jaxrpc20AssertionsTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/tools/assertions/Jaxrpc20AssertionsTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -1,24 +1,24 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.test.ws.tools.assertions; import org.jboss.test.ws.tools.WSToolsTest; @@ -43,37 +43,27 @@ { public void testIsInterface() throws Exception { - System.out.println("FIXME: JBWS-335"); assertWSDL11Test(SomeException.class); - //assertWSDL20Test(SomeException.class); } public void testRemoteType() throws Exception { - System.out.println("FIXME: JBWS-335"); assertWSDL11Test(AssertRemoteType.class); - //assertWSDL20Test(AssertRemoteType.class); } public void testRemoteExceptionsDeclared() throws Exception { - System.out.println("FIXME: JBWS-335"); assertWSDL11Test(AssertRemoteExceptions.class); - //assertWSDL20Test(AssertRemoteExceptions.class); } public void testAssertMethodParamExtendRemote() throws Exception { - System.out.println("FIXME: JBWS-335"); assertWSDL11Test(AssertMethodParamExtendRemote.class); - //assertWSDL20Test(AssertMethodParamExtendRemote.class); } public void testAssertReturnTypeExtendRemote() throws Exception { - System.out.println("FIXME: JBWS-335"); assertWSDL11Test(AssertReturnTypeExtendRemote.class); - //assertWSDL20Test(AssertReturnTypeExtendRemote.class); } /** @@ -90,21 +80,20 @@ jwsdl.setServiceName(WSDLUtils.getInstance().getJustClassName(seiClass) + "Service"); try { - WSDLDefinitions wsdl = jwsdl.generate(loadClass(seiName)); - fail("Test should have failed"); + WSDLDefinitions wsdl = jwsdl.generate(loadClass(seiName)); + fail("Test should have failed"); } - catch (WSException is ) + catch (WSException is) { //pass - } catch( Exception e) + } + catch (Exception e) { e.printStackTrace(); fail("Test should not have passed"); } } - - /** * The test is to see if the JavaToWSDL subsystem throws Jaxrpc 2.0 Assertions * for WSDL 1.1 @@ -119,39 +108,16 @@ jwsdl.setServiceName(WSDLUtils.getInstance().getJustClassName(seiClass) + "Service"); try { - WSDLDefinitions wsdl = jwsdl.generate(loadClass(seiName)); - fail("Test should have failed"); - }catch(IllegalArgumentException iae) + WSDLDefinitions wsdl = jwsdl.generate(loadClass(seiName)); + fail("Test should have failed"); + } + catch (IllegalArgumentException iae) { //pass - }catch(WSException ise) - { - //pass } - } - - /** - * The test is to see if the JavaToWSDL subsystem throws Jaxrpc 2.0 Assertions - * for WSDL 2.0 - * @param seiClass - * @throws Exception - */ - private void assertWSDL20Test(Class seiClass) throws Exception - { - String seiName = seiClass.getName(); - JavaToWSDL jwsdl = new JavaToWSDL(Constants.NS_WSDL20); - jwsdl.setTargetNamespace("http://org.jboss.ws/types"); - jwsdl.setServiceName(WSDLUtils.getInstance().getJustClassName(seiClass) + "Service"); - try + catch (WSException ise) { - WSDLDefinitions wsdl = jwsdl.generate(seiClass); - fail("Test should have failed"); - }catch(IllegalArgumentException iae) - { //pass - }catch(WSException ise) - { - //pass } } } Modified: trunk/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -190,7 +190,6 @@ JaxrpcMappingValidator mv = new JaxrpcMappingValidator(); //assertTrue(mv.validate(fix,gen)); - System.out.println("FIXME:JBWS-160"); } /** Modified: trunk/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -46,7 +46,6 @@ ToolsSchemaConfigReader configReader = new ToolsSchemaConfigReader(); Configuration config = configReader.readConfig(j2wConfigFile); assertNotNull("config is null?", config); - System.out.println("FIXME: JBWS-353"); checkJavaToWSDL(config); } @@ -56,7 +55,6 @@ ToolsSchemaConfigReader configReader = new ToolsSchemaConfigReader(); Configuration config = configReader.readConfig(w2jConfigFile); assertNotNull("config is null?", config); - System.out.println("FIXME: JBWS-353"); checkWSDLToJava(config); } Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws_206/tests/Attachment/AttachmentWSDL2JavaTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jbws_206/tests/Attachment/AttachmentWSDL2JavaTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws_206/tests/Attachment/AttachmentWSDL2JavaTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -37,7 +37,7 @@ public String getFixMe() { - return "FIXME: JBWS-269"; + return "FIXME: [JBWS-269] Support attachments in Web Services Tools"; } public String getSEIName() Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/Attachment/AttachmentJava2WSDLTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/Attachment/AttachmentJava2WSDLTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/Attachment/AttachmentJava2WSDLTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -40,7 +40,7 @@ public String getFixMe() { - return "FIXME:JBWS-269"; + return "FIXME: [JBWS-269] Support attachments in Web Services Tools"; } public String getWSDLName() Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/CustomHolders/CustomHolderJava2WSDLTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/CustomHolders/CustomHolderJava2WSDLTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/CustomHolders/CustomHolderJava2WSDLTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -39,11 +39,6 @@ return base; } - public String getFixMe() - { - return "FIXME:JBWS-103"; - } - public String getWSDLName() { return base + "Service.wsdl"; Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -32,10 +32,15 @@ */ public abstract class JBWS211Test extends WSToolsTest { - public abstract String getBase(); - public abstract String getWSDLName(); - public abstract String getFixMe(); + protected abstract String getBase(); + protected abstract String getWSDLName(); + + protected String getFixMe() + { + return null; + } + //Set up the test protected void setUp() { Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -38,11 +38,6 @@ return base; } - public String getFixMe() - { - return "FIXME:JBWS-271"; - } - public String getWSDLName() { return base + "Service.wsdl"; Modified: trunk/src/test/java/org/jboss/test/ws/tools/jsr181/webservice/JavaToWSDLTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jsr181/webservice/JavaToWSDLTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/tools/jsr181/webservice/JavaToWSDLTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -42,8 +42,9 @@ /** Test an ordanary unannotaded SEI */ public void testSEI() throws Exception { - System.out.println("FIXME: JBWS-550"); + System.out.println("FIXME: [JBWS-550] Use AnnotationMetaDataBuilder in tools"); if (true) return; + JavaToWSDL javaToWSDL = new JavaToWSDL(Constants.NS_WSDL11); javaToWSDL.setTargetNamespace("http://www.openuri.org/2004/04/HelloW...; javaToWSDL.setServiceName("TestService"); @@ -58,8 +59,9 @@ /** Test an JSR-181 annotated JSE endpoint */ public void testJSEBean01() throws Exception { - System.out.println("FIXME: JBWS-550"); + System.out.println("FIXME: [JBWS-550] Use AnnotationMetaDataBuilder in tools"); if (true) return; + JavaToWSDL javaToWSDL = new JavaToWSDL(Constants.NS_WSDL11); WSDLDefinitions wsdlDefs = javaToWSDL.generate(JSEBean01.class); @@ -72,8 +74,9 @@ /** Test an JSR-181 annotated SEI */ public void testJSEBean03() throws Exception { - System.out.println("FIXME: JBWS-550"); + System.out.println("FIXME: [JBWS-550] Use AnnotationMetaDataBuilder in tools"); if (true) return; + JavaToWSDL javaToWSDL = new JavaToWSDL(Constants.NS_WSDL11); WSDLDefinitions wsdlDefs = javaToWSDL.generate(JSEBean03.class); Modified: trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -183,8 +183,6 @@ ((XMLSchemaLoader)xsloader).setEntityResolver(new JBossXSEntityResolver(new JBossWSEntityResolver(), map)); //Construct a StringList StringList slist = new StringListImpl(arr, 2); - System.out.println("FIXME: JBXB-33"); - //XSModel xsmodel = Util.loadSchema(slist,getSchemaBindingResolver(map)); XSModel xsmodel = xsloader.loadURIList(slist); assertNotNull("XSModel is null?", xsmodel); Modified: trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java 2006-11-04 19:51:31 UTC (rev 1371) +++ trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java 2006-11-04 21:52:47 UTC (rev 1372) @@ -61,11 +61,13 @@ String base = "resources/tools/xsd-java-checker"; File file2 = new File(genPath + "/org/jboss/ws/types/" + fname); File file1 = new File(base + "/wscompile/simpletypes/" + fname); + + System.out.println("FIXME: [JBWS-940] Add wsdl-java support for jdk 1.4 typesafe enums"); + JBossSourceComparator sc = new JBossSourceComparator(file1, file2); //Add Enum support! //assertTrue("Source Files Match:", sc.validate()); //sc.validateImports(); - System.out.println("FIXME: JBWS-940"); //Compare the generated Java type against the one generated by wscompile fname = "USMidwest.java";