From 6071e29a22db4c2702d6875801bdef07b1512654 Mon Sep 17 00:00:00 2001 From: John Ament Date: Tue, 28 Jun 2011 22:33:51 -0400 Subject: [PATCH] SEAMJMS-34 Test case clean up, added pause in between to add more time between checks. --- .../seam/jms/bridge/RouteBuilderImpl.java | 28 ----------------- .../builder/topic/TopicBuilderImplTest.java | 9 ++++-- .../routeBuilder/RouteBuilderImplTest.java | 31 +++++++++++++++++++ 3 files changed, 37 insertions(+), 31 deletions(-) create mode 100644 impl/src/test/java/org/jboss/seam/jms/test/routeBuilder/RouteBuilderImplTest.java diff --git a/impl/src/main/java/org/jboss/seam/jms/bridge/RouteBuilderImpl.java b/impl/src/main/java/org/jboss/seam/jms/bridge/RouteBuilderImpl.java index efa4c8d..5ccc011 100644 --- a/impl/src/main/java/org/jboss/seam/jms/bridge/RouteBuilderImpl.java +++ b/impl/src/main/java/org/jboss/seam/jms/bridge/RouteBuilderImpl.java @@ -44,11 +44,6 @@ public class RouteBuilderImpl implements RouteBuilder, java.io.Serializable { @Inject BeanManager beanManager; - public RouteBuilderImpl() { - Logger log = Logger.getLogger(RouteBuilderImpl.class); - log.debug("Creating a new RouteBuilder()"); - } - @Override public void handleStartup(@Observes ServletContext servletContext) { log.debug("Starting up Seam JMS via ServletContext callback."); @@ -78,27 +73,4 @@ private void createListener(Route ingressRoute) { this.messageBuilder.createMessageConsumer(d, listener); } } - /* - @Override - public void registerDurableIngressRoute(Route ingressRoute, String clientId) { - if(ingressRoute.getType() == RouteType.INGRESS) { - ingressRoute.build(beanManager); - ClassLoader prevCl = Thread.currentThread().getContextClassLoader(); - log.debug("About to create listener for route " + ingressRoute); - log.debug("Routes: " + ingressRoute.getDestinations()); - for (Destination d : ingressRoute.getDestinations()) { - IngressMessageListener listener = new IngressMessageListener( - beanManager, prevCl, ingressRoute); - this.messageBuilder.createDurableSubscriber(d, clientId, listener); - } - } else { - throw new IllegalArgumentException("Route "+ingressRoute+" is not valid, it must be an ingress route."); - } - } - - @Override - public void unregisterRoute(String clientId) { - this.messageBuilder.unsubscribe(clientId); - } - */ } diff --git a/impl/src/test/java/org/jboss/seam/jms/test/builder/topic/TopicBuilderImplTest.java b/impl/src/test/java/org/jboss/seam/jms/test/builder/topic/TopicBuilderImplTest.java index be21ef6..ef731e5 100644 --- a/impl/src/test/java/org/jboss/seam/jms/test/builder/topic/TopicBuilderImplTest.java +++ b/impl/src/test/java/org/jboss/seam/jms/test/builder/topic/TopicBuilderImplTest.java @@ -93,24 +93,27 @@ public void testListen() { } @Test - public void testSendMap() { + public void testSendMap() throws Exception { Map mapData = new HashMap(); TopicTestListener ttl = new TopicTestListener(); topicBuilder.newBuilder().destination("jms/T3").listen(ttl).sendMap(mapData); + Thread.sleep(5000); testMessageSent(true,MapMessage.class,ttl); } @Test - public void testSendString() { + public void testSendString() throws Exception { String data = "new data"; TopicTestListener ttl = new TopicTestListener(); topicBuilder.newBuilder().destination("jms/T1").listen(ttl).sendString(data); + Thread.sleep(5000); testMessageSent(true,TextMessage.class,ttl); } @Test - public void testSendObject() { + public void testSendObject() throws Exception { Object data = 33L; TopicTestListener ttl = new TopicTestListener(); topicBuilder.newBuilder().destination("jms/T2").listen(ttl).sendObject(data); + Thread.sleep(5000); testMessageSent(true,ObjectMessage.class,ttl); } } diff --git a/impl/src/test/java/org/jboss/seam/jms/test/routeBuilder/RouteBuilderImplTest.java b/impl/src/test/java/org/jboss/seam/jms/test/routeBuilder/RouteBuilderImplTest.java new file mode 100644 index 0000000..b6bf8e7 --- /dev/null +++ b/impl/src/test/java/org/jboss/seam/jms/test/routeBuilder/RouteBuilderImplTest.java @@ -0,0 +1,31 @@ +package org.jboss.seam.jms.test.routeBuilder; + +import javax.inject.Inject; +import javax.jms.JMSException; + +import junit.framework.Assert; + +import org.jboss.arquillian.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.seam.jms.bridge.RouteBuilder; +import org.jboss.seam.jms.bridge.RouteBuilderImpl; +import org.jboss.seam.jms.test.Util; +import org.jboss.shrinkwrap.api.Archive; +import org.junit.Test; +import org.junit.runner.RunWith; + +@RunWith(Arquillian.class) +public class RouteBuilderImplTest { + @Deployment + public static Archive createDeployment() { + return Util.createDeployment(RouteBuilderImpl.class); + } + + @Inject RouteBuilder routeBuilder; + + @Test + public void testInit() throws JMSException { + routeBuilder.init(); + Assert.assertTrue(true); + } +}