You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2009/11/11 17:01:48 UTC

svn commit: r834931 [3/3] - in /activemq/activemq-cpp/trunk/activemq-cpp/src: main/ main/activemq/commands/ main/activemq/core/ main/activemq/io/ main/cms/ main/decaf/internal/io/ main/decaf/io/ main/decaf/lang/ main/decaf/net/ test/ test/activemq/comm...

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/commands/ActiveMQStreamMessageTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/commands/ActiveMQStreamMessageTest.cpp?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/commands/ActiveMQStreamMessageTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/commands/ActiveMQStreamMessageTest.cpp Wed Nov 11 16:01:47 2009
@@ -19,9 +19,36 @@
 
 #include <activemq/commands/ActiveMQStreamMessage.h>
 
+#include <cms/MessageFormatException.h>
+#include <cms/MessageEOFException.h>
+#include <cms/MessageNotReadableException.h>
+#include <cms/MessageNotWriteableException.h>
+
+#include <decaf/lang/Boolean.h>
+#include <decaf/lang/Byte.h>
+#include <decaf/lang/Character.h>
+#include <decaf/lang/Short.h>
+#include <decaf/lang/Integer.h>
+#include <decaf/lang/Long.h>
+#include <decaf/lang/Float.h>
+#include <decaf/lang/Double.h>
+
+using namespace cms;
 using namespace std;
 using namespace activemq;
 using namespace activemq::commands;
+using namespace decaf;
+using namespace decaf::lang;
+
+////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessageTest::setUp() {
+    this->buffer.reserve( 100 );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessageTest::tearDown() {
+    this->buffer.clear();
+}
 
 ////////////////////////////////////////////////////////////////////////////////
 void ActiveMQStreamMessageTest::testSetAndGet() {
@@ -61,3 +88,874 @@
     CPPUNIT_ASSERT( myMessage.readBytes( readData ) == data.size() );
 }
 
+////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessageTest::testReadBoolean() {
+
+    ActiveMQStreamMessage msg;
+
+    try {
+
+        msg.writeBoolean( true );
+        msg.reset();
+        CPPUNIT_ASSERT( msg.readBoolean() );
+        msg.reset();
+        CPPUNIT_ASSERT( msg.readString() == "true" );
+        msg.reset();
+
+        try {
+            msg.readByte();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readShort();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readInt();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readLong();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readFloat();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readDouble();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readChar();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readBytes( buffer );
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+
+    } catch( CMSException& ex ) {
+        ex.printStackTrace();
+        CPPUNIT_ASSERT(false);
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessageTest::testReadByte() {
+
+    ActiveMQStreamMessage msg;
+    try {
+        unsigned char test = (unsigned char)4;
+        msg.writeByte( test );
+        msg.reset();
+        CPPUNIT_ASSERT(msg.readByte() == test);
+        msg.reset();
+        CPPUNIT_ASSERT(msg.readShort() == test);
+        msg.reset();
+        CPPUNIT_ASSERT(msg.readInt() == test);
+        msg.reset();
+        CPPUNIT_ASSERT(msg.readLong() == test);
+        msg.reset();
+        CPPUNIT_ASSERT(msg.readString() == Byte(test).toString());
+        msg.reset();
+
+        try {
+            msg.readBoolean();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readFloat();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readDouble();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readChar();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readBytes( buffer );
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+
+    } catch( CMSException& ex ) {
+        ex.printStackTrace();
+        CPPUNIT_ASSERT(false);
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessageTest::testReadShort() {
+    ActiveMQStreamMessage msg;
+    try {
+
+        short test = (short)4;
+        msg.writeShort( test );
+        msg.reset();
+        CPPUNIT_ASSERT(msg.readShort() == test);
+        msg.reset();
+        CPPUNIT_ASSERT(msg.readInt() == test);
+        msg.reset();
+        CPPUNIT_ASSERT(msg.readLong() == test);
+        msg.reset();
+        CPPUNIT_ASSERT(msg.readString() == Short(test).toString());
+        msg.reset();
+        try {
+            msg.readBoolean();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readByte();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readFloat();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readDouble();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readChar();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readBytes( buffer );
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+
+    } catch( CMSException& ex ) {
+        ex.printStackTrace();
+        CPPUNIT_ASSERT(false);
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessageTest::testReadChar() {
+    ActiveMQStreamMessage msg;
+    try {
+        char test = 'z';
+        msg.writeChar( test );
+        msg.reset();
+        CPPUNIT_ASSERT(msg.readChar() == test);
+        msg.reset();
+        CPPUNIT_ASSERT(msg.readString() == Character(test).toString());
+        msg.reset();
+
+        try {
+            msg.readBoolean();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readByte();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readShort();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readInt();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readLong();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readFloat();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readDouble();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readBytes( buffer );
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+
+    } catch( CMSException& ex ) {
+        ex.printStackTrace();
+        CPPUNIT_ASSERT(false);
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessageTest::testReadInt() {
+
+    ActiveMQStreamMessage msg;
+
+    try {
+        int test = 4;
+        msg.writeInt( test );
+        msg.reset();
+        CPPUNIT_ASSERT(msg.readInt() == test);
+        msg.reset();
+        CPPUNIT_ASSERT(msg.readLong() == test);
+        msg.reset();
+        CPPUNIT_ASSERT(msg.readString() == Integer(test).toString());
+        msg.reset();
+        try {
+            msg.readBoolean();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readByte();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readShort();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readFloat();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readDouble();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readChar();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readBytes( buffer );
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+
+    } catch( CMSException& ex ) {
+        ex.printStackTrace();
+        CPPUNIT_ASSERT(false);
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessageTest::testReadLong() {
+
+    ActiveMQStreamMessage msg;
+
+    try {
+        long test = 4L;
+        msg.writeLong( test );
+        msg.reset();
+        CPPUNIT_ASSERT(msg.readLong() == test);
+        msg.reset();
+        CPPUNIT_ASSERT(msg.readString() == Long::valueOf(test).toString());
+        msg.reset();
+
+        try {
+            msg.readBoolean();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readByte();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readShort();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readInt();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readFloat();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readDouble();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readChar();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readBytes( buffer );
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+
+    } catch( CMSException& ex ) {
+        ex.printStackTrace();
+        CPPUNIT_ASSERT(false);
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessageTest::testReadFloat() {
+    ActiveMQStreamMessage msg;
+    try {
+        float test = 4.4f;
+        msg.writeFloat( test );
+        msg.reset();
+        CPPUNIT_ASSERT(msg.readFloat() == test);
+        msg.reset();
+        CPPUNIT_ASSERT(msg.readDouble() == test);
+        msg.reset();
+        CPPUNIT_ASSERT(msg.readString() == Float(test).toString());
+        msg.reset();
+
+        try {
+            msg.readBoolean();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readByte();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readShort();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readInt();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readLong();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readChar();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readBytes( buffer );
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+
+    } catch( CMSException& ex ) {
+        ex.printStackTrace();
+        CPPUNIT_ASSERT(false);
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessageTest::testReadDouble() {
+    ActiveMQStreamMessage msg;
+    try {
+        double test = 4.4;
+        msg.writeDouble( test );
+        msg.reset();
+        CPPUNIT_ASSERT(msg.readDouble() == test);
+        msg.reset();
+        CPPUNIT_ASSERT(msg.readString() == Double(test).toString());
+        msg.reset();
+
+        try {
+            msg.readBoolean();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readByte();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readShort();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readInt();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readLong();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readFloat();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readChar();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readBytes( buffer );
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+
+    } catch( CMSException& ex ) {
+        ex.printStackTrace();
+        CPPUNIT_ASSERT(false);
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessageTest::testReadString() {
+    ActiveMQStreamMessage msg;
+    try {
+        unsigned char testByte = (unsigned char)2;
+        msg.writeString( Byte( testByte ).toString() );
+        msg.reset();
+        CPPUNIT_ASSERT(msg.readByte() == testByte);
+        msg.clearBody();
+        short testShort = 3;
+        msg.writeString( Short( testShort ).toString() );
+        msg.reset();
+        CPPUNIT_ASSERT(msg.readShort() == testShort);
+        msg.clearBody();
+        int testInt = 4;
+        msg.writeString( Integer( testInt ).toString() );
+        msg.reset();
+        CPPUNIT_ASSERT(msg.readInt() == testInt);
+        msg.clearBody();
+        long testLong = 6L;
+        msg.writeString( Long( testLong ).toString() );
+        msg.reset();
+        CPPUNIT_ASSERT(msg.readLong() == testLong);
+        msg.clearBody();
+        float testFloat = 6.6f;
+        msg.writeString( Float( testFloat ).toString() );
+        msg.reset();
+        CPPUNIT_ASSERT(msg.readFloat() == testFloat);
+        msg.clearBody();
+        double testDouble = 7.7;
+        msg.writeString( Double( testDouble ).toString() );
+        msg.reset();
+        CPPUNIT_ASSERT_DOUBLES_EQUAL( testDouble, msg.readDouble(), 0.05 );
+        msg.clearBody();
+        msg.writeString( "true" );
+        msg.reset();
+        CPPUNIT_ASSERT(msg.readBoolean());
+        msg.clearBody();
+        msg.writeString( "a" );
+        msg.reset();
+        try {
+            msg.readChar();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& e ) {
+        }
+        msg.clearBody();
+        msg.writeString( "777" );
+        msg.reset();
+        try {
+            msg.readBytes( buffer );
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& e ) {
+        }
+
+    } catch( CMSException& ex ) {
+        ex.printStackTrace();
+        CPPUNIT_ASSERT(false);
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessageTest::testReadBigString() {
+    ActiveMQStreamMessage msg;
+    try {
+        // Test with a 1Meg String
+        std::string bigString;
+        bigString.reserve( 1024 * 1024 );
+        for( int i = 0; i < 1024 * 1024; i++ ) {
+            bigString.append( 1, (char)'a' + i % 26 );
+        }
+
+        msg.writeString( bigString );
+        msg.reset();
+        CPPUNIT_ASSERT_EQUAL( bigString, msg.readString() );
+
+    } catch( CMSException& ex ) {
+        ex.printStackTrace();
+        CPPUNIT_ASSERT(false);
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessageTest::testReadBytes() {
+
+    ActiveMQStreamMessage msg;
+    try {
+
+        unsigned char test[50];
+        for( int i = 0; i < 50; i++ ) {
+            test[i] = (unsigned char)i;
+        }
+        msg.writeBytes( test, 0, 50 );
+        msg.reset();
+
+        unsigned char valid[50];
+        msg.readBytes( valid, 50 );
+        for( int i = 0; i < 50; i++ ) {
+            CPPUNIT_ASSERT(valid[i] == test[i]);
+        }
+
+        msg.reset();
+        try {
+            msg.readByte();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readShort();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readInt();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readLong();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readFloat();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readChar();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+        msg.reset();
+        try {
+            msg.readString();
+            CPPUNIT_FAIL("Should have thrown exception");
+        } catch( MessageFormatException& ex ) {
+        }
+
+    } catch( CMSException& ex ) {
+        ex.printStackTrace();
+        CPPUNIT_ASSERT(false);
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessageTest::testClearBody() {
+
+    ActiveMQStreamMessage streamMessage;
+    try {
+
+        streamMessage.writeLong( 2LL );
+        streamMessage.clearBody();
+        CPPUNIT_ASSERT( !streamMessage.isReadOnlyBody() );
+        streamMessage.writeLong(  2LL );
+        streamMessage.readLong();
+        CPPUNIT_FAIL("should throw exception");
+
+    } catch( MessageNotReadableException& mnwe ) {
+    } catch( MessageNotWriteableException& mnwe ) {
+        CPPUNIT_FAIL("should be writeable");
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessageTest::testReset() {
+
+    ActiveMQStreamMessage streamMessage;
+
+    try {
+        streamMessage.writeDouble( 24.5 );
+        streamMessage.writeLong( 311LL );
+    } catch( MessageNotWriteableException& mnwe ) {
+        CPPUNIT_FAIL("should be writeable");
+    }
+
+    streamMessage.reset();
+
+    try {
+        CPPUNIT_ASSERT(streamMessage.isReadOnlyBody());
+        CPPUNIT_ASSERT_DOUBLES_EQUAL( streamMessage.readDouble(), 24.5, 0.01 );
+        CPPUNIT_ASSERT_EQUAL( streamMessage.readLong(), 311LL );
+    } catch( MessageNotReadableException& mnre ) {
+        CPPUNIT_FAIL("should be readable");
+    }
+
+    try {
+        streamMessage.writeInt( 33 );
+        CPPUNIT_FAIL("should throw exception");
+    } catch( MessageNotWriteableException& mnwe ) {
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessageTest::testReadOnlyBody() {
+    ActiveMQStreamMessage message;
+    try {
+        message.writeBoolean( true );
+        message.writeByte( (unsigned char)1 );
+        message.writeChar('a');
+        message.writeDouble( 121.5 );
+        message.writeFloat( (float)1.5 );
+        message.writeInt( 1 );
+        message.writeLong( 1 );
+        message.writeShort( (short)1 );
+        message.writeString( "string" );
+    } catch( MessageNotWriteableException& mnwe ) {
+        CPPUNIT_FAIL("Should be writeable");
+    }
+    message.reset();
+    try {
+        message.readBoolean();
+        message.readByte();
+        message.readChar();
+        message.readDouble();
+        message.readFloat();
+        message.readInt();
+        message.readLong();
+        message.readShort();
+        message.readString();
+    } catch( MessageNotReadableException& mnwe ) {
+        CPPUNIT_FAIL("Should be readable");
+    }
+    try {
+        message.writeBoolean( true );
+        CPPUNIT_FAIL("Should have thrown exception");
+    } catch( MessageNotWriteableException& mnwe ) {
+    }
+    try {
+        message.writeByte( (unsigned char)1 );
+        CPPUNIT_FAIL("Should have thrown exception");
+    } catch( MessageNotWriteableException& mnwe ) {
+    }
+    try {
+        message.writeBytes( buffer );
+        CPPUNIT_FAIL("Should have thrown exception");
+    } catch( MessageNotWriteableException& mnwe ) {
+    }
+    try {
+        unsigned char test[3];
+        message.writeBytes( test, 0, 2 );
+        CPPUNIT_FAIL("Should have thrown exception");
+    } catch( MessageNotWriteableException& mnwe ) {
+    }
+    try {
+        message.writeChar( 'a' );
+        CPPUNIT_FAIL("Should have thrown exception");
+    } catch( MessageNotWriteableException& mnwe ) {
+    }
+    try {
+        message.writeDouble( 1.5 );
+        CPPUNIT_FAIL("Should have thrown exception");
+    } catch( MessageNotWriteableException& mnwe ) {
+    }
+    try {
+        message.writeFloat( (float)1.5 );
+        CPPUNIT_FAIL("Should have thrown exception");
+    } catch( MessageNotWriteableException& mnwe ) {
+    }
+    try {
+        message.writeInt( 1 );
+        CPPUNIT_FAIL("Should have thrown exception");
+    } catch( MessageNotWriteableException& mnwe ) {
+    }
+    try {
+        message.writeLong( 1 );
+        CPPUNIT_FAIL("Should have thrown exception");
+    } catch( MessageNotWriteableException& mnwe ) {
+    }
+    try {
+        message.writeShort( (short)1 );
+        CPPUNIT_FAIL("Should have thrown exception");
+    } catch( MessageNotWriteableException& mnwe ) {
+    }
+    try {
+        message.writeString( "string" );
+        CPPUNIT_FAIL("Should have thrown exception");
+    } catch( MessageNotWriteableException& mnwe ) {
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessageTest::testWriteOnlyBody() {
+    ActiveMQStreamMessage message;
+    message.clearBody();
+    try {
+        message.writeBoolean( true );
+        message.writeByte( (unsigned char)1 );
+        message.writeBytes( buffer );
+        message.writeChar( 'a' );
+        message.writeDouble( 1.5 );
+        message.writeFloat( (float)1.5 );
+        message.writeInt( 1 );
+        message.writeLong( 1 );
+        message.writeShort( (short)1 );
+        message.writeString( "string" );
+    } catch( MessageNotWriteableException& mnwe ) {
+        CPPUNIT_FAIL("Should be writeable");
+    }
+    try {
+        message.readBoolean();
+        CPPUNIT_FAIL("Should have thrown exception");
+    } catch( MessageNotReadableException& mnwe ) {
+    }
+    try {
+        message.readByte();
+        CPPUNIT_FAIL("Should have thrown exception");
+    } catch( MessageNotReadableException& e ) {
+    }
+    try {
+        message.readBytes( buffer );
+        CPPUNIT_FAIL("Should have thrown exception");
+    } catch( MessageNotReadableException& e ) {
+    }
+    try {
+        unsigned char test[50];
+        message.readBytes( test, 50 );
+        CPPUNIT_FAIL("Should have thrown exception");
+    } catch( MessageNotReadableException& e ) {
+    }
+    try {
+        message.readChar();
+        CPPUNIT_FAIL("Should have thrown exception");
+    } catch( MessageNotReadableException& e ) {
+    }
+    try {
+        message.readDouble();
+        CPPUNIT_FAIL("Should have thrown exception");
+    } catch( MessageNotReadableException& e ) {
+    }
+    try {
+        message.readFloat();
+        CPPUNIT_FAIL("Should have thrown exception");
+    } catch( MessageNotReadableException& e ) {
+    }
+    try {
+        message.readInt();
+        CPPUNIT_FAIL("Should have thrown exception");
+    } catch( MessageNotReadableException& e ) {
+    }
+    try {
+        message.readLong();
+        CPPUNIT_FAIL("Should have thrown exception");
+    } catch( MessageNotReadableException& e ) {
+    }
+    try {
+        message.readString();
+        CPPUNIT_FAIL("Should have thrown exception");
+    } catch( MessageNotReadableException& e ) {
+    }
+    try {
+        message.readShort();
+        CPPUNIT_FAIL("Should have thrown exception");
+    } catch( MessageNotReadableException& e ) {
+    }
+    try {
+        message.readString();
+        CPPUNIT_FAIL("Should have thrown exception");
+    } catch( MessageNotReadableException& e ) {
+    }
+}

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/commands/ActiveMQStreamMessageTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/commands/ActiveMQStreamMessageTest.h?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/commands/ActiveMQStreamMessageTest.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/commands/ActiveMQStreamMessageTest.h Wed Nov 11 16:01:47 2009
@@ -28,14 +28,51 @@
 
         CPPUNIT_TEST_SUITE( ActiveMQStreamMessageTest );
         CPPUNIT_TEST( testSetAndGet );
+        CPPUNIT_TEST( testReadBoolean );
+        CPPUNIT_TEST( testReadByte );
+        CPPUNIT_TEST( testReadShort );
+        CPPUNIT_TEST( testReadChar );
+        CPPUNIT_TEST( testReadInt );
+        CPPUNIT_TEST( testReadLong );
+        CPPUNIT_TEST( testReadFloat );
+        CPPUNIT_TEST( testReadDouble );
+        CPPUNIT_TEST( testReadString );
+        CPPUNIT_TEST( testReadBigString );
+        CPPUNIT_TEST( testReadBytes );
+        CPPUNIT_TEST( testClearBody );
+        CPPUNIT_TEST( testReset );
+        CPPUNIT_TEST( testReadOnlyBody );
+        CPPUNIT_TEST( testWriteOnlyBody );
         CPPUNIT_TEST_SUITE_END();
 
+    private:
+
+        std::vector<unsigned char> buffer;
+
     public:
 
         ActiveMQStreamMessageTest() {}
         virtual ~ActiveMQStreamMessageTest() {}
 
+        void setUp();
+        void tearDown();
+
         void testSetAndGet();
+        void testReadBoolean();
+        void testReadByte();
+        void testReadShort();
+        void testReadChar();
+        void testReadInt();
+        void testReadLong();
+        void testReadFloat();
+        void testReadDouble();
+        void testReadString();
+        void testReadBigString();
+        void testReadBytes();
+        void testClearBody();
+        void testReset();
+        void testReadOnlyBody();
+        void testWriteOnlyBody();
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/BufferedInputStreamTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/BufferedInputStreamTest.cpp?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/BufferedInputStreamTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/BufferedInputStreamTest.cpp Wed Nov 11 16:01:47 2009
@@ -75,7 +75,7 @@
             return len - pos;
         }
 
-        virtual unsigned char read() throw (IOException){
+        virtual int read() throw (IOException){
             if( this->isThrowOnRead() ) {
                 throw IOException(
                     __FILE__, __LINE__,
@@ -83,7 +83,7 @@
             }
 
             if( pos >= data.length() ){
-                throw IOException();
+                return -1;
             }
 
             return data.c_str()[pos++];
@@ -191,23 +191,16 @@
         BufferedInputStream is( &myStream, testStr.length() );
 
         // Ensure buffer gets filled by evaluating one read
-        is.read();
+        CPPUNIT_ASSERT( is.read() != -1 );
 
         // Read the remaining buffered characters, no IOException should
         // occur.
         is.skip( testStr.length() - 2 );
-        is.read();
-        try {
-            // is.read should now throw an exception because it will have to
-            // be filled.
-            is.read();
-        } catch (IOException& e) {
-            exceptionFired = true;
-        }
-
-        CPPUNIT_ASSERT_MESSAGE( "Exception should have been triggered by read()", exceptionFired );
+        CPPUNIT_ASSERT( is.read() != -1 );
+        // is.read should now return -1 as all data has been read.
+        CPPUNIT_ASSERT( is.read() == -1 );
 
-    } catch (IOException& e) {
+    } catch( IOException& e ) {
         e.printStackTrace();
         CPPUNIT_ASSERT_MESSAGE("Exception during test_1_Constructor", false );
     }
@@ -248,7 +241,7 @@
     try {
         bis.available();
         CPPUNIT_ASSERT_MESSAGE("Expected test to throw IOE.", false );
-    } catch (IOException& ex) {
+    } catch( IOException& ex ) {
         // expected
     }
 }
@@ -337,7 +330,7 @@
             "Failed to read correct data",
             string( (const char*)&buf1[0], 100 ) == testStr.substr( 3000, 100 ) );
 
-    } catch (IOException& e) {
+    } catch( IOException& e ) {
         CPPUNIT_FAIL("Exception during read test");
     }
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/FilterInputStreamTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/FilterInputStreamTest.cpp?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/FilterInputStreamTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/FilterInputStreamTest.cpp Wed Nov 11 16:01:47 2009
@@ -66,7 +66,7 @@
             return len - pos;
         }
 
-        virtual unsigned char read() throw (IOException){
+        virtual int read() throw (IOException){
             if( this->isThrowOnRead() ) {
                 throw IOException(
                     __FILE__, __LINE__,
@@ -74,7 +74,7 @@
             }
 
             if( pos >= data.length() ){
-                throw IOException();
+                return -1;
             }
 
             return data.c_str()[pos++];

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/testRegistry.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/testRegistry.cpp?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/testRegistry.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/testRegistry.cpp Wed Nov 11 16:01:47 2009
@@ -18,250 +18,250 @@
 // All CPP Unit tests are registered in here so we can disable them and
 // enable them easily in one place.
 
-//#include <activemq/commands/BrokerInfoTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::BrokerInfoTest );
-//#include <activemq/commands/BrokerIdTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::BrokerIdTest );
-//#include <activemq/commands/ActiveMQTopicTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQTopicTest );
-//#include <activemq/commands/ActiveMQTextMessageTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQTextMessageTest );
-//#include <activemq/commands/ActiveMQTempTopicTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQTempTopicTest );
-//#include <activemq/commands/ActiveMQTempQueueTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQTempQueueTest );
-//#include <activemq/commands/ActiveMQQueueTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQQueueTest );
-//#include <activemq/commands/ActiveMQMessageTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQMessageTest );
-//#include <activemq/commands/ActiveMQMapMessageTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQMapMessageTest );
-//#include <activemq/commands/ActiveMQDestinationTest2.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQDestinationTest );
-//#include <activemq/commands/ActiveMQBytesMessageTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQBytesMessageTest );
-//#include <activemq/commands/ActiveMQStreamMessageTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQStreamMessageTest );
-//
-//#include <activemq/wireformat/openwire/marshal/BaseDataStreamMarshallerTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::openwire::marshal::BaseDataStreamMarshallerTest );
-//#include <activemq/wireformat/openwire/marshal/PrimitiveTypesMarshallerTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::openwire::marshal::PrimitiveTypesMarshallerTest );
-//
-//#include <activemq/wireformat/openwire/utils/BooleanStreamTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::openwire::utils::BooleanStreamTest );
-//#include <activemq/wireformat/openwire/utils/HexTableTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::openwire::utils::HexTableTest );
-//#include <activemq/wireformat/openwire/utils/OpenwireStringSupportTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::openwire::utils::OpenwireStringSupportTest );
-//#include <activemq/wireformat/openwire/utils/MessagePropertyInterceptorTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::openwire::utils::MessagePropertyInterceptorTest );
-//
-//#include <activemq/wireformat/openwire/OpenWireFormatTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::openwire::OpenWireFormatTest );
-//
-//#include <activemq/cmsutil/CmsAccessorTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::cmsutil::CmsAccessorTest );
-//#include <activemq/cmsutil/CmsDestinationAccessorTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::cmsutil::CmsDestinationAccessorTest );
-//#include <activemq/cmsutil/CmsTemplateTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::cmsutil::CmsTemplateTest );
-//#include <activemq/cmsutil/DynamicDestinationResolverTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::cmsutil::DynamicDestinationResolverTest );
-//#include <activemq/cmsutil/SessionPoolTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::cmsutil::SessionPoolTest );
-//
-//#include <activemq/core/ActiveMQConnectionFactoryTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::core::ActiveMQConnectionFactoryTest );
-//#include <activemq/core/ActiveMQConnectionTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::core::ActiveMQConnectionTest );
-//#include <activemq/core/ActiveMQSessionTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::core::ActiveMQSessionTest );
-//#include <activemq/core/MessageDispatchChannelTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::core::MessageDispatchChannelTest );
-//
-//#include <activemq/state/ConnectionStateTrackerTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::state::ConnectionStateTrackerTest );
-//#include <activemq/state/ConnectionStateTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::state::ConnectionStateTest );
-//#include <activemq/state/ConsumerStateTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::state::ConsumerStateTest );
-//#include <activemq/state/ProducerStateTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::state::ProducerStateTest );
-//#include <activemq/state/SessionStateTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::state::SessionStateTest );
-//#include <activemq/state/TransactionStateTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::state::TransactionStateTest );
-//
-//#include <activemq/transport/failover/FailoverTransportTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::transport::failover::FailoverTransportTest );
-//
-//#include <activemq/transport/correlator/ResponseCorrelatorTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::transport::correlator::ResponseCorrelatorTest );
-//
-//#include <activemq/transport/mock/MockTransportFactoryTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::transport::mock::MockTransportFactoryTest );
-//
-//#include <activemq/transport/TransportRegistryTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::transport::TransportRegistryTest );
-//#include <activemq/transport/IOTransportTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::transport::IOTransportTest );
-//
-//#include <activemq/exceptions/ActiveMQExceptionTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::exceptions::ActiveMQExceptionTest );
-//
-//#include <activemq/util/LongSequenceGeneratorTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::util::LongSequenceGeneratorTest );
-//#include <activemq/util/PrimitiveValueNodeTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::util::PrimitiveValueNodeTest );
-//#include <activemq/util/PrimitiveListTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::util::PrimitiveListTest );
-//#include <activemq/util/PrimitiveMapTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::util::PrimitiveMapTest );
-//#include <activemq/util/PrimitiveValueConverterTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::util::PrimitiveValueConverterTest );
-//#include <activemq/util/URISupportTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::util::URISupportTest );
-//#include <activemq/util/MemoryUsageTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::util::MemoryUsageTest );
-//
-//#include <activemq/threads/DedicatedTaskRunnerTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::threads::DedicatedTaskRunnerTest );
-//#include <activemq/threads/CompositeTaskRunnerTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::threads::CompositeTaskRunnerTest );
-//
-//#include <activemq/wireformat/WireFormatRegistryTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::WireFormatRegistryTest );
-//
-//#include <decaf/internal/util/ByteArrayAdapterTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::util::ByteArrayAdapterTest );
-//#include <decaf/internal/util/TimerTaskHeapTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::util::TimerTaskHeapTest );
-//
-//#include <decaf/internal/nio/ByteArrayPerspectiveTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::ByteArrayPerspectiveTest );
-//#include <decaf/internal/nio/ByteArrayBufferTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::ByteArrayBufferTest );
-//#include <decaf/internal/nio/BufferFactoryTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::BufferFactoryTest );
-//#include <decaf/internal/nio/CharArrayBufferTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::CharArrayBufferTest );
-//#include <decaf/internal/nio/DoubleArrayBufferTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::DoubleArrayBufferTest );
-//#include <decaf/internal/nio/FloatArrayBufferTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::FloatArrayBufferTest );
-//#include <decaf/internal/nio/LongArrayBufferTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::LongArrayBufferTest );
-//#include <decaf/internal/nio/IntArrayBufferTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::IntArrayBufferTest );
-//#include <decaf/internal/nio/ShortArrayBufferTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::ShortArrayBufferTest );
-//
-//#include <decaf/internal/net/URIEncoderDecoderTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::net::URIEncoderDecoderTest );
-//#include <decaf/internal/net/URIHelperTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::net::URIHelperTest );
-//
-//#include <decaf/nio/BufferTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::nio::BufferTest );
-//
-//#include <decaf/io/FilterInputStreamTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::io::FilterInputStreamTest );
-//#include <decaf/io/FilterOutputStreamTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::io::FilterOutputStreamTest );
-//#include <decaf/io/BufferedInputStreamTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::io::BufferedInputStreamTest );
-//#include <decaf/io/BufferedOutputStreamTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::io::BufferedOutputStreamTest );
-//#include <decaf/io/ByteArrayInputStreamTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::io::ByteArrayInputStreamTest );
-//#include <decaf/io/ByteArrayOutputStreamTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::io::ByteArrayOutputStreamTest );
-//#include <decaf/io/DataInputStreamTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::io::DataInputStreamTest );
-//#include <decaf/io/DataOutputStreamTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::io::DataOutputStreamTest );
-//
-//#include <decaf/lang/MathTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::MathTest );
-//#include <decaf/lang/ByteTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::ByteTest );
-//#include <decaf/lang/CharacterTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::CharacterTest );
-//#include <decaf/lang/BooleanTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::BooleanTest );
-//#include <decaf/lang/ShortTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::ShortTest );
-//#include <decaf/lang/IntegerTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::IntegerTest );
-//#include <decaf/lang/LongTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::LongTest );
-//#include <decaf/lang/FloatTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::FloatTest );
-//#include <decaf/lang/DoubleTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::DoubleTest );
-//#include <decaf/lang/ExceptionTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::ExceptionTest );
+#include <activemq/commands/BrokerInfoTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::BrokerInfoTest );
+#include <activemq/commands/BrokerIdTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::BrokerIdTest );
+#include <activemq/commands/ActiveMQTopicTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQTopicTest );
+#include <activemq/commands/ActiveMQTextMessageTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQTextMessageTest );
+#include <activemq/commands/ActiveMQTempTopicTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQTempTopicTest );
+#include <activemq/commands/ActiveMQTempQueueTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQTempQueueTest );
+#include <activemq/commands/ActiveMQQueueTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQQueueTest );
+#include <activemq/commands/ActiveMQMessageTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQMessageTest );
+#include <activemq/commands/ActiveMQMapMessageTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQMapMessageTest );
+#include <activemq/commands/ActiveMQDestinationTest2.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQDestinationTest );
+#include <activemq/commands/ActiveMQBytesMessageTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQBytesMessageTest );
+#include <activemq/commands/ActiveMQStreamMessageTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQStreamMessageTest );
+
+#include <activemq/wireformat/openwire/marshal/BaseDataStreamMarshallerTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::openwire::marshal::BaseDataStreamMarshallerTest );
+#include <activemq/wireformat/openwire/marshal/PrimitiveTypesMarshallerTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::openwire::marshal::PrimitiveTypesMarshallerTest );
+
+#include <activemq/wireformat/openwire/utils/BooleanStreamTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::openwire::utils::BooleanStreamTest );
+#include <activemq/wireformat/openwire/utils/HexTableTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::openwire::utils::HexTableTest );
+#include <activemq/wireformat/openwire/utils/OpenwireStringSupportTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::openwire::utils::OpenwireStringSupportTest );
+#include <activemq/wireformat/openwire/utils/MessagePropertyInterceptorTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::openwire::utils::MessagePropertyInterceptorTest );
+
+#include <activemq/wireformat/openwire/OpenWireFormatTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::openwire::OpenWireFormatTest );
+
+#include <activemq/cmsutil/CmsAccessorTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::cmsutil::CmsAccessorTest );
+#include <activemq/cmsutil/CmsDestinationAccessorTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::cmsutil::CmsDestinationAccessorTest );
+#include <activemq/cmsutil/CmsTemplateTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::cmsutil::CmsTemplateTest );
+#include <activemq/cmsutil/DynamicDestinationResolverTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::cmsutil::DynamicDestinationResolverTest );
+#include <activemq/cmsutil/SessionPoolTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::cmsutil::SessionPoolTest );
+
+#include <activemq/core/ActiveMQConnectionFactoryTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::core::ActiveMQConnectionFactoryTest );
+#include <activemq/core/ActiveMQConnectionTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::core::ActiveMQConnectionTest );
+#include <activemq/core/ActiveMQSessionTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::core::ActiveMQSessionTest );
+#include <activemq/core/MessageDispatchChannelTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::core::MessageDispatchChannelTest );
+
+#include <activemq/state/ConnectionStateTrackerTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::state::ConnectionStateTrackerTest );
+#include <activemq/state/ConnectionStateTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::state::ConnectionStateTest );
+#include <activemq/state/ConsumerStateTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::state::ConsumerStateTest );
+#include <activemq/state/ProducerStateTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::state::ProducerStateTest );
+#include <activemq/state/SessionStateTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::state::SessionStateTest );
+#include <activemq/state/TransactionStateTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::state::TransactionStateTest );
+
+#include <activemq/transport/failover/FailoverTransportTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::transport::failover::FailoverTransportTest );
+
+#include <activemq/transport/correlator/ResponseCorrelatorTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::transport::correlator::ResponseCorrelatorTest );
+
+#include <activemq/transport/mock/MockTransportFactoryTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::transport::mock::MockTransportFactoryTest );
+
+#include <activemq/transport/TransportRegistryTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::transport::TransportRegistryTest );
+#include <activemq/transport/IOTransportTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::transport::IOTransportTest );
+
+#include <activemq/exceptions/ActiveMQExceptionTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::exceptions::ActiveMQExceptionTest );
+
+#include <activemq/util/LongSequenceGeneratorTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::util::LongSequenceGeneratorTest );
+#include <activemq/util/PrimitiveValueNodeTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::util::PrimitiveValueNodeTest );
+#include <activemq/util/PrimitiveListTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::util::PrimitiveListTest );
+#include <activemq/util/PrimitiveMapTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::util::PrimitiveMapTest );
+#include <activemq/util/PrimitiveValueConverterTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::util::PrimitiveValueConverterTest );
+#include <activemq/util/URISupportTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::util::URISupportTest );
+#include <activemq/util/MemoryUsageTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::util::MemoryUsageTest );
+
+#include <activemq/threads/DedicatedTaskRunnerTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::threads::DedicatedTaskRunnerTest );
+#include <activemq/threads/CompositeTaskRunnerTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::threads::CompositeTaskRunnerTest );
+
+#include <activemq/wireformat/WireFormatRegistryTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::WireFormatRegistryTest );
+
+#include <decaf/internal/util/ByteArrayAdapterTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::util::ByteArrayAdapterTest );
+#include <decaf/internal/util/TimerTaskHeapTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::util::TimerTaskHeapTest );
+
+#include <decaf/internal/nio/ByteArrayPerspectiveTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::ByteArrayPerspectiveTest );
+#include <decaf/internal/nio/ByteArrayBufferTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::ByteArrayBufferTest );
+#include <decaf/internal/nio/BufferFactoryTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::BufferFactoryTest );
+#include <decaf/internal/nio/CharArrayBufferTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::CharArrayBufferTest );
+#include <decaf/internal/nio/DoubleArrayBufferTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::DoubleArrayBufferTest );
+#include <decaf/internal/nio/FloatArrayBufferTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::FloatArrayBufferTest );
+#include <decaf/internal/nio/LongArrayBufferTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::LongArrayBufferTest );
+#include <decaf/internal/nio/IntArrayBufferTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::IntArrayBufferTest );
+#include <decaf/internal/nio/ShortArrayBufferTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::ShortArrayBufferTest );
+
+#include <decaf/internal/net/URIEncoderDecoderTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::net::URIEncoderDecoderTest );
+#include <decaf/internal/net/URIHelperTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::net::URIHelperTest );
+
+#include <decaf/nio/BufferTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::nio::BufferTest );
+
+#include <decaf/io/FilterInputStreamTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::io::FilterInputStreamTest );
+#include <decaf/io/FilterOutputStreamTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::io::FilterOutputStreamTest );
+#include <decaf/io/BufferedInputStreamTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::io::BufferedInputStreamTest );
+#include <decaf/io/BufferedOutputStreamTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::io::BufferedOutputStreamTest );
+#include <decaf/io/ByteArrayInputStreamTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::io::ByteArrayInputStreamTest );
+#include <decaf/io/ByteArrayOutputStreamTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::io::ByteArrayOutputStreamTest );
+#include <decaf/io/DataInputStreamTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::io::DataInputStreamTest );
+#include <decaf/io/DataOutputStreamTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::io::DataOutputStreamTest );
+
+#include <decaf/lang/MathTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::MathTest );
+#include <decaf/lang/ByteTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::ByteTest );
+#include <decaf/lang/CharacterTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::CharacterTest );
+#include <decaf/lang/BooleanTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::BooleanTest );
+#include <decaf/lang/ShortTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::ShortTest );
+#include <decaf/lang/IntegerTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::IntegerTest );
+#include <decaf/lang/LongTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::LongTest );
+#include <decaf/lang/FloatTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::FloatTest );
+#include <decaf/lang/DoubleTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::DoubleTest );
+#include <decaf/lang/ExceptionTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::ExceptionTest );
 #include <decaf/lang/ThreadTest.h>
 CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::ThreadTest );
 #include <decaf/lang/SystemTest.h>
 CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::SystemTest );
-//#include <decaf/lang/PointerTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::PointerTest );
-//
-//#include <decaf/net/SocketFactoryTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::net::SocketFactoryTest );
-//#include <decaf/net/SocketTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::net::SocketTest );
-//#include <decaf/net/URITest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::net::URITest );
-//#include <decaf/net/URISyntaxExceptionTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::net::URISyntaxExceptionTest );
-//#include <decaf/net/URLEncoderTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::net::URLEncoderTest );
-//#include <decaf/net/URLDecoderTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::net::URLDecoderTest );
-//
-//#include <decaf/util/concurrent/ConcurrentStlMapTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::concurrent::ConcurrentStlMapTest );
-//#include <decaf/util/concurrent/CountDownLatchTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::concurrent::CountDownLatchTest );
-//#include <decaf/util/concurrent/MutexTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::concurrent::MutexTest );
-//#include <decaf/util/concurrent/ThreadPoolTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::concurrent::ThreadPoolTest );
-//#include <decaf/util/concurrent/TimeUnitTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::concurrent::TimeUnitTest );
-//
-//#include <decaf/util/concurrent/atomic/AtomicBooleanTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::concurrent::atomic::AtomicBooleanTest );
-//#include <decaf/util/concurrent/atomic/AtomicIntegerTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::concurrent::atomic::AtomicIntegerTest );
-//#include <decaf/util/concurrent/atomic/AtomicReferenceTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::concurrent::atomic::AtomicReferenceTest );
-//
+#include <decaf/lang/PointerTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::PointerTest );
+
+#include <decaf/net/SocketFactoryTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::net::SocketFactoryTest );
+#include <decaf/net/SocketTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::net::SocketTest );
+#include <decaf/net/URITest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::net::URITest );
+#include <decaf/net/URISyntaxExceptionTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::net::URISyntaxExceptionTest );
+#include <decaf/net/URLEncoderTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::net::URLEncoderTest );
+#include <decaf/net/URLDecoderTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::net::URLDecoderTest );
+
+#include <decaf/util/concurrent/ConcurrentStlMapTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::concurrent::ConcurrentStlMapTest );
+#include <decaf/util/concurrent/CountDownLatchTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::concurrent::CountDownLatchTest );
+#include <decaf/util/concurrent/MutexTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::concurrent::MutexTest );
+#include <decaf/util/concurrent/ThreadPoolTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::concurrent::ThreadPoolTest );
+#include <decaf/util/concurrent/TimeUnitTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::concurrent::TimeUnitTest );
+
+#include <decaf/util/concurrent/atomic/AtomicBooleanTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::concurrent::atomic::AtomicBooleanTest );
+#include <decaf/util/concurrent/atomic/AtomicIntegerTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::concurrent::atomic::AtomicIntegerTest );
+#include <decaf/util/concurrent/atomic/AtomicReferenceTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::concurrent::atomic::AtomicReferenceTest );
+
 #include <decaf/util/concurrent/locks/LockSupportTest.h>
 CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::concurrent::locks::LockSupportTest );
-//
-//#include <decaf/util/DateTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::DateTest );
-//#include <decaf/util/UUIDTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::UUIDTest );
-//#include <decaf/util/ListTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::ListTest );
-//#include <decaf/util/StlMapTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::StlMapTest );
-//#include <decaf/util/PropertiesTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::PropertiesTest );
-//#include <decaf/util/QueueTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::QueueTest );
-//#include <decaf/util/RandomTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::RandomTest );
-//#include <decaf/util/SetTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::SetTest );
-//#include <decaf/util/StringTokenizerTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::StringTokenizerTest );
-//#include <decaf/util/TimerTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::TimerTest );
-//#include <decaf/util/PriorityQueueTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::PriorityQueueTest );
+
+#include <decaf/util/DateTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::DateTest );
+#include <decaf/util/UUIDTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::UUIDTest );
+#include <decaf/util/ListTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::ListTest );
+#include <decaf/util/StlMapTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::StlMapTest );
+#include <decaf/util/PropertiesTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::PropertiesTest );
+#include <decaf/util/QueueTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::QueueTest );
+#include <decaf/util/RandomTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::RandomTest );
+#include <decaf/util/SetTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::SetTest );
+#include <decaf/util/StringTokenizerTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::StringTokenizerTest );
+#include <decaf/util/TimerTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::TimerTest );
+#include <decaf/util/PriorityQueueTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::PriorityQueueTest );