activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r520111 - in /activemq/activemq-cpp/trunk/activemq-cpp/src/test: Makefile.am activemq/connector/stomp/StompDestinationTest.cpp activemq/connector/stomp/StompDestinationTest.h
Date Mon, 19 Mar 2007 21:35:47 GMT
Author: tabish
Date: Mon Mar 19 14:35:46 2007
New Revision: 520111

URL: http://svn.apache.org/viewvc?view=rev&rev=520111
Log:
Moving ActiveMQDestinationTest into StompDestinationTest as the ActiveMQDestination has been
merged into StompDestination

Modified:
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/Makefile.am
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompDestinationTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompDestinationTest.h

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/Makefile.am
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/Makefile.am?view=diff&rev=520111&r1=520110&r2=520111
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/Makefile.am (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/Makefile.am Mon Mar 19 14:35:46 2007
@@ -42,6 +42,7 @@
   activemq/connector/stomp/StompCommandWriterTest.cpp \
   activemq/connector/stomp/StompConnectorTest.cpp \
   activemq/connector/stomp/StompFrameTest.cpp \
+  activemq/connector/stomp/StompDestinationTest.cpp \
   activemq/connector/stomp/StompSessionManagerTest.cpp \
   activemq/connector/openwire/OpenWireFormatTest.cpp \
   activemq/connector/openwire/marshal/PrimitiveMapMarshallerTest.cpp \

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompDestinationTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompDestinationTest.cpp?view=diff&rev=520111&r1=520110&r2=520111
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompDestinationTest.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompDestinationTest.cpp
Mon Mar 19 14:35:46 2007
@@ -17,7 +17,12 @@
 
 #include "StompDestinationTest.h"
 
-CPPUNIT_TEST_SUITE_REGISTRATION( activemq::core::StompDestinationTest );
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::stomp::StompDestinationTest );
+
+using namespace std;
+using namespace activemq;
+using namespace activemq::connector;
+using namespace activemq::connector::stomp;
 
 ///////////////////////////////////////////////////////////////////////////////
 void StompDestinationTest::test()

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompDestinationTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompDestinationTest.h?view=diff&rev=520111&r1=520110&r2=520111
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompDestinationTest.h
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompDestinationTest.h
Mon Mar 19 14:35:46 2007
@@ -25,7 +25,8 @@
 #include <cms/Topic.h>
 
 namespace activemq{
-namespace core{
+namespace connector{
+namespace stomp{
 
     class StompDestinationTest : public CppUnit::TestFixture
     {
@@ -35,15 +36,15 @@
 
     public:
 
-        class MyDestination : public StompDestinationTest< cms::Topic >
+        class MyDestination : public StompDestination< cms::Topic >
         {
         public:
 
             MyDestination( const cms::Destination* dest ) :
-                StompDestinationTest< cms::Topic >( dest ) {}
+                StompDestination< cms::Topic >( dest ) {}
 
             MyDestination( const std::string& name )
-                : StompDestinationTest< cms::Topic >( name, cms::Destination::TOPIC
)
+                : StompDestination< cms::Topic >( name, cms::Destination::TOPIC )
             {}
 
             virtual ~MyDestination() {}
@@ -82,6 +83,17 @@
             virtual std::string getTopicName(void)
                 const throw( cms::CMSException ) { return getName(); }
 
+        protected:
+
+            /**
+             * Retrieves the proper Stomp Prefix for the specified type
+             * of Destination
+             * @return string prefix
+             */
+            virtual std::string getPrefix() const {
+                return "topic/";
+            }
+
         };
 
         StompDestinationTest() {}
@@ -91,6 +103,6 @@
 
     };
 
-}}
+}}}
 
 #endif /*_ACTIVEMQ_CONNECTOR_STOMP_STOMPDESTINATIONTEST_H_*/



Mime
View raw message