1 files changed, 25 insertions, 0 deletions
diff --git a/sandbox/event/samples/event-jms/src/test/java/weather/WeatherTestCase.java b/sandbox/event/samples/event-jms/src/test/java/weather/WeatherTestCase.java
index 71162c7538..5293ec64f0 100644
--- a/sandbox/event/samples/event-jms/src/test/java/weather/WeatherTestCase.java
+++ b/sandbox/event/samples/event-jms/src/test/java/weather/WeatherTestCase.java
@@ -20,6 +20,8 @@
 package weather;
 
 
+import junit.framework.Assert;
+
 import org.apache.activemq.broker.BrokerService;
 import org.apache.tuscany.sca.host.embedded.SCADomain;
 import org.junit.After;
@@ -38,6 +40,8 @@ public class WeatherTestCase {
 	  
     private WeatherService weatherService;
     private WeatherService weatherService2;
+    private WeatherSubscriber weatherSubscriber;
+    private WeatherSubscriber weatherSubscriber2;
     private SCADomain weatherSubscriberDomain;
     private SCADomain weatherPublisherDomain;
    
@@ -52,6 +56,8 @@ public class WeatherTestCase {
             weatherSubscriberDomain = SCADomain.newInstance("weatherSubscriber.composite");
             weatherService = weatherPublisherDomain.getService(WeatherService.class, "WeatherPublisherComponent");
             weatherService2 = weatherPublisherDomain.getService(WeatherService.class, "WeatherPublisherComponent2");    
+            weatherSubscriber = weatherSubscriberDomain.getService(WeatherSubscriber.class, "WeatherSubscriberComponent/WeatherSubscriber");
+            weatherSubscriber2 = weatherPublisherDomain.getService(WeatherSubscriber.class, "WeatherSubscriberComponent2/WeatherSubscriber");
         } catch (Throwable e) {
             e.printStackTrace();
         }
@@ -59,8 +65,27 @@ public class WeatherTestCase {
     
     @Test
     public void runWeatherTest() throws Exception {
+        
         weatherService.start();
         weatherService2.start();
+        
+        Thread.sleep(2000);
+        
+        int[] messageList = weatherSubscriber.getMessageList();
+        Assert.assertNotNull("Message list is null.", messageList);
+        Assert.assertEquals("Message list invalid.", 3, messageList.length);
+        int[] expectedMessages = {0, 1, 1};
+        for (int i = 0; i < messageList.length; i++) {
+            Assert.assertEquals("Message type " + i + " not received correctly.", expectedMessages[i], messageList[i]);
+        }
+        
+        int[] messageList2 = weatherSubscriber2.getMessageList();
+        Assert.assertNotNull("Message list is null.", messageList2);
+        Assert.assertEquals("Message list invalid.", 3, messageList2.length);
+        int[] expectedMessages2 = {1, 0, 0};
+        for (int i = 0; i < messageList2.length; i++) {
+            Assert.assertEquals("Message type " + i + " not received correctly.", expectedMessages2[i], messageList2[i]);
+        }
     }