[jbossws-commits] JBossWS SVN: r3699 - in branches/jbossws-2.0: testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-06-22 10:09:33 -0400 (Fri, 22 Jun 2007)
New Revision: 3699

Modified:
   branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java
   branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java
Log:
Cleanup FIXME's

Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java	2007-06-22 13:05:27 UTC (rev 3698)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java	2007-06-22 14:09:33 UTC (rev 3699)
@@ -189,8 +189,8 @@
       String gen = "tools/jbws-160/jbossws/custom/mapping/jaxrpc-mapping.xml";
 
       JaxrpcMappingValidator mv = new JaxrpcMappingValidator();
+      // [JBWS-1291] Fix JaxrpcMappingValidator
       //assertTrue(mv.validate(fix,gen));
-      System.out.println("FIXME: [JBWS-1291] Fix JaxrpcMappingValidator");
    }
 
    /**

Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java
===================================================================
--- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java	2007-06-22 13:05:27 UTC (rev 3698)
+++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java	2007-06-22 14:09:33 UTC (rev 3699)
@@ -30,6 +30,7 @@
 import java.util.concurrent.TimeUnit;
 
 import javax.xml.namespace.QName;
+import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.ws.AsyncHandler;
 import javax.xml.ws.Dispatch;
@@ -42,7 +43,6 @@
 import org.jboss.wsf.spi.test.JBossWSTest;
 import org.jboss.wsf.spi.test.JBossWSTestSetup;
 import org.jboss.wsf.spi.utils.DOMUtils;
-import org.xml.sax.InputSource;
 
 /**
  * Test JAXWS asynchrous dispatch
@@ -65,30 +65,22 @@
 
    public void testInvokeAsynch() throws Exception
    {
-      System.out.println("FIXME: [JBWS-1294] Add support for mapping async methods");
-      if (true) return;
-      
       StreamSource reqObj = new StreamSource(new StringReader(reqPayload));
       Response response = createDispatch().invokeAsync(reqObj);
-      StreamSource result = (StreamSource)response.get(1000, TimeUnit.MILLISECONDS);
-      InputSource inputSource = new InputSource(result.getReader());
-      assertEquals(DOMUtils.parse(expPayload), DOMUtils.parse(inputSource));
+      Source result = (Source)response.get(1000, TimeUnit.MILLISECONDS);
+      assertEquals(DOMUtils.parse(expPayload), DOMUtils.sourceToElement(result));
    }
 
    public void testInvokeAsynchHandler() throws Exception
    {
-      System.out.println("FIXME: [JBWS-1294] Add support for mapping async methods");
-      if (true) return;
-      
       AsyncHandler handler = new AsyncHandler()
       {
          public void handleResponse(Response response)
          {
             try
             {
-               StreamSource result = (StreamSource)response.get();
-               InputSource inputSource = new InputSource(result.getReader());
-               assertEquals(DOMUtils.parse(expPayload), DOMUtils.parse(inputSource));
+               Source result = (Source)response.get();
+               assertEquals(DOMUtils.parse(expPayload), DOMUtils.sourceToElement(result));
                asyncHandlerCalled = true;
             }
             catch (Exception ex)
@@ -110,7 +102,7 @@
    private Dispatch createDispatch() throws MalformedURLException
    {
       URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-asynchronous?wsdl");
-      QName serviceName = new QName(targetNS, "TestEndpointService");
+      QName serviceName = new QName(targetNS, "TestEndpointBeanService");
       QName portName = new QName(targetNS, "TestEndpointPort");
       Service service = Service.create(wsdlURL, serviceName);
       Dispatch dispatch = service.createDispatch(portName, StreamSource.class, Mode.PAYLOAD);