Return-Path: Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org Received: (qmail 98126 invoked from network); 4 Dec 2006 12:37:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Dec 2006 12:37:48 -0000 Received: (qmail 95799 invoked by uid 500); 4 Dec 2006 12:37:56 -0000 Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org Received: (qmail 95727 invoked by uid 500); 4 Dec 2006 12:37:55 -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 95109 invoked by uid 99); 4 Dec 2006 12:37:54 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Dec 2006 04:37:54 -0800 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; Mon, 04 Dec 2006 04:37:44 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 206DD1A9846; Mon, 4 Dec 2006 04:37:04 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r482155 - in /incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/expiration: ExpirationTest.cpp ExpirationTest.h Date: Mon, 04 Dec 2006 12:37:04 -0000 To: activemq-commits@geronimo.apache.org From: tabish@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061204123704.206DD1A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tabish Date: Mon Dec 4 04:37:02 2006 New Revision: 482155 URL: http://svn.apache.org/viewvc?view=rev&rev=482155 Log: http://issues.apache.org/activemq/browse/AMQCPP-14 Added initail Time to Live processing to the Consumer, and the Time Stamping is now correct in the producer. Updated integ tests Modified: 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/expiration/ExpirationTest.h Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/expiration/ExpirationTest.cpp URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/expiration/ExpirationTest.cpp?view=diff&rev=482155&r1=482154&r2=482155 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/expiration/ExpirationTest.cpp (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/expiration/ExpirationTest.cpp Mon Dec 4 04:37:02 2006 @@ -19,7 +19,7 @@ #include -//CPPUNIT_TEST_SUITE_REGISTRATION( integration::expiration::ExpirationTest ); +CPPUNIT_TEST_SUITE_REGISTRATION( integration::expiration::ExpirationTest ); #include @@ -89,6 +89,7 @@ MessageProducer* producer; int numMessages; long long timeToLive; + bool disableTimeStamps; public: @@ -99,12 +100,21 @@ producer = NULL; this->numMessages = numMessages; this->timeToLive = timeToLive; + this->disableTimeStamps = false; } virtual ~Producer(){ cleanup(); } + virtual bool getDisableTimeStamps() const { + return disableTimeStamps; + } + + virtual void setDisableTimeStamps( bool value ) { + this->disableTimeStamps = value; + } + virtual void run() { try { // Create a ConnectionFactory @@ -123,6 +133,7 @@ producer = session->createProducer( destination ); producer->setDeliveryMode( DeliveryMode::PERSISTANT ); + producer->setDisableMessageTimeStamp( disableTimeStamps ); //unsigned long ttt=getcurt(); producer->setTimeToLive( 1); @@ -291,30 +302,37 @@ void ExpirationTest::testExpired() { - Producer producer( 2, 1 ); + Producer producer( 1, 1 ); Thread producerThread( &producer ); producerThread.start(); producerThread.join(); + Thread::sleep( 100 ); + Consumer consumer( 2000 ); Thread consumerThread( &consumer ); consumerThread.start(); consumerThread.join(); + Thread::sleep( 100 ); + CPPUNIT_ASSERT( consumer.getNumReceived() == 0 ); } void ExpirationTest::testNotExpired() { Producer producer( 2, 2000 ); + producer.setDisableTimeStamps( true ); Thread producerThread( &producer ); producerThread.start(); producerThread.join(); - Consumer consumer( 2000 ); + Consumer consumer( 3000 ); Thread consumerThread( &consumer ); consumerThread.start(); consumerThread.join(); + + Thread::sleep( 50 ); CPPUNIT_ASSERT( consumer.getNumReceived() == 2 ); } Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/expiration/ExpirationTest.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/expiration/ExpirationTest.h?view=diff&rev=482155&r1=482154&r2=482155 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/expiration/ExpirationTest.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/expiration/ExpirationTest.h Mon Dec 4 04:37:02 2006 @@ -36,8 +36,8 @@ class ExpirationTest : public CppUnit::TestFixture { CPPUNIT_TEST_SUITE( ExpirationTest ); - //CPPUNIT_TEST( testExpired ); - //CPPUNIT_TEST( testNotExpired ); + CPPUNIT_TEST( testExpired ); + CPPUNIT_TEST( testNotExpired ); CPPUNIT_TEST_SUITE_END(); public: