activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r985395 [2/2] - in /activemq/activemq-cpp/trunk/activemq-cpp/src: main/ main/activemq/core/ main/cms/ test-integration/ test-integration/activemq/test/ test-integration/activemq/test/openwire/ test/ test/activemq/core/
Date Fri, 13 Aug 2010 22:53:53 GMT
Copied: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/FifoMessageDispatchChannelTest.cpp
(from r979266, activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/MessageDispatchChannelTest.cpp)
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/FifoMessageDispatchChannelTest.cpp?p2=activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/FifoMessageDispatchChannelTest.cpp&p1=activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/MessageDispatchChannelTest.cpp&r1=979266&r2=985395&rev=985395&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/MessageDispatchChannelTest.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/FifoMessageDispatchChannelTest.cpp
Fri Aug 13 22:53:52 2010
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-#include "MessageDispatchChannelTest.h"
+#include "FifoMessageDispatchChannelTest.h"
 
-#include <activemq/core/MessageDispatchChannel.h>
+#include <activemq/core/FifoMessageDispatchChannel.h>
 #include <activemq/commands/MessageDispatch.h>
 #include <decaf/lang/Pointer.h>
 #include <decaf/lang/System.h>
@@ -29,9 +29,9 @@ using namespace decaf;
 using namespace decaf::lang;
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessageDispatchChannelTest::testCtor() {
+void FifoMessageDispatchChannelTest::testCtor() {
 
-    MessageDispatchChannel channel;
+    FifoMessageDispatchChannel channel;
     CPPUNIT_ASSERT( channel.isRunning() == false );
     CPPUNIT_ASSERT( channel.isEmpty() == true );
     CPPUNIT_ASSERT( channel.size() == 0 );
@@ -39,17 +39,17 @@ void MessageDispatchChannelTest::testCto
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessageDispatchChannelTest::testStart() {
+void FifoMessageDispatchChannelTest::testStart() {
 
-    MessageDispatchChannel channel;
+    FifoMessageDispatchChannel channel;
     channel.start();
     CPPUNIT_ASSERT( channel.isRunning() == true );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessageDispatchChannelTest::testStop() {
+void FifoMessageDispatchChannelTest::testStop() {
 
-    MessageDispatchChannel channel;
+    FifoMessageDispatchChannel channel;
     channel.start();
     CPPUNIT_ASSERT( channel.isRunning() == true );
     channel.stop();
@@ -57,9 +57,9 @@ void MessageDispatchChannelTest::testSto
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessageDispatchChannelTest::testClose() {
+void FifoMessageDispatchChannelTest::testClose() {
 
-    MessageDispatchChannel channel;
+    FifoMessageDispatchChannel channel;
     channel.start();
     CPPUNIT_ASSERT( channel.isRunning() == true );
     CPPUNIT_ASSERT( channel.isClosed() == false );
@@ -72,9 +72,9 @@ void MessageDispatchChannelTest::testClo
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessageDispatchChannelTest::testEnqueue() {
+void FifoMessageDispatchChannelTest::testEnqueue() {
 
-    MessageDispatchChannel channel;
+    FifoMessageDispatchChannel channel;
     Pointer<MessageDispatch> dispatch1( new MessageDispatch() );
     Pointer<MessageDispatch> dispatch2( new MessageDispatch() );
 
@@ -93,9 +93,9 @@ void MessageDispatchChannelTest::testEnq
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessageDispatchChannelTest::testEnqueueFront() {
+void FifoMessageDispatchChannelTest::testEnqueueFront() {
 
-    MessageDispatchChannel channel;
+    FifoMessageDispatchChannel channel;
     Pointer<MessageDispatch> dispatch1( new MessageDispatch() );
     Pointer<MessageDispatch> dispatch2( new MessageDispatch() );
 
@@ -119,9 +119,9 @@ void MessageDispatchChannelTest::testEnq
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessageDispatchChannelTest::testPeek() {
+void FifoMessageDispatchChannelTest::testPeek() {
 
-    MessageDispatchChannel channel;
+    FifoMessageDispatchChannel channel;
     Pointer<MessageDispatch> dispatch1( new MessageDispatch() );
     Pointer<MessageDispatch> dispatch2( new MessageDispatch() );
 
@@ -149,9 +149,9 @@ void MessageDispatchChannelTest::testPee
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessageDispatchChannelTest::testDequeueNoWait() {
+void FifoMessageDispatchChannelTest::testDequeueNoWait() {
 
-    MessageDispatchChannel channel;
+    FifoMessageDispatchChannel channel;
 
     Pointer<MessageDispatch> dispatch1( new MessageDispatch() );
     Pointer<MessageDispatch> dispatch2( new MessageDispatch() );
@@ -179,9 +179,9 @@ void MessageDispatchChannelTest::testDeq
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessageDispatchChannelTest::testDequeue() {
+void FifoMessageDispatchChannelTest::testDequeue() {
 
-    MessageDispatchChannel channel;
+    FifoMessageDispatchChannel channel;
 
     Pointer<MessageDispatch> dispatch1( new MessageDispatch() );
     Pointer<MessageDispatch> dispatch2( new MessageDispatch() );
@@ -210,9 +210,9 @@ void MessageDispatchChannelTest::testDeq
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessageDispatchChannelTest::testRemoveAll() {
+void FifoMessageDispatchChannelTest::testRemoveAll() {
 
-    MessageDispatchChannel channel;
+    FifoMessageDispatchChannel channel;
 
     Pointer<MessageDispatch> dispatch1( new MessageDispatch() );
     Pointer<MessageDispatch> dispatch2( new MessageDispatch() );

Copied: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/FifoMessageDispatchChannelTest.h
(from r979266, activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/MessageDispatchChannelTest.h)
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/FifoMessageDispatchChannelTest.h?p2=activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/FifoMessageDispatchChannelTest.h&p1=activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/MessageDispatchChannelTest.h&r1=979266&r2=985395&rev=985395&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/MessageDispatchChannelTest.h
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/FifoMessageDispatchChannelTest.h
Fri Aug 13 22:53:52 2010
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#ifndef _ACTIVEMQ_CORE_MESSAGEDISPATCHCHANNELTEST_H_
-#define _ACTIVEMQ_CORE_MESSAGEDISPATCHCHANNELTEST_H_
+#ifndef _ACTIVEMQ_CORE_FIFOMESSAGEDISPATCHCHANNELTEST_H_
+#define _ACTIVEMQ_CORE_FIFOMESSAGEDISPATCHCHANNELTEST_H_
 
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
@@ -24,9 +24,9 @@
 namespace activemq {
 namespace core {
 
-    class MessageDispatchChannelTest : public CppUnit::TestFixture {
+    class FifoMessageDispatchChannelTest : public CppUnit::TestFixture {
 
-        CPPUNIT_TEST_SUITE( MessageDispatchChannelTest );
+        CPPUNIT_TEST_SUITE( FifoMessageDispatchChannelTest );
         CPPUNIT_TEST( testCtor );
         CPPUNIT_TEST( testStart );
         CPPUNIT_TEST( testStop );
@@ -41,8 +41,8 @@ namespace core {
 
     public:
 
-        MessageDispatchChannelTest() {}
-        virtual ~MessageDispatchChannelTest() {}
+        FifoMessageDispatchChannelTest() {}
+        virtual ~FifoMessageDispatchChannelTest() {}
 
         void testCtor();
         void testStart();
@@ -59,4 +59,4 @@ namespace core {
 
 }}
 
-#endif /* _ACTIVEMQ_CORE_MESSAGEDISPATCHCHANNELTEST_H_ */
+#endif /* _ACTIVEMQ_CORE_FIFOMESSAGEDISPATCHCHANNELTEST_H_ */

Added: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/SimplePriorityMessageDispatchChannelTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/SimplePriorityMessageDispatchChannelTest.cpp?rev=985395&view=auto
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/SimplePriorityMessageDispatchChannelTest.cpp
(added)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/SimplePriorityMessageDispatchChannelTest.cpp
Fri Aug 13 22:53:52 2010
@@ -0,0 +1,286 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "SimplePriorityMessageDispatchChannelTest.h"
+
+#include <activemq/core/SimplePriorityMessageDispatchChannel.h>
+#include <activemq/commands/MessageDispatch.h>
+#include <decaf/lang/Pointer.h>
+#include <decaf/lang/System.h>
+
+using namespace activemq;
+using namespace activemq::core;
+using namespace activemq::commands;
+using namespace decaf;
+using namespace decaf::lang;
+
+////////////////////////////////////////////////////////////////////////////////
+void SimplePriorityMessageDispatchChannelTest::testCtor() {
+
+    SimplePriorityMessageDispatchChannel channel;
+    CPPUNIT_ASSERT( channel.isRunning() == false );
+    CPPUNIT_ASSERT( channel.isEmpty() == true );
+    CPPUNIT_ASSERT( channel.size() == 0 );
+    CPPUNIT_ASSERT( channel.isClosed() == false );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void SimplePriorityMessageDispatchChannelTest::testStart() {
+
+    SimplePriorityMessageDispatchChannel channel;
+    channel.start();
+    CPPUNIT_ASSERT( channel.isRunning() == true );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void SimplePriorityMessageDispatchChannelTest::testStop() {
+
+    SimplePriorityMessageDispatchChannel channel;
+    channel.start();
+    CPPUNIT_ASSERT( channel.isRunning() == true );
+    channel.stop();
+    CPPUNIT_ASSERT( channel.isRunning() == false );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void SimplePriorityMessageDispatchChannelTest::testClose() {
+
+    SimplePriorityMessageDispatchChannel channel;
+    channel.start();
+    CPPUNIT_ASSERT( channel.isRunning() == true );
+    CPPUNIT_ASSERT( channel.isClosed() == false );
+    channel.close();
+    CPPUNIT_ASSERT( channel.isRunning() == false );
+    CPPUNIT_ASSERT( channel.isClosed() == true );
+    channel.start();
+    CPPUNIT_ASSERT( channel.isRunning() == false );
+    CPPUNIT_ASSERT( channel.isClosed() == true );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void SimplePriorityMessageDispatchChannelTest::testEnqueue() {
+
+    SimplePriorityMessageDispatchChannel channel;
+    Pointer<MessageDispatch> dispatch1( new MessageDispatch() );
+    Pointer<MessageDispatch> dispatch2( new MessageDispatch() );
+
+    CPPUNIT_ASSERT( channel.isEmpty() == true );
+    CPPUNIT_ASSERT( channel.size() == 0 );
+
+    channel.enqueue( dispatch1 );
+
+    CPPUNIT_ASSERT( channel.isEmpty() == false );
+    CPPUNIT_ASSERT( channel.size() == 1 );
+
+    channel.enqueue( dispatch2 );
+
+    CPPUNIT_ASSERT( channel.isEmpty() == false );
+    CPPUNIT_ASSERT( channel.size() == 2 );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void SimplePriorityMessageDispatchChannelTest::testEnqueueFront() {
+
+    SimplePriorityMessageDispatchChannel channel;
+    Pointer<MessageDispatch> dispatch1( new MessageDispatch() );
+    Pointer<MessageDispatch> dispatch2( new MessageDispatch() );
+
+    Pointer<Message> message1( new Message() );
+    Pointer<Message> message2( new Message() );
+
+    message1->setPriority( 2 );
+    message2->setPriority( 1 );
+
+    dispatch1->setMessage( message1 );
+    dispatch2->setMessage( message2 );
+
+    channel.start();
+
+    CPPUNIT_ASSERT( channel.isEmpty() == true );
+    CPPUNIT_ASSERT( channel.size() == 0 );
+
+    channel.enqueueFirst( dispatch1 );
+
+    CPPUNIT_ASSERT( channel.isEmpty() == false );
+    CPPUNIT_ASSERT( channel.size() == 1 );
+
+    channel.enqueueFirst( dispatch2 );
+
+    CPPUNIT_ASSERT( channel.isEmpty() == false );
+    CPPUNIT_ASSERT( channel.size() == 2 );
+
+    CPPUNIT_ASSERT( channel.dequeueNoWait() == dispatch1 );
+    CPPUNIT_ASSERT( channel.dequeueNoWait() == dispatch2 );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void SimplePriorityMessageDispatchChannelTest::testPeek() {
+
+    SimplePriorityMessageDispatchChannel channel;
+    Pointer<MessageDispatch> dispatch1( new MessageDispatch() );
+    Pointer<MessageDispatch> dispatch2( new MessageDispatch() );
+
+    Pointer<Message> message1( new Message() );
+    Pointer<Message> message2( new Message() );
+
+    message1->setPriority( 2 );
+    message2->setPriority( 1 );
+
+    dispatch1->setMessage( message1 );
+    dispatch2->setMessage( message2 );
+
+    CPPUNIT_ASSERT( channel.isEmpty() == true );
+    CPPUNIT_ASSERT( channel.size() == 0 );
+
+    channel.enqueueFirst( dispatch1 );
+
+    CPPUNIT_ASSERT( channel.isEmpty() == false );
+    CPPUNIT_ASSERT( channel.size() == 1 );
+
+    channel.enqueueFirst( dispatch2 );
+
+    CPPUNIT_ASSERT( channel.isEmpty() == false );
+    CPPUNIT_ASSERT( channel.size() == 2 );
+
+    CPPUNIT_ASSERT( channel.peek() == NULL );
+
+    channel.start();
+
+    CPPUNIT_ASSERT( channel.peek() == dispatch1 );
+    CPPUNIT_ASSERT( channel.dequeueNoWait() == dispatch1 );
+    CPPUNIT_ASSERT( channel.peek() == dispatch2 );
+    CPPUNIT_ASSERT( channel.dequeueNoWait() == dispatch2 );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void SimplePriorityMessageDispatchChannelTest::testDequeueNoWait() {
+
+    SimplePriorityMessageDispatchChannel channel;
+
+    Pointer<MessageDispatch> dispatch1( new MessageDispatch() );
+    Pointer<MessageDispatch> dispatch2( new MessageDispatch() );
+    Pointer<MessageDispatch> dispatch3( new MessageDispatch() );
+
+    Pointer<Message> message1( new Message() );
+    Pointer<Message> message2( new Message() );
+    Pointer<Message> message3( new Message() );
+
+    message1->setPriority( 2 );
+    message2->setPriority( 3 );
+    message3->setPriority( 1 );
+
+    dispatch1->setMessage( message1 );
+    dispatch2->setMessage( message2 );
+    dispatch3->setMessage( message3 );
+
+    CPPUNIT_ASSERT( channel.isRunning() == false );
+    CPPUNIT_ASSERT( channel.dequeueNoWait() == NULL );
+
+    channel.enqueue( dispatch1 );
+    channel.enqueue( dispatch2 );
+    channel.enqueue( dispatch3 );
+
+    CPPUNIT_ASSERT( channel.dequeueNoWait() == NULL );
+    channel.start();
+    CPPUNIT_ASSERT( channel.isRunning() == true );
+
+    CPPUNIT_ASSERT( channel.isEmpty() == false );
+    CPPUNIT_ASSERT( channel.size() == 3 );
+    CPPUNIT_ASSERT( channel.dequeueNoWait() == dispatch2 );
+    CPPUNIT_ASSERT( channel.dequeueNoWait() == dispatch1 );
+    CPPUNIT_ASSERT( channel.dequeueNoWait() == dispatch3 );
+
+    CPPUNIT_ASSERT( channel.size() == 0 );
+    CPPUNIT_ASSERT( channel.isEmpty() == true );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void SimplePriorityMessageDispatchChannelTest::testDequeue() {
+
+    SimplePriorityMessageDispatchChannel channel;
+
+    Pointer<MessageDispatch> dispatch1( new MessageDispatch() );
+    Pointer<MessageDispatch> dispatch2( new MessageDispatch() );
+    Pointer<MessageDispatch> dispatch3( new MessageDispatch() );
+
+    Pointer<Message> message1( new Message() );
+    Pointer<Message> message2( new Message() );
+    Pointer<Message> message3( new Message() );
+
+    message1->setPriority( 2 );
+    message2->setPriority( 3 );
+    message3->setPriority( 1 );
+
+    dispatch1->setMessage( message1 );
+    dispatch2->setMessage( message2 );
+    dispatch3->setMessage( message3 );
+
+    channel.start();
+    CPPUNIT_ASSERT( channel.isRunning() == true );
+
+    long long timeStarted = System::currentTimeMillis();
+
+    CPPUNIT_ASSERT( channel.dequeue( 1000 ) == NULL );
+
+    CPPUNIT_ASSERT( System::currentTimeMillis() - timeStarted >= 999 );
+
+    channel.enqueue( dispatch1 );
+    channel.enqueue( dispatch2 );
+    channel.enqueue( dispatch3 );
+    CPPUNIT_ASSERT( channel.isEmpty() == false );
+    CPPUNIT_ASSERT( channel.size() == 3 );
+    CPPUNIT_ASSERT( channel.dequeue( -1 ) == dispatch2 );
+    CPPUNIT_ASSERT( channel.dequeue( 0 ) == dispatch1 );
+    CPPUNIT_ASSERT( channel.dequeue( 1000 ) == dispatch3 );
+
+    CPPUNIT_ASSERT( channel.size() == 0 );
+    CPPUNIT_ASSERT( channel.isEmpty() == true );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void SimplePriorityMessageDispatchChannelTest::testRemoveAll() {
+
+    SimplePriorityMessageDispatchChannel channel;
+
+    Pointer<MessageDispatch> dispatch1( new MessageDispatch() );
+    Pointer<MessageDispatch> dispatch2( new MessageDispatch() );
+    Pointer<MessageDispatch> dispatch3( new MessageDispatch() );
+
+    Pointer<Message> message1( new Message() );
+    Pointer<Message> message2( new Message() );
+    Pointer<Message> message3( new Message() );
+
+    message1->setPriority( 2 );
+    message2->setPriority( 3 );
+    message3->setPriority( 1 );
+
+    dispatch1->setMessage( message1 );
+    dispatch2->setMessage( message2 );
+    dispatch3->setMessage( message3 );
+
+    channel.enqueue( dispatch1 );
+    channel.enqueue( dispatch2 );
+    channel.enqueue( dispatch3 );
+
+    channel.start();
+    CPPUNIT_ASSERT( channel.isRunning() == true );
+    CPPUNIT_ASSERT( channel.isEmpty() == false );
+    CPPUNIT_ASSERT( channel.size() == 3 );
+    CPPUNIT_ASSERT( channel.removeAll().size() == 3 );
+    CPPUNIT_ASSERT( channel.size() == 0 );
+    CPPUNIT_ASSERT( channel.isEmpty() == true );
+}

Propchange: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/SimplePriorityMessageDispatchChannelTest.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/SimplePriorityMessageDispatchChannelTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/SimplePriorityMessageDispatchChannelTest.h?rev=985395&view=auto
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/SimplePriorityMessageDispatchChannelTest.h
(added)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/SimplePriorityMessageDispatchChannelTest.h
Fri Aug 13 22:53:52 2010
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _ACTIVEMQ_CORE_SIMPLEPRIORITYMESSAGEDISPATCHCHANNELTEST_H_
+#define _ACTIVEMQ_CORE_SIMPLEPRIORITYMESSAGEDISPATCHCHANNELTEST_H_
+
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+namespace activemq {
+namespace core {
+
+    class SimplePriorityMessageDispatchChannelTest : public CppUnit::TestFixture {
+
+        CPPUNIT_TEST_SUITE( SimplePriorityMessageDispatchChannelTest );
+        CPPUNIT_TEST( testCtor );
+        CPPUNIT_TEST( testStart );
+        CPPUNIT_TEST( testStop );
+        CPPUNIT_TEST( testClose );
+        CPPUNIT_TEST( testEnqueue );
+        CPPUNIT_TEST( testEnqueueFront );
+        CPPUNIT_TEST( testPeek );
+        CPPUNIT_TEST( testDequeueNoWait );
+        CPPUNIT_TEST( testDequeue );
+        CPPUNIT_TEST( testRemoveAll );
+        CPPUNIT_TEST_SUITE_END();
+
+    public:
+
+        SimplePriorityMessageDispatchChannelTest() {}
+        virtual ~SimplePriorityMessageDispatchChannelTest() {}
+
+        void testCtor();
+        void testStart();
+        void testStop();
+        void testClose();
+        void testEnqueue();
+        void testEnqueueFront();
+        void testPeek();
+        void testDequeueNoWait();
+        void testDequeue();
+        void testRemoveAll();
+
+    };
+
+}}
+
+#endif /* _ACTIVEMQ_CORE_SIMPLEPRIORITYMESSAGEDISPATCHCHANNELTEST_H_ */

Propchange: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/SimplePriorityMessageDispatchChannelTest.h
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/testRegistry.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/testRegistry.cpp?rev=985395&r1=985394&r2=985395&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/testRegistry.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/testRegistry.cpp Fri Aug 13 22:53:52
2010
@@ -75,8 +75,10 @@ CPPUNIT_TEST_SUITE_REGISTRATION( activem
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::core::ActiveMQConnectionTest );
 #include <activemq/core/ActiveMQSessionTest.h>
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::core::ActiveMQSessionTest );
-#include <activemq/core/MessageDispatchChannelTest.h>
-CPPUNIT_TEST_SUITE_REGISTRATION( activemq::core::MessageDispatchChannelTest );
+#include <activemq/core/FifoMessageDispatchChannelTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::core::FifoMessageDispatchChannelTest );
+#include <activemq/core/SimplePriorityMessageDispatchChannelTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::core::SimplePriorityMessageDispatchChannelTest
);
 
 #include <activemq/state/ConnectionStateTrackerTest.h>
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::state::ConnectionStateTrackerTest );



Mime
View raw message