[jbossws-commits] JBossWS SVN: r10970 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2630.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2009-10-21 03:50:42 -0400 (Wed, 21 Oct 2009)
New Revision: 10970

Modified:
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2630/JBWS2630TestCase.java
Log:
[JBWS-2717] fixing test to be more generic

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2630/JBWS2630TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2630/JBWS2630TestCase.java	2009-10-21 07:16:52 UTC (rev 10969)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2630/JBWS2630TestCase.java	2009-10-21 07:50:42 UTC (rev 10970)
@@ -29,6 +29,9 @@
 import javax.management.ObjectName;
 import javax.xml.namespace.QName;
 import javax.xml.ws.Service;
+import javax.wsdl.Definition;
+import javax.wsdl.factory.WSDLFactory;
+import javax.wsdl.xml.WSDLReader;
 
 import junit.framework.Test;
 
@@ -63,9 +66,10 @@
    
    public void testWSDL() throws Exception
    {
-      URL url = new URL(endpointAddress + "?wsdl");
-      BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
-      assertTrue(br.readLine().contains("definition"));
+      URL wsdlURL = new URL(endpointAddress + "?wsdl");
+      Definition wsdl = getWSDLDefinition(wsdlURL.toExternalForm());
+
+      assertNotNull("Unable to get WSDL", wsdl);
    }
    
    public void testEndpoint() throws Exception
@@ -77,4 +81,14 @@
       String s = "Hi";
       assertEquals(s, port.echo(s));
    }
+
+   private Definition getWSDLDefinition(String wsdlLocation) throws Exception
+   {
+      WSDLFactory wsdlFactory = WSDLFactory.newInstance();
+      WSDLReader wsdlReader = wsdlFactory.newWSDLReader();
+
+      Definition definition = wsdlReader.readWSDL(null, wsdlLocation);
+      return definition;
+   }
+
 }