Author: heiko.braun(a)jboss.com Date: 2007-10-24 06:55:04 -0400 (Wed, 24 Oct 2007) New Revision: 4878 Modified: framework/trunk/src/test/ant-import/build-testsuite.xml framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMEndpointBean.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/WrappedEndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java Log: Remove Metro fixme's Modified: framework/trunk/src/test/ant-import/build-testsuite.xml =================================================================== --- framework/trunk/src/test/ant-import/build-testsuite.xml 2007-10-24 10:52:45 UTC (rev 4877) +++ framework/trunk/src/test/ant-import/build-testsuite.xml 2007-10-24 10:55:04 UTC (rev 4878) @@ -456,6 +456,7 @@ <mkdir dir="${tests.output.dir}/reports"/> <junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}" haltonfailure="${haltonfailure}"> <jvmarg value="-Djava.security.manager"/> + <jvmarg value="-ea"/> <sysproperty key="jdk.home" value="${env.JAVA_HOME}"/> <sysproperty key="test.execution.dir" value="${tests.output.dir}"/> <sysproperty key="build.testlog" value="${tests.output.dir}/log"/> @@ -497,6 +498,7 @@ <junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}"> <jvmarg line="${remote.debug.line}"/> <jvmarg value="-Djava.security.manager"/> + <jvmarg value="-ea"/> <sysproperty key="jdk.home" value="${env.JAVA_HOME}"/> <sysproperty key="test.execution.dir" value="${tests.output.dir}"/> <sysproperty key="build.testlog" value="${tests.output.dir}/log"/> Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2007-10-24 10:52:45 UTC (rev 4877) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2007-10-24 10:55:04 UTC (rev 4878) @@ -57,6 +57,7 @@ if (isIntegrationXFire()) { System.out.println("FIXME: [JBWS-1746] - Add support for configurable invoker in cxf.xml"); + System.out.println("FIXME: [JBWS-1655] - Add support for endpoint address rewriting"); return; } @@ -65,19 +66,10 @@ Service service = Service.create(new URL(soapAddress + "?wsdl"), serviceName); TestEndpoint port = service.getPort(TestEndpoint.class); - if (!isIntegrationSunRI()) - { - System.out.println("[JBWS-1616] Verify correct bahaviour of @WebService.wsdlLocation"); Definition wsdl = getWSDLDefinition(soapAddress + "?wsdl"); String nsURI = wsdl.getNamespace("jbws1616"); assertEquals("http://jira.jboss.org/jira/browse/JBWS-1616";, nsURI); - } - else - { - System.out.println("FIXME [JBWS-1616]: Verify correct bahaviour of @WebService.wsdlLocation"); - } - System.out.println("[JBWS-1655] Add support for endpoint address rewriting"); BindingProvider bp = (BindingProvider)port; bp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, soapAddress); @@ -93,12 +85,10 @@ Service service = Service.create(new URL(soapAddress + "?wsdl"), serviceName); TestEndpoint port = service.getPort(TestEndpoint.class); - System.out.println("[JBWS-1616] Verify correct bahaviour of @WebService.wsdlLocation"); Definition wsdl = getWSDLDefinition(soapAddress + "?wsdl"); String nsURI = wsdl.getNamespace("jbws1616"); assertEquals("http://jira.jboss.org/jira/browse/JBWS-1616";, nsURI); - System.out.println("[JBWS-1655] Add support for endpoint address rewriting"); BindingProvider bp = (BindingProvider)port; bp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, soapAddress); Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMEndpointBean.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMEndpointBean.java 2007-10-24 10:52:45 UTC (rev 4877) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMEndpointBean.java 2007-10-24 10:55:04 UTC (rev 4878) @@ -25,11 +25,15 @@ import javax.activation.DataHandler; import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; import javax.xml.ws.WebServiceException; +import javax.xml.ws.BindingType; import org.jboss.logging.Logger; @WebService(name = "MTOMEndpoint", serviceName = "MTOMService", endpointInterface = "org.jboss.test.ws.jaxws.samples.xop.doclit.MTOMEndpoint") +@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) +@BindingType(value = "http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true") public class MTOMEndpointBean implements MTOMEndpoint { private Logger log = Logger.getLogger(MTOMEndpointBean.class); Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/WrappedEndpointImpl.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/WrappedEndpointImpl.java 2007-10-24 10:52:45 UTC (rev 4877) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/WrappedEndpointImpl.java 2007-10-24 10:55:04 UTC (rev 4878) @@ -21,14 +21,13 @@ */ package org.jboss.test.ws.jaxws.samples.xop.doclit; -import java.io.IOException; - import javax.activation.DataHandler; import javax.jws.WebMethod; import javax.jws.WebService; import javax.xml.bind.annotation.XmlMimeType; import javax.xml.ws.BindingType; import javax.xml.ws.WebServiceException; +import java.io.IOException; /** * @author Heiko.Braun(a)jboss.com @@ -40,11 +39,11 @@ @WebMethod @XmlMimeType("text/plain") - public DataHandler parameterAnnotation(@XmlMimeType("text/plain") - DataHandler data) + public DataHandler parameterAnnotation(@XmlMimeType("text/plain") DataHandler data) { try { + System.out.println("Recv " + data.getContentType()); System.out.println("Got " + data.getContent()); return new DataHandler("Server data", "text/plain"); } Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java 2007-10-24 10:52:45 UTC (rev 4877) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java 2007-10-24 10:55:04 UTC (rev 4878) @@ -63,11 +63,7 @@ Service service = Service.create(wsdlURL, serviceName); port = service.getPort(MTOMEndpoint.class); - - // enable MTOM binding = (SOAPBinding)((BindingProvider)port).getBinding(); - binding.setMTOMEnabled(true); - } /** @@ -77,7 +73,7 @@ { getBinding().setMTOMEnabled(true); - DataHandler dh = new DataHandler("Client Data", "text/plain"); + DataHandler dh = new DataHandler("testDataHandlerRoundtrip", "text/plain"); DHResponse response = getPort().echoDataHandler(new DHRequest(dh)); assertNotNull(response); @@ -85,15 +81,7 @@ String contentType = response.getDataHandler().getContentType(); assertEquals("Server data", content); - - if (isIntegrationSunRI()) - { - System.out.println("FIXME: [JBWS-1681] Fix SunRI XOP contentType handling"); - } - else - { - assertEquals("text/plain", contentType); - } + assertEquals("text/plain", contentType); } /** @@ -103,22 +91,15 @@ { getBinding().setMTOMEnabled(false); - DataHandler dh = new DataHandler("Client data", "text/plain"); + DataHandler dh = new DataHandler("testDataHandlerResponseOptimzed", "text/plain"); DHResponse response = getPort().echoDataHandler(new DHRequest(dh)); assertNotNull(response); Object content = getContent(response.getDataHandler()); String contentType = response.getDataHandler().getContentType(); - assertEquals("Server data", content); - - if (isIntegrationSunRI()) - { - System.out.println("FIXME: [JBWS-1681] Fix SunRI XOP contentType handling"); - } - else - { - assertEquals("text/plain", contentType); - } + assertEquals("Server data", content); + assertEquals("text/plain", contentType); + } } \ No newline at end of file Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2007-10-24 10:52:45 UTC (rev 4877) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2007-10-24 10:55:04 UTC (rev 4878) @@ -68,11 +68,8 @@ Service service = Service.create(wsdlURL, serviceName); port = service.getPort(MTOMEndpoint.class); + binding = (SOAPBinding)((BindingProvider)port).getBinding(); - // enable MTOM - binding = (SOAPBinding)((BindingProvider)port).getBinding(); - binding.setMTOMEnabled(true); - List<Handler> handlerChain = new ArrayList<Handler>(); handlerChain.addAll(binding.getHandlerChain()); handlerChain.add(new MTOMProtocolHandler()); Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java 2007-10-24 10:52:45 UTC (rev 4877) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java 2007-10-24 10:55:04 UTC (rev 4878) @@ -79,15 +79,7 @@ String contentType = response.getContentType(); assertEquals("Server data", content); - - if (isIntegrationSunRI()) - { - System.out.println("FIXME: [JBWS-1681] Fix SunRI XOP contentType handling"); - } - else - { - assertEquals("text/plain", contentType); - } + assertEquals("text/plain", contentType); } protected Object getContent(DataHandler dh) throws IOException Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2007-10-24 10:52:45 UTC (rev 4877) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2007-10-24 10:55:04 UTC (rev 4878) @@ -219,7 +219,7 @@ System.out.println(messageOut); System.out.println("--- End captured output --"); - System.out.println("FIXME [JBWS-1772]: WSConsume output is not correctly redirected"); + System.out.println("[JBWS-1772]: WSConsume output is not correctly redirected"); /*assertTrue("Tools output not correctly redirected", messageOut.indexOf("org/jboss/test/ws/tools/testMessageStream/EndpointInterface.java")!=-1