Author: dkulp
Date: Mon May 14 16:40:39 2012
New Revision: 1338281
URL: http://svn.apache.org/viewvc?rev=1338281&view=rev
Log:
JMS tests can be forkmode once
Modified:
cxf/trunk/systests/transport-jms/pom.xml
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerGzipTest.java
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerSoap12Test.java
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsClientServerTest.java
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/ProviderJMSContinuationTest.java
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/ClientServerSwaTest.java
Modified: cxf/trunk/systests/transport-jms/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transport-jms/pom.xml?rev=1338281&r1=1338280&r2=1338281&view=diff
==============================================================================
--- cxf/trunk/systests/transport-jms/pom.xml (original)
+++ cxf/trunk/systests/transport-jms/pom.xml Mon May 14 16:40:39 2012
@@ -307,8 +307,5 @@
</dependency>
</dependencies>
- <properties>
- <cxf.surefire.fork.mode>pertest</cxf.surefire.fork.mode>
- </properties>
</project>
Modified:
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerGzipTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerGzipTest.java?rev=1338281&r1=1338280&r2=1338281&view=diff
==============================================================================
---
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerGzipTest.java
(original)
+++
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerGzipTest.java
Mon May 14 16:40:39 2012
@@ -136,5 +136,6 @@ public class JMSClientServerGzipTest ext
} catch (UndeclaredThrowableException ex) {
throw (Exception)ex.getCause();
}
+ bus.shutdown(true);
}
}
Modified:
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerSoap12Test.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerSoap12Test.java?rev=1338281&r1=1338280&r2=1338281&view=diff
==============================================================================
---
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerSoap12Test.java
(original)
+++
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerSoap12Test.java
Mon May 14 16:40:39 2012
@@ -64,7 +64,6 @@ public class JMSClientServerSoap12Test e
assertTrue("server did not launch correctly",
launchServer(Soap12Server.class));
-
}
public URL getWSDLURL(String s) throws Exception {
@@ -136,5 +135,6 @@ public class JMSClientServerSoap12Test e
} catch (UndeclaredThrowableException ex) {
throw (Exception)ex.getCause();
}
+ bus.shutdown(true);
}
}
Modified:
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java?rev=1338281&r1=1338280&r2=1338281&view=diff
==============================================================================
---
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
(original)
+++
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
Mon May 14 16:40:39 2012
@@ -124,6 +124,7 @@ public class JMSClientServerTest extends
assertTrue("server did not launch correctly",
launchServer(Server.class, false));
+ createStaticBus();
}
Modified:
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsClientServerTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsClientServerTest.java?rev=1338281&r1=1338280&r2=1338281&view=diff
==============================================================================
---
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsClientServerTest.java
(original)
+++
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsClientServerTest.java
Mon May 14 16:40:39 2012
@@ -95,6 +95,7 @@ public class HelloWorldContinuationsClie
helloDoneSignal.await(60, TimeUnit.SECONDS);
executor.shutdownNow();
assertEquals("Not all invocations have completed", 0,
helloDoneSignal.getCount());
+ bus.shutdown(true);
}
}
Modified:
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java?rev=1338281&r1=1338280&r2=1338281&view=diff
==============================================================================
---
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java
(original)
+++
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java
Mon May 14 16:40:39 2012
@@ -100,6 +100,7 @@ public class HelloWorldContinuationsThro
executor.shutdownNow();
System.out.println("Completed : " + (5 - helloDoneSignal.getCount()));
assertEquals("Not all invocations have completed", 0,
helloDoneSignal.getCount());
+ bus.shutdown(true);
}
}
Modified:
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java?rev=1338281&r1=1338280&r2=1338281&view=diff
==============================================================================
---
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java
(original)
+++
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java
Mon May 14 16:40:39 2012
@@ -57,6 +57,7 @@ public class JMSContinuationsClientServe
assertTrue("server did not launch correctly",
launchServer(Server.class, false));
serversStarted = true;
+ createStaticBus();
}
public URL getWSDLURL(String s) throws Exception {
Modified:
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/ProviderJMSContinuationTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/ProviderJMSContinuationTest.java?rev=1338281&r1=1338280&r2=1338281&view=diff
==============================================================================
---
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/ProviderJMSContinuationTest.java
(original)
+++
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/ProviderJMSContinuationTest.java
Mon May 14 16:40:39 2012
@@ -57,6 +57,7 @@ public class ProviderJMSContinuationTest
assertTrue("server did not launch correctly",
launchServer(ProviderServer.class, false));
serversStarted = true;
+ createStaticBus();
}
public URL getWSDLURL(String s) throws Exception {
Modified:
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/ClientServerSwaTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/ClientServerSwaTest.java?rev=1338281&r1=1338280&r2=1338281&view=diff
==============================================================================
---
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/ClientServerSwaTest.java
(original)
+++
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/ClientServerSwaTest.java
Mon May 14 16:40:39 2012
@@ -56,6 +56,7 @@ public class ClientServerSwaTest extends
launchServer(EmbeddedJMSBrokerLauncher.class, props, null));
assertTrue("server did not launch correctly",
launchServer(Server.class));
+ createStaticBus();
}
@Test
public void testSwa() throws Exception {
