Author: tabish
Date: Wed Apr 25 17:01:20 2007
New Revision: 532544
URL: http://svn.apache.org/viewvc?view=rev&rev=532544
Log:
Adding more configurability to integ tests
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/IntegrationCommon.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/IntegrationCommon.h
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/IntegrationCommon.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/IntegrationCommon.cpp?view=diff&rev=532544&r1=532543&r2=532544
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/IntegrationCommon.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/IntegrationCommon.cpp
Wed Apr 25 17:01:20 2007
@@ -19,6 +19,21 @@
using namespace integration;
-const int IntegrationCommon::defaultDelay = 5;
-const unsigned int IntegrationCommon::defaultMsgCount = 1000;
+const int IntegrationCommon::defaultDelay = 5;
+const unsigned int IntegrationCommon::defaultMsgCount = 1000;
bool IntegrationCommon::debug = false;
+
+////////////////////////////////////////////////////////////////////////////////
+IntegrationCommon::IntegrationCommon() {
+
+ this->urlCommon = "tcp://localhost:";
+ this->stompURL = this->urlCommon + "61613?wireformat=stomp";
+ this->openwireURL = this->urlCommon + "61616?wireformat=openwire";
+}
+
+////////////////////////////////////////////////////////////////////////////////
+IntegrationCommon& IntegrationCommon::getInstance() {
+ static IntegrationCommon instance;
+
+ return instance;
+}
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/IntegrationCommon.h
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/IntegrationCommon.h?view=diff&rev=532544&r1=532543&r2=532544
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/IntegrationCommon.h
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/IntegrationCommon.h
Wed Apr 25 17:01:20 2007
@@ -25,14 +25,26 @@
class IntegrationCommon
{
public:
-
- virtual ~IntegrationCommon();
-
+
+ virtual ~IntegrationCommon() {}
+
static const int defaultDelay;
static const unsigned int defaultMsgCount;
-
+
static bool debug;
-
+
+ static IntegrationCommon& getInstance();
+
+ protected:
+
+ IntegrationCommon();
+
+ private:
+
+ std::string urlCommon;
+ std::string stompURL;
+ std::string openwireURL;
+
};
}