Author: richard.opalka(a)jboss.com Date: 2009-02-26 04:17:04 -0500 (Thu, 26 Feb 2009) New Revision: 9399 Modified: framework/branches/jbossws-framework-3.1.0/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java framework/branches/jbossws-framework-3.1.0/testsuite/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java framework/branches/jbossws-framework-3.1.0/testsuite/test/java/org/jboss/test/ws/jaxws/samples/soapbinding/SOAPBindingTestCase.java framework/branches/jbossws-framework-3.1.0/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java Log: [JBWS-2543] updating CXF fixmes Modified: framework/branches/jbossws-framework-3.1.0/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java =================================================================== --- framework/branches/jbossws-framework-3.1.0/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2009-02-25 18:15:45 UTC (rev 9398) +++ framework/branches/jbossws-framework-3.1.0/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2009-02-26 09:17:04 UTC (rev 9399) @@ -54,12 +54,6 @@ public void testEJB3Endpoint() throws Exception { - if (isIntegrationCXF()) - { - System.out.println("FIXME: [JBWS-1655] - Add support for endpoint address rewriting"); - return; - } - String soapAddress = "http://" + getServerHost() + ":8080/earejb3/EJB3Bean"; QName serviceName = new QName("http://eardeployment.jaxws/", "EndpointService"); Service service = Service.create(new URL(soapAddress + "?wsdl"), serviceName); Modified: framework/branches/jbossws-framework-3.1.0/testsuite/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java =================================================================== --- framework/branches/jbossws-framework-3.1.0/testsuite/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java 2009-02-25 18:15:45 UTC (rev 9398) +++ framework/branches/jbossws-framework-3.1.0/testsuite/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java 2009-02-26 09:17:04 UTC (rev 9399) @@ -69,18 +69,13 @@ String resStr = port.echo("Kermit"); assertEquals("Kermit|LogOut|AuthOut|RoutOut|RoutIn|AuthIn|LogIn|endpoint|LogOut|AuthOut|RoutOut|RoutIn|AuthIn|LogIn", resStr); - if (isIntegrationNative()) + if (isIntegrationMetro()) { - assertEquals("server-cookie=true", ClientMimeHandler.inboundCookie); - } - else if (isIntegrationMetro()) - { System.out.println("FIXME: [JBWS-1671] Metro client handler cannot set mime header"); + return; } - else if (isIntegrationCXF()) - { - System.out.println("FIXME: [CXF-1507] CXF client handler cannot set mime header"); - } + + assertEquals("server-cookie=true", ClientMimeHandler.inboundCookie); } public void testHandlerChainOnServiceEndpointInterface() throws Exception @@ -91,27 +86,22 @@ Service service = Service.create(wsdlURL, serviceName); EndpointWithHandlerChain port = (EndpointWithHandlerChain)service.getPort(EndpointWithHandlerChain.class); - if (isIntegrationCXF()) + if (isIntegrationMetro()) { - System.out.println("FIXME: [CXF-1253] CXF does not respect @HandlerChain on client SEI"); + System.out.println("FIXME: [JBWS-1672] Metro does not respect @HandlerChain on client SEI"); } - else if (isIntegrationNative()) //[JBWS-1672] Metro does not respect @HandlerChain on client SEI + else { String resStr = port.echo("Kermit"); assertEquals("Kermit|LogOut|AuthOut|RoutOut|RoutIn|AuthIn|LogIn|endpoint|LogOut|AuthOut|RoutOut|RoutIn|AuthIn|LogIn", resStr); } - if (isIntegrationNative()) + if (isIntegrationMetro()) { - assertEquals("server-cookie=true", ClientMimeHandler.inboundCookie); - } - else if (isIntegrationMetro()) - { System.out.println("FIXME: [JBWS-1671] Metro client handler cannot set mime header"); + return; } - else if (isIntegrationCXF()) - { - System.out.println("FIXME: [CXF-1507] CXF client handler cannot set mime header"); - } + + assertEquals("server-cookie=true", ClientMimeHandler.inboundCookie); } } Modified: framework/branches/jbossws-framework-3.1.0/testsuite/test/java/org/jboss/test/ws/jaxws/samples/soapbinding/SOAPBindingTestCase.java =================================================================== --- framework/branches/jbossws-framework-3.1.0/testsuite/test/java/org/jboss/test/ws/jaxws/samples/soapbinding/SOAPBindingTestCase.java 2009-02-25 18:15:45 UTC (rev 9398) +++ framework/branches/jbossws-framework-3.1.0/testsuite/test/java/org/jboss/test/ws/jaxws/samples/soapbinding/SOAPBindingTestCase.java 2009-02-26 09:17:04 UTC (rev 9399) @@ -157,12 +157,6 @@ public void testDocWrappedService() throws Exception { - if (isIntegrationCXF()) - { - System.out.println("FIXME [CXF-1257] Cannot create proxy for namespaced doc/wrapped"); - return; - } - QName serviceName = new QName(targetNS, "DocWrappedService"); URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-soapbinding/DocWrappedService?wsdl"); Modified: framework/branches/jbossws-framework-3.1.0/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java =================================================================== --- framework/branches/jbossws-framework-3.1.0/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java 2009-02-25 18:15:45 UTC (rev 9398) +++ framework/branches/jbossws-framework-3.1.0/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java 2009-02-26 09:17:04 UTC (rev 9399) @@ -139,12 +139,6 @@ " <faultstring>Endpoint {http://webmethod.samples.jaxws.ws.test.jboss.org/}EndpointPort does not contain operation meta data for: {http://webmethod.samples.jaxws.ws.test.jboss.org/}noWebMethod</faultstring>" + "</env:Fault>"; - if (isIntegrationCXF()) - { - System.out.println("FIXME [CXF-1258] soap:Fault response does not cause SOAPFaultException"); - return; - } - Service service = Service.create(wsdlURL, serviceName); Dispatch dispatch = service.createDispatch(portName, Source.class, Mode.PAYLOAD); try