You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2018/01/06 14:46:37 UTC
qpid-broker-j git commit: QPID-6933: [System Tests] Refactor queue
receiver tests as JMS 1.1 system test
Repository: qpid-broker-j
Updated Branches:
refs/heads/master 4b76f5408 -> 208b5ae59
QPID-6933: [System Tests] Refactor queue receiver tests as JMS 1.1 system test
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/208b5ae5
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/208b5ae5
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/208b5ae5
Branch: refs/heads/master
Commit: 208b5ae5938eb20ff04a1dd59d4e2c887e8197a4
Parents: 4b76f54
Author: Alex Rudyy <or...@apache.org>
Authored: Sat Jan 6 14:46:20 2018 +0000
Committer: Alex Rudyy <or...@apache.org>
Committed: Sat Jan 6 14:46:20 2018 +0000
----------------------------------------------------------------------
.../org/apache/qpid/systests/JmsTestBase.java | 6 ++
.../queueconnection/QueueReceiverTest.java | 66 ++++++++++++++++++++
.../queueconnection/QueueSessionTest.java | 5 --
.../test/client/queue/QueueReceiverTest.java | 57 -----------------
4 files changed, 72 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/208b5ae5/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/JmsTestBase.java
----------------------------------------------------------------------
diff --git a/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/JmsTestBase.java b/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/JmsTestBase.java
index a37f66d..de74ace 100644
--- a/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/JmsTestBase.java
+++ b/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/JmsTestBase.java
@@ -32,6 +32,7 @@ import java.util.Map;
import javax.jms.Connection;
import javax.jms.JMSException;
import javax.jms.Queue;
+import javax.jms.QueueConnection;
import javax.jms.Session;
import javax.jms.Topic;
import javax.jms.TopicConnection;
@@ -314,4 +315,9 @@ public abstract class JmsTestBase extends BrokerAdminUsingTestBase
.replace('-', '_')
.replace('.', '_'));
}
+
+ public QueueConnection getQueueConnection() throws JMSException, NamingException
+ {
+ return (QueueConnection)getConnection();
+ }
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/208b5ae5/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/queueconnection/QueueReceiverTest.java
----------------------------------------------------------------------
diff --git a/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/queueconnection/QueueReceiverTest.java b/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/queueconnection/QueueReceiverTest.java
new file mode 100644
index 0000000..f0f0e6b
--- /dev/null
+++ b/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/queueconnection/QueueReceiverTest.java
@@ -0,0 +1,66 @@
+/*
+ * 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.qpid.systests.jms_1_1.queueconnection;
+
+import static junit.framework.TestCase.assertNotNull;
+import static org.apache.qpid.systests.Utils.INDEX;
+import static org.junit.Assert.assertEquals;
+
+import javax.jms.Message;
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueReceiver;
+import javax.jms.QueueSession;
+import javax.jms.Session;
+
+import org.junit.Test;
+
+import org.apache.qpid.systests.JmsTestBase;
+import org.apache.qpid.systests.Utils;
+
+public class QueueReceiverTest extends JmsTestBase
+{
+
+ @Test
+ public void createReceiver() throws Exception
+ {
+ Queue queue = createQueue(getTestName());
+ QueueConnection queueConnection = getQueueConnection();
+ try
+ {
+ queueConnection.start();
+ Utils.sendMessages(queueConnection, queue, 3);
+
+ QueueSession session = queueConnection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
+ QueueReceiver receiver = session.createReceiver(queue, String.format("%s=2", INDEX));
+ assertEquals("Queue names should match from QueueReceiver", queue.getQueueName(), receiver.getQueue().getQueueName());
+
+ Message received = receiver.receive(getReceiveTimeout());
+ assertNotNull("Message is not received", received);
+ assertEquals("Unexpected message is received", 2, received.getIntProperty(INDEX));
+ }
+ finally
+ {
+ queueConnection.close();
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/208b5ae5/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/queueconnection/QueueSessionTest.java
----------------------------------------------------------------------
diff --git a/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/queueconnection/QueueSessionTest.java b/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/queueconnection/QueueSessionTest.java
index 709f70f..7a799fb 100644
--- a/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/queueconnection/QueueSessionTest.java
+++ b/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/queueconnection/QueueSessionTest.java
@@ -129,9 +129,4 @@ public class QueueSessionTest extends JmsTestBase
queueConnection.close();
}
}
-
- private QueueConnection getQueueConnection() throws JMSException, NamingException
- {
- return (QueueConnection)getConnection();
- }
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/208b5ae5/systests/src/test/java/org/apache/qpid/test/client/queue/QueueReceiverTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/test/client/queue/QueueReceiverTest.java b/systests/src/test/java/org/apache/qpid/test/client/queue/QueueReceiverTest.java
deleted file mode 100644
index b3e8820..0000000
--- a/systests/src/test/java/org/apache/qpid/test/client/queue/QueueReceiverTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.qpid.test.client.queue;
-
-import javax.jms.Connection;
-import javax.jms.JMSException;
-import javax.jms.Queue;
-import javax.jms.QueueReceiver;
-import javax.jms.QueueSession;
-import javax.jms.Session;
-
-import org.apache.qpid.test.utils.QpidBrokerTestCase;
-
-public class QueueReceiverTest extends QpidBrokerTestCase
-{
- private Connection _connection;
- private Session _session;
- private Queue _queue;
-
- @Override
- public void setUp() throws Exception
- {
- super.setUp();
- _connection = getConnection();
- _session = _connection.createSession(true, Session.SESSION_TRANSACTED);
- _queue = createTestQueue(_session);
- }
-
- public void testCreateReceiver() throws JMSException
- {
- QueueSession session = (QueueSession) _session;
-
- QueueReceiver receiver = session.createReceiver(_queue);
- assertEquals("Queue names should match from QueueReceiver", _queue.getQueueName(), receiver.getQueue().getQueueName());
-
- receiver = session.createReceiver(_queue, "abc");
- assertEquals("Queue names should match from QueueReceiver with selector", _queue.getQueueName(), receiver.getQueue().getQueueName());
- }
-}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org