Author: alessio.soldano(a)jboss.com Date: 2009-03-11 13:27:06 -0400 (Wed, 11 Mar 2009) New Revision: 9575 Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java Log: [JBWS-1665] Fixing test (changes got lost in the past when working on branch 2.0) Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2009-03-10 19:25:14 UTC (rev 9574) +++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2009-03-11 17:27:06 UTC (rev 9575) @@ -246,6 +246,13 @@ </classes> </war> + <!-- jaxws-jbws1665 --> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1665.jar"> + <fileset dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws1665/**/*.class"/> + </fileset> + </jar> + <!-- jaxws-jbws1694 --> <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1694.jar"> <fileset dir="${tests.output.dir}/test-classes"> Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java 2009-03-10 19:25:14 UTC (rev 9574) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java 2009-03-11 17:27:06 UTC (rev 9575) @@ -27,7 +27,10 @@ import javax.wsdl.factory.WSDLFactory; import javax.wsdl.xml.WSDLReader; +import junit.framework.Test; + import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; /** * [JBWS-1665] incorrect wsdl generation @@ -36,32 +39,14 @@ */ public class JBWS1665TestCase extends JBossWSTest { - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1655/TrackingService"; + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1665/TrackingServiceBean"; -// public static Test suite() -// { -// return JBossWSTestSetup.newTestSetup(JBWS1665TestCase.class, "jaxws-jbws1665.jar"); -// } - - public void testWebService() throws Exception + public static Test suite() { - System.out.println("FIXME [JBWS-1665] incorrect wsdl generation"); - - //assertWSDLAccess(); - - // Need to validate the WSDL is property populated. Several fields such as - // element names are being left blank. This is related to case 16130. The - // entire generated wsdl is attached to the case. - - /* - QName serviceName = new QName("http://org.jboss.ws/jbws1665", "EJB3BeanService"); - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - Service service = Service.create(wsdlURL, serviceName); - TrackingServiceInterface port = (TrackingServiceInterface)service.getPort(TrackingServiceInterface.class); - */ + return new JBossWSTestSetup(JBWS1665TestCase.class, "jaxws-jbws1665.jar"); } - private void assertWSDLAccess() throws Exception + public void testWebService() throws Exception { URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();