You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2016/09/21 14:16:00 UTC
qpid-jms git commit: QPIDJMS-207: consolidate a couple of tests
Repository: qpid-jms
Updated Branches:
refs/heads/master 4550dac6c -> 1daede27c
QPIDJMS-207: consolidate a couple of 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/1daede27
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/1daede27
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/1daede27
Branch: refs/heads/master
Commit: 1daede27c01676c0b300b7af8a38475bdf19aa31
Parents: 4550dac
Author: Robert Gemmell <ro...@apache.org>
Authored: Wed Sep 21 15:15:02 2016 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Wed Sep 21 15:15:02 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/qpid/jms/JmsConnectionTest.java | 4 ++++
.../jms/integration/ConnectionIntegrationTest.java | 15 ---------------
2 files changed, 4 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1daede27/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionTest.java
index 412ee73..df8c713 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionTest.java
@@ -295,6 +295,10 @@ public class JmsConnectionTest {
assertNotNull(metaData.getProviderVersion());
assertNotNull(metaData.getJMSProviderName());
+
+ int major = metaData.getProviderMajorVersion();
+ int minor = metaData.getProviderMinorVersion();
+ assertTrue("Expected non-zero provider major(" + major + ") / minor(" + minor +") version.", (major + minor) != 0);
}
//----- Currently these are unimplemented, these will fail after that ----//
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1daede27/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java
index 2e559ac..a550fc9 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java
@@ -254,21 +254,6 @@ public class ConnectionIntegrationTest extends QpidJmsTestCase {
}
@Test(timeout = 20000)
- public void testConnectionMetaDataVersion() throws Exception {
- try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- Connection connection = testFixture.establishConnecton(testPeer);
- ConnectionMetaData meta = connection.getMetaData();
- int result = meta.getProviderMajorVersion() + meta.getProviderMinorVersion();
- assertTrue("Expected non-zero provider major / minor version", result != 0);
-
- testPeer.expectClose();
- connection.close();
-
- testPeer.waitForAllHandlersToComplete(1000);
- }
- }
-
- @Test(timeout = 20000)
public void testConnectionPropertiesContainExpectedMetaData() throws Exception {
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org