[jbossws-commits] JBossWS SVN: r15923 - in stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws: benchmark/jaxws and 89 other directories.

Author: alessio.soldano(a)jboss.com Date: 2012-03-13 05:00:57 -0400 (Tue, 13 Mar 2012) New Revision: 15923 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkDocJSETestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/AddressingTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/JBWS1188TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316CallTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1386TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws163/JBWS163TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1792/JBWS1792TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws231/JBWS231TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws423/JBWS423TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws463/JBWS463TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws464/JBWS464TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareBoundTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareUnboundTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedBoundTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedUnboundTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws950/JBWS950TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws956/JBWS956TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitDIITestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/overloaded/OverloadedTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/StaticHandlerTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderClientTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderProxyTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcDIIConfiguredCallTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcProxyTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/oneway/OneWayTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/epr/NativeEndpointReferenceTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1850/JBWS1850TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/JBWS2234TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2259/JBWS2259TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2285/JBWS2285TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2319/JBWS2319TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2698/JBWS2698TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2706/JBWS2706TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2927/JBWS2927TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2949/JBWS2949TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2969/JBWS2969TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/JBWS3071TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3124/JBWS3124TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase.java Log: [JBWS-3455] Fixing native specific tests to clean up static member references to client proxies Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -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; @@ -43,7 +44,16 @@ public static Test suite() { - return new JBossWSTestSetup(BenchmarkDocEJBTestCase.class, "jaxrpc-benchmark-doclit.jar, jaxrpc-benchmark-doclit-appclient.ear#jaxrpc-benchmark-doclit-appclient.jar"); + return new JBossWSTestSetup(BenchmarkDocEJBTestCase.class, + "jaxrpc-benchmark-doclit.jar, jaxrpc-benchmark-doclit-appclient.ear#jaxrpc-benchmark-doclit-appclient.jar", + new CleanupOperation() + { + @Override + public void cleanUp() + { + endpoint = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -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; @@ -45,7 +46,12 @@ public static Test suite() { - return new JBossWSTestSetup(BenchmarkDocJSETestCase.class, "jaxrpc-benchmark-doclit.war, jaxrpc-benchmark-doclit-appclient.ear#jaxrpc-benchmark-doclit-appclient.jar"); + return new JBossWSTestSetup(BenchmarkDocJSETestCase.class, "jaxrpc-benchmark-doclit.war, jaxrpc-benchmark-doclit-appclient.ear#jaxrpc-benchmark-doclit-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + endpoint = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -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; @@ -43,7 +44,12 @@ public static Test suite() { - return new JBossWSTestSetup(BenchmarkRpcEJBTestCase.class, "jaxrpc-benchmark-rpclit.jar, jaxrpc-benchmark-rpclit-appclient.ear#jaxrpc-benchmark-rpclit-appclient.jar"); + return new JBossWSTestSetup(BenchmarkRpcEJBTestCase.class, "jaxrpc-benchmark-rpclit.jar, jaxrpc-benchmark-rpclit-appclient.ear#jaxrpc-benchmark-rpclit-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + endpoint = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -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; @@ -43,7 +44,12 @@ public static Test suite() { - return new JBossWSTestSetup(BenchmarkRpcJSETestCase.class, "jaxrpc-benchmark-rpclit.war, jaxrpc-benchmark-rpclit-appclient.ear#jaxrpc-benchmark-rpclit-appclient.jar"); + return new JBossWSTestSetup(BenchmarkRpcJSETestCase.class, "jaxrpc-benchmark-rpclit.war, jaxrpc-benchmark-rpclit-appclient.ear#jaxrpc-benchmark-rpclit-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + endpoint = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkDocJSETestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkDocJSETestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkDocJSETestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -25,6 +25,7 @@ import junit.framework.Test; import org.jboss.test.ws.benchmark.jaxws.doclit.*; +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(BenchmarkDocJSETestCase.class, "jaxws-benchmark-doclit.war"); + return new JBossWSTestSetup(BenchmarkDocJSETestCase.class, "jaxws-benchmark-doclit.war", new CleanupOperation() { + @Override + public void cleanUp() { + endpoint = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/AddressingTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/AddressingTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/AddressingTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -43,6 +43,7 @@ import org.jboss.ws.core.StubExt; import org.jboss.ws.extensions.addressing.AddressingClientUtil; import org.jboss.ws.common.DOMUtils; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; import org.w3c.dom.Element; @@ -79,7 +80,14 @@ public static Test suite() { - return new JBossWSTestSetup(AddressingTestCase.class, "jbossws-interop-nov2007-wsaSoap12.war, jbossws-interop-nov2007-wsaSoap12-client.jar"); + return new JBossWSTestSetup(AddressingTestCase.class, "jbossws-interop-nov2007-wsaSoap12.war, jbossws-interop-nov2007-wsaSoap12-client.jar", new CleanupOperation() { + @Override + public void cleanUp() { + echoPort = null; + notifyPort = null; + wsdlLocation = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -24,6 +24,7 @@ import junit.framework.Test; import org.jboss.ws.core.StubExt; import org.jboss.ws.extensions.addressing.AddressingClientUtil; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; import org.jboss.ws.common.DOMUtils; @@ -70,7 +71,14 @@ public static Test suite() { - return new JBossWSTestSetup(AddressingTestCase.class, "jbossws-interop-wsa10.war"); + return new JBossWSTestSetup(AddressingTestCase.class, "jbossws-interop-wsa10.war", new CleanupOperation() { + @Override + public void cleanUp() { + echoPort = null; + notifyPort = null; + wsdlLocation = null; + } + }); } protected void setUp() throws Exception @@ -78,7 +86,7 @@ if (echoPort==null || notifyPort==null) { - this.wsdlLocation = getResourceURL("interop/wsa/WEB-INF/wsdl/service.wsdl"); + wsdlLocation = getResourceURL("interop/wsa/WEB-INF/wsdl/service.wsdl"); Service service = Service.create(wsdlLocation, new QName("http://tempuri.org/";, "WSAddressingCR")); echoPort = service.getPort(EchoPortType.class); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -26,6 +26,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -42,7 +43,12 @@ public static Test suite() { - return new JBossWSTestSetup(AnonymousTypesTestCase.class, "jaxrpc-anonymous.war, jaxrpc-anonymous-appclient.ear#jaxrpc-anonymous-appclient.jar"); + return new JBossWSTestSetup(AnonymousTypesTestCase.class, "jaxrpc-anonymous.war, jaxrpc-anonymous-appclient.ear#jaxrpc-anonymous-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + endpoint = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -26,6 +26,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -42,7 +43,12 @@ public static Test suite() { - return new JBossWSTestSetup(MarshallTestCase.class, "jaxrpc-encoded-href.war, jaxrpc-encoded-href-appclient.ear#jaxrpc-encoded-href-appclient.jar"); + return new JBossWSTestSetup(MarshallTestCase.class, "jaxrpc-encoded-href.war, jaxrpc-encoded-href-appclient.ear#jaxrpc-encoded-href-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -32,6 +32,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(MarshallTestCase.class, "jaxrpc-encoded-marshalltest.war, jaxrpc-encoded-marshalltest-appclient.ear#jaxrpc-encoded-marshalltest-appclient.jar"); + return new JBossWSTestSetup(MarshallTestCase.class, "jaxrpc-encoded-marshalltest.war, jaxrpc-encoded-marshalltest-appclient.ear#jaxrpc-encoded-marshalltest-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -75,6 +75,7 @@ import org.jboss.test.ws.jaxrpc.encoded.parametermode.holders.EnumLongHolder; import org.jboss.test.ws.jaxrpc.encoded.parametermode.holders.EnumShortHolder; import org.jboss.test.ws.jaxrpc.encoded.parametermode.holders.EnumStringHolder; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -130,7 +131,17 @@ public static Test suite() { - return new JBossWSTestSetup(ParameterModeTestCase.class, "jaxrpc-encoded-parametermode.war, jaxrpc-encoded-parametermode-appclient.ear#jaxrpc-encoded-parametermode-appclient.jar"); + return new JBossWSTestSetup( + ParameterModeTestCase.class, + "jaxrpc-encoded-parametermode.war, jaxrpc-encoded-parametermode-appclient.ear#jaxrpc-encoded-parametermode-appclient.jar", + new CleanupOperation() + { + @Override + public void cleanUp() + { + port = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -26,6 +26,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -42,7 +43,12 @@ public static Test suite() { - return new JBossWSTestSetup(EnvEntryEJBTestCase.class, "jaxrpc-enventry.jar, jaxrpc-enventry-appclient.ear#jaxrpc-enventry-appclient.jar"); + return new JBossWSTestSetup(EnvEntryEJBTestCase.class, "jaxrpc-enventry.jar, jaxrpc-enventry-appclient.ear#jaxrpc-enventry-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -26,6 +26,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -42,7 +43,12 @@ public static Test suite() { - return new JBossWSTestSetup(EnvEntryJSETestCase.class, "jaxrpc-enventry.war, jaxrpc-enventry-appclient.ear#jaxrpc-enventry-appclient.jar"); + return new JBossWSTestSetup(EnvEntryJSETestCase.class, "jaxrpc-enventry.war, jaxrpc-enventry-appclient.ear#jaxrpc-enventry-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -26,6 +26,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -45,7 +46,12 @@ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS1010TestCase.class, "jaxrpc-jbws1010.war, jaxrpc-jbws1010-appclient.ear#jaxrpc-jbws1010-appclient.jar"); + return new JBossWSTestSetup(JBWS1010TestCase.class, "jaxrpc-jbws1010.war, jaxrpc-jbws1010-appclient.ear#jaxrpc-jbws1010-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } public void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -26,6 +26,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 @@ private static InitialContext iniCtx; public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS1011TestCase.class, "jaxrpc-jbws1011.jar, jaxrpc-jbws1011-appclient.ear#jaxrpc-jbws1011-appclient.jar"); + return new JBossWSTestSetup(JBWS1011TestCase.class, "jaxrpc-jbws1011.jar, jaxrpc-jbws1011-appclient.ear#jaxrpc-jbws1011-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } public void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -35,6 +35,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; import org.jboss.ws.common.DOMWriter; @@ -55,7 +56,12 @@ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS1093TestCase.class, "jaxrpc-jbws1093.war, jaxrpc-jbws1093-appclient.ear#jaxrpc-jbws1093-appclient.jar"); + return new JBossWSTestSetup(JBWS1093TestCase.class, "jaxrpc-jbws1093.war, jaxrpc-jbws1093-appclient.ear#jaxrpc-jbws1093-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } public void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -26,6 +26,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() throws Exception { - return new JBossWSTestSetup(JBWS1107TestCase.class, "jaxrpc-jbws1107.war, jaxrpc-jbws1107-appclient.ear#jaxrpc-jbws1107-appclient.jar"); + return new JBossWSTestSetup(JBWS1107TestCase.class, "jaxrpc-jbws1107.war, jaxrpc-jbws1107-appclient.ear#jaxrpc-jbws1107-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } public void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -26,6 +26,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -49,7 +50,12 @@ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS1121TestCase.class, "jaxrpc-jbws1121.ear, jaxrpc-jbws1121-appclient.ear#jaxrpc-jbws1121-appclient.jar"); + return new JBossWSTestSetup(JBWS1121TestCase.class, "jaxrpc-jbws1121.ear, jaxrpc-jbws1121-appclient.ear#jaxrpc-jbws1121-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } public void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -33,6 +33,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -51,7 +52,12 @@ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS1125TestCase.class, "jaxrpc-jbws1125.war, jaxrpc-jbws1125-appclient.ear#jaxrpc-jbws1125-appclient.jar"); + return new JBossWSTestSetup(JBWS1125TestCase.class, "jaxrpc-jbws1125.war, jaxrpc-jbws1125-appclient.ear#jaxrpc-jbws1125-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } public void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -26,6 +26,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -45,7 +46,12 @@ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS1148TestCase.class, "jaxrpc-jbws1148.war, jaxrpc-jbws1148-appclient.ear#jaxrpc-jbws1148-appclient.jar"); + return new JBossWSTestSetup(JBWS1148TestCase.class, "jaxrpc-jbws1148.war, jaxrpc-jbws1148-appclient.ear#jaxrpc-jbws1148-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } public void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -35,6 +35,7 @@ import junit.framework.Test; import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -53,7 +54,12 @@ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS1186TestCase.class, "jaxrpc-jbws1186.war"); + return new JBossWSTestSetup(JBWS1186TestCase.class, "jaxrpc-jbws1186.war", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } public void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/JBWS1188TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/JBWS1188TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/JBWS1188TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -22,11 +22,7 @@ package org.jboss.test.ws.jaxrpc.jbws1188; import java.io.ByteArrayInputStream; -import java.io.File; -import java.net.URL; -import javax.xml.namespace.QName; -import javax.xml.rpc.Service; import javax.xml.soap.MessageFactory; import javax.xml.soap.SOAPConnection; import javax.xml.soap.SOAPConnectionFactory; @@ -35,7 +31,6 @@ import junit.framework.Test; -import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -47,8 +42,6 @@ public class JBWS1188TestCase extends JBossWSTest { - private static TestEndpoint port; - public static Test suite() throws Exception { return new JBossWSTestSetup(JBWS1188TestCase.class, "jaxrpc-jbws1188.war"); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -26,6 +26,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(JBWS1190TestCase.class, ARCHIVE_NAME + ", jaxrpc-jbws1190-appclient.ear#jaxrpc-jbws1190-appclient.jar"); + return new JBossWSTestSetup(JBWS1190TestCase.class, ARCHIVE_NAME + ", jaxrpc-jbws1190-appclient.ear#jaxrpc-jbws1190-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -26,6 +26,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -45,7 +46,12 @@ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS1205TestCase.class, "jaxrpc-jbws1205-simple.war, jaxrpc-jbws1205-test.war, jaxrpc-jbws1205-appclient.ear#jaxrpc-jbws1205-appclient.jar"); + return new JBossWSTestSetup(JBWS1205TestCase.class, "jaxrpc-jbws1205-simple.war, jaxrpc-jbws1205-test.war, jaxrpc-jbws1205-appclient.ear#jaxrpc-jbws1205-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -26,6 +26,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(JBWS1303TestCase.class, "jaxrpc-jbws1303.war, jaxrpc-jbws1303-appclient.ear#jaxrpc-jbws1303-appclient.jar"); + return new JBossWSTestSetup(JBWS1303TestCase.class, "jaxrpc-jbws1303.war, jaxrpc-jbws1303-appclient.ear#jaxrpc-jbws1303-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316CallTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316CallTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316CallTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -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; @@ -48,7 +49,12 @@ public static Test suite() { - return new JBossWSTestSetup(JBWS1316CallTestCase.class, "jaxrpc-jbws1316.war, jaxrpc-jbws1316-appclient.ear#jaxrpc-jbws1316-appclient.jar"); + return new JBossWSTestSetup(JBWS1316CallTestCase.class, "jaxrpc-jbws1316.war, jaxrpc-jbws1316-appclient.ear#jaxrpc-jbws1316-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -21,7 +21,6 @@ */ package org.jboss.test.ws.jaxrpc.jbws1378; -import java.io.File; import java.net.URL; import javax.xml.namespace.QName; @@ -45,30 +44,21 @@ */ public class JBWS1378TestCase extends JBossWSTest { - private static ExamplePort port; - public static Test suite() { return new JBossWSTestSetup(JBWS1378TestCase.class, "jaxrpc-jbws1378.war"); } - protected void setUp() throws Exception - { - super.setUp(); - if (port == null) - { - ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance(); - URL wsdlURL = getResourceURL("jaxrpc/jbws1378/WEB-INF/wsdl/ExampleService.wsdl"); - URL mappingURL = getResourceURL("jaxrpc/jbws1378/WEB-INF/jaxrpc-mapping.xml"); - QName serviceName = new QName("http://www.example.com/Example";, "ExampleService"); - Service service = factory.createService(wsdlURL, serviceName , mappingURL); - port = (ExamplePort)service.getPort(ExamplePort.class); - ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-jbws1378"); - } - } - public void testEndpoint() throws Exception { + ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance(); + URL wsdlURL = getResourceURL("jaxrpc/jbws1378/WEB-INF/wsdl/ExampleService.wsdl"); + URL mappingURL = getResourceURL("jaxrpc/jbws1378/WEB-INF/jaxrpc-mapping.xml"); + QName serviceName = new QName("http://www.example.com/Example";, "ExampleService"); + Service service = factory.createService(wsdlURL, serviceName , mappingURL); + ExamplePort port = (ExamplePort)service.getPort(ExamplePort.class); + ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-jbws1378"); + String retStr = port.echo("Hello World"); assertEquals("Hello World", retStr); } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -21,7 +21,6 @@ */ package org.jboss.test.ws.jaxrpc.jbws1384; -import java.io.File; import java.net.URL; import javax.xml.namespace.QName; @@ -46,28 +45,11 @@ */ public class JBWS1384TestCase extends JBossWSTest { - private static TransmulatorInterface port; - public static Test suite() { return new JBossWSTestSetup(JBWS1384TestCase.class, "jaxrpc-jbws1384.war"); } - protected void setUp() throws Exception - { - super.setUp(); - if (port == null) - { - ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance(); - URL wsdlURL = getResourceURL("jaxrpc/jbws1384/WEB-INF/wsdl/ExampleService.wsdl"); - URL mappingURL = getResourceURL("jaxrpc/jbws1384/WEB-INF/jaxrpc-mapping.xml"); - QName serviceName = new QName("http://org.jboss.test.webservice/samples2", "Gasherbrum"); - Service service = factory.createService(wsdlURL, serviceName , mappingURL); - port = (TransmulatorInterface)service.getPort(TransmulatorInterface.class); - ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-jbws1384"); - } - } - public void testWsdlToJava() throws Exception { WSTools wstools = new WSTools(); @@ -78,6 +60,14 @@ public void testEndpoint() throws Exception { + ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance(); + URL wsdlURL = getResourceURL("jaxrpc/jbws1384/WEB-INF/wsdl/ExampleService.wsdl"); + URL mappingURL = getResourceURL("jaxrpc/jbws1384/WEB-INF/jaxrpc-mapping.xml"); + QName serviceName = new QName("http://org.jboss.test.webservice/samples2", "Gasherbrum"); + Service service = factory.createService(wsdlURL, serviceName , mappingURL); + TransmulatorInterface port = (TransmulatorInterface)service.getPort(TransmulatorInterface.class); + ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-jbws1384"); + /* StubExt stub = (StubExt)port; AttachmentPart part = stub.createAttachmentPart(); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1386TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1386TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1386TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -21,7 +21,6 @@ */ package org.jboss.test.ws.jaxrpc.jbws1386; -import java.io.File; import java.net.URL; import javax.xml.namespace.QName; @@ -45,30 +44,21 @@ */ public class JBWS1386TestCase extends JBossWSTest { - private static RequestService port; - public static Test suite() { return new JBossWSTestSetup(JBWS1386TestCase.class, "jaxrpc-jbws1386.war"); } - protected void setUp() throws Exception - { - super.setUp(); - if (port == null) - { - ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance(); - URL wsdlURL = getResourceURL("jaxrpc/jbws1386/WEB-INF/wsdl/TestService.wsdl"); - URL mappingURL = getResourceURL("jaxrpc/jbws1386/WEB-INF/jaxrpc-mapping.xml"); - QName serviceName = new QName("http://org.jboss.test.ws/jbws1386", "TestService"); - Service service = factory.createService(wsdlURL, serviceName , mappingURL); - port = (RequestService)service.getPort(RequestService.class); - ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-jbws1386"); - } - } - public final void testEndpointAccess() throws Exception { + ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance(); + URL wsdlURL = getResourceURL("jaxrpc/jbws1386/WEB-INF/wsdl/TestService.wsdl"); + URL mappingURL = getResourceURL("jaxrpc/jbws1386/WEB-INF/jaxrpc-mapping.xml"); + QName serviceName = new QName("http://org.jboss.test.ws/jbws1386", "TestService"); + Service service = factory.createService(wsdlURL, serviceName , mappingURL); + RequestService port = (RequestService)service.getPort(RequestService.class); + ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-jbws1386"); + Message inObj = new Message("Kermit", "base64".getBytes()); Message retObj = port.processClaim(inObj); assertEquals(inObj, retObj); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -21,7 +21,6 @@ */ package org.jboss.test.ws.jaxrpc.jbws1410; -import java.io.File; import java.net.URL; import javax.xml.namespace.QName; @@ -34,6 +33,7 @@ import org.jboss.ws.core.StubExt; import org.jboss.ws.core.WSTimeoutException; import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -51,7 +51,12 @@ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS1410TestCase.class, "jaxrpc-jbws1410.war"); + return new JBossWSTestSetup(JBWS1410TestCase.class, "jaxrpc-jbws1410.war", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } public void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -47,28 +47,11 @@ */ public class JBWS1427TestCase extends JBossWSTest { - private static RequestService port; - public static Test suite() { return new JBossWSTestSetup(JBWS1427TestCase.class, "jaxrpc-jbws1427.jar"); } - protected void setUp() throws Exception - { - super.setUp(); - if (port == null) - { - ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance(); - URL wsdlURL = getResourceURL("jaxrpc/jbws1427/META-INF/wsdl/ProcessClaim.wsdl"); - URL mappingURL = getResourceURL("jaxrpc/jbws1427/META-INF/jaxrpc-mapping.xml"); - QName serviceName = new QName("http://za.co.testws.interfaces", "ProcessClaim"); - Service service = factory.createService(wsdlURL, serviceName , mappingURL); - port = (RequestService)service.getPort(RequestService.class); - ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-jbws1427/RequestServiceEJB"); - } - } - public final void testWsdlParser() throws Exception { WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); @@ -78,6 +61,14 @@ public final void testEndpointAccess() throws Exception { + ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance(); + URL wsdlURL = getResourceURL("jaxrpc/jbws1427/META-INF/wsdl/ProcessClaim.wsdl"); + URL mappingURL = getResourceURL("jaxrpc/jbws1427/META-INF/jaxrpc-mapping.xml"); + QName serviceName = new QName("http://za.co.testws.interfaces", "ProcessClaim"); + Service service = factory.createService(wsdlURL, serviceName , mappingURL); + RequestService port = (RequestService)service.getPort(RequestService.class); + ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-jbws1427/RequestServiceEJB"); + Message inObj = new Message("Kermit", new Integer(100)); Message retObj = port.processClaim(inObj); assertEquals(inObj, retObj); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -26,6 +26,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -45,7 +46,12 @@ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS1619TestCase.class, "jaxrpc-jbws1619.war, jaxrpc-jbws1619-appclient.ear#jaxrpc-jbws1619-appclient.jar"); + return new JBossWSTestSetup(JBWS1619TestCase.class, "jaxrpc-jbws1619.war, jaxrpc-jbws1619-appclient.ear#jaxrpc-jbws1619-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } public void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws163/JBWS163TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws163/JBWS163TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws163/JBWS163TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -32,6 +32,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -50,7 +51,12 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS163TestCase.class, "jaxrpc-jbws163.war, jaxrpc-jbws163-appclient.ear#jaxrpc-jbws163-appclient.jar"); + return new JBossWSTestSetup(JBWS163TestCase.class, "jaxrpc-jbws163.war, jaxrpc-jbws163-appclient.ear#jaxrpc-jbws163-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + hello = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1792/JBWS1792TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1792/JBWS1792TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1792/JBWS1792TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -26,6 +26,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() throws Exception { - return new JBossWSTestSetup(JBWS1792TestCase.class, "jaxrpc-jbws1792.war, jaxrpc-jbws1792-appclient.ear#jaxrpc-jbws1792-appclient.jar"); + return new JBossWSTestSetup(JBWS1792TestCase.class, "jaxrpc-jbws1792.war, jaxrpc-jbws1792-appclient.ear#jaxrpc-jbws1792-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } public void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -26,6 +26,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -43,7 +44,12 @@ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS2234TestCase.class, "jaxrpc-jbws2234.war, jaxrpc-jbws2234-appclient.ear#jaxrpc-jbws2234-appclient.jar"); + return new JBossWSTestSetup(JBWS2234TestCase.class, "jaxrpc-jbws2234.war, jaxrpc-jbws2234-appclient.ear#jaxrpc-jbws2234-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } public void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws231/JBWS231TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws231/JBWS231TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws231/JBWS231TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -26,6 +26,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() throws Exception { - return new JBossWSTestSetup(JBWS231TestCase.class, "jaxrpc-jbws231.war, jaxrpc-jbws231-appclient.ear#jaxrpc-jbws231-appclient.jar"); + return new JBossWSTestSetup(JBWS231TestCase.class, "jaxrpc-jbws231.war, jaxrpc-jbws231-appclient.ear#jaxrpc-jbws231-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } public void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -26,6 +26,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 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS251TestCase.class, "jaxrpc-jbws251.war, jaxrpc-jbws251-appclient.ear#jaxrpc-jbws251-appclient.jar"); + return new JBossWSTestSetup(JBWS251TestCase.class, "jaxrpc-jbws251.war, jaxrpc-jbws251-appclient.ear#jaxrpc-jbws251-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + hello = null; + } + }); } public void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -26,6 +26,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 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS316TestCase.class, "jaxrpc-jbws316.war, jaxrpc-jbws316-appclient.ear#jaxrpc-jbws316-appclient.jar"); + return new JBossWSTestSetup(JBWS316TestCase.class, "jaxrpc-jbws316.war, jaxrpc-jbws316-appclient.ear#jaxrpc-jbws316-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + endpoint = null; + } + }); } public void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -26,6 +26,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() throws Exception { - return new JBossWSTestSetup(JBWS349TestCase.class, "jaxrpc-jbws349.war, jaxrpc-jbws349-appclient.ear#jaxrpc-jbws349-appclient.jar"); + return new JBossWSTestSetup(JBWS349TestCase.class, "jaxrpc-jbws349.war, jaxrpc-jbws349-appclient.ear#jaxrpc-jbws349-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + endpoint = null; + } + }); } public void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws423/JBWS423TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws423/JBWS423TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws423/JBWS423TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -26,6 +26,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 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS423TestCase.class, "jaxrpc-jbws423.war, jaxrpc-jbws423-appclient.ear#jaxrpc-jbws423-appclient.jar"); + return new JBossWSTestSetup(JBWS423TestCase.class, "jaxrpc-jbws423.war, jaxrpc-jbws423-appclient.ear#jaxrpc-jbws423-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -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; @@ -59,7 +60,12 @@ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS425TestCase.class, "jaxrpc-jbws425.war, jaxrpc-jbws425-appclient.ear#jaxrpc-jbws425-appclient.jar"); + return new JBossWSTestSetup(JBWS425TestCase.class, "jaxrpc-jbws425.war, jaxrpc-jbws425-appclient.ear#jaxrpc-jbws425-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + endpoint = null; + } + }); } public void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -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; import org.jboss.ws.common.DOMUtils; @@ -49,7 +50,12 @@ public static Test suite() { - return new JBossWSTestSetup(JBWS434TestCase.class, "jaxrpc-jbws434.war, jaxrpc-jbws434-appclient.ear#jaxrpc-jbws434-appclient.jar"); + return new JBossWSTestSetup(JBWS434TestCase.class, "jaxrpc-jbws434.war, jaxrpc-jbws434-appclient.ear#jaxrpc-jbws434-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws463/JBWS463TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws463/JBWS463TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws463/JBWS463TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -26,6 +26,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() throws Exception { - return new JBossWSTestSetup(JBWS463TestCase.class, "jaxrpc-jbws463.war, jaxrpc-jbws463-appclient.ear#jaxrpc-jbws463-appclient.jar"); + return new JBossWSTestSetup(JBWS463TestCase.class, "jaxrpc-jbws463.war, jaxrpc-jbws463-appclient.ear#jaxrpc-jbws463-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws464/JBWS464TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws464/JBWS464TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws464/JBWS464TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -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; @@ -48,7 +49,12 @@ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS464TestCase.class, "jaxrpc-jbws464.war, jaxrpc-jbws464-appclient.ear#jaxrpc-jbws464-appclient.jar"); + return new JBossWSTestSetup(JBWS464TestCase.class, "jaxrpc-jbws464.war, jaxrpc-jbws464-appclient.ear#jaxrpc-jbws464-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + hello = null; + } + }); } public void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -26,6 +26,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() throws Exception { - return new JBossWSTestSetup(JBWS484TestCase.class, "jaxrpc-jbws484.war, jaxrpc-jbws484-appclient.ear#jaxrpc-jbws484-appclient.jar"); + return new JBossWSTestSetup(JBWS484TestCase.class, "jaxrpc-jbws484.war, jaxrpc-jbws484-appclient.ear#jaxrpc-jbws484-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + endpoint = null; + } + }); } public void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -26,6 +26,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -45,7 +46,12 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS626TestCase.class, "jaxrpc-jbws626.ear, jaxrpc-jbws626-appclient.ear#jaxrpc-jbws626-appclient.jar"); + return new JBossWSTestSetup(JBWS626TestCase.class, "jaxrpc-jbws626.ear, jaxrpc-jbws626-appclient.ear#jaxrpc-jbws626-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -26,6 +26,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 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS632TestCase.class, "jaxrpc-jbws632.war, jaxrpc-jbws632-appclient.ear#jaxrpc-jbws632-appclient.jar"); + return new JBossWSTestSetup(JBWS632TestCase.class, "jaxrpc-jbws632.war, jaxrpc-jbws632-appclient.ear#jaxrpc-jbws632-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -25,6 +25,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 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS637TestCase.class, "jaxrpc-jbws637-appclient.ear#jaxrpc-jbws637-appclient.jar"); + return new JBossWSTestSetup(JBWS637TestCase.class, "jaxrpc-jbws637-appclient.ear#jaxrpc-jbws637-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -26,6 +26,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 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS643TestCase.class, "jaxrpc-jbws643.war, jaxrpc-jbws643-appclient.ear#jaxrpc-jbws643-appclient.jar"); + return new JBossWSTestSetup(JBWS643TestCase.class, "jaxrpc-jbws643.war, jaxrpc-jbws643-appclient.ear#jaxrpc-jbws643-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareBoundTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareBoundTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareBoundTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -28,6 +28,7 @@ import org.jboss.test.ws.jaxrpc.jbws663.holders.ResponseInfoHolder; import org.jboss.test.ws.jaxrpc.jbws663.holders.SubscriptionInfoHolder; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -47,7 +48,12 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS663BareBoundTestCase.class, "jaxrpc-jbws663bb.war, jaxrpc-jbws663bb-appclient.ear#jaxrpc-jbws663bb-appclient.jar"); + return new JBossWSTestSetup(JBWS663BareBoundTestCase.class, "jaxrpc-jbws663bb.war, jaxrpc-jbws663bb-appclient.ear#jaxrpc-jbws663bb-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareUnboundTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareUnboundTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareUnboundTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -26,6 +26,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 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS663BareUnboundTestCase.class, "jaxrpc-jbws663b.war, jaxrpc-jbws663b-appclient.ear#jaxrpc-jbws663b-appclient.jar"); + return new JBossWSTestSetup(JBWS663BareUnboundTestCase.class, "jaxrpc-jbws663b.war, jaxrpc-jbws663b-appclient.ear#jaxrpc-jbws663b-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedBoundTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedBoundTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedBoundTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -28,6 +28,7 @@ import org.jboss.test.ws.jaxrpc.jbws663.holders.ResponseInfoHolder; import org.jboss.test.ws.jaxrpc.jbws663.holders.SubscriptionInfoHolder; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -47,7 +48,12 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS663WrappedBoundTestCase.class, "jaxrpc-jbws663wb.war, jaxrpc-jbws663wb-appclient.ear#jaxrpc-jbws663wb-appclient.jar"); + return new JBossWSTestSetup(JBWS663WrappedBoundTestCase.class, "jaxrpc-jbws663wb.war, jaxrpc-jbws663wb-appclient.ear#jaxrpc-jbws663wb-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedUnboundTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedUnboundTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedUnboundTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -26,6 +26,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 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS663WrappedUnboundTestCase.class, "jaxrpc-jbws663w.war, jaxrpc-jbws663w-appclient.ear#jaxrpc-jbws663w-appclient.jar"); + return new JBossWSTestSetup(JBWS663WrappedUnboundTestCase.class, "jaxrpc-jbws663w.war, jaxrpc-jbws663w-appclient.ear#jaxrpc-jbws663w-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -27,6 +27,7 @@ import junit.framework.Test; import junit.framework.TestSuite; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -58,7 +59,12 @@ suite.addTest(new JBWS70TestCase("testSetVersion")); suite.addTest(new JBWS70TestCase("testGetVersion")); - return new JBossWSTestSetup(suite, "jaxrpc-jbws70.war, jaxrpc-jbws70-appclient.ear#jaxrpc-jbws70-appclient.jar"); + return new JBossWSTestSetup(suite, "jaxrpc-jbws70.war, jaxrpc-jbws70-appclient.ear#jaxrpc-jbws70-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + hello = null; + } + }); } public void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -35,6 +35,7 @@ import junit.framework.Test; import org.jboss.ws.core.soap.SOAPBodyImpl; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; import org.w3c.dom.Node; @@ -59,7 +60,12 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS707TestCase.class, "jaxrpc-jbws707.war, jaxrpc-jbws707-appclient.ear#jaxrpc-jbws707-appclient.jar"); + return new JBossWSTestSetup(JBWS707TestCase.class, "jaxrpc-jbws707.war, jaxrpc-jbws707-appclient.ear#jaxrpc-jbws707-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } public void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -26,6 +26,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -45,7 +46,12 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS710TestCase.class, "jaxrpc-jbws710.war, jaxrpc-jbws710-appclient.ear#jaxrpc-jbws710-appclient.jar"); + return new JBossWSTestSetup(JBWS710TestCase.class, "jaxrpc-jbws710.war, jaxrpc-jbws710-appclient.ear#jaxrpc-jbws710-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -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; @@ -47,7 +48,12 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS720TestCase.class, "jaxrpc-jbws720.war, jaxrpc-jbws720-appclient.ear#jaxrpc-jbws720-appclient.jar"); + return new JBossWSTestSetup(JBWS720TestCase.class, "jaxrpc-jbws720.war, jaxrpc-jbws720-appclient.ear#jaxrpc-jbws720-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } public void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -26,6 +26,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(JBWS732TestCase.class, "jaxrpc-jbws732.war, jaxrpc-jbws732-appclient.ear#jaxrpc-jbws732-appclient.jar"); + return new JBossWSTestSetup(JBWS732TestCase.class, "jaxrpc-jbws732.war, jaxrpc-jbws732-appclient.ear#jaxrpc-jbws732-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + wrapped = null; + bare = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -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; @@ -46,7 +47,12 @@ public static Test suite() { - return new JBossWSTestSetup(JBWS807TestCase.class, "jaxrpc-jbws807.war, jaxrpc-jbws807-appclient.ear#jaxrpc-jbws807-appclient.jar"); + return new JBossWSTestSetup(JBWS807TestCase.class, "jaxrpc-jbws807.war, jaxrpc-jbws807-appclient.ear#jaxrpc-jbws807-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws950/JBWS950TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws950/JBWS950TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws950/JBWS950TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -31,6 +31,7 @@ import junit.framework.Test; import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +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(JBWS950TestCase.class, "jaxrpc-jbws950.war"); + return new JBossWSTestSetup(JBWS950TestCase.class, "jaxrpc-jbws950.war", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws956/JBWS956TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws956/JBWS956TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws956/JBWS956TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -31,6 +31,7 @@ import junit.framework.Test; import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +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(JBWS956TestCase.class, "jaxrpc-jbws956.war"); + return new JBossWSTestSetup(JBWS956TestCase.class, "jaxrpc-jbws956.war", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -31,6 +31,7 @@ import junit.framework.Test; import org.jboss.test.ws.jaxrpc.marshall.types.JavaBean; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -48,7 +49,12 @@ /** Deploy the test ear */ public static Test suite() throws Exception { - return new JBossWSTestSetup(MarshallDocLitTestCase.class, "jaxrpc-marshall-doclit.war, jaxrpc-marshall-doclit-appclient.ear#jaxrpc-marshall-doclit-appclient.jar"); + return new JBossWSTestSetup(MarshallDocLitTestCase.class, "jaxrpc-marshall-doclit.war, jaxrpc-marshall-doclit-appclient.ear#jaxrpc-marshall-doclit-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitDIITestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitDIITestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitDIITestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -62,6 +62,11 @@ ServiceFactoryImpl factory = new ServiceFactoryImpl(); service = factory.createService(new QName(TARGET_NAMESPACE, SERVICE_NAME)); } + protected void tearDown() throws Exception + { + service = null; + super.tearDown(); + } }; } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -32,6 +32,7 @@ import junit.framework.Test; import org.jboss.test.ws.jaxrpc.marshall.types.JavaBean; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -49,7 +50,12 @@ /** Deploy the test ear */ public static Test suite() throws Exception { - return new JBossWSTestSetup(MarshallRpcLitTestCase.class, "jaxrpc-marshall-rpclit.war, jaxrpc-marshall-rpclit-appclient.ear#jaxrpc-marshall-rpclit-appclient.jar"); + return new JBossWSTestSetup(MarshallRpcLitTestCase.class, "jaxrpc-marshall-rpclit.war, jaxrpc-marshall-rpclit-appclient.ear#jaxrpc-marshall-rpclit-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/overloaded/OverloadedTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/overloaded/OverloadedTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/overloaded/OverloadedTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -26,6 +26,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -41,7 +42,12 @@ public static Test suite() { - return new JBossWSTestSetup(OverloadedTestCase.class, "jaxrpc-overloaded.war, jaxrpc-overloaded-appclient.ear#jaxrpc-overloaded-appclient.jar"); + return new JBossWSTestSetup(OverloadedTestCase.class, "jaxrpc-overloaded.war, jaxrpc-overloaded-appclient.ear#jaxrpc-overloaded-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + endpoint = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -23,7 +23,6 @@ import java.net.URL; -import javax.naming.InitialContext; import javax.xml.namespace.QName; import javax.xml.rpc.Service; import javax.xml.rpc.ServiceFactory; @@ -43,23 +42,12 @@ { private static final String TARGET_NAMESPACE = "http://org.jboss.ws/samples/docstyle/bare"; private static final String TARGET_ENDPOINT_URL = "http://" + getServerHost() + ":8080/jaxrpc-samples-docstyle-bare"; - private static TrivialService port; public static Test suite() { return new JBossWSTestSetup(TrivialServiceDocBareTestCase.class, "jaxrpc-samples-docstyle-bare.war, jaxrpc-samples-docstyle-bare-client.jar"); } - protected void setUp() throws Exception - { - super.setUp(); - - if (port == null) - { - port = getService(TrivialService.class, "SampleService", "TrivialServicePort"); - } - } - protected <T> T getService(final Class<T> clazz, final String serviceName, final String portName) throws Exception { ServiceFactory serviceFactory = ServiceFactory.newInstance(); Service service = serviceFactory.createService(new URL(TARGET_ENDPOINT_URL + "?wsdl"), new QName(TARGET_NAMESPACE, serviceName)); @@ -68,6 +56,7 @@ public void testProducPurchase() throws Exception { + TrivialService port = getService(TrivialService.class, "SampleService", "TrivialServicePort"); String person = "Kermit"; String product = "Ferrari"; TrivialOrder req = new TrivialOrder(person, product); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -23,7 +23,6 @@ import java.net.URL; -import javax.naming.InitialContext; import javax.xml.namespace.QName; import javax.xml.rpc.Service; import javax.xml.rpc.ServiceFactory; @@ -43,23 +42,12 @@ { private static final String TARGET_NAMESPACE = "http://org.jboss.ws/samples/docstyle/wrapped"; private static final String TARGET_ENDPOINT_URL = "http://" + getServerHost() + ":8080/jaxrpc-samples-docstyle-wrapped"; - private static TrivialService port; public static Test suite() { return new JBossWSTestSetup(TrivialServiceDocWrappedTestCase.class, "jaxrpc-samples-docstyle-wrapped.war, jaxrpc-samples-docstyle-wrapped-client.jar"); } - protected void setUp() throws Exception - { - super.setUp(); - - if (port == null) - { - port = getService(TrivialService.class, "SampleService", "TrivialServicePort"); - } - } - protected <T> T getService(final Class<T> clazz, final String serviceName, final String portName) throws Exception { ServiceFactory serviceFactory = ServiceFactory.newInstance(); Service service = serviceFactory.createService(new URL(TARGET_ENDPOINT_URL + "?wsdl"), new QName(TARGET_NAMESPACE, serviceName)); @@ -68,6 +56,7 @@ public void testProducTrivial() throws Exception { + TrivialService port = getService(TrivialService.class, "SampleService", "TrivialServicePort"); String person = "Kermit"; String product = "Ferrari"; String status = port.purchase(person, product); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -32,6 +32,7 @@ import junit.framework.Test; import org.jboss.ws.core.jaxrpc.client.ServiceExt; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -52,7 +53,13 @@ public static Test suite() { - return new JBossWSTestSetup(DynamicHandlerTestCase.class, "jaxrpc-samples-dynamichandler.war, jaxrpc-samples-dynamichandler-appclient.ear#jaxrpc-samples-dynamichandler-appclient.jar"); + return new JBossWSTestSetup(DynamicHandlerTestCase.class, "jaxrpc-samples-dynamichandler.war, jaxrpc-samples-dynamichandler-appclient.ear#jaxrpc-samples-dynamichandler-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + endpoint = null; + service = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/StaticHandlerTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/StaticHandlerTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/StaticHandlerTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -26,6 +26,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(StaticHandlerTestCase.class, "jaxrpc-samples-dynamichandler.war, jaxrpc-samples-dynamichandler-appclient.ear#jaxrpc-samples-dynamichandler-appclient.jar"); + return new JBossWSTestSetup(StaticHandlerTestCase.class, "jaxrpc-samples-dynamichandler.war, jaxrpc-samples-dynamichandler-appclient.ear#jaxrpc-samples-dynamichandler-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + endpoint = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderClientTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderClientTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderClientTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -23,7 +23,6 @@ import java.net.URL; -import javax.naming.InitialContext; import javax.xml.namespace.QName; import javax.xml.rpc.ParameterMode; import javax.xml.rpc.Service; @@ -32,9 +31,9 @@ import junit.framework.Test; -import org.jboss.test.ws.jaxrpc.samples.handler.HeaderTestService; import org.jboss.ws.common.Constants; import org.jboss.ws.core.StubExt; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -53,7 +52,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: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderProxyTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderProxyTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderProxyTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -33,6 +33,7 @@ import org.jboss.ws.core.StubExt; import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; import org.jboss.ws.core.jaxrpc.client.ServiceImpl; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -51,7 +52,12 @@ public static Test suite() { - return new JBossWSTestSetup(HeaderProxyTestCase.class, "jaxrpc-samples-handler.war"); + return new JBossWSTestSetup(HeaderProxyTestCase.class, "jaxrpc-samples-handler.war", new CleanupOperation() { + @Override + public void cleanUp() { + endpoint = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -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: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -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: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -33,6 +33,7 @@ import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; import org.jboss.ws.core.jaxrpc.client.ServiceImpl; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -51,7 +52,12 @@ public static Test suite() { - return new JBossWSTestSetup(RpcDIIConfiguredCallTestCase.class, "jaxrpc-samples-jsr109ejb-rpc.jar"); + return new JBossWSTestSetup(RpcDIIConfiguredCallTestCase.class, "jaxrpc-samples-jsr109ejb-rpc.jar", new CleanupOperation() { + @Override + public void cleanUp() { + call = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -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: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -29,6 +29,7 @@ import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; import org.jboss.ws.core.jaxrpc.client.ServiceImpl; +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(RpcProxyTestCase.class, "jaxrpc-samples-jsr109ejb-rpc.jar"); + return new JBossWSTestSetup(RpcProxyTestCase.class, "jaxrpc-samples-jsr109ejb-rpc.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -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: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcDIIConfiguredCallTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcDIIConfiguredCallTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcDIIConfiguredCallTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -32,6 +32,7 @@ import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; import org.jboss.ws.core.jaxrpc.client.ServiceImpl; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -50,7 +51,12 @@ public static Test suite() { - return new JBossWSTestSetup(RpcDIIConfiguredCallTestCase.class, "jaxrpc-samples-jsr109pojo-rpc.war"); + return new JBossWSTestSetup(RpcDIIConfiguredCallTestCase.class, "jaxrpc-samples-jsr109pojo-rpc.war", new CleanupOperation() { + @Override + public void cleanUp() { + call = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -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: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcProxyTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcProxyTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcProxyTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -29,6 +29,7 @@ import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; import org.jboss.ws.core.jaxrpc.client.ServiceImpl; +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(RpcProxyTestCase.class, "jaxrpc-samples-jsr109pojo-rpc.war"); + return new JBossWSTestSetup(RpcProxyTestCase.class, "jaxrpc-samples-jsr109pojo-rpc.war", new CleanupOperation() { + @Override + public void cleanUp() { + endpoint = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -27,7 +27,6 @@ import java.net.URL; import javax.activation.DataHandler; -import javax.naming.InitialContext; import javax.xml.namespace.QName; import javax.xml.rpc.Service; import javax.xml.rpc.ServiceFactory; @@ -36,6 +35,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 +56,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: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/oneway/OneWayTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/oneway/OneWayTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/oneway/OneWayTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -23,13 +23,13 @@ import java.net.URL; -import javax.naming.InitialContext; import javax.xml.namespace.QName; import javax.xml.rpc.Service; import javax.xml.rpc.ServiceFactory; import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -48,7 +48,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: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -23,13 +23,13 @@ import java.net.URL; -import javax.naming.InitialContext; import javax.xml.namespace.QName; import javax.xml.rpc.Service; import javax.xml.rpc.ServiceFactory; import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -48,7 +48,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: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -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; @@ -55,7 +56,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: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -33,6 +33,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 +53,13 @@ { return new JBossWSTestSetup(AddressingReplyToTestCase.class, "jaxrpc-samples-wsaddr-hello.war, jaxrpc-samples-wsaddr-replyto.war," + - "jaxrpc-samples-wsaddr-hello-appclient.ear#jaxrpc-samples-wsaddr-hello-appclient.jar"); + "jaxrpc-samples-wsaddr-hello-appclient.ear#jaxrpc-samples-wsaddr-hello-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + initial = null; + replyto = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -40,14 +40,12 @@ */ public class StorePassEncryptTestCase extends JBossWSTest { - private static Hello port; - public static Test suite() throws Exception { return new JBossWSTestSetup(StorePassEncryptTestCase.class, "jaxrpc-samples-store-pass-encrypt.war"); } - public void setUp() throws Exception + public void testEndpoint() throws Exception { ServiceFactoryImpl factory = new ServiceFactoryImpl(); URL wsdlURL = getResourceURL("jaxrpc/samples/wssecurity/WEB-INF/wsdl/HelloService.wsdl"); @@ -55,13 +53,10 @@ URL securityURL = getResourceURL("jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF/jboss-wsse-client.xml"); QName qname = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService"); ServiceImpl service = (ServiceImpl)factory.createService(wsdlURL, qname, mappingURL, securityURL); - port = (Hello)service.getPort(Hello.class); + Hello port = (Hello)service.getPort(Hello.class); ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-store-pass-encrypt"); ((StubExt)port).setConfigName("Standard WSSecurity Client"); - } - - public void testEndpoint() throws Exception - { + UserType in0 = new UserType("Kermit"); UserType retObj = port.echoUserType(in0); assertEquals(in0, retObj); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -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; @@ -50,7 +51,12 @@ public static Test suite() { - return new JBossWSTestSetup(UsernameTestCase.class, "jaxrpc-wsse-username.jar, jaxrpc-wsse-username-appclient.ear#jaxrpc-wsse-username-appclient.jar", true); + return new JBossWSTestSetup(UsernameTestCase.class, "jaxrpc-wsse-username.jar, jaxrpc-wsse-username-appclient.ear#jaxrpc-wsse-username-appclient.jar", true, new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -27,6 +27,7 @@ import junit.framework.Test; import org.jboss.ws.core.StubExt; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -44,7 +45,12 @@ public static Test suite() { - return new JBossWSTestSetup(XOPHandlerTestCase.class, "jaxrpc-xop-doclit_handler.war, jaxrpc-xop-doclit_handler-appclient.ear#jaxrpc-xop-doclit_handler-appclient.jar"); + return new JBossWSTestSetup(XOPHandlerTestCase.class, "jaxrpc-xop-doclit_handler.war, jaxrpc-xop-doclit_handler-appclient.ear#jaxrpc-xop-doclit_handler-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -27,6 +27,7 @@ import junit.framework.Test; import org.jboss.ws.core.StubExt; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -42,7 +43,12 @@ public static Test suite() { - return new JBossWSTestSetup(XOPTestCase.class, "jaxrpc-xop-doclit.war, jaxrpc-xop-doclit-appclient.ear#jaxrpc-xop-doclit-appclient.jar"); + return new JBossWSTestSetup(XOPTestCase.class, "jaxrpc-xop-doclit.war, jaxrpc-xop-doclit-appclient.ear#jaxrpc-xop-doclit-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -27,6 +27,7 @@ import junit.framework.Test; import org.jboss.ws.core.StubExt; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -40,7 +41,12 @@ public static Test suite() { - return new JBossWSTestSetup(XOPHandlerTestCase.class, "jaxrpc-xop-rpclit_handler.war, jaxrpc-xop-rpclit_handler-appclient.ear#jaxrpc-xop-rpclit_handler-appclient.jar"); + return new JBossWSTestSetup(XOPHandlerTestCase.class, "jaxrpc-xop-rpclit_handler.war, jaxrpc-xop-rpclit_handler-appclient.ear#jaxrpc-xop-rpclit_handler-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -27,6 +27,7 @@ import junit.framework.Test; import org.jboss.ws.core.StubExt; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -41,7 +42,12 @@ public static Test suite() { - return new JBossWSTestSetup(XOPTestCase.class, "jaxrpc-xop-rpclit.war, jaxrpc-xop-rpclit-appclient.ear#jaxrpc-xop-rpclit-appclient.jar"); + return new JBossWSTestSetup(XOPTestCase.class, "jaxrpc-xop-rpclit.war, jaxrpc-xop-rpclit-appclient.ear#jaxrpc-xop-rpclit-appclient.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/epr/NativeEndpointReferenceTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/epr/NativeEndpointReferenceTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/epr/NativeEndpointReferenceTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -51,22 +51,21 @@ private static final QName WSAM_SERVICE_QNAME = new QName(WSAM_NS, "ServiceName"); private static final QName WSAM_INTERFACE_QNAME = new QName(WSAM_NS, "InterfaceName"); private static final QName METADATA_QNAME = new QName(WSA_NS, "Metadata"); - private static final String XML = - "<EndpointReference xmlns='http://www.w3.org/2005/08/addressing'> " + - " <Address>http://localhost:8080/hello</Address>" + - " <ReferenceParameters>" + - " <ns1:param1 wsa:IsReferenceParameter='true' xmlns:ns1='http://helloservice.org/param1' xmlns:wsa='http://www.w3.org/2005/08/addressing'>Hello</ns1... + - " <ns2:param2 wsa:IsReferenceParameter='true' xmlns:ns2='http://helloservice.org/param2' xmlns:wsa='http://www.w3.org/2005/08/addressing'>World</ns2... + - " </ReferenceParameters>" + - " <Metadata wsdli:wsdlLocation='http://helloservice.org/wsdl http://localhost:8080/hello?wsdl' xmlns:wsdli='http://www.w3.org/ns/wsdl-instance'>" + - " <wsam:ServiceName EndpointName='HelloPort' xmlns:myns='http://helloservice.org/wsdl' xmlns:wsam='http://www.w3.org/2007/05/addressing/metadata'>myn... + - " <wsam:InterfaceName xmlns:myns='http://helloservice.org/wsdl' xmlns:wsam='http://www.w3.org/2007/05/addressing/metadata'>myn... + - " </Metadata>" + - "</EndpointReference>"; public void testNativeEndpointReferenceFromSource() throws Exception { - System.out.println(DOMUtils.node2String(DOMUtils.parse(XML))); + String XML = + "<EndpointReference xmlns='http://www.w3.org/2005/08/addressing'> " + + " <Address>http://localhost:8080/hello</Address>" + + " <ReferenceParameters>" + + " <ns1:param1 wsa:IsReferenceParameter='true' xmlns:ns1='http://helloservice.org/param1' xmlns:wsa='http://www.w3.org/2005/08/addressing'>Hello</ns1... + + " <ns2:param2 wsa:IsReferenceParameter='true' xmlns:ns2='http://helloservice.org/param2' xmlns:wsa='http://www.w3.org/2005/08/addressing'>World</ns2... + + " </ReferenceParameters>" + + " <Metadata wsdli:wsdlLocation='http://helloservice.org/wsdl http://localhost:8080/hello?wsdl' xmlns:wsdli='http://www.w3.org/ns/wsdl-instance'>" + + " <wsam:ServiceName EndpointName='HelloPort' xmlns:myns='http://helloservice.org/wsdl' xmlns:wsam='http://www.w3.org/2007/05/addressing/metadata'>myn... + + " <wsam:InterfaceName xmlns:myns='http://helloservice.org/wsdl' xmlns:wsam='http://www.w3.org/2007/05/addressing/metadata'>myn... + + " </Metadata>" + + "</EndpointReference>"; final Source xml = new DOMSource(DOMUtils.parse(XML)); NativeEndpointReference epr = new NativeEndpointReference(xml); DOMResult dr = new DOMResult(); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -34,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; @@ -50,7 +51,13 @@ public static Test suite() { - return new JBossWSTestSetup(HandlerLifecycleTestCase.class, "jaxws-handlerlifecycle.war, jaxws-handlerlifecycle-client.jar"); + return new JBossWSTestSetup(HandlerLifecycleTestCase.class, "jaxws-handlerlifecycle.war, jaxws-handlerlifecycle-client.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + trackerPort = null; + } + }); } public void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1850/JBWS1850TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1850/JBWS1850TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1850/JBWS1850TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -49,23 +49,11 @@ { public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1850"; - private static TestService port; - public static Test suite() { return new JBossWSTestSetup(JBWS1850TestCase.class, "jaxws-jbws1850.jar"); } - protected void setUp() throws Exception - { - if (port == null) - { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - QName serviceName = new QName("http://org.jboss.ws/jbws1850", "TestEndpointService"); - port = Service.create(wsdlURL, serviceName).getPort(TestService.class); - } - } - public void testWsdl() throws Exception { URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); @@ -81,8 +69,12 @@ assertEquals("This is the useless test operation of the test service", wsdlOperation.getDocumentationElement().getContent()); } - public void testInvocation() + public void testInvocation() throws Exception { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + QName serviceName = new QName("http://org.jboss.ws/jbws1850", "TestEndpointService"); + TestService port = Service.create(wsdlURL, serviceName).getPort(TestService.class); + String retObj = port.test("Hello", "World"); assertEquals("World", retObj); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/JBWS2234TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/JBWS2234TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2234/JBWS2234TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -32,6 +32,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -49,7 +50,12 @@ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS2234TestCase.class, "jaxws-jbws2234.war"); + return new JBossWSTestSetup(JBWS2234TestCase.class, "jaxws-jbws2234.war", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } public void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2259/JBWS2259TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2259/JBWS2259TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2259/JBWS2259TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -47,33 +47,23 @@ public class JBWS2259TestCase extends JBossWSTest { - private static Endpoint port; - public static Test suite() throws Exception { return new JBossWSTestSetup(JBWS2259TestCase.class, "jaxws-jbws2259.war"); } - public void setUp() throws Exception + public void testCall() throws Exception { - super.setUp(); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2259?wsdl"); + QName serviceName = new QName("http://ws.jboss.org/jbws2259";, "EndpointService"); - if (port == null) - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2259?wsdl"); - QName serviceName = new QName("http://ws.jboss.org/jbws2259";, "EndpointService"); + Service service = Service.create(wsdlURL, serviceName); + Endpoint port = service.getPort(Endpoint.class); - Service service = Service.create(wsdlURL, serviceName); - port = service.getPort(Endpoint.class); - - BindingProvider bindingProvider = (BindingProvider)port; - SOAPBinding soapBinding = (SOAPBinding)bindingProvider.getBinding(); - soapBinding.setMTOMEnabled(true); - } - } - - public void testCall() throws Exception - { + BindingProvider bindingProvider = (BindingProvider)port; + SOAPBinding soapBinding = (SOAPBinding)bindingProvider.getBinding(); + soapBinding.setMTOMEnabled(true); + File sharkFile = getResourceFile("jaxws/jbws2259/attach.jpeg"); DataSource ds = new FileDataSource(sharkFile); DataHandler handler = new DataHandler(ds); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2285/JBWS2285TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2285/JBWS2285TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2285/JBWS2285TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -56,25 +56,19 @@ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2285/"; - private static Endpoint port; - public static Test suite() throws Exception { return new JBossWSTestSetup(JBWS2285TestCase.class, "jaxws-jbws2285.war"); } - public void setUp() throws Exception + public void testCall() throws Exception { - super.setUp(); URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); QName serviceName = new QName("http://ws.jboss.org/jbws2285";, "EndpointImplService"); Service service = Service.create(wsdlURL, serviceName); - port = service.getPort(Endpoint.class); - } - - public void testCall() throws Exception - { + Endpoint port = service.getPort(Endpoint.class); + final String message = "Hello!!"; String response = port.echo(message); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2319/JBWS2319TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2319/JBWS2319TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2319/JBWS2319TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -56,25 +56,19 @@ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2319/"; - private static Endpoint port; - public static Test suite() throws Exception { return new JBossWSTestSetup(JBWS2319TestCase.class, "jaxws-jbws2319.war"); } - public void setUp() throws Exception + public void testCall() throws Exception { - super.setUp(); URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); QName serviceName = new QName("http://ws.jboss.org/jbws2319";, "EndpointImplService"); Service service = Service.create(wsdlURL, serviceName); - port = service.getPort(Endpoint.class); - } - - public void testCall() throws Exception - { + Endpoint port = service.getPort(Endpoint.class); + final String message = "Hello!!"; String response = port.echo(message); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2698/JBWS2698TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2698/JBWS2698TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2698/JBWS2698TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -47,30 +47,24 @@ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2698/"; - private static Endpoint port; - public static Test suite() throws Exception { return new JBossWSTestSetup(JBWS2698TestCase.class, "jaxws-jbws2698.war"); } - public void setUp() throws Exception + public void testCall() throws Exception { - super.setUp(); URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); QName serviceName = new QName("http://ws.jboss.org/jbws2698";, "EndpointImplService"); Service service = Service.create(wsdlURL, serviceName); - port = service.getPort(Endpoint.class); + Endpoint port = service.getPort(Endpoint.class); BindingProvider bindingProvider = (BindingProvider)port; List<Handler> handlerChain = new ArrayList<Handler>(); handlerChain.add(new SOAPHandler()); bindingProvider.getBinding().setHandlerChain(handlerChain); - } - - public void testCall() throws Exception - { + String message = "Howdy"; String response = port.echo(message); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2706/JBWS2706TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2706/JBWS2706TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2706/JBWS2706TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -22,14 +22,10 @@ package org.jboss.test.ws.jaxws.jbws2706; import java.net.URL; -import java.util.ArrayList; -import java.util.List; import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; import javax.xml.ws.Holder; import javax.xml.ws.Service; -import javax.xml.ws.handler.Handler; import junit.framework.Test; @@ -48,25 +44,19 @@ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2706/"; - private static SwaTest port; - public static Test suite() throws Exception { return new JBossWSTestSetup(JBWS2706TestCase.class, "jaxws-jbws2706.war"); } - public void setUp() throws Exception + public void testCall() throws Exception { - super.setUp(); URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); QName serviceName = new QName("http://SwaTestService.org/wsdl";, "WSIDLSwaTestService"); Service service = Service.create(wsdlURL, serviceName); - port = service.getPort(SwaTest.class); - } - - public void testCall() throws Exception - { + SwaTest port = service.getPort(SwaTest.class); + String message = "Howdy"; InputRequest request = new InputRequest(); request.setMessage(message); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -43,25 +43,19 @@ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2845/"; - private static Endpoint port; - public static Test suite() throws Exception { return new JBossWSTestSetup(JBWS2845TestCase.class, "jaxws-jbws2845.war"); } - public void setUp() throws Exception + public void testCall() throws Exception { - super.setUp(); URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); QName serviceName = new QName("http://ws.jboss.org/jbws2845";, "EndpointImplService"); Service service = Service.create(wsdlURL, serviceName); - port = service.getPort(Endpoint.class); - } - - public void testCall() throws Exception - { + Endpoint port = service.getPort(Endpoint.class); + TheType in = new TheType(); in.setMessage("Happy New Year"); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2927/JBWS2927TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2927/JBWS2927TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2927/JBWS2927TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -31,20 +31,11 @@ import javax.xml.soap.SOAPConnectionFactory; import javax.xml.soap.SOAPEnvelope; import javax.xml.soap.SOAPMessage; -import javax.xml.ws.BindingProvider; import javax.xml.ws.Service; -import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.addressing.JAXWSAConstants; import junit.framework.Test; -import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS; -import org.jboss.ws.core.jaxws.spi.EndpointImpl; import org.jboss.ws.core.soap.NodeImpl; -import org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler; -import org.jboss.ws.extensions.addressing.soap.SOAPAddressingPropertiesImpl; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; - import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; import org.w3c.dom.Node; @@ -60,25 +51,19 @@ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2927"; - private static WSAEndpoint port; - public static Test suite() throws Exception { return new JBossWSTestSetup(JBWS2927TestCase.class, "jaxws-jbws2927.war"); } - public void setUp() throws Exception - { - super.setUp(); + public void testCall() throws Exception + { URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); QName serviceName = new QName("http://ws.jboss.org/jbws2927";, "WSAEndpointService"); Service service = Service.create(wsdlURL, serviceName); - port = service.getPort(WSAEndpoint.class); - } - - public void testCall() throws Exception - { + WSAEndpoint port = service.getPort(WSAEndpoint.class); + String response = port.echo("testJBWS2927"); assertEquals("testJBWS2927", response); } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2949/JBWS2949TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2949/JBWS2949TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2949/JBWS2949TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -22,51 +22,33 @@ package org.jboss.test.ws.jaxws.jbws2949; import java.net.URL; -import java.util.Iterator; import javax.xml.namespace.QName; -import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPBody; -import javax.xml.soap.SOAPConnection; -import javax.xml.soap.SOAPConnectionFactory; -import javax.xml.soap.SOAPEnvelope; -import javax.xml.soap.SOAPMessage; import javax.xml.ws.Service; import junit.framework.Test; -import org.jboss.ws.core.soap.NodeImpl; - import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - public class JBWS2949TestCase extends JBossWSTest { public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2949"; - private static Endpoint port; - public static Test suite() throws Exception { return new JBossWSTestSetup(JBWS2949TestCase.class, "jaxws-jbws2949.war"); } - public void setUp() throws Exception - { - super.setUp(); + public void testCall() throws Exception + { URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); QName serviceName = new QName("http://ws.jboss.org/jbws2949";, "EndpointService"); Service service = Service.create(wsdlURL, serviceName); - port = service.getPort(Endpoint.class); - } - - public void testCall() throws Exception - { + Endpoint port = service.getPort(Endpoint.class); + String response = port.echo("testJBWS2949"); assertEquals("PutByServerHandler2", response); } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2969/JBWS2969TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2969/JBWS2969TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2969/JBWS2969TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -45,25 +45,19 @@ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2969/"; - private static Endpoint port; - public static Test suite() throws Exception { return new JBossWSTestSetup(JBWS2969TestCase.class, "jaxws-jbws2969.war"); } - public void setUp() throws Exception + public void testRpcLitPassNull() throws Exception { - super.setUp(); URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); QName serviceName = new QName("http://ws.jboss.org", "EndpointService"); Service service = Service.create(wsdlURL, serviceName); - port = service.getPort(Endpoint.class); - } - - public void testRpcLitPassNull() throws Exception - { + Endpoint port = service.getPort(Endpoint.class); + // this should be successful assertEquals("helloworld",port.testPassNull("hello")); //Throw WebServiceException Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/JBWS3071TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/JBWS3071TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/JBWS3071TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -32,6 +32,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -51,7 +52,12 @@ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS3071TestCase.class, "jaxws-jbws3071.war"); + return new JBossWSTestSetup(JBWS3071TestCase.class, "jaxws-jbws3071.war", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } public void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3124/JBWS3124TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3124/JBWS3124TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3124/JBWS3124TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -36,7 +36,7 @@ */ public final class JBWS3124TestCase extends JBossWSTest { - private static final String XML_SOURCE = "<?xml version='1.0' encoding='UTF-8' standalone='yes'?>\n" + + private 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" + Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -39,6 +39,7 @@ import junit.framework.Test; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -50,10 +51,6 @@ */ public class JBWS771TestCase extends JBossWSTest { - private static final String FS = System.getProperty("file.separator"); // '/' on unix, '\' on windows - private static final String PS = System.getProperty("path.separator"); // ':' on unix, ';' on windows - private static final String EXT = ":".equals( PS ) ? ".sh" : ".bat"; - private static final String TARGET_NAMESPACE = "http://jbws771.jaxws.ws.test.jboss.org/"; private static URL wsdlURL; private static IWebsvc port; @@ -63,7 +60,13 @@ public static Test suite() { - return new JBossWSTestSetup(JBWS771TestCase.class, "jaxws-jbws771.jar"); + return new JBossWSTestSetup(JBWS771TestCase.class, "jaxws-jbws771.jar", new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + wsdlURL = null; + } + }); } @Override @@ -146,6 +149,9 @@ public void testWSConsume() throws Exception { + String FS = System.getProperty("file.separator"); // '/' on unix, '\' on windows + String PS = System.getProperty("path.separator"); // ':' on unix, ';' on windows + String EXT = ":".equals( PS ) ? ".sh" : ".bat"; // use absolute path for the output to be re-usable String absOutput = createResourceFile("wsconsume" + FS + "java").getAbsolutePath(); String command = JBOSS_HOME + FS + "bin" + FS + "wsconsume" + EXT + " -k -o " + absOutput + " --extension --binding=" + RESOURCES_DIR + FS + "jaxws" + FS + "jbws771" + FS + "binding.xml " + wsdlURL.toExternalForm(); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -22,7 +22,6 @@ package org.jboss.test.ws.jaxws.jbws871; import java.io.ByteArrayInputStream; -import java.io.File; import java.io.StringWriter; import java.net.URL; @@ -37,9 +36,10 @@ import junit.framework.Test; +import org.jboss.ws.core.jaxws.JAXBContextFactory; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; -import org.jboss.ws.core.jaxws.JAXBContextFactory; /** * Arrays with JSR181 endpoints @@ -55,7 +55,12 @@ public static Test suite() { - return new JBossWSTestSetup(JBWS871TestCase.class, "jaxws-jbws871-rpc.war"); + return new JBossWSTestSetup(JBWS871TestCase.class, "jaxws-jbws871-rpc.war", new CleanupOperation() { + @Override + public void cleanUp() { + endpoint = null; + } + }); } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -38,6 +38,7 @@ import org.jboss.ws.core.ConfigProvider; import org.jboss.ws.common.DOMUtils; import org.jboss.ws.common.DOMWriter; +import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; import org.w3c.dom.Element; @@ -58,7 +59,13 @@ public static Test suite() throws Exception { - return new JBossWSTestSetup(SimpleDispatchTestCase.class, "jaxws-samples-wssecurity-username.war jaxws-samples-wssecurity-encrypt.war", true); + return new JBossWSTestSetup(SimpleDispatchTestCase.class, "jaxws-samples-wssecurity-username.war jaxws-samples-wssecurity-encrypt.war", true, new CleanupOperation() { + @Override + public void cleanUp() { + usernameDispatch = null; + encryptDispatch = null; + } + }); } @Override Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -31,6 +31,7 @@ import junit.framework.Test; import org.jboss.ws.core.StubExt; +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() throws Exception { - return new JBossWSTestSetup(SimpleUsernameTestCase.class, "jaxws-samples-wssecurity-username.war", true); + return new JBossWSTestSetup(SimpleUsernameTestCase.class, "jaxws-samples-wssecurity-username.war", true, new CleanupOperation() { + @Override + public void cleanUp() { + port = null; + } + }); } @Override Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase.java 2012-03-13 08:56:43 UTC (rev 15922) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase.java 2012-03-13 09:00:57 UTC (rev 15923) @@ -23,6 +23,7 @@ import junit.framework.Test; import org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler; +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(AddressingActionTestCase.class, "jaxws-wsaddressing-action-rpc.war"); + return new JBossWSTestSetup(AddressingActionTestCase.class, "jaxws-wsaddressing-action-rpc.war", new CleanupOperation() { + @Override + public void cleanUp() { + endpoint = null; + } + }); } protected void setUp() throws Exception