From activemq-commits-return-4220-apmail-geronimo-activemq-commits-archive=geronimo.apache.org@geronimo.apache.org Tue Dec 05 20:37:58 2006 Return-Path: Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org Received: (qmail 54409 invoked from network); 5 Dec 2006 20:37:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Dec 2006 20:37:57 -0000 Received: (qmail 67963 invoked by uid 500); 5 Dec 2006 20:38:05 -0000 Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org Received: (qmail 67938 invoked by uid 500); 5 Dec 2006 20:38:05 -0000 Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: activemq-dev@geronimo.apache.org Delivered-To: mailing list activemq-commits@geronimo.apache.org Received: (qmail 67929 invoked by uid 99); 5 Dec 2006 20:38:05 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Dec 2006 12:38:05 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 22CE71A9846; Tue, 5 Dec 2006 12:36:45 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r482767 - in /incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration: common/ durable/ expiration/ simple/ transactional/ various/ Date: Tue, 05 Dec 2006 20:36:44 -0000 To: activemq-commits@geronimo.apache.org From: tabish@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061205203645.22CE71A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tabish Date: Tue Dec 5 12:36:43 2006 New Revision: 482767 URL: http://svn.apache.org/viewvc?view=rev&rev=482767 Log: Clean up output and add a debug flag to integration common so that the output can be turned on or off. Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/common/AbstractTester.cpp incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/common/IntegrationCommon.cpp incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/common/IntegrationCommon.h incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/durable/DurableTester.cpp incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/expiration/ExpirationTest.cpp incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/simple/SimpleTester.cpp incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/transactional/TransactionTester.cpp incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/various/SimpleRollbackTest.cpp Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/common/AbstractTester.cpp URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/common/AbstractTester.cpp?view=diff&rev=482767&r1=482766&r2=482767 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/common/AbstractTester.cpp (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/common/AbstractTester.cpp Tue Dec 5 12:36:43 2006 @@ -217,7 +217,9 @@ { std::string text = txtMsg->getText(); + if( IntegrationCommon::debug ) { printf("received text msg: %s\n", txtMsg->getText().c_str() ); + } numReceived++; @@ -240,12 +242,9 @@ string transcode( (const char*)bytes, bytesMsg->getBodyLength() ); - //printf("received bytes msg: " ); - //int numBytes = bytesMsg.getBodyLength(); - //for( int ix=0; ixcreateTopic( "mytopic?consumer.retroactive=true"); - consumer = session->createDurableConsumer( destination , user ,"",false); + consumer = session->createConsumer( destination ); consumer->setMessageListener( this ); Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/simple/SimpleTester.cpp URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/simple/SimpleTester.cpp?view=diff&rev=482767&r1=482766&r2=482767 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/simple/SimpleTester.cpp (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/simple/SimpleTester.cpp Tue Dec 5 12:36:43 2006 @@ -86,12 +86,14 @@ { try { - cout << "Starting activemqcms test (sending " - << IntegrationCommon::defaultMsgCount - << " messages per type and sleeping " - << IntegrationCommon::defaultDelay - << " milli-seconds) ...\n" - << endl; + if( IntegrationCommon::debug ) { + cout << "Starting activemqcms test (sending " + << IntegrationCommon::defaultMsgCount + << " messages per type and sleeping " + << IntegrationCommon::defaultDelay + << " milli-seconds) ...\n" + << endl; + } // Create CMS Object for Comms cms::Topic* topic = session->createTopic("mytopic"); @@ -112,11 +114,15 @@ // Wait for the messages to get here waitForMessages( IntegrationCommon::defaultMsgCount * 2 ); - printf("received: %d\n", numReceived ); + if( IntegrationCommon::debug ) { + printf("received: %d\n", numReceived ); + } CPPUNIT_ASSERT( numReceived == IntegrationCommon::defaultMsgCount * 2 ); - printf("Shutting Down\n" ); + if( IntegrationCommon::debug ) { + printf("Shutting Down\n" ); + } delete producer; delete consumer; } Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/transactional/TransactionTester.cpp URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/transactional/TransactionTester.cpp?view=diff&rev=482767&r1=482766&r2=482767 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/transactional/TransactionTester.cpp (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/transactional/TransactionTester.cpp Tue Dec 5 12:36:43 2006 @@ -83,12 +83,14 @@ { try { - cout << "Starting activemqcms transactional test (sending " - << IntegrationCommon::defaultMsgCount - << " messages per type and sleeping " - << IntegrationCommon::defaultDelay - << " milli-seconds) ...\n" - << endl; + if( IntegrationCommon::debug ) { + cout << "Starting activemqcms transactional test (sending " + << IntegrationCommon::defaultMsgCount + << " messages per type and sleeping " + << IntegrationCommon::defaultDelay + << " milli-seconds) ...\n" + << endl; + } // Create CMS Object for Comms cms::Topic* topic = session->createTopic("mytopic"); @@ -113,7 +115,9 @@ // Wait till we get all the messages waitForMessages( IntegrationCommon::defaultMsgCount * 2 ); - printf("received: %d\n", numReceived ); + if( IntegrationCommon::debug ) { + printf("received: %d\n", numReceived ); + } CPPUNIT_ASSERT( numReceived == IntegrationCommon::defaultMsgCount * 2 ); @@ -128,11 +132,15 @@ // Wait till we get all the messages waitForMessages( IntegrationCommon::defaultMsgCount ); - printf("received: %d\n", numReceived ); + if( IntegrationCommon::debug ) { + printf("received: %d\n", numReceived ); + } CPPUNIT_ASSERT( numReceived == IntegrationCommon::defaultMsgCount ); - printf("Shutting Down\n" ); + if( IntegrationCommon::debug ) { + printf("Shutting Down\n" ); + } delete producer; delete consumer; } Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/various/SimpleRollbackTest.cpp URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/various/SimpleRollbackTest.cpp?view=diff&rev=482767&r1=482766&r2=482767 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/various/SimpleRollbackTest.cpp (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/various/SimpleRollbackTest.cpp Tue Dec 5 12:36:43 2006 @@ -185,7 +185,9 @@ producer->send( textMsg ); delete textMsg; - printf( "Shutting Down\n" ); + if( IntegrationCommon::debug ) { + printf( "Shutting Down\n" ); + } delete producer; delete consumer; @@ -210,9 +212,9 @@ if( txtMsg != NULL ) { - std::string text = txtMsg->getText(); - - // printf("received text msg: %s\n", txtMsg.getText() ); + if( IntegrationCommon::debug ) { + printf("received text msg: %s\n", txtMsg->getText().c_str() ); + } numReceived++; @@ -234,13 +236,10 @@ const unsigned char* bytes = bytesMsg->getBodyBytes(); string transcode( (const char*)bytes, bytesMsg->getBodyLength() ); - - //printf("received bytes msg: " ); - //int numBytes = bytesMsg.getBodyLength(); - //for( int ix=0; ix