activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject git commit: Fix the inheritance hierarchy of these tests.
Date Thu, 21 Aug 2014 22:47:48 GMT
Repository: activemq-cpp
Updated Branches:
  refs/heads/trunk 35c570ba7 -> 2f3c592ff


Fix the inheritance hierarchy of these tests.

Project: http://git-wip-us.apache.org/repos/asf/activemq-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-cpp/commit/2f3c592f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-cpp/tree/2f3c592f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-cpp/diff/2f3c592f

Branch: refs/heads/trunk
Commit: 2f3c592ff221e94ff088324b1cfcc1787f6a55b5
Parents: 35c570b
Author: Timothy Bish <tabish121@gmail.com>
Authored: Thu Aug 21 18:47:35 2014 -0400
Committer: Timothy Bish <tabish121@gmail.com>
Committed: Thu Aug 21 18:47:35 2014 -0400

----------------------------------------------------------------------
 .../test/openwire/OpenwireNonBlockingRedeliveryTest.h        | 8 ++++++--
 .../activemq/test/openwire/OpenwireOptimizedAckTest.h        | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/2f3c592f/activemq-cpp/src/test-integration/activemq/test/openwire/OpenwireNonBlockingRedeliveryTest.h
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/test-integration/activemq/test/openwire/OpenwireNonBlockingRedeliveryTest.h
b/activemq-cpp/src/test-integration/activemq/test/openwire/OpenwireNonBlockingRedeliveryTest.h
index 542094c..725b0ee 100644
--- a/activemq-cpp/src/test-integration/activemq/test/openwire/OpenwireNonBlockingRedeliveryTest.h
+++ b/activemq-cpp/src/test-integration/activemq/test/openwire/OpenwireNonBlockingRedeliveryTest.h
@@ -18,13 +18,14 @@
 #ifndef _ACTIVEMQ_TEST_OPENWIRE_OPENWIRENONBLOCKINGREDELIVERYTEST_H_
 #define _ACTIVEMQ_TEST_OPENWIRE_OPENWIRENONBLOCKINGREDELIVERYTEST_H_
 
-#include <activemq/test/MessagePriorityTest.h>
+#include <activemq/test/CMSTestFixture.h>
+#include <activemq/util/IntegrationCommon.h>
 
 namespace activemq {
 namespace test {
 namespace openwire {
 
-    class OpenwireNonBlockingRedeliveryTest : public MessagePriorityTest {
+    class OpenwireNonBlockingRedeliveryTest : public CMSTestFixture {
 
         CPPUNIT_TEST_SUITE( OpenwireNonBlockingRedeliveryTest );
 //        CPPUNIT_TEST( testConsumerMessagesAreNotOrdered );
@@ -41,6 +42,9 @@ namespace openwire {
         OpenwireNonBlockingRedeliveryTest();
         virtual ~OpenwireNonBlockingRedeliveryTest();
 
+        virtual void setUp() {}
+        virtual void tearDown() {}
+
         virtual std::string getBrokerURL() const;
 
         void testConsumerMessagesAreNotOrdered();

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/2f3c592f/activemq-cpp/src/test-integration/activemq/test/openwire/OpenwireOptimizedAckTest.h
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/test-integration/activemq/test/openwire/OpenwireOptimizedAckTest.h
b/activemq-cpp/src/test-integration/activemq/test/openwire/OpenwireOptimizedAckTest.h
index 8d39922..c7e9899 100644
--- a/activemq-cpp/src/test-integration/activemq/test/openwire/OpenwireOptimizedAckTest.h
+++ b/activemq-cpp/src/test-integration/activemq/test/openwire/OpenwireOptimizedAckTest.h
@@ -18,13 +18,14 @@
 #ifndef _ACTIVEMQ_TEST_OPENWIRE_OPENWIREOPTIMIZEDACKTEST_H_
 #define _ACTIVEMQ_TEST_OPENWIRE_OPENWIREOPTIMIZEDACKTEST_H_
 
-#include <activemq/test/MessagePriorityTest.h>
+#include <activemq/test/CMSTestFixture.h>
+#include <activemq/util/IntegrationCommon.h>
 
 namespace activemq {
 namespace test {
 namespace openwire {
 
-    class OpenwireOptimizedAckTest : public MessagePriorityTest {
+    class OpenwireOptimizedAckTest : public CMSTestFixture {
 
         CPPUNIT_TEST_SUITE( OpenwireOptimizedAckTest );
         CPPUNIT_TEST( testOptimizedAckSettings );
@@ -38,6 +39,9 @@ namespace openwire {
         OpenwireOptimizedAckTest();
         virtual ~OpenwireOptimizedAckTest();
 
+        virtual void setUp() {}
+        virtual void tearDown() {}
+
         virtual std::string getBrokerURL() const;
 
         void testOptimizedAckSettings();


Mime
View raw message