Author: dkulp
Date: Wed Jun 6 19:05:46 2012
New Revision: 1347058
URL: http://svn.apache.org/viewvc?rev=1347058&view=rev
Log:
Merged revisions 1345422 via svn merge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1345422 | dkulp | 2012-06-01 22:43:50 -0400 (Fri, 01 Jun 2012) | 1 line
A little more cleanup
........
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java
cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java?rev=1347058&r1=1347057&r2=1347058&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java
(original)
+++
cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java
Wed Jun 6 19:05:46 2012
@@ -50,7 +50,6 @@ public class DecoupledClientServerTest e
public static final String DECOUPLE_PORT =
allocatePort(DecoupledClientServerTest.class);
private static final Logger LOG =
LogUtils.getLogger(DecoupledClientServerTest.class);
- private Bus bus;
public static class Server extends AbstractBusTestServerBase {
Endpoint ep;
Modified:
cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java?rev=1347058&r1=1347057&r2=1347058&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
(original)
+++
cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
Wed Jun 6 19:05:46 2012
@@ -50,13 +50,10 @@ import org.apache.cxf.greeter_control.Gr
import org.apache.cxf.helpers.XMLUtils;
import org.apache.cxf.helpers.XPathUtils;
import org.apache.cxf.systest.ws.util.ConnectionHelper;
-import org.apache.cxf.test.TestUtilities;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.ws.rm.RMManager;
import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
import org.junit.Test;
/**
@@ -73,18 +70,6 @@ public class DeliveryAssuranceOnewayTest
private Endpoint endpoint;
private Bus greeterBus;
private Greeter greeter;
-
-
- @BeforeClass
- public static void setProps() throws Exception {
- TestUtilities.setKeepAliveSystemProperty(false);
- }
-
- @AfterClass
- public static void cleanup() {
- TestUtilities.recoverKeepAliveSystemProperty();
- }
-
@After
public void tearDown() throws Exception {
@@ -364,7 +349,7 @@ public class DeliveryAssuranceOnewayTest
}
LOG.fine("Created greeter client.");
- ConnectionHelper.setKeepAliveConnection(greeter, true);
+ ConnectionHelper.setKeepAliveConnection(greeter, false);
}
private void stopClient() {
@@ -403,6 +388,7 @@ public class DeliveryAssuranceOnewayTest
private void awaitMessages(int nExpectedIn, int delay, int timeout) {
int waited = 0;
int nIn = 0;
+ long start = System.currentTimeMillis();
while (waited <= timeout) {
synchronized (GreeterProvider.CALL_ARGS) {
nIn = GreeterProvider.CALL_ARGS.size();
@@ -417,6 +403,12 @@ public class DeliveryAssuranceOnewayTest
}
waited += 100;
}
+ // we'll use the delay amount or at least double the original amount
+ // of time, which ever is less, to wait for additional messages.
+ long total = System.currentTimeMillis() - start;
+ if (delay > total) {
+ delay = (int)total;
+ }
try {
Thread.sleep(delay);
} catch (InterruptedException ex) {
Modified:
cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java?rev=1347058&r1=1347057&r2=1347058&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
(original)
+++
cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
Wed Jun 6 19:05:46 2012
@@ -68,7 +68,6 @@ import org.apache.cxf.phase.AbstractPhas
import org.apache.cxf.phase.Phase;
import org.apache.cxf.systest.ws.util.ConnectionHelper;
import org.apache.cxf.systest.ws.util.MessageFlow;
-import org.apache.cxf.test.TestUtilities;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.testutil.recorders.InMessageRecorder;
import org.apache.cxf.testutil.recorders.MessageRecorder;
@@ -82,7 +81,6 @@ import org.apache.cxf.ws.rm.RMManager;
import org.apache.cxf.ws.rm.RMProperties;
import org.junit.After;
-import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -119,15 +117,9 @@ public class SequenceTest extends Abstra
@BeforeClass
public static void startServers() throws Exception {
- TestUtilities.setKeepAliveSystemProperty(false);
assertTrue("server did not launch correctly",
launchServer(Server.class));
}
- @AfterClass
- public static void cleanup() {
- TestUtilities.recoverKeepAliveSystemProperty();
- }
-
@After
public void tearDown() throws Exception {
