Author: ffang
Date: Tue Jun 17 19:51:56 2008
New Revision: 669065
URL: http://svn.apache.org/viewvc?rev=669065&view=rev
Log:
[SM-1409] Modifications to ServiceMix cxf-bc ws-rm test and servicemix-wsn
serviceengine.
Modified:
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/serviceengines/servicemix-wsn2005/src/test/java/org/apache/servicemix/wsn/component/WSNComponentTest.java
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=669065&r1=669064&r2=669065&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 17 19:51:56 2008
@@ -73,7 +73,7 @@
private static final QName GREETER_SERVICE = new
QName("http://cxf.apache.org/greeter_control";, "GreeterService");
- private static int decoupledEndpointPort = 10000;
+ private static int decoupledEndpointPort = 11000;
private static String decoupledEndpoint;
Modified:
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-wsn2005/src/test/java/org/apache/servicemix/wsn/component/WSNComponentTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-wsn2005/src/test/java/org/apache/servicemix/wsn/component/WSNComponentTest.java?rev=669065&r1=669064&r2=669065&view=diff
==============================================================================
---
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-wsn2005/src/test/java/org/apache/servicemix/wsn/component/WSNComponentTest.java
(original)
+++
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-wsn2005/src/test/java/org/apache/servicemix/wsn/component/WSNComponentTest.java
Tue Jun 17 19:51:56 2008
@@ -58,6 +58,7 @@
public static final QName NOTIFICATION_BROKER =
new QName("http://servicemix.org/wsnotification";,
"NotificationBroker");
+ private int timeout = 1000;
private JBIContainer jbi;
private BrokerService jmsBroker;
private NotificationBroker wsnBroker;
@@ -120,7 +121,7 @@
wsnBroker.notify("myTopic", parse("<hello>world</hello>"));
// Wait for notification
- Thread.sleep(500);
+ Thread.sleep(timeout);
receiver.getMessageList().assertMessagesReceived(1);
NormalizedMessage msg = (NormalizedMessage)
receiver.getMessageList().getMessages().get(0);
@@ -128,7 +129,7 @@
assertEquals("Notify", node.getLocalName());
// Wait for acks to be processed
- Thread.sleep(500);
+ Thread.sleep(timeout);
}
public void testRawNotify() throws Exception {
@@ -144,7 +145,7 @@
// END SNIPPET: notify
// Wait for notification
- Thread.sleep(500);
+ Thread.sleep(timeout);
receiver.getMessageList().assertMessagesReceived(1);
NormalizedMessage msg = (NormalizedMessage)
receiver.getMessageList().getMessages().get(0);
@@ -152,7 +153,7 @@
assertEquals("hello", node.getLocalName());
// Wait for acks to be processed
- Thread.sleep(500);
+ Thread.sleep(timeout);
}
public void testUnsubscribe() throws Exception {
@@ -163,7 +164,7 @@
wsnBroker.notify("myTopic", new Notify());
// Wait for notification
- Thread.sleep(500);
+ Thread.sleep(timeout);
assertEquals(1, pullPoint.getMessages(0).size());
@@ -171,12 +172,12 @@
wsnBroker.notify("myTopic", new Notify());
// Wait for notification
- Thread.sleep(500);
+ Thread.sleep(timeout);
assertEquals(0, pullPoint.getMessages(0).size());
// Wait for acks to be processed
- Thread.sleep(500);
+ Thread.sleep(timeout);
}
public void testPauseResume() throws Exception {
@@ -185,7 +186,7 @@
wsnBroker.notify("myTopic", new Notify());
// Wait for notification
- Thread.sleep(500);
+ Thread.sleep(timeout);
assertEquals(1, pullPoint.getMessages(0).size());
@@ -193,7 +194,7 @@
wsnBroker.notify("myTopic", new Notify());
// Wait for notification
- Thread.sleep(500);
+ Thread.sleep(timeout);
assertEquals(0, pullPoint.getMessages(0).size());
@@ -201,12 +202,12 @@
wsnBroker.notify("myTopic", new Notify());
// Wait for notification
- Thread.sleep(500);
+ Thread.sleep(timeout);
assertEquals(1, pullPoint.getMessages(0).size());
// Wait for acks to be processed
- Thread.sleep(500);
+ Thread.sleep(timeout);
}
public void testPull() throws Exception {
@@ -215,14 +216,14 @@
wsnBroker.notify("myTopic", new Notify());
// Wait for notification
- Thread.sleep(500);
+ Thread.sleep(timeout);
List<NotificationMessageHolderType> msgs = pullPoint.getMessages(0);
assertNotNull(msgs);
assertEquals(1, msgs.size());
// Wait for acks to be processed
- Thread.sleep(500);
+ Thread.sleep(timeout);
}
public void xtestPullWithFilter() throws Exception {
@@ -233,21 +234,21 @@
wsnBroker.notify("myTopic", parse("<msg type='a'/>"));
// Wait for notification
- Thread.sleep(500);
+ Thread.sleep(timeout);
assertEquals(1, pullPoint1.getMessages(0).size());
assertEquals(0, pullPoint2.getMessages(0).size());
wsnBroker.notify("myTopic", parse("<msg type='b'/>"));
// Wait for notification
- Thread.sleep(500);
+ Thread.sleep(timeout);
assertEquals(0, pullPoint1.getMessages(0).size());
assertEquals(1, pullPoint2.getMessages(0).size());
wsnBroker.notify("myTopic", parse("<msg type='c'/>"));
// Wait for notification
- Thread.sleep(500);
+ Thread.sleep(timeout);
assertEquals(0, pullPoint1.getMessages(0).size());
assertEquals(0, pullPoint2.getMessages(0).size());
@@ -261,21 +262,21 @@
publisherComponent.setDemand(true);
jbi.activateComponent(publisherComponent, "publisher");
- Thread.sleep(500);
+ Thread.sleep(timeout);
assertNull(publisherComponent.getSubscription());
PullPoint pullPoint = wsnCreatePullPoint.createPullPoint();
Subscription subscription =
wsnBroker.subscribe(pullPoint.getEndpoint(), "myTopic", null);
- Thread.sleep(500);
+ Thread.sleep(timeout);
assertNotNull(publisherComponent.getSubscription());
subscription.unsubscribe();
- Thread.sleep(500);
+ Thread.sleep(timeout);
assertNull(publisherComponent.getSubscription());
- Thread.sleep(500);
+ Thread.sleep(timeout);
}
public void testDeployPullPoint() throws Exception {
@@ -290,7 +291,7 @@
PullPoint pullPoint = new PullPoint(
AbstractWSAClient.createWSA("http://www.consumer.org/service/endpoint";),
jbi);
- Thread.sleep(500);
+ Thread.sleep(timeout);
assertEquals(1, pullPoint.getMessages(0).size());
}
@@ -311,7 +312,7 @@
wsnBroker.notify("myTopic", parse("<hello>world</hello>"));
// Wait for notification
- Thread.sleep(500);
+ Thread.sleep(timeout);
receiver.getMessageList().assertMessagesReceived(1);
receiver.getMessageList().flushMessages();
@@ -319,14 +320,14 @@
wsnBroker.notify("myTopic", parse("<hello>world</hello>"));
// Wait for notification
- Thread.sleep(500);
+ Thread.sleep(timeout);
assertEquals(0, receiver.getMessageList().flushMessages().size());
wsnComponent.getServiceUnitManager().start("subscription");
wsnBroker.notify("myTopic", parse("<hello>world</hello>"));
// Wait for notification
- Thread.sleep(500);
+ Thread.sleep(timeout);
receiver.getMessageList().assertMessagesReceived(1);
receiver.getMessageList().flushMessages();
}
