You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2014/12/05 16:38:36 UTC
[12/13] activemq-6 git commit: Handful of test fixes
Handful of test fixes
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/7cfd76d3
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/7cfd76d3
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/7cfd76d3
Branch: refs/heads/master
Commit: 7cfd76d321fe4b9fb9bbb4030bae7dd8b4072c3d
Parents: e6a3d3a
Author: jbertram <jb...@redhat.com>
Authored: Mon Nov 24 16:49:39 2014 -0600
Committer: jbertram <jb...@redhat.com>
Committed: Fri Dec 5 09:27:53 2014 -0600
----------------------------------------------------------------------
.../org/apache/activemq/tests/integration/client/PagingTest.java | 2 +-
.../integration/jms/server/management/JMSServerControl2Test.java | 4 ++--
.../activemq/tests/integration/ra/ResourceAdapterTest.java | 2 +-
.../apache/activemq/tests/integration/stomp/ExtraStompTest.java | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/7cfd76d3/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingTest.java
index 01bb091..56369c8 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingTest.java
@@ -5239,7 +5239,7 @@ public class PagingTest extends ServiceTestBase
// allow time for the logging to actually happen on the server
Thread.sleep(100);
- Assert.assertTrue("Expected to find HQ224016", AssertionLoggerHandler.findText("HQ224016"));
+ Assert.assertTrue("Expected to find AMQ224016", AssertionLoggerHandler.findText("AMQ224016"));
ClientConsumer consumer = session.createConsumer(ADDRESS);
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/7cfd76d3/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControl2Test.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControl2Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControl2Test.java
index fb5d3f5..4ca8615 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControl2Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControl2Test.java
@@ -543,7 +543,7 @@ public class JMSServerControl2Test extends ManagementTestBase
spec.setPassword("password");
- spec.setDestinationType("Queue");
+ spec.setDestinationType("javax.jms.Queue");
spec.setDestination("test");
spec.setMinSession(1);
@@ -632,7 +632,7 @@ public class JMSServerControl2Test extends ManagementTestBase
spec.setUser("user");
spec.setPassword("password");
- spec.setDestinationType("Queue");
+ spec.setDestinationType("javax.jms.Queue");
spec.setDestination("test");
spec.setMinSession(1);
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/7cfd76d3/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ResourceAdapterTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ResourceAdapterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ResourceAdapterTest.java
index 6e0ef08..9387ab5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ResourceAdapterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ResourceAdapterTest.java
@@ -86,7 +86,7 @@ public class ResourceAdapterTest extends ActiveMQRATestBase
spec.setUser("user");
spec.setPassword("password");
- spec.setDestinationType("Topic");
+ spec.setDestinationType("javax.jms.Topic");
spec.setDestination("test");
spec.setMinSession(1);
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/7cfd76d3/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/ExtraStompTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/ExtraStompTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/ExtraStompTest.java
index f2533a8..6b427e2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/ExtraStompTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/ExtraStompTest.java
@@ -740,7 +740,7 @@ public class ExtraStompTest extends StompTestBase
while (enu.hasMoreElements())
{
Message msg = (Message) enu.nextElement();
- String msgId = msg.getStringProperty("amqMessageId");
+ String msgId = msg.getStringProperty("hqMessageId");
if (enable != null && enable.booleanValue())
{
assertNotNull(msgId);