Author: tabish
Date: Tue Sep 8 23:52:10 2009
New Revision: 812732
URL: http://svn.apache.org/viewvc?rev=812732&view=rev
Log:
Add some new tests and fix a segfault
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/transport/correlator/ResponseCorrelatorTest.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/lang/ThreadTest.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/lang/ThreadTest.h
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/transport/correlator/ResponseCorrelatorTest.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/transport/correlator/ResponseCorrelatorTest.cpp?rev=812732&r1=812731&r2=812732&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/transport/correlator/ResponseCorrelatorTest.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/transport/correlator/ResponseCorrelatorTest.cpp
Tue Sep 8 23:52:10 2009
@@ -291,7 +291,6 @@
}
virtual ~RequestThread(){
- join();
}
void setTransport( Transport* transport ){
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/lang/ThreadTest.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/lang/ThreadTest.cpp?rev=812732&r1=812731&r2=812732&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/lang/ThreadTest.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/lang/ThreadTest.cpp
Tue Sep 8 23:52:10 2009
@@ -17,10 +17,195 @@
#include "ThreadTest.h"
+#include <decaf/util/concurrent/Mutex.h>
+#include <decaf/lang/System.h>
+#include <decaf/lang/exceptions/InterruptedException.h>
+#include <decaf/lang/exceptions/RuntimeException.h>
+
+#include <memory>
+
using namespace std;
using namespace decaf;
using namespace decaf::lang;
+using namespace decaf::lang::exceptions;
+using namespace decaf::util;
+using namespace decaf::util::concurrent;
+
+////////////////////////////////////////////////////////////////////////////////
+namespace decaf{
+namespace lang{
+
+ class SimpleThread : public Runnable {
+ private:
+
+ int delay;
+
+ public:
+
+ decaf::util::concurrent::Mutex lock;
+
+ virtual void run() {
+ try {
+
+ synchronized( &lock ) {
+ lock.notify();
+ lock.wait( delay );
+ }
+
+ } catch( decaf::lang::exceptions::InterruptedException& e ) {
+ return;
+ }
+ }
+
+ SimpleThread( int d ) : delay( 0 ) {
+ if( d >= 0 ) {
+ delay = d;
+ }
+ }
+ };
+
+ class YieldThread : public Runnable {
+ private:
+
+ volatile int delay;
+
+ public:
+
+ virtual void run() {
+ int x = 0;
+ while( true ) {
+ ++x;
+ }
+ }
+
+ YieldThread( int d ) : delay( 0 ) {
+ if( d >= 0 ) {
+ delay = d;
+ }
+ }
+ };
+
+ class Delegate : public Runnable{
+ private:
+
+ int stuff;
+
+ public:
+
+ Delegate(){ stuff = 0; }
+ virtual ~Delegate(){}
+
+ int getStuff(){
+ return stuff;
+ }
+
+ virtual void run(){
+ stuff = 1;
+ }
+
+ };
+
+ class Derived : public Thread{
+ private:
+
+ int stuff;
+
+ public:
+
+ Derived(){ stuff = 0; }
+ virtual ~Derived(){}
+
+ int getStuff(){
+ return stuff;
+ }
+
+ virtual void run(){
+ stuff = 1;
+ }
+
+ };
+
+ class JoinTest : public Thread{
+ public:
+
+ JoinTest(){}
+ virtual ~JoinTest(){}
+
+ virtual void run(){
+
+ // Sleep for 2 seconds.
+ Thread::sleep( 2000 );
+ }
+
+ };
+
+ class BadRunnable : public Runnable {
+ public:
+
+ BadRunnable(){}
+ virtual ~BadRunnable(){}
+
+ virtual void run(){
+
+ Thread::sleep( 100 );
+ throw RuntimeException( __FILE__, __LINE__, "Planned" );
+ }
+
+ };
+
+ class Handler : public Thread::UncaughtExceptionHandler {
+ public:
+
+ bool executed;
+
+ Handler() : executed( false ) {
+ }
+
+ virtual void uncaughtException( const Thread* t, const Throwable&
error ) throw() {
+ this->executed = true;
+ }
+ };
+
+}}
+
+////////////////////////////////////////////////////////////////////////////////
+void ThreadTest::testConstructor() {
+
+ Thread ct;
+ ct.start();
+ ct.join();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ThreadTest::testConstructor_1() {
+
+ std::auto_ptr<Runnable> runnable( new SimpleThread( 10 ) );
+ Thread ct( runnable.get() );
+ ct.start();
+ ct.join();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ThreadTest::testConstructor_2() {
+
+ std::auto_ptr<Runnable> runnable( new SimpleThread( 10 ) );
+ Thread ct( runnable.get(), "SimpleThread_1" );
+ CPPUNIT_ASSERT( ct.getName() == "SimpleThread_1" );
+ ct.start();
+ ct.join();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ThreadTest::testConstructor_3() {
+
+ Thread ct( "SimpleThread_1" );
+ CPPUNIT_ASSERT( ct.getName() == "SimpleThread_1" );
+ ct.start();
+ ct.join();
+}
+
+////////////////////////////////////////////////////////////////////////////////
void ThreadTest::testDelegate(){
Delegate test;
@@ -37,7 +222,8 @@
CPPUNIT_ASSERT( finalValue != initialValue );
}
-void ThreadTest::testDerived(){
+////////////////////////////////////////////////////////////////////////////////
+void ThreadTest::testDerived() {
Derived test;
int initialValue = test.getStuff();
@@ -52,7 +238,8 @@
CPPUNIT_ASSERT( finalValue != initialValue );
}
-void ThreadTest::testJoin(){
+////////////////////////////////////////////////////////////////////////////////
+void ThreadTest::testJoin() {
JoinTest test;
@@ -66,3 +253,147 @@
// Should be about 5 seconds that elapsed.
CPPUNIT_ASSERT( delta >= 1 && delta <= 3 );
}
+
+////////////////////////////////////////////////////////////////////////////////
+void ThreadTest::testSetPriority() {
+
+ std::auto_ptr<Runnable> runnable( new SimpleThread( 10 ) );
+ Thread ct( runnable.get() );
+ CPPUNIT_ASSERT( ct.getPriority() == Thread::NORM_PRIORITY );
+ ct.setPriority( Thread::MAX_PRIORITY );
+ CPPUNIT_ASSERT( ct.getPriority() == Thread::MAX_PRIORITY );
+ ct.start();
+ ct.join();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ThreadTest::testIsAlive() {
+
+ std::auto_ptr<SimpleThread> runnable( new SimpleThread( 500 ) );
+ Thread ct( runnable.get() );
+
+ CPPUNIT_ASSERT_MESSAGE( "A thread that wasn't started is alive.",
!ct.isAlive() );
+
+ synchronized( &( runnable->lock ) ) {
+ ct.start();
+ try {
+ runnable->lock.wait();
+ } catch( InterruptedException& e ) {
+ }
+ }
+
+ CPPUNIT_ASSERT_MESSAGE( "Started thread returned false", ct.isAlive() );
+
+ try {
+ ct.join();
+ } catch( InterruptedException& e ) {
+ CPPUNIT_FAIL( "Thread did not die" );
+ }
+
+ CPPUNIT_ASSERT_MESSAGE( "Stopped thread returned true", !ct.isAlive() );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ThreadTest::testGetId() {
+ CPPUNIT_ASSERT( Thread::getId() > 0 );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ThreadTest::testSleep() {
+
+ long long startTime = 0LL;
+ long long endTime = 0LL;
+
+ try {
+ startTime = System::currentTimeMillis();
+ Thread::sleep( 1000 );
+ endTime = System::currentTimeMillis();
+ } catch( InterruptedException& e ) {
+ CPPUNIT_FAIL( "Unexpected interrupt received" );
+ }
+
+ CPPUNIT_ASSERT_MESSAGE( "Failed to sleep long enough", ( endTime -
startTime ) >= 800 );
+
+ CPPUNIT_ASSERT_THROW_MESSAGE(
+ "Should throw an IllegalArgumentException",
+ Thread::sleep( -1 ),
+ IllegalArgumentException );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ThreadTest::testSleep2Arg() {
+
+ long long startTime = 0LL;
+ long long endTime = 0LL;
+
+ try {
+ startTime = System::currentTimeMillis();
+ Thread::sleep( 1000, 10 );
+ endTime = System::currentTimeMillis();
+ } catch( InterruptedException& e ) {
+ CPPUNIT_FAIL( "Unexpected interrupt received" );
+ }
+
+ CPPUNIT_ASSERT_MESSAGE( "Failed to sleep long enough", ( endTime -
startTime ) >= 800 );
+
+ CPPUNIT_ASSERT_THROW_MESSAGE(
+ "Should throw an IllegalArgumentException",
+ Thread::sleep( -1, 0 ),
+ IllegalArgumentException );
+
+ CPPUNIT_ASSERT_THROW_MESSAGE(
+ "Should throw an IllegalArgumentException",
+ Thread::sleep( 1000, 10000000 ),
+ IllegalArgumentException );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ThreadTest::testGetState() {
+ std::auto_ptr<SimpleThread> runnable( new SimpleThread( 500 ) );
+ Thread ct( runnable.get() );
+
+ CPPUNIT_ASSERT_MESSAGE( "A thread that wasn't started is alive.",
!ct.isAlive() );
+
+ synchronized( &( runnable->lock ) ) {
+ ct.start();
+ try {
+ runnable->lock.wait();
+ } catch( InterruptedException& e ) {
+ }
+ }
+
+ CPPUNIT_ASSERT_MESSAGE( "Started thread returned false", ct.isAlive() );
+ CPPUNIT_ASSERT( ct.getState() == Thread::RUNNABLE );
+
+ try {
+ ct.join();
+ } catch( InterruptedException& e ) {
+ CPPUNIT_FAIL( "Thread did not die" );
+ }
+
+ CPPUNIT_ASSERT_MESSAGE( "Stopped thread returned true", !ct.isAlive() );
+ CPPUNIT_ASSERT( ct.getState() == Thread::TERMINATED );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ThreadTest::testUncaughtExceptionHandler() {
+
+ std::auto_ptr<BadRunnable> runnable( new BadRunnable() );
+ Thread t1( runnable.get() );
+ Handler myHandler;
+
+ t1.start();
+ t1.join();
+
+ Thread t2( runnable.get() );
+
+ CPPUNIT_ASSERT( myHandler.executed == false );
+ CPPUNIT_ASSERT( t2.getUncaughtExceptionHandler() == NULL );
+ t2.setUncaughtExceptionHandler( &myHandler );
+ CPPUNIT_ASSERT( t2.getUncaughtExceptionHandler() == &myHandler );
+
+ t2.start();
+ t2.join();
+
+ CPPUNIT_ASSERT( myHandler.executed == true );
+}
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/lang/ThreadTest.h
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/lang/ThreadTest.h?rev=812732&r1=812731&r2=812732&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/lang/ThreadTest.h
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/lang/ThreadTest.h
Tue Sep 8 23:52:10 2009
@@ -30,77 +30,44 @@
class ThreadTest : public CppUnit::TestFixture {
CPPUNIT_TEST_SUITE( ThreadTest );
+ CPPUNIT_TEST( testConstructor );
+ CPPUNIT_TEST( testConstructor_1 );
+ CPPUNIT_TEST( testConstructor_2 );
+ CPPUNIT_TEST( testConstructor_3 );
CPPUNIT_TEST( testDelegate );
CPPUNIT_TEST( testDerived );
CPPUNIT_TEST( testJoin );
+ CPPUNIT_TEST( testSetPriority );
+ CPPUNIT_TEST( testIsAlive );
+ CPPUNIT_TEST( testGetId );
+ CPPUNIT_TEST( testGetState );
+ CPPUNIT_TEST( testSleep );
+ CPPUNIT_TEST( testSleep2Arg );
+ CPPUNIT_TEST( testUncaughtExceptionHandler );
CPPUNIT_TEST_SUITE_END();
public:
- class Delegate : public Runnable{
- private:
-
- int stuff;
-
- public:
-
- Delegate(){ stuff = 0; }
- virtual ~Delegate(){}
-
- int getStuff(){
- return stuff;
- }
-
- virtual void run(){
- stuff = 1;
- }
-
- };
-
- class Derived : public Thread{
- private:
-
- int stuff;
-
- public:
-
- Derived(){ stuff = 0; }
- virtual ~Derived(){}
-
- int getStuff(){
- return stuff;
- }
-
- virtual void run(){
- stuff = 1;
- }
-
- };
-
- class JoinTest : public Thread{
- public:
-
- JoinTest(){}
- virtual ~JoinTest(){}
-
- virtual void run(){
-
- // Sleep for 2 seconds.
- Thread::sleep( 2000 );
- }
-
- };
-
- public:
-
virtual ~ThreadTest(){}
virtual void setUp(){}
virtual void tearDown(){}
+ void testConstructor();
+ void testConstructor_1();
+ void testConstructor_2();
+ void testConstructor_3();
void testDelegate();
void testDerived();
void testJoin();
+ void testSetPriority();
+ void testIsAlive();
+ void testGetId();
+ void testGetState();
+ void testSleep();
+ void testSleep2Arg();
+ void testUncaughtExceptionHandler();
+
};
}}
