JBossWS SVN: r15930 - in shared-testsuite/trunk: testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-03-13 09:24:23 -0400 (Tue, 13 Mar 2012)
New Revision: 15930
Added:
shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/AppclientHelper.java
Modified:
shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/CleanupOperation.java
shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java
Log:
[JBWS-3435] finalizing appclient integration
Added: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/AppclientHelper.java
===================================================================
--- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/AppclientHelper.java (rev 0)
+++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/AppclientHelper.java 2012-03-13 13:24:23 UTC (rev 15930)
@@ -0,0 +1,213 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.wsf.test;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import org.jboss.ws.common.concurrent.CopyJob;
+import org.jboss.ws.common.io.TeeOutputStream;
+
+/**
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+final class AppclientHelper
+{
+
+ private static final String JBOSS_HOME = System.getProperty("jboss.home");
+ 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 appclientScript = JBOSS_HOME + FS + "bin" + FS + "appclient" + EXT;
+ private static Map<String, AppclientProcess> appclients = new HashMap<String, AppclientProcess>();
+ private static ExecutorService es = Executors.newCachedThreadPool();
+ private static String appclientOutputDir;
+
+ private static class AppclientProcess {
+ public Process process;
+ public CopyJob outTask;
+ public CopyJob errTask;
+ public OutputStream output;
+ public OutputStream log;
+ }
+
+ private AppclientHelper()
+ {
+ // forbidden instantiation
+ }
+
+ static Process deployAppclient(final String archive, final OutputStream appclientOS, final String... appclientArgs) throws Exception
+ {
+ final AppclientProcess ap = newAppclientProcess(archive, appclientOS, appclientArgs);
+ final String appclientEarName = getAppclientEarName(archive);
+ final String appclientFullName = getAppclientFullName(archive);
+ final String patternToMatch = "Deployed \"" + appclientEarName + "\"";
+ final String errorMessage = "Cannot deploy " + appclientFullName + " to appclient";
+ awaitOutput(ap.output, patternToMatch, errorMessage);
+ appclients.put(archive, ap);
+ return ap.process;
+ }
+
+ static void undeployAppclient(final String archive, boolean awaitShutdown) throws Exception
+ {
+ final AppclientProcess ap = appclients.remove(archive);
+ try
+ {
+ if (awaitShutdown)
+ {
+ shutdownAppclient(archive, ap.output);
+ }
+ }
+ finally
+ {
+ ap.outTask.kill();
+ ap.errTask.kill();
+ ap.process.destroy();
+ ap.log.close();
+ }
+ }
+
+ private static AppclientProcess newAppclientProcess(final String archive, final OutputStream appclientOS, final String... appclientArgs) throws IOException
+ {
+ final String killFileName = getKillFileName(archive);
+ final String appclientFullName = getAppclientFullName(archive);
+ final String appclientShortName = getAppclientShortName(archive);
+ final AppclientProcess ap = new AppclientProcess();
+ ap.output = new ByteArrayOutputStream();
+ final List<String> args = new LinkedList<String>();
+ args.add(appclientScript);
+ args.add("--appclient-config=appclient-ws.xml");
+ args.add(appclientFullName);
+ if (appclientOS == null)
+ {
+ args.add(killFileName);
+ }
+ else
+ {
+ // propagate appclient args
+ for (final String appclientArg : appclientArgs)
+ {
+ args.add(appclientArg);
+ }
+ }
+ ap.process = new ProcessBuilder().command(args).start();
+ ap.log = new FileOutputStream(new File(getAppclientOutputDir(), appclientShortName + ".log-" + System.currentTimeMillis()));
+ // appclient out
+ ap.outTask = new CopyJob(ap.process.getInputStream(),
+ appclientOS == null ? new TeeOutputStream(ap.output, ap.log) : new TeeOutputStream(ap.output, ap.log, appclientOS));
+ // appclient err
+ ap.errTask = new CopyJob(ap.process.getErrorStream(), ap.log);
+ // unfortunately the following threads are needed because of Windows behavior
+ es.submit(ap.outTask);
+ es.submit(ap.errTask);
+ return ap;
+ }
+
+ private static void shutdownAppclient(final String archive, final OutputStream os) throws IOException, InterruptedException
+ {
+ final File killFile = new File(getKillFileName(archive));
+ killFile.createNewFile();
+ final String appclientFullName = getAppclientFullName(archive);
+ final String patternToMatch = "stopped in";
+ final String errorMessage = "Cannot undeploy " + appclientFullName + " from appclient";
+ try
+ {
+ awaitOutput(os, patternToMatch, errorMessage);
+ }
+ finally
+ {
+ if (!killFile.delete())
+ {
+ killFile.deleteOnExit();
+ }
+ }
+ }
+
+ private static void awaitOutput(final OutputStream os, final String patternToMatch, final String errorMessage) throws InterruptedException {
+ int countOfAttempts = 0;
+ final int maxCountOfAttempts = 120; // max wait time: 2 minutes
+ while (!os.toString().contains(patternToMatch))
+ {
+ Thread.sleep(1000);
+ if (countOfAttempts++ == maxCountOfAttempts)
+ {
+ throw new RuntimeException(errorMessage);
+ }
+ }
+ }
+
+ private static String getKillFileName(final String archive)
+ {
+ final int sharpIndex = archive.indexOf('#');
+ return JBOSS_HOME + FS + "bin" + FS + archive.substring(sharpIndex + 1) + ".kill";
+ }
+
+ private static String getAppclientOutputDir()
+ {
+ if (appclientOutputDir == null)
+ {
+ appclientOutputDir = System.getProperty("appclient.output.dir");
+ if (appclientOutputDir == null)
+ {
+ throw new IllegalStateException("System property appclient.output.dir not configured");
+ }
+ final File appclientOutputDirectory = new File(appclientOutputDir);
+ if (!appclientOutputDirectory.exists())
+ {
+ if (!appclientOutputDirectory.mkdirs())
+ {
+ throw new IllegalStateException("Unable to create directory " + appclientOutputDir);
+ }
+ }
+ }
+ return appclientOutputDir;
+ }
+
+ private static String getAppclientFullName(final String archive)
+ {
+ final int sharpIndex = archive.indexOf('#');
+ final String earName = archive.substring(0, sharpIndex);
+ return JBossWSTestHelper.getArchiveFile(earName).getParent() + FS + archive;
+ }
+
+ private static String getAppclientShortName(final String archive)
+ {
+ final int sharpIndex = archive.indexOf('#');
+ return archive.substring(sharpIndex + 1);
+ }
+
+ private static String getAppclientEarName(final String archive)
+ {
+ final int sharpIndex = archive.indexOf('#');
+ return archive.substring(0, sharpIndex);
+ }
+}
Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/CleanupOperation.java
===================================================================
--- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/CleanupOperation.java 2012-03-13 11:47:59 UTC (rev 15929)
+++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/CleanupOperation.java 2012-03-13 13:24:23 UTC (rev 15930)
@@ -21,8 +21,7 @@
*/
package org.jboss.wsf.test;
-public abstract class CleanupOperation {
-
- public abstract void cleanUp();
-
+public interface CleanupOperation
+{
+ void cleanUp();
}
Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
--- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2012-03-13 11:47:59 UTC (rev 15929)
+++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2012-03-13 13:24:23 UTC (rev 15930)
@@ -21,9 +21,7 @@
*/
package org.jboss.wsf.test;
-import java.io.ByteArrayOutputStream;
import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.net.Inet6Address;
@@ -31,12 +29,7 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.net.UnknownHostException;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
import javax.management.MBeanServerConnection;
import javax.management.remote.JMXConnectorFactory;
@@ -48,8 +41,6 @@
import javax.xml.ws.soap.SOAPBinding;
import org.jboss.logging.Logger;
-import org.jboss.ws.common.concurrent.CopyJob;
-import org.jboss.ws.common.io.TeeOutputStream;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployer.Deployer;
@@ -65,10 +56,6 @@
{
private static final Logger LOGGER = Logger.getLogger(JBossWSTestHelper.class);
- private static final String JBOSS_HOME = System.getProperty("jboss.home");
- 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 SYSPROP_JBOSSWS_INTEGRATION_TARGET = "jbossws.integration.target";
private static final String SYSPROP_JBOSS_BIND_ADDRESS = "jboss.bind.address";
private static final String SYSPROP_TEST_ARCHIVE_DIRECTORY = "test.archive.directory";
@@ -85,18 +72,7 @@
private static String implVersion;
private static String testArchiveDir;
private static String testResourcesDir;
- private static String appclientOutputDir;
- private static Map<String, AppclientProcess> appclients = new HashMap<String, JBossWSTestHelper.AppclientProcess>();
- private static ExecutorService es = Executors.newCachedThreadPool();
-
- private static class AppclientProcess {
- public Process process;
- public CopyJob outTask;
- public CopyJob errTask;
- public OutputStream output;
- public OutputStream log;
- }
-
+
private static synchronized Deployer getDeployer()
{
//lazy loading of deployer
@@ -137,55 +113,7 @@
{
if (DEPLOY_PROCESS_ENABLED)
{
- final int sharpIndex = archive.indexOf('#');
- final String appclientScript = JBOSS_HOME + FS + "bin" + FS + "appclient" + EXT;
- final String earName = archive.substring(0, sharpIndex);
- final String appclientName = archive.substring(sharpIndex + 1);
- final String appclientFullName = getArchiveFile(earName).getParent() + FS + archive;
- final String touchFile = JBOSS_HOME + FS + "bin" + FS + appclientName + ".kill";
- final String appclientOutputDirName = System.getProperty("appclient.output.dir");
- if (appclientOutputDirName == null)
- {
- throw new IllegalStateException("System property appclient.output.dir not configured");
- }
- final File appclientOutputDir = new File(appclientOutputDirName);
- if (!appclientOutputDir.exists())
- {
- appclientOutputDir.mkdirs();
- }
- AppclientProcess ap = new AppclientProcess();
- ap.output = new ByteArrayOutputStream();
- if (appclientOS == null)
- {
- ap.process = new ProcessBuilder().command(appclientScript, "--appclient-config=appclient-ws.xml", appclientFullName, touchFile).start();
- }
- else
- {
- final List<String> args = new LinkedList<String>();
- args.add(appclientScript);
- args.add("--appclient-config=appclient-ws.xml");
- args.add(appclientFullName);
- // propagate appclient args
- for (final String appclientArg : appclientArgs)
- {
- args.add(appclientArg);
- }
- ap.process = new ProcessBuilder().command(args).start();
- }
- ap.log = new FileOutputStream(new File(getAppclientOutputDir(), appclientName + ".log-" + System.currentTimeMillis()));
- // appclient out
- ap.outTask = new CopyJob(ap.process.getInputStream(),
- appclientOS == null ? new TeeOutputStream(ap.output, ap.log) : new TeeOutputStream(ap.output, ap.log, appclientOS));
- // appclient err
- ap.errTask = new CopyJob(ap.process.getErrorStream(), ap.log);
- // unfortunately the following threads are needed because of Windows behavior
- es.submit(ap.outTask);
- es.submit(ap.errTask);
- final String patternToMatch = "Deployed \"" + earName + "\"";
- final String errorMessage = "Cannot deploy " + appclientFullName + " to appclient";
- awaitOutput(ap.output, patternToMatch, errorMessage);
- appclients.put(archive, ap);
- return ap.process;
+ return AppclientHelper.deployAppclient(archive, appclientOS, appclientArgs);
}
return null;
}
@@ -193,68 +121,14 @@
/** Undeploy the given archive from the appclient
* Archive name is always in form archive.ear#appclient.jar
*/
- public static void undeployAppclient(final String archive) throws Exception
+ public static void undeployAppclient(final String archive, boolean awaitShutdown) throws Exception
{
if (DEPLOY_PROCESS_ENABLED)
{
- AppclientProcess ap = appclients.get(archive);
- final int sharpIndex = archive.indexOf('#');
- final String earName = archive.substring(0, sharpIndex);
- final String appclientFullName = getArchiveFile(earName).getParent() + FS + archive;
- final File touchFile = new File(JBOSS_HOME + FS + "bin" + FS + archive.substring(sharpIndex + 1) + ".kill");
- touchFile.createNewFile();
- final String patternToMatch = "stopped in";
- final String errorMessage = "Cannot undeploy " + appclientFullName + " from appclient";
- try
- {
- awaitOutput(ap.output, patternToMatch, errorMessage);
- }
- finally
- {
- touchFile.delete();
- ap.outTask.kill();
- ap.errTask.kill();
- ap.log.close();
- ap.process.destroy();
- appclients.remove(archive);
- }
+ AppclientHelper.undeployAppclient(archive, awaitShutdown);
}
}
- private static String getAppclientOutputDir()
- {
- if (appclientOutputDir == null)
- {
- appclientOutputDir = System.getProperty("appclient.output.dir");
- if (appclientOutputDir == null)
- {
- throw new IllegalStateException("System property appclient.output.dir not configured");
- }
- final File appclientOutputDirectory = new File(appclientOutputDir);
- if (!appclientOutputDirectory.exists())
- {
- if (!appclientOutputDirectory.mkdirs())
- {
- throw new IllegalStateException("Unable to create directory " + appclientOutputDir);
- }
- }
- }
- return appclientOutputDir;
- }
-
- private static void awaitOutput(final OutputStream os, final String patternToMatch, final String errorMessage) throws InterruptedException {
- int countOfAttempts = 0;
- final int maxCountOfAttempts = 120; // max wait time: 2 minutes
- while (!os.toString().contains(patternToMatch))
- {
- Thread.sleep(1000);
- if (countOfAttempts++ == maxCountOfAttempts)
- {
- throw new RuntimeException(errorMessage);
- }
- }
- }
-
public static boolean isTargetJBoss7()
{
String target = getIntegrationTarget();
Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java
===================================================================
--- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2012-03-13 11:47:59 UTC (rev 15929)
+++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2012-03-13 13:24:23 UTC (rev 15930)
@@ -281,7 +281,7 @@
String archive = archives[archives.length - i - 1];
if (archive.endsWith("-appclient.jar"))
{
- JBossWSTestHelper.undeployAppclient(archive);
+ JBossWSTestHelper.undeployAppclient(archive, true);
}
else
{
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java 2012-03-13 11:47:59 UTC (rev 15929)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java 2012-03-13 13:24:23 UTC (rev 15930)
@@ -76,18 +76,25 @@
public void testApplicationClient() throws Exception
{
- final OutputStream appclientOS = new ByteArrayOutputStream();
- JBossWSTestHelper.deployAppclient("jaxws-samples-serviceref-appclient.ear#jaxws-samples-serviceref-appclient.jar", appclientOS, "Hello World!");
- // wait till appclient stops
- String appclientLog = appclientOS.toString();
- while (!appclientLog.contains("stopped in")) {
- Thread.sleep(100);
- appclientLog = appclientOS.toString();
+ try
+ {
+ final OutputStream appclientOS = new ByteArrayOutputStream();
+ JBossWSTestHelper.deployAppclient("jaxws-samples-serviceref-appclient.ear#jaxws-samples-serviceref-appclient.jar", appclientOS, "Hello World!");
+ // wait till appclient stops
+ String appclientLog = appclientOS.toString();
+ while (!appclientLog.contains("stopped in")) {
+ Thread.sleep(100);
+ appclientLog = appclientOS.toString();
+ }
+ // assert appclient logs
+ assertTrue(appclientLog.contains("TEST START"));
+ assertTrue(appclientLog.contains("TEST END"));
+ assertFalse(appclientLog.contains("not overridden through service-ref"));
+ assertFalse(appclientLog.contains("Invalid echo return"));
}
- // assert appclient logs
- assertTrue(appclientLog.contains("TEST START"));
- assertTrue(appclientLog.contains("TEST END"));
- assertFalse(appclientLog.contains("not overridden through service-ref"));
- assertFalse(appclientLog.contains("Invalid echo return"));
+ finally
+ {
+ JBossWSTestHelper.undeployAppclient("jaxws-samples-serviceref-appclient.ear#jaxws-samples-serviceref-appclient.jar", false);
+ }
}
}
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java 2012-03-13 11:47:59 UTC (rev 15929)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java 2012-03-13 13:24:23 UTC (rev 15930)
@@ -76,18 +76,25 @@
public void testApplicationClient() throws Throwable
{
- final String appclientArg = "Hello World!";
- final OutputStream appclientOS = new ByteArrayOutputStream();
- final Process appclientProcess = JBossWSTestHelper.deployAppclient("jaxws-samples-webserviceref-appclient.ear#jaxws-samples-webserviceref-appclient.jar", appclientOS, appclientArg);
- // wait till appclient stops
- String appclientLog = appclientOS.toString();
- while (!appclientLog.contains("stopped in")) {
- Thread.sleep(100);
- appclientLog = appclientOS.toString();
+ try
+ {
+ final String appclientArg = "Hello World!";
+ final OutputStream appclientOS = new ByteArrayOutputStream();
+ final Process appclientProcess = JBossWSTestHelper.deployAppclient("jaxws-samples-webserviceref-appclient.ear#jaxws-samples-webserviceref-appclient.jar", appclientOS, appclientArg);
+ // wait till appclient stops
+ String appclientLog = appclientOS.toString();
+ while (!appclientLog.contains("stopped in")) {
+ Thread.sleep(100);
+ appclientLog = appclientOS.toString();
+ }
+ // assert appclient logs
+ assertTrue(!appclientLog.contains("Invalid echo return"));
+ assertTrue(appclientLog.contains("TEST START"));
+ assertTrue(appclientLog.contains("TEST END"));
}
- // assert appclient logs
- assertTrue(!appclientLog.contains("Invalid echo return"));
- assertTrue(appclientLog.contains("TEST START"));
- assertTrue(appclientLog.contains("TEST END"));
+ finally
+ {
+ JBossWSTestHelper.undeployAppclient("jaxws-samples-webserviceref-appclient.ear#jaxws-samples-webserviceref-appclient.jar", false);
+ }
}
}
14 years, 1 month
- 1
- 0
JBossWS SVN: r15929 - in container/jboss71/branches/jbossws-jboss711/src/main: java/org/jboss/as/webservices/tests and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-03-13 07:47:59 -0400 (Tue, 13 Mar 2012)
New Revision: 15929
Modified:
container/jboss71/branches/jbossws-jboss711/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemAdd.java
container/jboss71/branches/jbossws-jboss711/src/main/java/org/jboss/as/webservices/tests/RemoteDeployer.java
container/jboss71/branches/jbossws-jboss711/src/main/resources/org/jboss/as/webservices/dmr/LocalDescriptions.properties
Log:
Synch with AS 7.1.1.Final release
Modified: container/jboss71/branches/jbossws-jboss711/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemAdd.java
===================================================================
--- container/jboss71/branches/jbossws-jboss711/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemAdd.java 2012-03-13 11:11:46 UTC (rev 15928)
+++ container/jboss71/branches/jbossws-jboss711/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemAdd.java 2012-03-13 11:47:59 UTC (rev 15929)
@@ -21,6 +21,7 @@
*/
package org.jboss.as.webservices.dmr;
+import org.jboss.as.controller.PathAddress;
import static org.jboss.as.webservices.WSLogger.ROOT_LOGGER;
import static org.jboss.as.webservices.dmr.Constants.ENDPOINT;
import static org.jboss.as.webservices.dmr.Constants.ENDPOINT_CONFIG;
@@ -129,7 +130,8 @@
newControllers.add(ServerConfigService.install(serviceTarget, serverConfig, verificationHandler));
newControllers.add(EndpointRegistryService.install(serviceTarget, verificationHandler));
- String defaultHost = context.getRootResource().getChild(PathElement.pathElement("subsystem", "web")).getModel().get("default-virtual-server").asString();
+ final Resource webSubsystem = context.readResourceFromRoot(PathAddress.pathAddress(PathElement.pathElement("subsystem", "web")));
+ String defaultHost = webSubsystem.getModel().get("default-virtual-server").asString();
newControllers.add(PortComponentLinkService.install(serviceTarget, defaultHost, verificationHandler));
}
}
Modified: container/jboss71/branches/jbossws-jboss711/src/main/java/org/jboss/as/webservices/tests/RemoteDeployer.java
===================================================================
--- container/jboss71/branches/jbossws-jboss711/src/main/java/org/jboss/as/webservices/tests/RemoteDeployer.java 2012-03-13 11:11:46 UTC (rev 15928)
+++ container/jboss71/branches/jbossws-jboss711/src/main/java/org/jboss/as/webservices/tests/RemoteDeployer.java 2012-03-13 11:47:59 UTC (rev 15929)
@@ -19,26 +19,28 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.as.webservices.tests;
+package org.jboss.as.webservices.deployer;
-import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD;
-import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP;
-import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR;
-import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REMOVE;
-import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM;
-import static org.jboss.as.security.Constants.AUTHENTICATION;
-import static org.jboss.as.security.Constants.CODE;
-import static org.jboss.as.security.Constants.FLAG;
-import static org.jboss.as.security.Constants.MODULE_OPTIONS;
-import static org.jboss.as.security.Constants.SECURITY_DOMAIN;
-
import java.io.IOException;
import java.net.InetAddress;
import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.PasswordCallback;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.security.sasl.RealmCallback;
+import javax.security.sasl.RealmChoiceCallback;
+
import org.jboss.as.controller.client.ModelControllerClient;
+import org.jboss.as.controller.client.OperationBuilder;
import org.jboss.as.controller.client.helpers.standalone.DeploymentAction;
import org.jboss.as.controller.client.helpers.standalone.DeploymentPlan;
import org.jboss.as.controller.client.helpers.standalone.DeploymentPlanBuilder;
@@ -49,9 +51,35 @@
import org.jboss.logging.Logger;
import org.jboss.wsf.spi.deployer.Deployer;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ALLOW_RESOURCE_SERVICE_RESTART;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.FAILURE_DESCRIPTION;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.NAME;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OPERATION_HEADERS;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OUTCOME;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.READ_ATTRIBUTE_OPERATION;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.RELEASE_VERSION;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REMOVE;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REQUIRED;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.RESULT;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ROLLBACK_ON_RUNTIME_FAILURE;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUCCESS;
+import static org.jboss.as.security.Constants.AUTHENTICATION;
+import static org.jboss.as.security.Constants.CLASSIC;
+import static org.jboss.as.security.Constants.CODE;
+import static org.jboss.as.security.Constants.FLAG;
+import static org.jboss.as.security.Constants.LOGIN_MODULES;
+import static org.jboss.as.security.Constants.MODULE_OPTIONS;
+import static org.jboss.as.security.Constants.SECURITY_DOMAIN;
+
/**
* Remote deployer that uses AS7 client deployment API.
*
+ * TODO: this class leaks the ModelControllerClient
+ *
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
* @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a>
*/
@@ -59,23 +87,27 @@
private static final Logger LOGGER = Logger.getLogger(RemoteDeployer.class);
private static final int PORT = 9999;
+
private static final String JBWS_DEPLOYER_HOST = "jbossws.deployer.host";
private static final String JBWS_DEPLOYER_PORT = "jbossws.deployer.port";
+ private static final String JBWS_DEPLOYER_AUTH_USER = "jbossws.deployer.authentication.username";
+ private static final String JBWS_DEPLOYER_AUTH_PWD = "jbossws.deployer.authentication.password";
private final Map<URL, String> url2Id = new HashMap<URL, String>();
- private final InetAddress address = InetAddress.getByName("127.0.0.1");
+ private final CallbackHandler callbackHandler = getCallbackHandler();
+ private final ServerDeploymentManager deploymentManager;
+ private final ModelControllerClient modelControllerClient;
- private ServerDeploymentManager deploymentManager;
-
public RemoteDeployer() throws IOException {
final String host = System.getProperty(JBWS_DEPLOYER_HOST);
InetAddress address;
- if (host != null) {
+ if(host != null) {
address = InetAddress.getByName(host);
} else {
address = InetAddress.getByName("localhost");
}
final Integer port = Integer.getInteger(JBWS_DEPLOYER_PORT, PORT);
- deploymentManager = ServerDeploymentManager.Factory.create(address, port);
+ deploymentManager = ServerDeploymentManager.Factory.create(address, port, callbackHandler);
+ modelControllerClient = ModelControllerClient.Factory.create(address, port, callbackHandler);
}
@Override
@@ -88,7 +120,6 @@
url2Id.put(archiveURL, uniqueId);
}
- @Override
public void undeploy(final URL archiveURL) throws Exception {
final DeploymentPlanBuilder builder = deploymentManager.newDeploymentPlan();
final String uniqueName = url2Id.get(archiveURL);
@@ -108,8 +139,7 @@
final ServerDeploymentPlanResult planResult = deploymentManager.execute(plan).get();
if (deployAction != null) {
- final ServerDeploymentActionResult actionResult = planResult
- .getDeploymentActionResult(deployAction.getId());
+ final ServerDeploymentActionResult actionResult = planResult.getDeploymentActionResult(deployAction.getId());
if (actionResult != null) {
final Exception deploymentException = (Exception) actionResult.getDeploymentException();
if (deploymentException != null)
@@ -122,54 +152,124 @@
}
}
- @Override
- public void addSecurityDomain(String name, Map<String, String> authenticationOptions) throws Exception {
- ModelControllerClient client = ModelControllerClient.Factory.create(address, PORT);
- ModelNode result = createSecurityDomain(client, name, authenticationOptions);
- checkResult(result);
- }
+ public String getServerVersion() throws Exception {
+ final ModelNode request = new ModelNode();
+ request.get(OP).set(READ_ATTRIBUTE_OPERATION);
+ request.get(OP_ADDR).setEmptyList();
+ request.get(NAME).set(RELEASE_VERSION);
- @Override
- public void removeSecurityDomain(String name) throws Exception {
- ModelControllerClient client = ModelControllerClient.Factory.create(address, PORT);
- ModelNode result = removeSecurityDomain(client, name);
- checkResult(result);
+ final ModelNode response = applyUpdate(request, getModelControllerClient());
+ return response.get(RESULT).asString();
}
- private static ModelNode createSecurityDomain(ModelControllerClient client, String name, Map<String, String> authenticationOptions) throws IOException {
+ public void addSecurityDomain(String name, Map<String, String> authenticationOptions) throws Exception {
+ final List<ModelNode> updates = new ArrayList<ModelNode>();
+
ModelNode op = new ModelNode();
op.get(OP).set(ADD);
op.get(OP_ADDR).add(SUBSYSTEM, "security");
op.get(OP_ADDR).add(SECURITY_DOMAIN, name);
- ModelNode loginModule = op.get(AUTHENTICATION).add();
+ updates.add(op);
+
+ op = new ModelNode();
+ op.get(OP).set(ADD);
+ op.get(OP_ADDR).add(SUBSYSTEM, "security");
+ op.get(OP_ADDR).add(SECURITY_DOMAIN, name);
+ op.get(OP_ADDR).add(AUTHENTICATION, CLASSIC);
+
+ final ModelNode loginModule = op.get(LOGIN_MODULES).add();
loginModule.get(CODE).set("UsersRoles");
- loginModule.get(FLAG).set("required");
- ModelNode moduleOptions = loginModule.get(MODULE_OPTIONS);
+ loginModule.get(FLAG).set(REQUIRED);
+ op.get(OPERATION_HEADERS).get(ALLOW_RESOURCE_SERVICE_RESTART).set(true);
+ updates.add(op);
+
+ final ModelNode moduleOptions = loginModule.get(MODULE_OPTIONS);
if (authenticationOptions != null) {
- for (String k : authenticationOptions.keySet()) {
+ for (final String k : authenticationOptions.keySet()) {
moduleOptions.add(k, authenticationOptions.get(k));
}
}
- return client.execute(op);
+
+ applyUpdates(updates, getModelControllerClient());
}
- private static ModelNode removeSecurityDomain(ModelControllerClient client, String name) throws IOException {
- ModelNode op = new ModelNode();
+ public void removeSecurityDomain(String name) throws Exception {
+ final ModelNode op = new ModelNode();
op.get(OP).set(REMOVE);
op.get(OP_ADDR).add(SUBSYSTEM, "security");
op.get(OP_ADDR).add(SECURITY_DOMAIN, name);
- return client.execute(op);
+ op.get(OPERATION_HEADERS, ROLLBACK_ON_RUNTIME_FAILURE).set(false);
+
+ applyUpdate(op, getModelControllerClient());
}
- private static void checkResult(ModelNode result) throws Exception {
- if (result.hasDefined("outcome") && "success".equals(result.get("outcome").asString())) {
- if (result.hasDefined("result")) {
- LOGGER.info(result.get("result"));
+ private ModelControllerClient getModelControllerClient() {
+ return modelControllerClient;
+ }
+
+ private static void applyUpdates(final List<ModelNode> updates, final ModelControllerClient client) throws Exception {
+ for (final ModelNode update : updates) {
+ applyUpdate(update, client);
+ }
+ }
+
+ private static ModelNode applyUpdate(final ModelNode update, final ModelControllerClient client) throws Exception {
+ final ModelNode result = client.execute(new OperationBuilder(update).build());
+ checkResult(result);
+ return result;
+ }
+
+ private static void checkResult(final ModelNode result) throws Exception {
+ if (result.hasDefined(OUTCOME) && SUCCESS.equals(result.get(OUTCOME).asString())) {
+ if (result.hasDefined(RESULT)) {
+ LOGGER.info(result.get(RESULT));
}
- } else if (result.hasDefined("failure-description")) {
- throw new Exception(result.get("failure-description").toString());
+ } else if (result.hasDefined(FAILURE_DESCRIPTION)) {
+ throw new Exception(result.get(FAILURE_DESCRIPTION).toString());
} else {
- throw new Exception("Operation not successful; outcome = " + result.get("outcome"));
+ throw new Exception("Operation not successful; outcome = " + result.get(OUTCOME));
}
}
+
+ private static CallbackHandler getCallbackHandler() {
+ final String username = getSystemProperty(JBWS_DEPLOYER_AUTH_USER, null);
+ if (username == null || ("${" + JBWS_DEPLOYER_AUTH_USER + "}").equals(username)) {
+ return null;
+ }
+ String pwd = getSystemProperty(JBWS_DEPLOYER_AUTH_PWD, null);
+ if (("${" + JBWS_DEPLOYER_AUTH_PWD + "}").equals(pwd)) {
+ pwd = null;
+ }
+ final String password = pwd;
+ return new CallbackHandler() {
+ public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+ for (Callback current : callbacks) {
+ if (current instanceof NameCallback) {
+ NameCallback ncb = (NameCallback) current;
+ ncb.setName(username);
+ } else if (current instanceof PasswordCallback) {
+ PasswordCallback pcb = (PasswordCallback) current;
+ pcb.setPassword(password.toCharArray());
+ } else if (current instanceof RealmCallback) {
+ RealmCallback rcb = (RealmCallback) current;
+ rcb.setText(rcb.getDefaultText());
+ } else if (current instanceof RealmChoiceCallback) {
+ // Ignored but not rejected.
+ } else {
+ throw new UnsupportedCallbackException(current);
+ }
+ }
+ }
+ };
+ }
+
+ private static String getSystemProperty(final String name, final String defaultValue) {
+ PrivilegedAction<String> action = new PrivilegedAction<String>() {
+ public String run() {
+ return System.getProperty(name, defaultValue);
+ }
+ };
+ return AccessController.doPrivileged(action);
+ }
+
}
Modified: container/jboss71/branches/jbossws-jboss711/src/main/resources/org/jboss/as/webservices/dmr/LocalDescriptions.properties
===================================================================
--- container/jboss71/branches/jbossws-jboss711/src/main/resources/org/jboss/as/webservices/dmr/LocalDescriptions.properties 2012-03-13 11:11:46 UTC (rev 15928)
+++ container/jboss71/branches/jbossws-jboss711/src/main/resources/org/jboss/as/webservices/dmr/LocalDescriptions.properties 2012-03-13 11:47:59 UTC (rev 15929)
@@ -1,5 +1,7 @@
ws=The configuration of the web services subsystem.
ws.add=Adds the web services subsystem.
+ws.remove=Removes the web services subsystem.
+deployment=Runtime resources exposed by web service components in the deployment.
endpoint=Webservice endpoint.
endpoint.name=Webservice endpoint name.
endpoint.context=Webservice endpoint context.
@@ -20,16 +22,16 @@
response.count=Count of responses the endpoint generated.
fault.count=Count of faults the endpoint generated.
-endpoint.config=Webservice Endpoint configuration
-endpoint.config.add=Add a new endpoint configuration
-endpoint.config.remove=Remove a endpoint configuration
-endpoint.config.name=Endpoint configuration name
-protocol.binding=Protocol binding value
-servicename.pattern=Service name pattern
-portname.pattern=Port name pattern
+endpoint.config=Webservice endpoint configuration
+endpoint.config.add=Add endpoint configuration
+endpoint.config.remove=Remove endpoint configuration
+endpoint.config.pre.handler.chain=Endpoint configuration PRE handler chain
+endpoint.config.post.handler.chain=Endpoint configuration POST handler chain
+endpoint.config.property=Endpoint configuration property
+endpoint.config.property.add=Add endpoint configuration property
+endpoint.config.property.remove=Remove endpoint configuration property
+endpoint.config.property.value="Endpoint configuration property value
+protocol.binding=Protocol binding
+handler=Endpoint handler
handler.name=Handler name
handler.class=Handler class
-property.name=Property name
-property.value=Property value
-feature.name=Feature name
-feature.value=Feature value
14 years, 1 month
- 1
- 0
JBossWS SVN: r15928 - container/jboss71/branches/jbossws-jboss711.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-03-13 07:11:46 -0400 (Tue, 13 Mar 2012)
New Revision: 15928
Modified:
container/jboss71/branches/jbossws-jboss711/pom.xml
Log:
Modified: container/jboss71/branches/jbossws-jboss711/pom.xml
===================================================================
--- container/jboss71/branches/jbossws-jboss711/pom.xml 2012-03-13 11:10:54 UTC (rev 15927)
+++ container/jboss71/branches/jbossws-jboss711/pom.xml 2012-03-13 11:11:46 UTC (rev 15928)
@@ -2,10 +2,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <name>JBoss Web Services - Container JBoss-7.1.0.Final</name>
+ <name>JBoss Web Services - Container JBoss-7.1.1.Final</name>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss711</artifactId>
- <description>JBossWS Container integration for JBoss AS 7.1.0.Final</description>
+ <description>JBossWS Container integration for JBoss AS 7.1.1.Final</description>
<version>4.1.0-SNAPSHOT</version>
14 years, 1 month
- 1
- 0
JBossWS SVN: r15927 - container/jboss71/branches/jbossws-jboss711.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-03-13 07:10:54 -0400 (Tue, 13 Mar 2012)
New Revision: 15927
Modified:
container/jboss71/branches/jbossws-jboss711/pom.xml
Log:
Updating pom.xml
Modified: container/jboss71/branches/jbossws-jboss711/pom.xml
===================================================================
--- container/jboss71/branches/jbossws-jboss711/pom.xml 2012-03-13 11:08:13 UTC (rev 15926)
+++ container/jboss71/branches/jbossws-jboss711/pom.xml 2012-03-13 11:10:54 UTC (rev 15927)
@@ -4,7 +4,7 @@
<name>JBoss Web Services - Container JBoss-7.1.0.Final</name>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss710</artifactId>
+ <artifactId>jbossws-jboss711</artifactId>
<description>JBossWS Container integration for JBoss AS 7.1.0.Final</description>
<version>4.1.0-SNAPSHOT</version>
14 years, 1 month
- 1
- 0
JBossWS SVN: r15926 - container/jboss71/branches/jbossws-jboss710.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-03-13 07:08:13 -0400 (Tue, 13 Mar 2012)
New Revision: 15926
Modified:
container/jboss71/branches/jbossws-jboss710/pom.xml
Log:
Updating pom.xml
Modified: container/jboss71/branches/jbossws-jboss710/pom.xml
===================================================================
--- container/jboss71/branches/jbossws-jboss710/pom.xml 2012-03-13 11:07:52 UTC (rev 15925)
+++ container/jboss71/branches/jbossws-jboss710/pom.xml 2012-03-13 11:08:13 UTC (rev 15926)
@@ -7,7 +7,7 @@
<artifactId>jbossws-jboss710</artifactId>
<description>JBossWS Container integration for JBoss AS 7.1.0.Final</description>
- <version>4.0.3-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
<!-- Parent -->
<parent>
14 years, 1 month
- 1
- 0
JBossWS SVN: r15925 - container/jboss71/branches/jbossws-jboss711.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-03-13 07:07:52 -0400 (Tue, 13 Mar 2012)
New Revision: 15925
Modified:
container/jboss71/branches/jbossws-jboss711/pom.xml
Log:
Updating pom.xml
Modified: container/jboss71/branches/jbossws-jboss711/pom.xml
===================================================================
--- container/jboss71/branches/jbossws-jboss711/pom.xml 2012-03-13 11:02:59 UTC (rev 15924)
+++ container/jboss71/branches/jbossws-jboss711/pom.xml 2012-03-13 11:07:52 UTC (rev 15925)
@@ -7,7 +7,7 @@
<artifactId>jbossws-jboss710</artifactId>
<description>JBossWS Container integration for JBoss AS 7.1.0.Final</description>
- <version>4.0.3-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
<!-- Parent -->
<parent>
@@ -18,9 +18,9 @@
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/container/jboss71/branches...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/container/jboss71/branches/jb...</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/container/jboss71/branches/jboss...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/container/jboss71/branches...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/container/jboss71/branches/jb...</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/container/jboss71/branches/jboss...</url>
</scm>
<!-- Properties -->
@@ -29,7 +29,7 @@
<jbossws.spi.version>2.0.4-SNAPSHOT</jbossws.spi.version>
<jbossws.common.version>2.0.3-SNAPSHOT</jbossws.common.version>
<jboss.msc.version>1.0.2.GA</jboss.msc.version>
- <jboss.version>7.1.0.Final</jboss.version>
+ <jboss.version>7.1.1.Final</jboss.version>
<jboss.jaxws.api.version>2.0.0.Final</jboss.jaxws.api.version>
</properties>
14 years, 1 month
- 1
- 0
JBossWS SVN: r15924 - container/jboss71/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-03-13 07:02:59 -0400 (Tue, 13 Mar 2012)
New Revision: 15924
Added:
container/jboss71/branches/jbossws-jboss711/
Log:
Copying jbossws-jboss710 CI into 711
14 years, 1 month
- 1
- 0
JBossWS SVN: r15923 - in stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws: benchmark/jaxws and 89 other directories.
by jbossws-commits＠lists.jboss.org
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:param1>" +
- " <ns2:param2 wsa:IsReferenceParameter='true' xmlns:ns2='http://helloservice.org/param2' xmlns:wsa='http://www.w3.org/2005/08/addressing'>World</ns2:param2>" +
- " </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'>myns:HelloService</wsam:ServiceName>" +
- " <wsam:InterfaceName xmlns:myns='http://helloservice.org/wsdl' xmlns:wsam='http://www.w3.org/2007/05/addressing/metadata'>myns:Hello</wsam:InterfaceName>" +
- " </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:param1>" +
+ " <ns2:param2 wsa:IsReferenceParameter='true' xmlns:ns2='http://helloservice.org/param2' xmlns:wsa='http://www.w3.org/2005/08/addressing'>World</ns2:param2>" +
+ " </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'>myns:HelloService</wsam:ServiceName>" +
+ " <wsam:InterfaceName xmlns:myns='http://helloservice.org/wsdl' xmlns:wsam='http://www.w3.org/2007/05/addressing/metadata'>myns:Hello</wsam:InterfaceName>" +
+ " </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
14 years, 1 month
- 1
- 0
JBossWS SVN: r15922 - shared-testsuite/trunk/src/main/java/org/jboss/wsf/test.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-03-13 04:56:43 -0400 (Tue, 13 Mar 2012)
New Revision: 15922
Modified:
shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java
Log:
[JBWS-3455] Adding another constructor accepting cleanup operation
Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java
===================================================================
--- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2012-03-12 17:08:42 UTC (rev 15921)
+++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2012-03-13 08:56:43 UTC (rev 15922)
@@ -103,6 +103,12 @@
getArchiveArray(archiveList);
}
+ public JBossWSTestSetup(Test test, String archiveList, CleanupOperation cleanupOp)
+ {
+ this(test, archiveList);
+ this.cleanupOp = cleanupOp;
+ }
+
public JBossWSTestSetup(Test test, String archiveList, boolean requiresDefaultSecurityDomain)
{
this(test, archiveList);
14 years, 1 month
- 1
- 0
JBossWS SVN: r15921 - in shared-testsuite/trunk: testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/bare and 25 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-03-12 13:08:42 -0400 (Mon, 12 Mar 2012)
New Revision: 15921
Added:
shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/CleanupOperation.java
Modified:
shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java
shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderClientTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/oneway/OneWayTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1446/JBWS1446TestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1797/JBWS1797TestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2218/JBWS2218TestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2917/JBWS2917TestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2955/JBWS2955TestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2956/JBWS2956TestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3034/JBWS3034TestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3114/JBWS3114TestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/addressing/AddressingStatefulTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webresult/WebResultTestCase.java
Log:
[JBWS-3455] Adding CleanupOperation and fixing shared-testsuite tests to clean up static member references to client proxies
Added: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/CleanupOperation.java
===================================================================
--- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/CleanupOperation.java (rev 0)
+++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/CleanupOperation.java 2012-03-12 17:08:42 UTC (rev 15921)
@@ -0,0 +1,28 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.test;
+
+public abstract class CleanupOperation {
+
+ public abstract void cleanUp();
+
+}
Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java
===================================================================
--- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2012-03-12 14:45:11 UTC (rev 15920)
+++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2012-03-12 17:08:42 UTC (rev 15921)
@@ -36,11 +36,9 @@
import java.util.Map;
import java.util.Map.Entry;
import java.util.Properties;
-import java.util.Set;
import java.util.StringTokenizer;
import javax.management.MBeanServerConnection;
-import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
@@ -58,11 +56,11 @@
*
* @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a>
*/
public abstract class JBossWSTest extends TestCase
{
protected static Logger log = Logger.getLogger(JBossWSTest.class.getName());
- //private static JBossWSTestHelper delegate = new JBossWSTestHelper();
public JBossWSTest()
{
@@ -72,7 +70,7 @@
{
super(name);
}
-
+
/**
* Execute <b>command</b> in separate process.
* @param command command to execute
@@ -130,8 +128,7 @@
if (command == null)
throw new NullPointerException( "Command cannot be null" );
- System.out.println("Executing command: " + command);
- log.debug("Executing command: " + command);
+ log.info("Executing command: " + command);
StringTokenizer st = new StringTokenizer(command, " \t\r");
List<String> tokenizedCommand = new LinkedList<String>();
Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java
===================================================================
--- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2012-03-12 14:45:11 UTC (rev 15920)
+++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2012-03-12 17:08:42 UTC (rev 15921)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2012, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -37,7 +37,9 @@
import javax.security.sasl.SaslException;
import junit.extensions.TestSetup;
+import junit.framework.Protectable;
import junit.framework.Test;
+import junit.framework.TestResult;
import junit.framework.TestSuite;
import org.jboss.logging.Logger;
@@ -62,6 +64,7 @@
private ClassLoader originalClassLoader;
private Map<String, Map<String, String>> securityDomains;
private boolean defaultSecurityDomainRequirement = false;
+ private CleanupOperation cleanupOp;
public JBossWSTestSetup(Class<?> testClass, String archiveList)
{
@@ -69,6 +72,12 @@
getArchiveArray(archiveList);
}
+ public JBossWSTestSetup(Class<?> testClass, String archiveList, CleanupOperation cleanupOp)
+ {
+ this(testClass, archiveList);
+ this.cleanupOp = cleanupOp;
+ }
+
public JBossWSTestSetup(Class<?> testClass, String archiveList, OutputStream appclientOutputStream)
{
super(new TestSuite(testClass));
@@ -82,6 +91,12 @@
setDefaultSecurityDomainRequirement(requiresDefaultSecurityDomain);
}
+ public JBossWSTestSetup(Class<?> testClass, String archiveList, boolean requiresDefaultSecurityDomain, CleanupOperation cleanupOp)
+ {
+ this(testClass, archiveList, requiresDefaultSecurityDomain);
+ this.cleanupOp = cleanupOp;
+ }
+
public JBossWSTestSetup(Test test, String archiveList)
{
super(test);
@@ -98,6 +113,29 @@
{
super(test);
}
+
+ /**
+ * Override junit.extensions.TestSetup:run(TestResult result) to call cleanup operation
+ * before tearing down the whole test setup. Required for allowing tests to perform
+ * final cleanup of static references.
+ */
+ @Override
+ public void run(final TestResult result)
+ {
+ Protectable p = new Protectable()
+ {
+ public void protect() throws Exception
+ {
+ setUp();
+ basicRun(result);
+ if (cleanupOp != null) {
+ cleanupOp.cleanUp();
+ }
+ tearDown();
+ }
+ };
+ result.runProtected(this, p);
+ }
public File getArchiveFile(String archive)
{
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase.java 2012-03-12 14:45:11 UTC (rev 15920)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase.java 2012-03-12 17:08:42 UTC (rev 15921)
@@ -30,6 +30,7 @@
import junit.framework.Test;
+import org.jboss.wsf.test.CleanupOperation;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -47,7 +48,12 @@
public static Test suite()
{
- return new JBossWSTestSetup(TrivialServiceDocBareTestCase.class, "jaxrpc-samples-docstyle-bare.war, jaxrpc-samples-docstyle-bare-client.jar");
+ return new JBossWSTestSetup(TrivialServiceDocBareTestCase.class, "jaxrpc-samples-docstyle-bare.war, jaxrpc-samples-docstyle-bare-client.jar", new CleanupOperation() {
+ @Override
+ public void cleanUp() {
+ port = null;
+ }
+ });
}
protected void setUp() throws Exception
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase.java 2012-03-12 14:45:11 UTC (rev 15920)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase.java 2012-03-12 17:08:42 UTC (rev 15921)
@@ -30,6 +30,7 @@
import junit.framework.Test;
+import org.jboss.wsf.test.CleanupOperation;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -47,7 +48,12 @@
public static Test suite()
{
- return new JBossWSTestSetup(TrivialServiceDocWrappedTestCase.class, "jaxrpc-samples-docstyle-wrapped.war, jaxrpc-samples-docstyle-wrapped-client.jar");
+ return new JBossWSTestSetup(TrivialServiceDocWrappedTestCase.class, "jaxrpc-samples-docstyle-wrapped.war, jaxrpc-samples-docstyle-wrapped-client.jar", new CleanupOperation() {
+ @Override
+ public void cleanUp() {
+ port = null;
+ }
+ });
}
protected void setUp() throws Exception
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderClientTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderClientTestCase.java 2012-03-12 14:45:11 UTC (rev 15920)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderClientTestCase.java 2012-03-12 17:08:42 UTC (rev 15921)
@@ -33,6 +33,7 @@
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
+import org.jboss.wsf.test.CleanupOperation;
/**
* Test bound and unbound headers
@@ -49,7 +50,12 @@
public static Test suite()
{
- return new JBossWSTestSetup(HeaderClientTestCase.class, "jaxrpc-samples-handler.war, jaxrpc-samples-handler-client.jar");
+ return new JBossWSTestSetup(HeaderClientTestCase.class, "jaxrpc-samples-handler.war, jaxrpc-samples-handler-client.jar", new CleanupOperation() {
+ @Override
+ public void cleanUp() {
+ port = null;
+ }
+ });
}
protected void setUp() throws Exception
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderTestCase.java 2012-03-12 14:45:11 UTC (rev 15920)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderTestCase.java 2012-03-12 17:08:42 UTC (rev 15921)
@@ -53,6 +53,7 @@
import junit.framework.Test;
+import org.jboss.wsf.test.CleanupOperation;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -71,7 +72,12 @@
public static Test suite()
{
- return new JBossWSTestSetup(HolderDIITestCase.class, "jaxrpc-samples-holder.war, jaxrpc-samples-holder-client.jar");
+ return new JBossWSTestSetup(HolderDIITestCase.class, "jaxrpc-samples-holder.war, jaxrpc-samples-holder-client.jar", new CleanupOperation() {
+ @Override
+ public void cleanUp() {
+ port = null;
+ }
+ });
}
protected void setUp() throws Exception
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java 2012-03-12 14:45:11 UTC (rev 15920)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java 2012-03-12 17:08:42 UTC (rev 15921)
@@ -29,6 +29,7 @@
import junit.framework.Test;
+import org.jboss.wsf.test.CleanupOperation;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -46,7 +47,12 @@
public static Test suite()
{
- return new JBossWSTestSetup(DocEJBTestCase.class, "jaxrpc-samples-jsr109ejb-doc.jar, jaxrpc-samples-jsr109ejb-doc-client.jar");
+ return new JBossWSTestSetup(DocEJBTestCase.class, "jaxrpc-samples-jsr109ejb-doc.jar, jaxrpc-samples-jsr109ejb-doc-client.jar", new CleanupOperation() {
+ @Override
+ public void cleanUp() {
+ endpoint = null;
+ }
+ });
}
protected void setUp() throws Exception
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java 2012-03-12 14:45:11 UTC (rev 15920)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java 2012-03-12 17:08:42 UTC (rev 15921)
@@ -29,6 +29,7 @@
import junit.framework.Test;
+import org.jboss.wsf.test.CleanupOperation;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -46,7 +47,12 @@
public static Test suite()
{
- return new JBossWSTestSetup(RpcEJBTestCase.class, "jaxrpc-samples-jsr109ejb-rpc.jar, jaxrpc-samples-jsr109ejb-rpc-client.jar");
+ return new JBossWSTestSetup(RpcEJBTestCase.class, "jaxrpc-samples-jsr109ejb-rpc.jar, jaxrpc-samples-jsr109ejb-rpc-client.jar", new CleanupOperation() {
+ @Override
+ public void cleanUp() {
+ port = null;
+ }
+ });
}
protected void setUp() throws Exception
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java 2012-03-12 14:45:11 UTC (rev 15920)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java 2012-03-12 17:08:42 UTC (rev 15921)
@@ -29,6 +29,7 @@
import junit.framework.Test;
+import org.jboss.wsf.test.CleanupOperation;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -46,7 +47,12 @@
public static Test suite()
{
- return new JBossWSTestSetup(DocJSETestCase.class, "jaxrpc-samples-jsr109pojo-doc.war, jaxrpc-samples-jsr109pojo-doc-client.jar");
+ return new JBossWSTestSetup(DocJSETestCase.class, "jaxrpc-samples-jsr109pojo-doc.war, jaxrpc-samples-jsr109pojo-doc-client.jar", new CleanupOperation() {
+ @Override
+ public void cleanUp() {
+ port = null;
+ }
+ });
}
protected void setUp() throws Exception
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2012-03-12 14:45:11 UTC (rev 15920)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2012-03-12 17:08:42 UTC (rev 15921)
@@ -29,6 +29,7 @@
import junit.framework.Test;
+import org.jboss.wsf.test.CleanupOperation;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -46,7 +47,12 @@
public static Test suite()
{
- return new JBossWSTestSetup(RpcJSETestCase.class, "jaxrpc-samples-jsr109pojo-rpc.war, jaxrpc-samples-jsr109pojo-rpc-client.jar");
+ return new JBossWSTestSetup(RpcJSETestCase.class, "jaxrpc-samples-jsr109pojo-rpc.war, jaxrpc-samples-jsr109pojo-rpc-client.jar", new CleanupOperation() {
+ @Override
+ public void cleanUp() {
+ port = null;
+ }
+ });
}
protected void setUp() throws Exception
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java 2012-03-12 14:45:11 UTC (rev 15920)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java 2012-03-12 17:08:42 UTC (rev 15921)
@@ -36,6 +36,7 @@
import junit.framework.Test;
+import org.jboss.wsf.test.CleanupOperation;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -56,7 +57,12 @@
/** Deploy the test ear */
public static Test suite() throws Exception
{
- return new JBossWSTestSetup(MTOMTestCase.class, "jaxrpc-samples-mtom.war, jaxrpc-samples-mtom-client.jar");
+ return new JBossWSTestSetup(MTOMTestCase.class, "jaxrpc-samples-mtom.war, jaxrpc-samples-mtom-client.jar", new CleanupOperation() {
+ @Override
+ public void cleanUp() {
+ port = null;
+ }
+ });
}
protected void setUp() throws Exception
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/oneway/OneWayTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/oneway/OneWayTestCase.java 2012-03-12 14:45:11 UTC (rev 15920)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/oneway/OneWayTestCase.java 2012-03-12 17:08:42 UTC (rev 15921)
@@ -30,6 +30,7 @@
import junit.framework.Test;
+import org.jboss.wsf.test.CleanupOperation;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -48,7 +49,12 @@
public static Test suite()
{
- return new JBossWSTestSetup(OneWayTestCase.class, "jaxrpc-samples-oneway.war, jaxrpc-samples-oneway-client.jar");
+ return new JBossWSTestSetup(OneWayTestCase.class, "jaxrpc-samples-oneway.war, jaxrpc-samples-oneway-client.jar", new CleanupOperation() {
+ @Override
+ public void cleanUp() {
+ port = null;
+ }
+ });
}
protected void setUp() throws Exception
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase.java 2012-03-12 14:45:11 UTC (rev 15920)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase.java 2012-03-12 17:08:42 UTC (rev 15921)
@@ -30,6 +30,7 @@
import junit.framework.Test;
+import org.jboss.wsf.test.CleanupOperation;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -48,7 +49,12 @@
public static Test suite()
{
- return new JBossWSTestSetup(TrivialServiceRpcTestCase.class, "jaxrpc-samples-rpcstyle.war, jaxrpc-samples-rpcstyle-client.jar");
+ return new JBossWSTestSetup(TrivialServiceRpcTestCase.class, "jaxrpc-samples-rpcstyle.war, jaxrpc-samples-rpcstyle-client.jar", new CleanupOperation() {
+ @Override
+ public void cleanUp() {
+ port = null;
+ }
+ });
}
protected void setUp() throws Exception
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java 2012-03-12 14:45:11 UTC (rev 15920)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java 2012-03-12 17:08:42 UTC (rev 15921)
@@ -38,6 +38,7 @@
import junit.framework.Test;
+import org.jboss.wsf.test.CleanupOperation;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -57,7 +58,12 @@
/** Deploy the test ear */
public static Test suite() throws Exception
{
- return new JBossWSTestSetup(AttachmentProxyTestCase.class, "jaxrpc-samples-swa.war, jaxrpc-samples-swa-client.jar");
+ return new JBossWSTestSetup(AttachmentProxyTestCase.class, "jaxrpc-samples-swa.war, jaxrpc-samples-swa-client.jar", new CleanupOperation() {
+ @Override
+ public void cleanUp() {
+ port = null;
+ }
+ });
}
protected void setUp() throws Exception
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java 2012-03-12 14:45:11 UTC (rev 15920)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java 2012-03-12 17:08:42 UTC (rev 15921)
@@ -28,6 +28,7 @@
import junit.framework.Test;
+import org.jboss.wsf.test.CleanupOperation;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -44,7 +45,12 @@
public static Test suite()
{
- return new JBossWSTestSetup(JBWS1422TestCase.class, "jaxws-jbws1422.jar");
+ return new JBossWSTestSetup(JBWS1422TestCase.class, "jaxws-jbws1422.jar", new CleanupOperation() {
+ @Override
+ public void cleanUp() {
+ port = null;
+ }
+ });
}
@Override
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1446/JBWS1446TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1446/JBWS1446TestCase.java 2012-03-12 14:45:11 UTC (rev 15920)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1446/JBWS1446TestCase.java 2012-03-12 17:08:42 UTC (rev 15921)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.jbws1446;
-import java.net.MalformedURLException;
import java.net.URL;
import javax.xml.namespace.QName;
@@ -42,26 +41,18 @@
*/
public class JBWS1446TestCase extends JBossWSTest
{
- private static EndpointInterface port;
-
public static Test suite()
{
return new JBossWSTestSetup(JBWS1446TestCase.class, "jaxws-jbws1446.jar");
}
- public void setUp() throws MalformedURLException
- {
- if (port == null)
- {
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1446/EJB3Bean?wsdl");
- QName serviceName = new QName("http://jbws1446.jaxws.ws.test.jboss.org/", "EJB3BeanService");
- Service service = Service.create(wsdlURL, serviceName);
- port = service.getPort(EndpointInterface.class);
- }
- }
-
public void testObjectAccess() throws Exception
{
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1446/EJB3Bean?wsdl");
+ QName serviceName = new QName("http://jbws1446.jaxws.ws.test.jboss.org/", "EJB3BeanService");
+ Service service = Service.create(wsdlURL, serviceName);
+ EndpointInterface port = service.getPort(EndpointInterface.class);
+
Object hello = port.helloObject("hello");
assertEquals("hello", hello);
}
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java 2012-03-12 14:45:11 UTC (rev 15920)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java 2012-03-12 17:08:42 UTC (rev 15921)
@@ -29,6 +29,7 @@
import junit.framework.Test;
+import org.jboss.wsf.test.CleanupOperation;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -46,7 +47,12 @@
public static Test suite()
{
- return new JBossWSTestSetup(JBWS1556EarTestCase.class, "jaxws-jbws1556.ear");
+ return new JBossWSTestSetup(JBWS1556EarTestCase.class, "jaxws-jbws1556.ear", new CleanupOperation() {
+ @Override
+ public void cleanUp() {
+ port = null;
+ }
+ });
}
public void setUp() throws MalformedURLException
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1797/JBWS1797TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1797/JBWS1797TestCase.java 2012-03-12 14:45:11 UTC (rev 15920)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1797/JBWS1797TestCase.java 2012-03-12 17:08:42 UTC (rev 15921)
@@ -38,6 +38,7 @@
import junit.framework.Test;
+import org.jboss.wsf.test.CleanupOperation;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -55,7 +56,13 @@
public static Test suite()
{
- return new JBossWSTestSetup(JBWS1797TestCase.class, "jaxws-jbws1797.war");
+ return new JBossWSTestSetup(JBWS1797TestCase.class, "jaxws-jbws1797.war", new CleanupOperation() {
+ @Override
+ public void cleanUp() {
+ port = null;
+ wsdlURL = null;
+ }
+ });
}
@Override
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java 2012-03-12 14:45:11 UTC (rev 15920)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java 2012-03-12 17:08:42 UTC (rev 15921)
@@ -22,6 +22,8 @@
package org.jboss.test.ws.jaxws.jbws1841;
import junit.framework.Test;
+
+import org.jboss.wsf.test.CleanupOperation;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -46,7 +48,13 @@
private static InitialContext ctx;
public static Test suite()
{
- return new JBossWSTestSetup(JBWS1841TestCase.class, "jaxws-jbws1841.jar");
+ return new JBossWSTestSetup(JBWS1841TestCase.class, "jaxws-jbws1841.jar", new CleanupOperation() {
+ @Override
+ public void cleanUp() {
+ port = null;
+ remote = null;
+ }
+ });
}
protected void setUp() throws Exception
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2218/JBWS2218TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2218/JBWS2218TestCase.java 2012-03-12 14:45:11 UTC (rev 15920)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2218/JBWS2218TestCase.java 2012-03-12 17:08:42 UTC (rev 15921)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.jbws2218;
-import java.net.MalformedURLException;
import java.net.URL;
import javax.xml.namespace.QName;
@@ -39,26 +38,17 @@
*/
public class JBWS2218TestCase extends JBossWSTest
{
- private static EndpointInterface port;
-
public static Test suite()
{
return new JBossWSTestSetup(JBWS2218TestCase.class, "jaxws-jbws2218.jar");
}
- public void setUp() throws MalformedURLException
- {
- if (port == null)
- {
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/myweb/myweb-service/WebDelegateEndPoint?wsdl");
- QName serviceName = new QName("http://jbws2218.jaxws.ws.test.jboss.org/", "EJB3BeanService");
- Service service = Service.create(wsdlURL, serviceName);
- port = service.getPort(EndpointInterface.class);
- }
- }
-
public void testSimpleAccess() throws Exception
{
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/myweb/myweb-service/WebDelegateEndPoint?wsdl");
+ QName serviceName = new QName("http://jbws2218.jaxws.ws.test.jboss.org/", "EJB3BeanService");
+ Service service = Service.create(wsdlURL, serviceName);
+ EndpointInterface port = service.getPort(EndpointInterface.class);
String hello = port.helloSimple("hello");
assertEquals("hello", hello);
}
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2917/JBWS2917TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2917/JBWS2917TestCase.java 2012-03-12 14:45:11 UTC (rev 15920)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2917/JBWS2917TestCase.java 2012-03-12 17:08:42 UTC (rev 15921)
@@ -36,19 +36,19 @@
*/
public final class JBWS2917TestCase extends JBossWSTest
{
- private static final String XML_SOURCE = "<?xml version='1.0' encoding='UTF-8' standalone='yes'?>\n" +
- "<EndpointReference xmlns='http://www.w3.org/2005/08/addressing'>\n" +
- " <Address>http://localhost:8080/jaxws-endpointReference</Address>\n" +
- " <Metadata\n" +
- " wsdli:wsdlLocation='http://org.jboss.ws/endpointReference http://localhost:8080/jaxws-endpointReference?wsdl'\n" +
- " xmlns:wsdli='http://www.w3.org/ns/wsdl-instance'>\n" +
- " <wsam:InterfaceName xmlns:wsam='http://www.w3.org/2005/08/addressing' xmlns:wsns='http://org.jboss.ws/endpointReference'>wsns:Endpoint</wsam:InterfaceName>\n" +
- " <wsam:ServiceName xmlns:wsam='http://www.w3.org/2005/08/addressing' xmlns:wsns='http://org.jboss.ws/endpointReference' xmlns='' EndpointName='HelloPort'>wsns:EndpointService</wsam:ServiceName>\n" +
- " </Metadata>\n" +
- "</EndpointReference>\n";
-
public void testToString() throws Exception
{
+ String XML_SOURCE = "<?xml version='1.0' encoding='UTF-8' standalone='yes'?>\n" +
+ "<EndpointReference xmlns='http://www.w3.org/2005/08/addressing'>\n" +
+ " <Address>http://localhost:8080/jaxws-endpointReference</Address>\n" +
+ " <Metadata\n" +
+ " wsdli:wsdlLocation='http://org.jboss.ws/endpointReference http://localhost:8080/jaxws-endpointReference?wsdl'\n" +
+ " xmlns:wsdli='http://www.w3.org/ns/wsdl-instance'>\n" +
+ " <wsam:InterfaceName xmlns:wsam='http://www.w3.org/2005/08/addressing' xmlns:wsns='http://org.jboss.ws/endpointReference'>wsns:Endpoint</wsam:InterfaceName>\n" +
+ " <wsam:ServiceName xmlns:wsam='http://www.w3.org/2005/08/addressing' xmlns:wsns='http://org.jboss.ws/endpointReference' xmlns='' EndpointName='HelloPort'>wsns:EndpointService</wsam:ServiceName>\n" +
+ " </Metadata>\n" +
+ "</EndpointReference>\n";
+
assertTrue("lost xmlns:wsns namespace declaration", this.getXML(XML_SOURCE).indexOf("xmlns:wsns") != -1);
StreamSource source = new StreamSource(new StringReader(XML_SOURCE));
EndpointReference epRef = EndpointReference.readFrom(source);
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2955/JBWS2955TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2955/JBWS2955TestCase.java 2012-03-12 14:45:11 UTC (rev 15920)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2955/JBWS2955TestCase.java 2012-03-12 17:08:42 UTC (rev 15921)
@@ -33,23 +33,16 @@
public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2955";
- private static Endpoint port;
-
public static Test suite() throws Exception
{
return new JBossWSTestSetup(JBWS2955TestCase.class, "jaxws-jbws2955.war");
}
- public void setUp() throws Exception
- {
- super.setUp();
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
- EndpointService service = new EndpointService(wsdlURL);
- port = service.getEndpointPort();
- }
-
public void testCall() throws Exception
{
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ EndpointService service = new EndpointService(wsdlURL);
+ Endpoint port = service.getEndpointPort();
String response = port.echo("testJBWS2955");
assertEquals("PutByClientSOAPHandler", response);
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2956/JBWS2956TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2956/JBWS2956TestCase.java 2012-03-12 14:45:11 UTC (rev 15920)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2956/JBWS2956TestCase.java 2012-03-12 17:08:42 UTC (rev 15921)
@@ -33,23 +33,16 @@
public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2956";
- private static OnewayEndpoint port;
-
public static Test suite() throws Exception
{
return new JBossWSTestSetup(JBWS2956TestCase.class, "jaxws-jbws2956.war");
}
- public void setUp() throws Exception
- {
- super.setUp();
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
- OnewayEndpointService service = new OnewayEndpointService(wsdlURL);
- port = service.getOnewayEndpointPort();
- }
-
public void testCall() throws Exception
{
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ OnewayEndpointService service = new OnewayEndpointService(wsdlURL);
+ OnewayEndpoint port = service.getOnewayEndpointPort();
//there should be no exception threw
port.echo("testJBWS2956");
}
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3034/JBWS3034TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3034/JBWS3034TestCase.java 2012-03-12 14:45:11 UTC (rev 15920)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3034/JBWS3034TestCase.java 2012-03-12 17:08:42 UTC (rev 15921)
@@ -36,23 +36,16 @@
public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws3034";
- private static Endpoint port;
-
public static Test suite() throws Exception
{
return new JBossWSTestSetup(JBWS3034TestCase.class, "jaxws-jbws3034.war");
}
- public void setUp() throws Exception
+ public void testCall() throws Exception
{
- super.setUp();
URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
Service service = Service.create(wsdlURL, new QName("http://ws.jboss.org/jbws3034", "EndpointService"));
- port = service.getPort(new QName("http://ws.jboss.org/jbws3034", "EndpointPort"), Endpoint.class);
- }
-
- public void testCall() throws Exception
- {
+ Endpoint port = service.getPort(new QName("http://ws.jboss.org/jbws3034", "EndpointPort"), Endpoint.class);
String response = port.echo("testJBWS3034");
assertEquals("PutByServerSOAPHandler", response);
}
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3114/JBWS3114TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3114/JBWS3114TestCase.java 2012-03-12 14:45:11 UTC (rev 15920)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3114/JBWS3114TestCase.java 2012-03-12 17:08:42 UTC (rev 15921)
@@ -38,23 +38,16 @@
public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws3114";
- private static Endpoint port;
-
public static Test suite() throws Exception
{
return new JBossWSTestSetup(JBWS3114TestCase.class, "jaxws-jbws3114.war");
}
- public void setUp() throws Exception
+ public void testConfigureTimeout() throws Exception
{
- super.setUp();
URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
EndpointService service = new EndpointService(wsdlURL);
- port = service.getEndpointPort();
- }
-
- public void testConfigureTimeout() throws Exception
- {
+ Endpoint port = service.getEndpointPort();
String response = port.echo("testjbws3114");
assertEquals("testjbws3114", response);
((BindingProvider) port).getRequestContext().put("javax.xml.ws.client.connectionTimeout", "6000");
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java 2012-03-12 14:45:11 UTC (rev 15920)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java 2012-03-12 17:08:42 UTC (rev 15921)
@@ -40,28 +40,19 @@
public class JBWS981TestCase extends JBossWSTest
{
- private static EndpointInterface port;
-
public static Test suite()
{
return new JBossWSTestSetup(JBWS981TestCase.class, "jaxws-jbws981.jar");
}
- protected void setUp() throws Exception
- {
- super.setUp();
- if (port == null)
- {
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws981/EndpointService/EJB3Bean?wsdl");
- QName serviceName = new QName("http://www.jboss.org/test/ws/jaxws/jbws981", "EndpointService");
- Service.create(wsdlURL, serviceName);
- Service service = Service.create(wsdlURL, serviceName);
- port = (EndpointInterface)service.getPort(EndpointInterface.class);
- }
- }
-
public void testCall() throws Exception
{
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws981/EndpointService/EJB3Bean?wsdl");
+ QName serviceName = new QName("http://www.jboss.org/test/ws/jaxws/jbws981", "EndpointService");
+ Service.create(wsdlURL, serviceName);
+ Service service = Service.create(wsdlURL, serviceName);
+ EndpointInterface port = (EndpointInterface)service.getPort(EndpointInterface.class);
+
String message = "Web service mapped to virtual host.";
assertEquals("Web service mapped to virtual host.", port.hello(message));
}
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/addressing/AddressingStatefulTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/addressing/AddressingStatefulTestCase.java 2012-03-12 14:45:11 UTC (rev 15920)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/addressing/AddressingStatefulTestCase.java 2012-03-12 17:08:42 UTC (rev 15921)
@@ -29,6 +29,7 @@
import junit.framework.Test;
+import org.jboss.wsf.test.CleanupOperation;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -46,7 +47,13 @@
public static Test suite()
{
- return new JBossWSTestSetup(AddressingStatefulTestCase.class, "jaxws-samples-wsaddressing.war");
+ return new JBossWSTestSetup(AddressingStatefulTestCase.class, "jaxws-samples-wsaddressing.war", new CleanupOperation() {
+ @Override
+ public void cleanUp() {
+ port1 = null;
+ port2 = null;
+ }
+ });
}
protected void setUp() throws Exception
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java 2012-03-12 14:45:11 UTC (rev 15920)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java 2012-03-12 17:08:42 UTC (rev 15921)
@@ -23,6 +23,7 @@
import junit.framework.Test;
+import org.jboss.wsf.test.CleanupOperation;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -46,12 +47,23 @@
private QName wrappedServiceQName = new QName("http://swaref.samples.jaxws.ws.test.jboss.org/", "WrappedEndpointService");
private QName rpcLitServiceQName = new QName("http://swaref.samples.jaxws.ws.test.jboss.org/", "RpcLitEndpointService");
- private static DataHandler data = new DataHandler("Client data", "text/plain");
+ private static DataHandler data;
public static Test suite()
{
- return new JBossWSTestSetup(SWARefTestCase.class, "jaxws-samples-swaref.jar");
+ return new JBossWSTestSetup(SWARefTestCase.class, "jaxws-samples-swaref.jar", new CleanupOperation() {
+ @Override
+ public void cleanUp() {
+ data = null;
+ }
+ });
}
+
+ protected void setUp() throws Exception {
+ if (data == null) {
+ data = new DataHandler("Client data", "text/plain");
+ }
+ }
public void testBeanAnnotationWithBare() throws Exception
{
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java 2012-03-12 14:45:11 UTC (rev 15920)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java 2012-03-12 17:08:42 UTC (rev 15921)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.samples.webparam;
-import java.io.File;
import java.net.URL;
import javax.xml.namespace.QName;
@@ -30,6 +29,7 @@
import junit.framework.Test;
+import org.jboss.wsf.test.CleanupOperation;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -47,7 +47,12 @@
public static Test suite()
{
- return new JBossWSTestSetup(WebParamTestCase.class, "jaxws-samples-webparam.war");
+ return new JBossWSTestSetup(WebParamTestCase.class, "jaxws-samples-webparam.war", new CleanupOperation() {
+ @Override
+ public void cleanUp() {
+ port = null;
+ }
+ });
}
public void setUp() throws Exception
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webresult/WebResultTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webresult/WebResultTestCase.java 2012-03-12 14:45:11 UTC (rev 15920)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webresult/WebResultTestCase.java 2012-03-12 17:08:42 UTC (rev 15921)
@@ -22,7 +22,6 @@
package org.jboss.test.ws.jaxws.samples.webresult;
import java.io.ByteArrayInputStream;
-import java.io.File;
import java.net.URL;
import javax.xml.namespace.QName;
@@ -35,6 +34,7 @@
import junit.framework.Test;
+import org.jboss.wsf.test.CleanupOperation;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -52,7 +52,12 @@
public static Test suite()
{
- return new JBossWSTestSetup(WebResultTestCase.class, "jaxws-samples-webresult.war");
+ return new JBossWSTestSetup(WebResultTestCase.class, "jaxws-samples-webresult.war", new CleanupOperation() {
+ @Override
+ public void cleanUp() {
+ port = null;
+ }
+ });
}
public void setUp() throws Exception
14 years, 1 month
- 1
- 0