Author: alessio.soldano(a)jboss.com Date: 2012-03-12 13:08:42 -0400 (Mon, 12 Mar 2012) New Revision: 15921 Added: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/CleanupOperation.java Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderClientTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/oneway/OneWayTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1446/JBWS1446TestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1797/JBWS1797TestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2218/JBWS2218TestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2917/JBWS2917TestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2955/JBWS2955TestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2956/JBWS2956TestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3034/JBWS3034TestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3114/JBWS3114TestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/addressing/AddressingStatefulTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webresult/WebResultTestCase.java Log: [JBWS-3455] Adding CleanupOperation and fixing shared-testsuite tests to clean up static member references to client proxies Added: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/CleanupOperation.java =================================================================== --- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/CleanupOperation.java (rev 0) +++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/CleanupOperation.java 2012-03-12 17:08:42 UTC (rev 15921) @@ -0,0 +1,28 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.test; + +public abstract class CleanupOperation { + + public abstract void cleanUp(); + +} Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java =================================================================== --- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2012-03-12 14:45:11 UTC (rev 15920) +++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2012-03-12 17:08:42 UTC (rev 15921) @@ -36,11 +36,9 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Properties; -import java.util.Set; import java.util.StringTokenizer; import javax.management.MBeanServerConnection; -import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; @@ -58,11 +56,11 @@ * * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a> * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a> */ public abstract class JBossWSTest extends TestCase { protected static Logger log = Logger.getLogger(JBossWSTest.class.getName()); - //private static JBossWSTestHelper delegate = new JBossWSTestHelper(); public JBossWSTest() { @@ -72,7 +70,7 @@ { super(name); } - + /** * Execute <b>command</b> in separate process. * @param command command to execute @@ -130,8 +128,7 @@ if (command == null) throw new NullPointerException( "Command cannot be null" ); - System.out.println("Executing command: " + command); - log.debug("Executing command: " + command); + log.info("Executing command: " + command); StringTokenizer st = new StringTokenizer(command, " \t\r"); List<String> tokenizedCommand = new LinkedList<String>(); Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java =================================================================== --- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2012-03-12 14:45:11 UTC (rev 15920) +++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2012-03-12 17:08:42 UTC (rev 15921) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat Middleware LLC, and individual contributors + * Copyright 2012, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -37,7 +37,9 @@ import javax.security.sasl.SaslException; import junit.extensions.TestSetup; +import junit.framework.Protectable; import junit.framework.Test; +import junit.framework.TestResult; import junit.framework.TestSuite; import org.jboss.logging.Logger; @@ -62,6 +64,7 @@ private ClassLoader originalClassLoader; private Map<String, Map<String, String>> securityDomains; private boolean defaultSecurityDomainRequirement = false; + private CleanupOperation cleanupOp; public JBossWSTestSetup(Class<?> testClass, String archiveList) { @@ -69,6 +72,12 @@ getArchiveArray(archiveList); } + public JBossWSTestSetup(Class<?> testClass, String archiveList, CleanupOperation cleanupOp) + { + this(testClass, archiveList); + this.cleanupOp = cleanupOp; + } + public JBossWSTestSetup(Class<?> testClass, String archiveList, OutputStream appclientOutputStream) { super(new TestSuite(testClass)); @@ -82,6 +91,12 @@ setDefaultSecurityDomainRequirement(requiresDefaultSecurityDomain); } + public JBossWSTestSetup(Class<?> testClass, String archiveList, boolean requiresDefaultSecurityDomain, CleanupOperation cleanupOp) + { + this(testClass, archiveList, requiresDefaultSecurityDomain); + this.cleanupOp = cleanupOp; + } + public JBossWSTestSetup(Test test, String archiveList) { super(test); @@ -98,6 +113,29 @@ { super(test); } + + /** + * Override junit.extensions.TestSetup:run(TestResult result) to call cleanup operation + * before tearing down the whole test setup. Required for allowing tests to perform + * final cleanup of static references. + */ + @Override + public void run(final TestResult result) + { + Protectable p = new Protectable() + { + public void protect() throws Exception + { + setUp(); + basicRun(result); + if (cleanupOp != null) { + cleanupOp.cleanUp(); + } + tearDown(); + } + }; + result.runProtected(this, p); + } public File getArchiveFile(String archive) { Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase.java 2012-03-12 14:45:11 UTC (rev 15920) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase.java 2012-03-12 17:08:42 UTC (rev 15921) @@ -30,6 +30,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -47,7 +48,12 @@ public static Test suite() { - return new JBossWSTestSetup(TrivialServiceDocBareTestCase.class, "jaxrpc-samples-docstyle-bare.war, jaxrpc-samples-docstyle-bare-client.jar"); + return new JBossWSTestSetup(TrivialServiceDocBareTestCase.class, "jaxrpc-samples-docstyle-bare.war, jaxrpc-samples-docstyle-bare-client.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase.java 2012-03-12 14:45:11 UTC (rev 15920) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase.java 2012-03-12 17:08:42 UTC (rev 15921) @@ -30,6 +30,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -47,7 +48,12 @@ public static Test suite() { - return new JBossWSTestSetup(TrivialServiceDocWrappedTestCase.class, "jaxrpc-samples-docstyle-wrapped.war, jaxrpc-samples-docstyle-wrapped-client.jar"); + return new JBossWSTestSetup(TrivialServiceDocWrappedTestCase.class, "jaxrpc-samples-docstyle-wrapped.war, jaxrpc-samples-docstyle-wrapped-client.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderClientTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderClientTestCase.java 2012-03-12 14:45:11 UTC (rev 15920) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderClientTestCase.java 2012-03-12 17:08:42 UTC (rev 15921) @@ -33,6 +33,7 @@ import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; +import org.jboss.wsf.test.CleanupOperation; /** * Test bound and unbound headers @@ -49,7 +50,12 @@ public static Test suite() { - return new JBossWSTestSetup(HeaderClientTestCase.class, "jaxrpc-samples-handler.war, jaxrpc-samples-handler-client.jar"); + return new JBossWSTestSetup(HeaderClientTestCase.class, "jaxrpc-samples-handler.war, jaxrpc-samples-handler-client.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderTestCase.java 2012-03-12 14:45:11 UTC (rev 15920) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderTestCase.java 2012-03-12 17:08:42 UTC (rev 15921) @@ -53,6 +53,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -71,7 +72,12 @@ public static Test suite() { - return new JBossWSTestSetup(HolderDIITestCase.class, "jaxrpc-samples-holder.war, jaxrpc-samples-holder-client.jar"); + return new JBossWSTestSetup(HolderDIITestCase.class, "jaxrpc-samples-holder.war, jaxrpc-samples-holder-client.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java 2012-03-12 14:45:11 UTC (rev 15920) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java 2012-03-12 17:08:42 UTC (rev 15921) @@ -29,6 +29,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -46,7 +47,12 @@ public static Test suite() { - return new JBossWSTestSetup(DocEJBTestCase.class, "jaxrpc-samples-jsr109ejb-doc.jar, jaxrpc-samples-jsr109ejb-doc-client.jar"); + return new JBossWSTestSetup(DocEJBTestCase.class, "jaxrpc-samples-jsr109ejb-doc.jar, jaxrpc-samples-jsr109ejb-doc-client.jar", new CleanupOperation() { + @Override + public void cleanUp() { + endpoint = null; + } + }); } protected void setUp() throws Exception Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java 2012-03-12 14:45:11 UTC (rev 15920) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java 2012-03-12 17:08:42 UTC (rev 15921) @@ -29,6 +29,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -46,7 +47,12 @@ public static Test suite() { - return new JBossWSTestSetup(RpcEJBTestCase.class, "jaxrpc-samples-jsr109ejb-rpc.jar, jaxrpc-samples-jsr109ejb-rpc-client.jar"); + return new JBossWSTestSetup(RpcEJBTestCase.class, "jaxrpc-samples-jsr109ejb-rpc.jar, jaxrpc-samples-jsr109ejb-rpc-client.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java 2012-03-12 14:45:11 UTC (rev 15920) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java 2012-03-12 17:08:42 UTC (rev 15921) @@ -29,6 +29,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -46,7 +47,12 @@ public static Test suite() { - return new JBossWSTestSetup(DocJSETestCase.class, "jaxrpc-samples-jsr109pojo-doc.war, jaxrpc-samples-jsr109pojo-doc-client.jar"); + return new JBossWSTestSetup(DocJSETestCase.class, "jaxrpc-samples-jsr109pojo-doc.war, jaxrpc-samples-jsr109pojo-doc-client.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2012-03-12 14:45:11 UTC (rev 15920) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2012-03-12 17:08:42 UTC (rev 15921) @@ -29,6 +29,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -46,7 +47,12 @@ public static Test suite() { - return new JBossWSTestSetup(RpcJSETestCase.class, "jaxrpc-samples-jsr109pojo-rpc.war, jaxrpc-samples-jsr109pojo-rpc-client.jar"); + return new JBossWSTestSetup(RpcJSETestCase.class, "jaxrpc-samples-jsr109pojo-rpc.war, jaxrpc-samples-jsr109pojo-rpc-client.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java 2012-03-12 14:45:11 UTC (rev 15920) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java 2012-03-12 17:08:42 UTC (rev 15921) @@ -36,6 +36,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -56,7 +57,12 @@ /** Deploy the test ear */ public static Test suite() throws Exception { - return new JBossWSTestSetup(MTOMTestCase.class, "jaxrpc-samples-mtom.war, jaxrpc-samples-mtom-client.jar"); + return new JBossWSTestSetup(MTOMTestCase.class, "jaxrpc-samples-mtom.war, jaxrpc-samples-mtom-client.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/oneway/OneWayTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/oneway/OneWayTestCase.java 2012-03-12 14:45:11 UTC (rev 15920) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/oneway/OneWayTestCase.java 2012-03-12 17:08:42 UTC (rev 15921) @@ -30,6 +30,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -48,7 +49,12 @@ public static Test suite() { - return new JBossWSTestSetup(OneWayTestCase.class, "jaxrpc-samples-oneway.war, jaxrpc-samples-oneway-client.jar"); + return new JBossWSTestSetup(OneWayTestCase.class, "jaxrpc-samples-oneway.war, jaxrpc-samples-oneway-client.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase.java 2012-03-12 14:45:11 UTC (rev 15920) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase.java 2012-03-12 17:08:42 UTC (rev 15921) @@ -30,6 +30,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -48,7 +49,12 @@ public static Test suite() { - return new JBossWSTestSetup(TrivialServiceRpcTestCase.class, "jaxrpc-samples-rpcstyle.war, jaxrpc-samples-rpcstyle-client.jar"); + return new JBossWSTestSetup(TrivialServiceRpcTestCase.class, "jaxrpc-samples-rpcstyle.war, jaxrpc-samples-rpcstyle-client.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java 2012-03-12 14:45:11 UTC (rev 15920) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java 2012-03-12 17:08:42 UTC (rev 15921) @@ -38,6 +38,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -57,7 +58,12 @@ /** Deploy the test ear */ public static Test suite() throws Exception { - return new JBossWSTestSetup(AttachmentProxyTestCase.class, "jaxrpc-samples-swa.war, jaxrpc-samples-swa-client.jar"); + return new JBossWSTestSetup(AttachmentProxyTestCase.class, "jaxrpc-samples-swa.war, jaxrpc-samples-swa-client.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java 2012-03-12 14:45:11 UTC (rev 15920) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java 2012-03-12 17:08:42 UTC (rev 15921) @@ -28,6 +28,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -44,7 +45,12 @@ public static Test suite() { - return new JBossWSTestSetup(JBWS1422TestCase.class, "jaxws-jbws1422.jar"); + return new JBossWSTestSetup(JBWS1422TestCase.class, "jaxws-jbws1422.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } @Override Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1446/JBWS1446TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1446/JBWS1446TestCase.java 2012-03-12 14:45:11 UTC (rev 15920) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1446/JBWS1446TestCase.java 2012-03-12 17:08:42 UTC (rev 15921) @@ -21,7 +21,6 @@ */ package org.jboss.test.ws.jaxws.jbws1446; -import java.net.MalformedURLException; import java.net.URL; import javax.xml.namespace.QName; @@ -42,26 +41,18 @@ */ public class JBWS1446TestCase extends JBossWSTest { - private static EndpointInterface port; - public static Test suite() { return new JBossWSTestSetup(JBWS1446TestCase.class, "jaxws-jbws1446.jar"); } - public void setUp() throws MalformedURLException - { - if (port == null) - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1446/EJB3Bean?wsdl"); - QName serviceName = new QName("http://jbws1446.jaxws.ws.test.jboss.org/";, "EJB3BeanService"); - Service service = Service.create(wsdlURL, serviceName); - port = service.getPort(EndpointInterface.class); - } - } - public void testObjectAccess() throws Exception { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1446/EJB3Bean?wsdl"); + QName serviceName = new QName("http://jbws1446.jaxws.ws.test.jboss.org/";, "EJB3BeanService"); + Service service = Service.create(wsdlURL, serviceName); + EndpointInterface port = service.getPort(EndpointInterface.class); + Object hello = port.helloObject("hello"); assertEquals("hello", hello); } Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java 2012-03-12 14:45:11 UTC (rev 15920) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java 2012-03-12 17:08:42 UTC (rev 15921) @@ -29,6 +29,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -46,7 +47,12 @@ public static Test suite() { - return new JBossWSTestSetup(JBWS1556EarTestCase.class, "jaxws-jbws1556.ear"); + return new JBossWSTestSetup(JBWS1556EarTestCase.class, "jaxws-jbws1556.ear", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } public void setUp() throws MalformedURLException Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1797/JBWS1797TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1797/JBWS1797TestCase.java 2012-03-12 14:45:11 UTC (rev 15920) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1797/JBWS1797TestCase.java 2012-03-12 17:08:42 UTC (rev 15921) @@ -38,6 +38,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -55,7 +56,13 @@ public static Test suite() { - return new JBossWSTestSetup(JBWS1797TestCase.class, "jaxws-jbws1797.war"); + return new JBossWSTestSetup(JBWS1797TestCase.class, "jaxws-jbws1797.war", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + wsdlURL = null; + } + }); } @Override Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java 2012-03-12 14:45:11 UTC (rev 15920) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java 2012-03-12 17:08:42 UTC (rev 15921) @@ -22,6 +22,8 @@ package org.jboss.test.ws.jaxws.jbws1841; import junit.framework.Test; + +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -46,7 +48,13 @@ private static InitialContext ctx; public static Test suite() { - return new JBossWSTestSetup(JBWS1841TestCase.class, "jaxws-jbws1841.jar"); + return new JBossWSTestSetup(JBWS1841TestCase.class, "jaxws-jbws1841.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + remote = null; + } + }); } protected void setUp() throws Exception Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2218/JBWS2218TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2218/JBWS2218TestCase.java 2012-03-12 14:45:11 UTC (rev 15920) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2218/JBWS2218TestCase.java 2012-03-12 17:08:42 UTC (rev 15921) @@ -21,7 +21,6 @@ */ package org.jboss.test.ws.jaxws.jbws2218; -import java.net.MalformedURLException; import java.net.URL; import javax.xml.namespace.QName; @@ -39,26 +38,17 @@ */ public class JBWS2218TestCase extends JBossWSTest { - private static EndpointInterface port; - public static Test suite() { return new JBossWSTestSetup(JBWS2218TestCase.class, "jaxws-jbws2218.jar"); } - public void setUp() throws MalformedURLException - { - if (port == null) - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/myweb/myweb-service/WebDelegateEndPoint?wsdl"); - QName serviceName = new QName("http://jbws2218.jaxws.ws.test.jboss.org/";, "EJB3BeanService"); - Service service = Service.create(wsdlURL, serviceName); - port = service.getPort(EndpointInterface.class); - } - } - public void testSimpleAccess() throws Exception { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/myweb/myweb-service/WebDelegateEndPoint?wsdl"); + QName serviceName = new QName("http://jbws2218.jaxws.ws.test.jboss.org/";, "EJB3BeanService"); + Service service = Service.create(wsdlURL, serviceName); + EndpointInterface port = service.getPort(EndpointInterface.class); String hello = port.helloSimple("hello"); assertEquals("hello", hello); } Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2917/JBWS2917TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2917/JBWS2917TestCase.java 2012-03-12 14:45:11 UTC (rev 15920) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2917/JBWS2917TestCase.java 2012-03-12 17:08:42 UTC (rev 15921) @@ -36,19 +36,19 @@ */ public final class JBWS2917TestCase extends JBossWSTest { - private static final String XML_SOURCE = "<?xml version='1.0' encoding='UTF-8' standalone='yes'?>\n" + - "<EndpointReference xmlns='http://www.w3.org/2005/08/addressing'>\n" + - " <Address>http://localhost:8080/jaxws-endpointReference</Address>\n" + - " <Metadata\n" + - " wsdli:wsdlLocation='http://org.jboss.ws/endpointReference http://localhost:8080/jaxws-endpointReference?wsdl'\n" + - " xmlns:wsdli='http://www.w3.org/ns/wsdl-instance'>\n" + - " <wsam:InterfaceName xmlns:wsam='http://www.w3.org/2005/08/addressing' xmlns:wsns='http://org.jboss.ws/endpointReference'>wsns:Endpoint</wsam:InterfaceName>\n" + - " <wsam:ServiceName xmlns:wsam='http://www.w3.org/2005/08/addressing' xmlns:wsns='http://org.jboss.ws/endpointReference' xmlns='' EndpointName='HelloPort'>wsns:EndpointService</wsam:ServiceName>\n" + - " </Metadata>\n" + - "</EndpointReference>\n"; - public void testToString() throws Exception { + String XML_SOURCE = "<?xml version='1.0' encoding='UTF-8' standalone='yes'?>\n" + + "<EndpointReference xmlns='http://www.w3.org/2005/08/addressing'>\n" + + " <Address>http://localhost:8080/jaxws-endpointReference</Address>\n" + + " <Metadata\n" + + " wsdli:wsdlLocation='http://org.jboss.ws/endpointReference http://localhost:8080/jaxws-endpointReference?wsdl'\n" + + " xmlns:wsdli='http://www.w3.org/ns/wsdl-instance'>\n" + + " <wsam:InterfaceName xmlns:wsam='http://www.w3.org/2005/08/addressing' xmlns:wsns='http://org.jboss.ws/endpointReference'>wsns:Endpoint</wsam:InterfaceName>\n" + + " <wsam:ServiceName xmlns:wsam='http://www.w3.org/2005/08/addressing' xmlns:wsns='http://org.jboss.ws/endpointReference' xmlns='' EndpointName='HelloPort'>wsns:EndpointService</wsam:ServiceName>\n" + + " </Metadata>\n" + + "</EndpointReference>\n"; + assertTrue("lost xmlns:wsns namespace declaration", this.getXML(XML_SOURCE).indexOf("xmlns:wsns") != -1); StreamSource source = new StreamSource(new StringReader(XML_SOURCE)); EndpointReference epRef = EndpointReference.readFrom(source); Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2955/JBWS2955TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2955/JBWS2955TestCase.java 2012-03-12 14:45:11 UTC (rev 15920) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2955/JBWS2955TestCase.java 2012-03-12 17:08:42 UTC (rev 15921) @@ -33,23 +33,16 @@ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2955"; - private static Endpoint port; - public static Test suite() throws Exception { return new JBossWSTestSetup(JBWS2955TestCase.class, "jaxws-jbws2955.war"); } - public void setUp() throws Exception - { - super.setUp(); - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - EndpointService service = new EndpointService(wsdlURL); - port = service.getEndpointPort(); - } - public void testCall() throws Exception { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + EndpointService service = new EndpointService(wsdlURL); + Endpoint port = service.getEndpointPort(); String response = port.echo("testJBWS2955"); assertEquals("PutByClientSOAPHandler", response); Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2956/JBWS2956TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2956/JBWS2956TestCase.java 2012-03-12 14:45:11 UTC (rev 15920) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2956/JBWS2956TestCase.java 2012-03-12 17:08:42 UTC (rev 15921) @@ -33,23 +33,16 @@ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2956"; - private static OnewayEndpoint port; - public static Test suite() throws Exception { return new JBossWSTestSetup(JBWS2956TestCase.class, "jaxws-jbws2956.war"); } - public void setUp() throws Exception - { - super.setUp(); - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - OnewayEndpointService service = new OnewayEndpointService(wsdlURL); - port = service.getOnewayEndpointPort(); - } - public void testCall() throws Exception { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + OnewayEndpointService service = new OnewayEndpointService(wsdlURL); + OnewayEndpoint port = service.getOnewayEndpointPort(); //there should be no exception threw port.echo("testJBWS2956"); } Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3034/JBWS3034TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3034/JBWS3034TestCase.java 2012-03-12 14:45:11 UTC (rev 15920) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3034/JBWS3034TestCase.java 2012-03-12 17:08:42 UTC (rev 15921) @@ -36,23 +36,16 @@ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws3034"; - private static Endpoint port; - public static Test suite() throws Exception { return new JBossWSTestSetup(JBWS3034TestCase.class, "jaxws-jbws3034.war"); } - public void setUp() throws Exception + public void testCall() throws Exception { - super.setUp(); URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); Service service = Service.create(wsdlURL, new QName("http://ws.jboss.org/jbws3034";, "EndpointService")); - port = service.getPort(new QName("http://ws.jboss.org/jbws3034";, "EndpointPort"), Endpoint.class); - } - - public void testCall() throws Exception - { + Endpoint port = service.getPort(new QName("http://ws.jboss.org/jbws3034";, "EndpointPort"), Endpoint.class); String response = port.echo("testJBWS3034"); assertEquals("PutByServerSOAPHandler", response); } Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3114/JBWS3114TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3114/JBWS3114TestCase.java 2012-03-12 14:45:11 UTC (rev 15920) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3114/JBWS3114TestCase.java 2012-03-12 17:08:42 UTC (rev 15921) @@ -38,23 +38,16 @@ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws3114"; - private static Endpoint port; - public static Test suite() throws Exception { return new JBossWSTestSetup(JBWS3114TestCase.class, "jaxws-jbws3114.war"); } - public void setUp() throws Exception + public void testConfigureTimeout() throws Exception { - super.setUp(); URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); EndpointService service = new EndpointService(wsdlURL); - port = service.getEndpointPort(); - } - - public void testConfigureTimeout() throws Exception - { + Endpoint port = service.getEndpointPort(); String response = port.echo("testjbws3114"); assertEquals("testjbws3114", response); ((BindingProvider) port).getRequestContext().put("javax.xml.ws.client.connectionTimeout", "6000"); Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java 2012-03-12 14:45:11 UTC (rev 15920) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java 2012-03-12 17:08:42 UTC (rev 15921) @@ -40,28 +40,19 @@ public class JBWS981TestCase extends JBossWSTest { - private static EndpointInterface port; - public static Test suite() { return new JBossWSTestSetup(JBWS981TestCase.class, "jaxws-jbws981.jar"); } - protected void setUp() throws Exception - { - super.setUp(); - if (port == null) - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws981/EndpointService/EJB3Bean?wsdl"); - QName serviceName = new QName("http://www.jboss.org/test/ws/jaxws/jbws981";, "EndpointService"); - Service.create(wsdlURL, serviceName); - Service service = Service.create(wsdlURL, serviceName); - port = (EndpointInterface)service.getPort(EndpointInterface.class); - } - } - public void testCall() throws Exception { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws981/EndpointService/EJB3Bean?wsdl"); + QName serviceName = new QName("http://www.jboss.org/test/ws/jaxws/jbws981";, "EndpointService"); + Service.create(wsdlURL, serviceName); + Service service = Service.create(wsdlURL, serviceName); + EndpointInterface port = (EndpointInterface)service.getPort(EndpointInterface.class); + String message = "Web service mapped to virtual host."; assertEquals("Web service mapped to virtual host.", port.hello(message)); } Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/addressing/AddressingStatefulTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/addressing/AddressingStatefulTestCase.java 2012-03-12 14:45:11 UTC (rev 15920) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/addressing/AddressingStatefulTestCase.java 2012-03-12 17:08:42 UTC (rev 15921) @@ -29,6 +29,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -46,7 +47,13 @@ public static Test suite() { - return new JBossWSTestSetup(AddressingStatefulTestCase.class, "jaxws-samples-wsaddressing.war"); + return new JBossWSTestSetup(AddressingStatefulTestCase.class, "jaxws-samples-wsaddressing.war", new CleanupOperation() { + @Override + public void cleanUp() { + port1 = null; + port2 = null; + } + }); } protected void setUp() throws Exception Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java 2012-03-12 14:45:11 UTC (rev 15920) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java 2012-03-12 17:08:42 UTC (rev 15921) @@ -23,6 +23,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -46,12 +47,23 @@ private QName wrappedServiceQName = new QName("http://swaref.samples.jaxws.ws.test.jboss.org/";, "WrappedEndpointService"); private QName rpcLitServiceQName = new QName("http://swaref.samples.jaxws.ws.test.jboss.org/";, "RpcLitEndpointService"); - private static DataHandler data = new DataHandler("Client data", "text/plain"); + private static DataHandler data; public static Test suite() { - return new JBossWSTestSetup(SWARefTestCase.class, "jaxws-samples-swaref.jar"); + return new JBossWSTestSetup(SWARefTestCase.class, "jaxws-samples-swaref.jar", new CleanupOperation() { + @Override + public void cleanUp() { + data = null; + } + }); } + + protected void setUp() throws Exception { + if (data == null) { + data = new DataHandler("Client data", "text/plain"); + } + } public void testBeanAnnotationWithBare() throws Exception { Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java 2012-03-12 14:45:11 UTC (rev 15920) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java 2012-03-12 17:08:42 UTC (rev 15921) @@ -21,7 +21,6 @@ */ package org.jboss.test.ws.jaxws.samples.webparam; -import java.io.File; import java.net.URL; import javax.xml.namespace.QName; @@ -30,6 +29,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -47,7 +47,12 @@ public static Test suite() { - return new JBossWSTestSetup(WebParamTestCase.class, "jaxws-samples-webparam.war"); + return new JBossWSTestSetup(WebParamTestCase.class, "jaxws-samples-webparam.war", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } public void setUp() throws Exception Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webresult/WebResultTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webresult/WebResultTestCase.java 2012-03-12 14:45:11 UTC (rev 15920) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webresult/WebResultTestCase.java 2012-03-12 17:08:42 UTC (rev 15921) @@ -22,7 +22,6 @@ package org.jboss.test.ws.jaxws.samples.webresult; import java.io.ByteArrayInputStream; -import java.io.File; import java.net.URL; import javax.xml.namespace.QName; @@ -35,6 +34,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -52,7 +52,12 @@ public static Test suite() { - return new JBossWSTestSetup(WebResultTestCase.class, "jaxws-samples-webresult.war"); + return new JBossWSTestSetup(WebResultTestCase.class, "jaxws-samples-webresult.war", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } public void setUp() throws Exception