Author: nmittler
Date: Sat Mar 10 14:46:42 2007
New Revision: 516800
URL: http://svn.apache.org/viewvc?view=rev&rev=516800
Log:
restructuring the integration tests
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/TestSupport.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/AsyncSenderTest.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/DurableTest.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/ExpirationTest.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/SimpleRollbackTest.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/SimpleTest.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/TransactionTest.cpp
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/TestSupport.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/TestSupport.cpp?view=diff&rev=516800&r1=516799&r2=516800
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/TestSupport.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/TestSupport.cpp
Sat Mar 10 14:46:42 2007
@@ -42,8 +42,10 @@
using namespace integration;
TestSupport::TestSupport( const string& brokerUrl,
cms::Session::AcknowledgeMode ackMode )
- : connectionFactory( NULL ),
- connection( NULL )
+:
+ session( NULL ),
+ connectionFactory( NULL ),
+ connection( NULL )
{
this->ackMode = ackMode;
this->brokerUrl = brokerUrl;
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/AsyncSenderTest.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/AsyncSenderTest.cpp?view=diff&rev=516800&r1=516799&r2=516800
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/AsyncSenderTest.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/AsyncSenderTest.cpp
Sat Mar 10 14:46:42 2007
@@ -76,7 +76,7 @@
////////////////////////////////////////////////////////////////////////////////
AsyncSenderTest::AsyncSenderTest()
:
- testSupport("stomp://localhost:61613?useAsyncSend=true")
+ testSupport("tcp://localhost:61613?wireFormat=stomp&useAsyncSend=true")
{
testSupport.initialize();
}
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/DurableTest.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/DurableTest.cpp?view=diff&rev=516800&r1=516799&r2=516800
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/DurableTest.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/DurableTest.cpp
Sat Mar 10 14:46:42 2007
@@ -75,7 +75,7 @@
DurableTest::DurableTest()
:
- testSupport("stomp://localhost:61613")
+ testSupport("tcp://localhost:61613?wireFormat=stomp")
{
testSupport.initialize();
}
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/ExpirationTest.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/ExpirationTest.cpp?view=diff&rev=516800&r1=516799&r2=516800
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/ExpirationTest.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/ExpirationTest.cpp
Sat Mar 10 14:46:42 2007
@@ -119,7 +119,7 @@
virtual void run() {
try {
// Create a ConnectionFactory
- connectionFactory = new
ActiveMQConnectionFactory("tcp://localhost:61613");
+ connectionFactory = new
ActiveMQConnectionFactory("tcp://localhost:61613?wireFormat=stomp");
// Create a Connection
connection = connectionFactory->createConnection();
@@ -235,7 +235,7 @@
// Create a ConnectionFactory
ActiveMQConnectionFactory* connectionFactory =
- new
ActiveMQConnectionFactory("tcp://localhost:61613",user,passwd,sID);
+ new
ActiveMQConnectionFactory("tcp://localhost:61613?wireFormat=stomp",user,passwd,sID);
// Create a Connection
connection = connectionFactory->createConnection();
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/SimpleRollbackTest.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/SimpleRollbackTest.cpp?view=diff&rev=516800&r1=516799&r2=516800
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/SimpleRollbackTest.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/SimpleRollbackTest.cpp
Sat Mar 10 14:46:42 2007
@@ -84,7 +84,7 @@
{
try
{
- string url = "stomp://localhost:61613";
+ string url = "tcp://localhost:61613?wireFormat=stomp";
numReceived = 0;
// Default amount to send and receive
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/SimpleTest.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/SimpleTest.cpp?view=diff&rev=516800&r1=516799&r2=516800
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/SimpleTest.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/SimpleTest.cpp
Sat Mar 10 14:46:42 2007
@@ -74,7 +74,7 @@
SimpleTest::SimpleTest()
:
- testSupport( "stomp://localhost:61613" )
+ testSupport( "tcp://localhost:61613?wireFormat=stomp" )
{
testSupport.initialize();
}
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/TransactionTest.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/TransactionTest.cpp?view=diff&rev=516800&r1=516799&r2=516800
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/TransactionTest.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/TransactionTest.cpp
Sat Mar 10 14:46:42 2007
@@ -74,7 +74,7 @@
TransactionTest::TransactionTest()
:
- testSupport( "stomp://localhost:61613", cms::Session::SESSION_TRANSACTED )
+ testSupport( "tcp://127.0.0.1:61613?wireFormat=stomp",
cms::Session::SESSION_TRANSACTED )
{
testSupport.initialize();
}
