activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1364741 - in /activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo: CombinationTestSupport.java JMSUsecaseTest.java
Date Mon, 23 Jul 2012 18:12:55 GMT
Author: chirino
Date: Mon Jul 23 18:12:54 2012
New Revision: 1364741

URL: http://svn.apache.org/viewvc?rev=1364741&view=rev
Log:
Ported the ActiveMQ 5.x JMSUsecaseTest works fine /w Openwire.. stomp over JMS is having issues.

Added:
    activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/JMSUsecaseTest.java
  (with props)
Modified:
    activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/CombinationTestSupport.java

Modified: activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/CombinationTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/CombinationTestSupport.java?rev=1364741&r1=1364740&r2=1364741&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/CombinationTestSupport.java
(original)
+++ activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/CombinationTestSupport.java
Mon Jul 23 18:12:54 2012
@@ -76,6 +76,10 @@ public abstract class CombinationTestSup
         }
     }
 
+    public void setCombinationValues(String attribute, Object[] options) {
+        ComboOption co = this.comboOptions.get(attribute);
+        this.comboOptions.put(attribute, new ComboOption(attribute, Arrays.asList(options)));
+    }
 
 
     public void runBare() throws Throwable {

Added: activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/JMSUsecaseTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/JMSUsecaseTest.java?rev=1364741&view=auto
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/JMSUsecaseTest.java
(added)
+++ activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/JMSUsecaseTest.java
Mon Jul 23 18:12:54 2012
@@ -0,0 +1,131 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.apollo;
+
+import junit.framework.Test;
+
+import javax.jms.*;
+import java.util.Enumeration;
+
+public class JMSUsecaseTest extends JmsTestBase {
+
+    public Destination destination;
+    public int deliveryMode;
+    public int prefetch;
+    public DestinationType destinationType;
+    public boolean durableConsumer;
+
+    public static Test suite() {
+        return suite(JMSUsecaseTest.class);
+    }
+
+    public static void main(String[] args) {
+        junit.textui.TestRunner.run(suite());
+    }
+
+    @Override
+    public void initCombos() {
+        super.initCombos();
+        setCombinationValues("protocol", new Object[]{new OpenwireBrokerProtocol()});
+//        setCombinationValues("protocol", new Object[]{new StompBrokerProtocol()});
+    }
+
+    public void initCombosForTestQueueBrowser() {
+        addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_PERSISTENT),
Integer.valueOf(DeliveryMode.PERSISTENT)});
+        addCombinationValues("destinationType", new Object[] {DestinationType.QUEUE_TYPE,
DestinationType.TEMP_QUEUE_TYPE});
+    }
+
+    public void testQueueBrowser() throws Exception {
+
+        // Send a message to the broker.
+        connection.start();
+        Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+        destination = createDestination(session, destinationType);
+        sendMessages(session, destination, 5);
+
+        QueueBrowser browser = session.createBrowser((Queue)destination);
+        Enumeration enumeration = browser.getEnumeration();
+        for (int i = 0; i < 5; i++) {
+            Thread.sleep(100);
+            assertTrue(enumeration.hasMoreElements());
+            Message m = (Message)enumeration.nextElement();
+            assertNotNull(m);
+            assertEquals("" + i, ((TextMessage)m).getText());
+        }
+        assertFalse(enumeration.hasMoreElements());
+    }
+
+    public void initCombosForTestSendReceive() {
+        addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_PERSISTENT),
Integer.valueOf(DeliveryMode.PERSISTENT)});
+        addCombinationValues("destinationType", new Object[] {DestinationType.QUEUE_TYPE,
DestinationType.TOPIC_TYPE,
+                                                              DestinationType.TEMP_QUEUE_TYPE,
DestinationType.TEMP_TOPIC_TYPE});
+    }
+
+    public void testSendReceive() throws Exception {
+        // Send a message to the broker.
+        connection.start();
+        Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+        destination = createDestination(session, destinationType);
+        MessageProducer producer = session.createProducer(destination);
+        MessageConsumer consumer = session.createConsumer(destination);
+        producer.send(session.createMessage());
+
+        // Make sure only 1 message was delivered.
+        assertNotNull(consumer.receive(1000));
+        assertNull(consumer.receiveNoWait());
+    }
+
+    public void initCombosForTestSendReceiveTransacted() {
+        addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_PERSISTENT),
Integer.valueOf(DeliveryMode.PERSISTENT)});
+        addCombinationValues("destinationType", new Object[] {DestinationType.QUEUE_TYPE,
DestinationType.TOPIC_TYPE,
+                                                              DestinationType.TEMP_QUEUE_TYPE,
DestinationType.TEMP_TOPIC_TYPE});
+    }
+
+    public void testSendReceiveTransacted() throws Exception {
+        // Send a message to the broker.
+        connection.start();
+        Session session = connection.createSession(true, Session.SESSION_TRANSACTED);
+        destination = createDestination(session, destinationType);
+        MessageProducer producer = session.createProducer(destination);
+        MessageConsumer consumer = session.createConsumer(destination);
+        producer.send(session.createTextMessage("test"));
+
+        // Message should not be delivered until commit.
+        assertNull(consumer.receiveNoWait());
+        session.commit();
+
+        // Make sure only 1 message was delivered.
+        Message message = consumer.receive(1000);
+        assertNotNull(message);
+        assertFalse(message.getJMSRedelivered());
+        assertNull(consumer.receiveNoWait());
+
+        // Message should be redelivered is rollback is used.
+        session.rollback();
+
+        // Make sure only 1 message was delivered.
+        message = consumer.receive(2000);
+        assertNotNull(message);
+        assertTrue(message.getJMSRedelivered());
+        assertNull(consumer.receiveNoWait());
+
+        // If we commit now, the message should not be redelivered.
+        session.commit();
+        assertNull(consumer.receiveNoWait());
+    }
+
+}

Propchange: activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/JMSUsecaseTest.java
------------------------------------------------------------------------------
    svn:executable = *



Mime
View raw message