activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nmitt...@apache.org
Subject svn commit: r516793 - in /activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration: ./ connector/stomp/
Date Sat, 10 Mar 2007 21:52:41 GMT
Author: nmittler
Date: Sat Mar 10 13:52:40 2007
New Revision: 516793

URL: http://svn.apache.org/viewvc?view=rev&rev=516793
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/AsyncSenderTest.h
    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.h
    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
    activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/TransactionTest.h

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=516793&r1=516792&r2=516793
==============================================================================
--- 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 13:52:40 2007
@@ -57,26 +57,26 @@
 void TestSupport::close() {
     try
     {
-        if( session != null ) {
+        if( session != NULL ) {
             session->close();
             delete session;
         }
         
-        if( connection != null ) {
+        if( connection != NULL ) {
             connection->close();
             delete connection;
         }
 
-        if( connectionFactory != null ) {
+        if( connectionFactory != NULL ) {
             delete connectionFactory;
         }
     }
     AMQ_CATCH_NOTHROW( ActiveMQException )
     AMQ_CATCHALL_NOTHROW( )
     
-    session = null;
-    connection = null;
-    connectionFactory = null;
+    session = NULL;
+    connection = NULL;
+    connectionFactory = NULL;
 }
 
 void TestSupport::initialize(){

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=516793&r1=516792&r2=516793
==============================================================================
--- 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 13:52:40 2007
@@ -15,7 +15,9 @@
  * limitations under the License.
  */
  
-#include "AsyncSender.h"
+#include "AsyncSenderTest.h"
+
+#include <integration/IntegrationCommon.h>
 
 #include <activemq/concurrent/Thread.h>
 #include <activemq/connector/stomp/StompConnector.h>

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/AsyncSenderTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/AsyncSenderTest.h?view=diff&rev=516793&r1=516792&r2=516793
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/AsyncSenderTest.h
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/AsyncSenderTest.h
Sat Mar 10 13:52:40 2007
@@ -41,10 +41,6 @@
     
         AsyncSenderTest();
         virtual ~AsyncSenderTest();
-        
-        virtual std::string getBrokerURL() const {
-            return common::IntegrationCommon::defaultURL + "?useAsyncSend=true";
-        }
 
         virtual void test();
 

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=516793&r1=516792&r2=516793
==============================================================================
--- 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 13:52:40 2007
@@ -15,7 +15,9 @@
  * limitations under the License.
  */
 
-#include "DurableTester.h"
+#include "DurableTest.h"
+
+#include <integration/IntegrationCommon.h>
 
 CPPUNIT_TEST_SUITE_REGISTRATION( integration::connector::stomp::DurableTest );
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/ExpirationTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/ExpirationTest.h?view=diff&rev=516793&r1=516792&r2=516793
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/ExpirationTest.h
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/ExpirationTest.h
Sat Mar 10 13:52:40 2007
@@ -29,7 +29,8 @@
 #include <cms/MessageProducer.h>
 
 namespace integration{
-namespace expiration{
+namespace connector{
+namespace stomp{
 
     class ExpirationTest : public CppUnit::TestFixture   
     {
@@ -47,6 +48,6 @@
         virtual void testNotExpired();
     };
 
-}}
+}}}
 
 #endif /*_INTEGRATION_CONNECTOR_STOMP_EXPIRATIONTEST_H_*/

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=516793&r1=516792&r2=516793
==============================================================================
--- 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 13:52:40 2007
@@ -17,7 +17,7 @@
 
 #include "SimpleRollbackTest.h"
 
-#include <integration/common/IntegrationCommon.h>
+#include <integration/IntegrationCommon.h>
 
 CPPUNIT_TEST_SUITE_REGISTRATION( integration::connector::stomp::SimpleRollbackTest );
 

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=516793&r1=516792&r2=516793
==============================================================================
--- 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 13:52:40 2007
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-#include "SimpleTester.h"
-#include <integration/common/IntegrationCommon.h>
+#include "SimpleTest.h"
+#include <integration/IntegrationCommon.h>
 
-CPPUNIT_TEST_SUITE_REGISTRATION( integration::connector::stomp::SimpleTester );
+CPPUNIT_TEST_SUITE_REGISTRATION( integration::connector::stomp::SimpleTest );
 
 #include <activemq/concurrent/Thread.h>
 #include <activemq/connector/stomp/StompConnector.h>
@@ -72,18 +72,18 @@
 using namespace integration;
 using namespace integration::connector::stomp;
 
-SimpleTester::SimpleTester()
+SimpleTest::SimpleTest()
 :
     testSupport( "stomp://localhost:61613" )
 {
     testSupport.initialize();
 }
 
-SimpleTester::~SimpleTester()
+SimpleTest::~SimpleTest()
 {
 }
 
-void SimpleTester::test()
+void SimpleTest::test()
 {
     try
     {

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=516793&r1=516792&r2=516793
==============================================================================
--- 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 13:52:40 2007
@@ -16,7 +16,7 @@
  */
 
 #include "TransactionTest.h"
-#include <integration/common/IntegrationCommon.h>
+#include <integration/IntegrationCommon.h>
 
 CPPUNIT_TEST_SUITE_REGISTRATION( integration::connector::stomp::TransactionTest );
 
@@ -129,7 +129,7 @@
         testSupport.setNumReceived( 0 );
 
         // Send some text messages
-        this->produceTextMessages( 
+        testSupport.produceTextMessages( 
             *producer, IntegrationCommon::defaultMsgCount );
 
         session->rollback();

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/TransactionTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/TransactionTest.h?view=diff&rev=516793&r1=516792&r2=516793
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/TransactionTest.h
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/TransactionTest.h
Sat Mar 10 13:52:40 2007
@@ -33,6 +33,10 @@
         CPPUNIT_TEST( test );
         CPPUNIT_TEST_SUITE_END();
 
+    private:
+    
+        TestSupport testSupport;
+        
     public:
 
     	TransactionTest();



Mime
View raw message