You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2008/06/11 03:51:54 UTC
svn commit: r666504 - in
/servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc:
./ provider/ ws/rm/ ws/security/
Author: ffang
Date: Tue Jun 10 18:51:54 2008
New Revision: 666504
URL: http://svn.apache.org/viewvc?rev=666504&view=rev
Log:
[SM-1394]CxfBcRMSequenceTest intermittent failures on windows.
Modified:
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTest.java
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/provider/CxfBCSEProviderSystemTest.java
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/rm/CxfBcRMSequenceTest.java
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderSecurityTest.java
Modified: servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTest.java?rev=666504&r1=666503&r2=666504&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTest.java (original)
+++ servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTest.java Tue Jun 10 18:51:54 2008
@@ -36,6 +36,8 @@
protected static boolean serversStarted;
private ServerLauncher sl;
+ private ServerLauncher embeddedLauncher;
+ private ServerLauncher jmsLauncher;
@@ -52,8 +54,10 @@
assertTrue("server did not launch correctly",
launchServer(EmbededJMSBrokerLauncher.class, props, false));
+ embeddedLauncher = sl;
assertTrue("server did not launch correctly",
launchServer(MyJMSServer.class, null, false));
+ jmsLauncher = sl;
serversStarted = true;
}
@@ -64,6 +68,22 @@
}
+ protected void tearDown() throws Exception {
+ try {
+ embeddedLauncher.stopServer();
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ fail("failed to stop server " + embeddedLauncher.getClass());
+ }
+ try {
+ jmsLauncher.stopServer();
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ fail("failed to stop server " + jmsLauncher.getClass());
+ }
+ serversStarted = false;
+ }
+
public boolean launchServer(Class<?> clz, Map<String, String> p, boolean inProcess) {
boolean ok = false;
try {
Modified: servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/provider/CxfBCSEProviderSystemTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/provider/CxfBCSEProviderSystemTest.java?rev=666504&r1=666503&r2=666504&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/provider/CxfBCSEProviderSystemTest.java (original)
+++ servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/provider/CxfBCSEProviderSystemTest.java Tue Jun 10 18:51:54 2008
@@ -64,7 +64,7 @@
startServers();
//super.setUp();
LOG.info("setUp is invoked");
- }
+ }
public boolean launchServer(Class<?> clz, Map<String, String> p, boolean inProcess) {
boolean ok = false;
@@ -79,10 +79,7 @@
}
return ok;
- }
-
-
-
+ }
public void setUpJBI(String beanFile) throws Exception {
if (context != null) {
@@ -110,6 +107,14 @@
jbi.destroy();
jbi = null;
}
+
+ try {
+ sl.stopServer();
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ fail("failed to stop server " + sl.getClass());
+ }
+ serversStarted = false;
}
public void testGreetMeProviderWithOutJBIWrapper() throws Exception {
Modified: servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/rm/CxfBcRMSequenceTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/rm/CxfBcRMSequenceTest.java?rev=666504&r1=666503&r2=666504&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/rm/CxfBcRMSequenceTest.java (original)
+++ servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/rm/CxfBcRMSequenceTest.java Tue Jun 10 18:51:54 2008
@@ -772,7 +772,7 @@
greeter.greetMe("one");
try {
- Thread.sleep(500);
+ Thread.sleep(200);
} catch (InterruptedException ex) {
// ignore
}
@@ -787,7 +787,7 @@
assertTrue("Unexpected reason.", sf.getReason().endsWith("is not a known Sequence identifier."));
}
- awaitMessages(3, 3, 5000);
+ awaitMessages(3, 3, 2000);
MessageFlow mf = new MessageFlow(outRecorder.getOutboundMessages(), inRecorder.getInboundMessages());
Modified: servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderSecurityTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderSecurityTest.java?rev=666504&r1=666503&r2=666504&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderSecurityTest.java (original)
+++ servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderSecurityTest.java Tue Jun 10 18:51:54 2008
@@ -55,11 +55,23 @@
launchServer(HttpsServer.class, false));
}
+ protected void tearDown() throws Exception {
+ component.getServiceUnitManager().stop("proxy");
+ component.getServiceUnitManager().shutDown("proxy");
+ component.getServiceUnitManager().undeploy("proxy", getServiceUnitPath("provider"));
+ try {
+ sl.stopServer();
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ fail("failed to stop server " + sl.getClass());
+ }
+ }
+
public boolean launchServer(Class<?> clz, boolean inProcess) {
boolean ok = false;
try {
sl = new ServerLauncher(clz.getName(), inProcess);
- ok = sl.launchServer();
+ ok = sl.launchServer();
assertTrue("server failed to launch", ok);
} catch (IOException ex) {