Repository: qpid-jms
Updated Branches:
  refs/heads/master ea0eda8a4 -> 2ccb2fb06


NO-JIRA Move one test from ActiveMQ module to client and remove some
tests from the ActiveMQ module that are now duplicated in the client
tests.

Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/2ccb2fb0
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/2ccb2fb0
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/2ccb2fb0

Branch: refs/heads/master
Commit: 2ccb2fb06cebbc4114b7df607210ce951d51f373
Parents: ea0eda8
Author: Timothy Bish <[email protected]>
Authored: Mon Sep 28 10:52:58 2015 -0400
Committer: Timothy Bish <[email protected]>
Committed: Mon Sep 28 10:52:58 2015 -0400

----------------------------------------------------------------------
 .../jms/integration/SessionIntegrationTest.java |  3 ++
 .../apache/qpid/jms/session/JmsSessionTest.java | 41 --------------------
 2 files changed, 3 insertions(+), 41 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2ccb2fb0/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java
----------------------------------------------------------------------
diff --git 
a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java
 
b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java
index a162629..030441d 100644
--- 
a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java
+++ 
b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java
@@ -105,6 +105,9 @@ public class SessionIntegrationTest extends QpidJmsTestCase 
{
             assertNotNull("Session should not be null", session);
             testPeer.expectEnd();
             session.close();
+
+            // Should send nothing and throw no error.
+            session.close();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2ccb2fb0/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/session/JmsSessionTest.java
----------------------------------------------------------------------
diff --git 
a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/session/JmsSessionTest.java
 
b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/session/JmsSessionTest.java
index 5fe9d55..adb1ae5 100644
--- 
a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/session/JmsSessionTest.java
+++ 
b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/session/JmsSessionTest.java
@@ -83,47 +83,6 @@ public class JmsSessionTest extends AmqpTestSupport {
     }
 
     @Test(timeout=30000)
-    public void testSessionDoubleCloseWithoutException() throws Exception {
-        connection = createAmqpConnection();
-        connection.start();
-        Session session = connection.createSession(false, 
Session.AUTO_ACKNOWLEDGE);
-        session.close();
-        session.close();
-    }
-
-    @Test(timeout=30000)
-    public void testConsumerCreateThrowsWhenBrokerStops() throws Exception {
-        connection = createAmqpConnection();
-        Session session = connection.createSession(false, 
Session.AUTO_ACKNOWLEDGE);
-        Queue queue = session.createQueue(getDestinationName());
-        connection.start();
-
-        stopPrimaryBroker();
-        try {
-            session.createConsumer(queue);
-            fail("Should have thrown an IllegalStateException");
-        } catch (Exception ex) {
-            LOG.info("Caught exception on create consumer: {}", ex);
-        }
-    }
-
-    @Test(timeout=30000)
-    public void testProducerCreateThrowsWhenBrokerStops() throws Exception {
-        connection = createAmqpConnection();
-        Session session = connection.createSession(false, 
Session.AUTO_ACKNOWLEDGE);
-        Queue queue = session.createQueue(getDestinationName());
-        connection.start();
-
-        stopPrimaryBroker();
-        try {
-            session.createProducer(queue);
-            fail("Should have thrown an IllegalStateException");
-        } catch (Exception ex) {
-            LOG.info("Caught exception on create producer: {}", ex);
-        }
-    }
-
-    @Test(timeout=30000)
     public void testCreateTemporaryQueue() throws Exception {
         connection = createAmqpConnection();
         Session session = connection.createSession(false, 
Session.AUTO_ACKNOWLEDGE);


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to