Author: richard.opalka(a)jboss.com Date: 2010-05-14 02:56:04 -0400 (Fri, 14 May 2010) New Revision: 12232 Removed: framework/trunk/testsuite/test/resources/jaxws/jbws2960/ Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2960/JBWS2960TestCase.java Log: [JBWS-3024] rollback endorsing workaround - use forked and endorsed tools Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2010-05-14 06:53:26 UTC (rev 12231) +++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2010-05-14 06:56:04 UTC (rev 12232) @@ -883,18 +883,6 @@ </webinf> </war> - <!-- jaxws-jbws2960 --> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2960.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2960/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2960/AddNumbersImpl.class"/> - <include name="org/jboss/test/ws/jaxws/jbws2960/AddNumbersException.class"/> - <include name="org/jboss/test/ws/jaxws/jbws2960/TooBigNumbersException.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2960/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - </war> - <!-- jaxws-jbws2985 --> <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2985.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2985/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2960/JBWS2960TestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2960/JBWS2960TestCase.java 2010-05-14 06:53:26 UTC (rev 12231) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2960/JBWS2960TestCase.java 2010-05-14 06:56:04 UTC (rev 12232) @@ -21,7 +21,7 @@ */ package org.jboss.test.ws.jaxws.jbws2960; -import java.net.URL; +import java.io.File; import java.util.List; import javax.wsdl.Definition; @@ -34,11 +34,10 @@ import javax.xml.namespace.QName; import junit.framework.Assert; -import junit.framework.Test; import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; +import org.jboss.wsf.test.JBossWSTestHelper; import org.w3c.dom.Element; /** @@ -53,17 +52,12 @@ private static final QName WSAM_NON_ANONYMOUS_RESPONSES_QNAME = new QName("http://www.w3.org/2007/05/addressing/metadata";, "NonAnonymousResponses"); private static final QName POLICY_QNAME = new QName("http://www.w3.org/ns/ws-policy";, "Policy"); private static final QName POLICY_REFERENCE_QNAME = new QName("http://www.w3.org/ns/ws-policy";, "PolicyReference"); - private URL wsdlFile; + private final File wsdlFile = JBossWSTestHelper.getResourceFile("jaxws/jbws2960/AddNumbersService.wsdl"); - public static Test suite() + public void setUp() { - return new JBossWSTestSetup(JBWS2960TestCase.class, "jaxws-jbws2960.war"); - } - - public void setUp() throws Exception - { - wsdlFile = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2960/Endpoint?wsdl"); assertNotNull("WSDL not found", wsdlFile); + assertTrue("WSDL doesn't exist", wsdlFile.exists()); } /* @@ -92,7 +86,7 @@ @SuppressWarnings("unchecked") public void testPolicyReference() throws Exception { - Definition wsdl = getWSDLDefinition(wsdlFile); + Definition wsdl = getWSDLDefinition(wsdlFile.getAbsolutePath()); List definitionExtElements = wsdl.getExtensibilityElements(); QName serviceQName = new QName("http://foobar.org/";, "AddNumbersService"); Port wsdlPort = wsdl.getService(serviceQName).getPort("AddNumbersPort"); @@ -115,7 +109,7 @@ public void testOperations() throws Exception { - Definition wsdl = getWSDLDefinition(wsdlFile); + Definition wsdl = getWSDLDefinition(wsdlFile.getAbsolutePath()); PortType port = wsdl.getPortType(new QName("http://foobar.org/";, "AddNumbers")); Operation operation = null; @@ -236,12 +230,12 @@ Assert.assertEquals("Wrong WSAM attr. value", expectedValue, wsamValue.getLocalPart()); } - private Definition getWSDLDefinition(final URL wsdlLocation) throws Exception + private Definition getWSDLDefinition(final String wsdlLocation) throws Exception { WSDLFactory wsdlFactory = WSDLFactory.newInstance(); WSDLReader wsdlReader = wsdlFactory.newWSDLReader(); - return wsdlReader.readWSDL(null, wsdlLocation.toURI().toString()); + return wsdlReader.readWSDL(null, wsdlLocation); } @SuppressWarnings("unchecked")