Author: richard.opalka(a)jboss.com Date: 2007-10-20 13:08:01 -0400 (Sat, 20 Oct 2007) New Revision: 4832 Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/AbstractEJB3Test.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/AbstractPOJOTest.java Log: [JBWS-1762] tests optimization Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2007-10-20 17:06:27 UTC (rev 4831) +++ stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2007-10-20 17:08:01 UTC (rev 4832) @@ -378,8 +378,7 @@ <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.jar"/> <unjar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar" - dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.jar" - /> + dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.jar"/> <war warfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" webxml="${tests.output.dir}/resources/jaxws/jbws1762/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> @@ -391,8 +390,7 @@ <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.war"/> <unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" - dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.war" - /> + dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.war"/> <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.sar"> <fileset dir="${tests.output.dir}/libs"> @@ -410,8 +408,7 @@ todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/META-INF"/> <unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" - dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/jaxws-jbws1762-exploded.war" - /> + dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/jaxws-jbws1762-exploded.war"/> <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.ear"> <fileset dir="${tests.output.dir}/libs"> @@ -434,12 +431,10 @@ todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/> <unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" - dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.war" - /> + dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.war"/> <unjar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar" - dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.jar" - /> + dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.jar"/> <!-- jaxws-jbws1797 --> <war destfile="${tests.output.dir}/libs/jaxws-jbws1797.war" webxml="${tests.output.dir}/resources/jaxws/jbws1797/WEB-INF/web.xml"> Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/AbstractEJB3Test.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/AbstractEJB3Test.java 2007-10-20 17:06:27 UTC (rev 4831) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/AbstractEJB3Test.java 2007-10-20 17:08:01 UTC (rev 4832) @@ -46,15 +46,11 @@ public void setUp() throws Exception { super.setUp(); - - if (ejb3Proxy == null) - { - QName serviceName = new QName(ejb3TargetNS, ejb3ServiceName); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + getWSDLLocation()); + QName serviceName = new QName(ejb3TargetNS, ejb3ServiceName); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + getWSDLLocation()); - Service service = Service.create(wsdlURL, serviceName); - ejb3Proxy = service.getPort(EJB3Iface.class); - } + Service service = Service.create(wsdlURL, serviceName); + ejb3Proxy = service.getPort(EJB3Iface.class); } protected abstract String getWSDLLocation(); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/AbstractPOJOTest.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/AbstractPOJOTest.java 2007-10-20 17:06:27 UTC (rev 4831) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/AbstractPOJOTest.java 2007-10-20 17:08:01 UTC (rev 4832) @@ -46,15 +46,11 @@ protected void setUp() throws Exception { super.setUp(); + QName serviceName = new QName(pojoTargetNS, pojoServiceName); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + getWSDLLocation()); - if (pojoProxy == null) - { - QName serviceName = new QName(pojoTargetNS, pojoServiceName); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + getWSDLLocation()); - - Service service = Service.create(wsdlURL, serviceName); - pojoProxy = (POJOIface)service.getPort(POJOIface.class); - } + Service service = Service.create(wsdlURL, serviceName); + pojoProxy = (POJOIface)service.getPort(POJOIface.class); } protected abstract String getWSDLLocation();