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 2015/08/12 16:13:57 UTC
[1/3] qpid-jms git commit: QPIDJMS-91: update to 5.12-SNAPSHOT,
update or enable various tests accordingly
Repository: qpid-jms
Updated Branches:
refs/heads/master 3960d9e35 -> d28be7cd8
QPIDJMS-91: update to 5.12-SNAPSHOT, update or enable various tests accordingly
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/50ea0151
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/50ea0151
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/50ea0151
Branch: refs/heads/master
Commit: 50ea0151d267c789e1ec16eb76cdb8234e109d99
Parents: 3960d9e
Author: Robert Gemmell <ro...@apache.org>
Authored: Wed Aug 12 14:33:45 2015 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Wed Aug 12 15:08:21 2015 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
qpid-jms-interop-tests/qpid-jms-activemq-tests/pom.xml | 9 ---------
.../test/java/org/apache/qpid/jms/JmsConnectionTest.java | 4 ++--
.../apache/qpid/jms/consumer/JmsMessageConsumerTest.java | 2 --
.../java/org/apache/qpid/jms/session/JmsSessionTest.java | 5 -----
.../qpid/jms/transactions/JmsTransactedConsumerTest.java | 2 --
6 files changed, 3 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/50ea0151/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f3cecbf..38613e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
<slf4j-version>1.7.12</slf4j-version>
<geronimo-jms-1-1-spec-version>1.1.1</geronimo-jms-1-1-spec-version>
<!-- Test Dependency Versions for this Project -->
- <activemq-version>5.11.1</activemq-version>
+ <activemq-version>5.12-SNAPSHOT</activemq-version>
<junit-version>4.12</junit-version>
<fuse-joram-tests-version>1.0</fuse-joram-tests-version>
<jetty-version>8.1.16.v20140903</jetty-version>
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/50ea0151/qpid-jms-interop-tests/qpid-jms-activemq-tests/pom.xml
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/pom.xml b/qpid-jms-interop-tests/qpid-jms-activemq-tests/pom.xml
index 36ab5c6..3e475d4 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/pom.xml
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/pom.xml
@@ -112,15 +112,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <!-- Need 5.12 snapshot -->
- <exclude>**/JoramSelectorTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/50ea0151/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsConnectionTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsConnectionTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsConnectionTest.java
index b512f36..f035348 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsConnectionTest.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsConnectionTest.java
@@ -25,6 +25,7 @@ import java.util.concurrent.TimeUnit;
import javax.jms.DeliveryMode;
import javax.jms.ExceptionListener;
+import javax.jms.InvalidClientIDException;
import javax.jms.JMSException;
import javax.jms.JMSSecurityException;
import javax.jms.Message;
@@ -68,8 +69,7 @@ public class JmsConnectionTest extends AmqpTestSupport {
try {
connection2.setClientID("Test");
fail("should have thrown a JMSException");
- } catch (JMSException ex) {
- //TODO: change to InvalidClientIDException when updating to 5.12 or above
+ } catch (InvalidClientIDException ex) {
LOG.info("Remote threw ex: {}", ex);
} catch (Exception unexpected) {
fail("Wrong exception type thrown: " + unexpected);
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/50ea0151/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerTest.java
index e8b8fd4..acd8f61 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerTest.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerTest.java
@@ -47,7 +47,6 @@ import org.apache.qpid.jms.JmsMessageAvailableListener;
import org.apache.qpid.jms.JmsMessageConsumer;
import org.apache.qpid.jms.support.AmqpTestSupport;
import org.apache.qpid.jms.support.Wait;
-import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -456,7 +455,6 @@ public class JmsMessageConsumerTest extends AmqpTestSupport {
assertNull(consumer.receive(1000));
}
- @Ignore //TODO: needs 5.12 snapshot
@Test(timeout=30000)
public void testSelectorsWithJMSType() throws Exception {
connection = createAmqpConnection();
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/50ea0151/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 7f23a90..5fe9d55 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
@@ -35,7 +35,6 @@ import javax.jms.Topic;
import org.apache.activemq.broker.jmx.BrokerViewMBean;
import org.apache.qpid.jms.support.AmqpTestSupport;
import org.apache.qpid.jms.support.Wait;
-import org.junit.Ignore;
import org.junit.Test;
/**
@@ -146,7 +145,6 @@ public class JmsSessionTest extends AmqpTestSupport {
} catch (JMSSecurityException jmsse) {}
}
- @Ignore("Delete of Temporary destinations not yet supported.")
@Test(timeout=30000)
public void testDeleteTemporaryQueue() throws Exception {
connection = createAmqpConnection();
@@ -170,7 +168,6 @@ public class JmsSessionTest extends AmqpTestSupport {
}, TimeUnit.SECONDS.toMillis(30), TimeUnit.MILLISECONDS.toMillis(50)));
}
- @Ignore("Temporary Topics not supported in AMQ yet.")
@Test(timeout=30000)
public void testCreateTemporaryTopic() throws Exception {
connection = createAmqpConnection();
@@ -183,7 +180,6 @@ public class JmsSessionTest extends AmqpTestSupport {
assertEquals(1, broker.getTemporaryTopics().length);
}
- @Ignore("Temporary Topics not supported in AMQ yet.")
@Test(timeout=30000)
public void testCreateTemporaryTopicNotAuthorized() throws Exception {
connection = createAmqpConnection("guest", "password");
@@ -194,7 +190,6 @@ public class JmsSessionTest extends AmqpTestSupport {
} catch (JMSSecurityException jmsse) {}
}
- @Ignore("Temporary Topics not supported in AMQ yet.")
@Test(timeout=30000)
public void testDeleteTemporaryTopic() throws Exception {
connection = createAmqpConnection();
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/50ea0151/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactedConsumerTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactedConsumerTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactedConsumerTest.java
index 474dcfa..797b765 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactedConsumerTest.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactedConsumerTest.java
@@ -36,7 +36,6 @@ import org.apache.activemq.broker.jmx.QueueViewMBean;
import org.apache.qpid.jms.JmsConnection;
import org.apache.qpid.jms.support.AmqpTestSupport;
import org.apache.qpid.jms.support.QpidJmsTestSupport;
-import org.junit.Ignore;
import org.junit.Test;
/**
@@ -385,7 +384,6 @@ public class JmsTransactedConsumerTest extends AmqpTestSupport {
session.close();
}
- @Ignore("Fails at 500 messages consumed.") //TODO: needs 5.12 snapshot broker
@Test(timeout = 60000)
public void testSingleConsumedMessagePerTxCase() throws Exception {
connection = createAmqpConnection();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[3/3] qpid-jms git commit: QPIDJMS-91: enable previously skipped
tests, now work with 5.12
Posted by ro...@apache.org.
QPIDJMS-91: enable previously skipped tests, now work with 5.12
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/d28be7cd
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/d28be7cd
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/d28be7cd
Branch: refs/heads/master
Commit: d28be7cd821d84c5ae20e62f07ac27ed6c8c0bd3
Parents: 896cfe2
Author: Robert Gemmell <ro...@apache.org>
Authored: Wed Aug 12 15:02:19 2015 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Wed Aug 12 15:08:26 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/qpid/jms/consumer/JmsZeroPrefetchTest.java | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/d28be7cd/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsZeroPrefetchTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsZeroPrefetchTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsZeroPrefetchTest.java
index e06336d..084ae13 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsZeroPrefetchTest.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsZeroPrefetchTest.java
@@ -34,7 +34,6 @@ import org.apache.activemq.broker.jmx.QueueViewMBean;
import org.apache.qpid.jms.JmsConnection;
import org.apache.qpid.jms.support.AmqpTestSupport;
import org.apache.qpid.jms.support.Wait;
-import org.junit.Ignore;
import org.junit.Test;
/**
@@ -83,8 +82,6 @@ public class JmsZeroPrefetchTest extends AmqpTestSupport {
assertNull("Should have not received a message!", answer);
}
- // TODO - Enable once broker side credit handling is fixed
- @Ignore // ActiveMQ doesn't honor link credit.
@Test(timeout = 60000)
public void testPullConsumerOnlyRequestsOneMessage() throws Exception {
connection = createAmqpConnection();
@@ -121,8 +118,6 @@ public class JmsZeroPrefetchTest extends AmqpTestSupport {
assertEquals(0, queueView.getInFlightCount());
}
- // TODO - Enable once broker side credit handling is fixed
- @Ignore // ActiveMQ doesn't honor link credit.
@Test(timeout = 60000)
public void testTwoConsumers() throws Exception {
connection = createAmqpConnection();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/3] qpid-jms git commit: QPIDJMS-91: enable a previously skipped
test, now works with 5.12
Posted by ro...@apache.org.
QPIDJMS-91: enable a previously skipped test, now works with 5.12
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/896cfe27
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/896cfe27
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/896cfe27
Branch: refs/heads/master
Commit: 896cfe279b53645776970518f4fc36145a2ff323
Parents: 50ea015
Author: Robert Gemmell <ro...@apache.org>
Authored: Wed Aug 12 14:57:05 2015 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Wed Aug 12 15:08:24 2015 +0100
----------------------------------------------------------------------
.../qpid/jms/destinations/JmsTemporaryTopicTest.java | 14 --------------
1 file changed, 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/896cfe27/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/destinations/JmsTemporaryTopicTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/destinations/JmsTemporaryTopicTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/destinations/JmsTemporaryTopicTest.java
index ec5dac9..83121d3 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/destinations/JmsTemporaryTopicTest.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/destinations/JmsTemporaryTopicTest.java
@@ -30,7 +30,6 @@ import javax.jms.Session;
import javax.jms.TemporaryTopic;
import org.apache.qpid.jms.support.AmqpTestSupport;
-import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,7 +41,6 @@ public class JmsTemporaryTopicTest extends AmqpTestSupport {
protected static final Logger LOG = LoggerFactory.getLogger(JmsTemporaryTopicTest.class);
- @Ignore //TODO: enable and remove "testCreateTemporaryTopicWithoutBrokerCheck"
@Test(timeout = 60000)
public void testCreateTemporaryTopic() throws Exception {
connection = createAmqpConnection();
@@ -53,22 +51,10 @@ public class JmsTemporaryTopicTest extends AmqpTestSupport {
TemporaryTopic topic = session.createTemporaryTopic();
session.createConsumer(topic);
- //TODO: TempTopics not yet supported on the Broker, it is faking it, this check fails.
assertEquals(1, brokerService.getAdminView().getTemporaryTopics().length);
}
@Test(timeout = 60000)
- public void testCreateTemporaryTopicWithoutBrokerCheck() throws Exception {
- connection = createAmqpConnection();
- connection.start();
-
- Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- assertNotNull(session);
- TemporaryTopic topic = session.createTemporaryTopic();
- session.createConsumer(topic);
- }
-
- @Test(timeout = 60000)
public void testCantConsumeFromTemporaryTopicCreatedOnAnotherConnection() throws Exception {
connection = createAmqpConnection();
connection.start();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org