[jbossws-commits] JBossWS SVN: r15931 - in stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws: wsaddressing/replyto and 1 other directory.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Tue Mar 13 09:28:13 EDT 2012
Author: ropalka
Date: 2012-03-13 09:28:12 -0400 (Tue, 13 Mar 2012)
New Revision: 15931
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java
Log:
[JBWS-3435] finalizing appclient integration
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java 2012-03-13 13:24:23 UTC (rev 15930)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java 2012-03-13 13:28:12 UTC (rev 15931)
@@ -96,23 +96,30 @@
private String executeApplicationClient(final String... appclientArgs) throws Throwable
{
- final OutputStream appclientOS = new ByteArrayOutputStream();
- JBossWSTestHelper.deployAppclient("jaxws-webserviceref-override-appclient.ear#jaxws-webserviceref-override-appclient.jar", appclientOS, appclientArgs);
- // 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-webserviceref-override-appclient.ear#jaxws-webserviceref-override-appclient.jar", appclientOS, appclientArgs);
+ // 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"));
+ assertTrue(appclientLog.contains("RESULT ["));
+ assertTrue(appclientLog.contains("] RESULT"));
+ int indexOfResultStart = appclientLog.indexOf("RESULT [");
+ int indexOfResultStop = appclientLog.indexOf("] RESULT");
+ assertTrue(indexOfResultStart > 0);
+ assertTrue(indexOfResultStop > 0);
+ return appclientLog.substring(indexOfResultStart + 8, indexOfResultStop);
}
- // assert appclient logs
- assertTrue(appclientLog.contains("TEST START"));
- assertTrue(appclientLog.contains("TEST END"));
- assertTrue(appclientLog.contains("RESULT ["));
- assertTrue(appclientLog.contains("] RESULT"));
- int indexOfResultStart = appclientLog.indexOf("RESULT [");
- int indexOfResultStop = appclientLog.indexOf("] RESULT");
- assertTrue(indexOfResultStart > 0);
- assertTrue(indexOfResultStop > 0);
- return appclientLog.substring(indexOfResultStart + 8, indexOfResultStop);
+ finally
+ {
+ JBossWSTestHelper.undeployAppclient("jaxws-webserviceref-override-appclient.ear#jaxws-webserviceref-override-appclient.jar", false);
+ }
}
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java 2012-03-13 13:24:23 UTC (rev 15930)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java 2012-03-13 13:28:12 UTC (rev 15931)
@@ -119,24 +119,31 @@
private String executeApplicationClient(final String... appclientArgs) throws Throwable
{
- final OutputStream appclientOS = new ByteArrayOutputStream();
- JBossWSTestHelper.deployAppclient("jaxws-webserviceref-secure-appclient.ear#jaxws-webserviceref-secure-appclient.jar", appclientOS, appclientArgs);
- // 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-webserviceref-secure-appclient.ear#jaxws-webserviceref-secure-appclient.jar", appclientOS, appclientArgs);
+ // 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"));
+ assertTrue(appclientLog.contains("RESULT ["));
+ assertTrue(appclientLog.contains("] RESULT"));
+ int indexOfResultStart = appclientLog.indexOf("RESULT [");
+ int indexOfResultStop = appclientLog.indexOf("] RESULT");
+ assertTrue(indexOfResultStart > 0);
+ assertTrue(indexOfResultStop > 0);
+ return appclientLog.substring(indexOfResultStart + 8, indexOfResultStop);
}
- // assert appclient logs
- assertTrue(appclientLog.contains("TEST START"));
- assertTrue(appclientLog.contains("TEST END"));
- assertTrue(appclientLog.contains("RESULT ["));
- assertTrue(appclientLog.contains("] RESULT"));
- int indexOfResultStart = appclientLog.indexOf("RESULT [");
- int indexOfResultStop = appclientLog.indexOf("] RESULT");
- assertTrue(indexOfResultStart > 0);
- assertTrue(indexOfResultStop > 0);
- return appclientLog.substring(indexOfResultStart + 8, indexOfResultStop);
+ finally
+ {
+ JBossWSTestHelper.undeployAppclient("jaxws-webserviceref-secure-appclient.ear#jaxws-webserviceref-secure-appclient.jar", false);
+ }
}
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2012-03-13 13:24:23 UTC (rev 15930)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2012-03-13 13:28:12 UTC (rev 15931)
@@ -51,19 +51,26 @@
public void testApplicationClient() throws Exception
{
- final String appclientArg = getServerHost();;
- final OutputStream appclientOS = new ByteArrayOutputStream();
- JBossWSTestHelper.deployAppclient("jaxws-wsaddressing-appclient.ear#jaxws-wsaddressing-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 = getServerHost();;
+ final OutputStream appclientOS = new ByteArrayOutputStream();
+ JBossWSTestHelper.deployAppclient("jaxws-wsaddressing-appclient.ear#jaxws-wsaddressing-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("APPCLIENT TEST FAILURE"));
+ assertTrue(appclientLog.contains("TEST START"));
+ assertTrue(appclientLog.contains("TEST END"));
}
- // assert appclient logs
- assertTrue(!appclientLog.contains("APPCLIENT TEST FAILURE"));
- assertTrue(appclientLog.contains("TEST START"));
- assertTrue(appclientLog.contains("TEST END"));
+ finally
+ {
+ JBossWSTestHelper.undeployAppclient("jaxws-wsaddressing-appclient.ear#jaxws-wsaddressing-appclient.jar", false);
+ }
}
}
More information about the jbossws-commits
mailing list