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 2008/02/01 18:07:49 UTC
svn commit: r617560 - in /activemq/activemq-cpp/decaf/trunk/src/test:
decaf/internal/nio/ByteArrayBufferTest.cpp
decaf/internal/nio/CharArrayBufferTest.cpp decaf/io/FilterInputStreamTest.h
testRegistry.cpp
Author: tabish
Date: Fri Feb 1 09:07:46 2008
New Revision: 617560
URL: http://svn.apache.org/viewvc?rev=617560&view=rev
Log:
http://issues.apache.org/activemq/browse/AMQCPP-103
Modified:
activemq/activemq-cpp/decaf/trunk/src/test/decaf/internal/nio/ByteArrayBufferTest.cpp
activemq/activemq-cpp/decaf/trunk/src/test/decaf/internal/nio/CharArrayBufferTest.cpp
activemq/activemq-cpp/decaf/trunk/src/test/decaf/io/FilterInputStreamTest.h
activemq/activemq-cpp/decaf/trunk/src/test/testRegistry.cpp
Modified: activemq/activemq-cpp/decaf/trunk/src/test/decaf/internal/nio/ByteArrayBufferTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/decaf/trunk/src/test/decaf/internal/nio/ByteArrayBufferTest.cpp?rev=617560&r1=617559&r2=617560&view=diff
==============================================================================
--- activemq/activemq-cpp/decaf/trunk/src/test/decaf/internal/nio/ByteArrayBufferTest.cpp (original)
+++ activemq/activemq-cpp/decaf/trunk/src/test/decaf/internal/nio/ByteArrayBufferTest.cpp Fri Feb 1 09:07:46 2008
@@ -263,7 +263,7 @@
CPPUNIT_ASSERT( testBuffer1->limit() == duplicate->limit() );
CPPUNIT_ASSERT( testBuffer1->isReadOnly() == duplicate->isReadOnly() );
- for( std::size_t ix; ix < testBuffer1->capacity(); ix++ ) {
+ for( std::size_t ix = 0; ix < testBuffer1->capacity(); ix++ ) {
CPPUNIT_ASSERT( testBuffer1->get( ix ) == duplicate->get( ix ) );
}
@@ -367,7 +367,7 @@
testBuffer1->clear();
ByteBuffer& ret = testBuffer1->get( array, 0, testBuffer1->capacity() );
CPPUNIT_ASSERT( testBuffer1->position() == testBuffer1->capacity() );
- for( std::size_t ix; ix < testBuffer1->capacity() - 1; ix++ ) {
+ for( std::size_t ix = 0; ix < testBuffer1->capacity() - 1; ix++ ) {
CPPUNIT_ASSERT( testBuffer1->get( ix ) == array[ix] );
}
@@ -410,7 +410,7 @@
testBuffer1->clear();
for( size_t i = 0; i < testBuffer1->capacity(); i++) {
CPPUNIT_ASSERT( testBuffer1->position() == i );
- ByteBuffer& ret = testBuffer1->put( i );
+ ByteBuffer& ret = testBuffer1->put( (unsigned char)i );
CPPUNIT_ASSERT( testBuffer1->get(i) == i );
CPPUNIT_ASSERT( &ret == testBuffer1 );
}
@@ -438,7 +438,7 @@
testBuffer1->clear();
for( std::size_t i = 0; i < testBuffer1->capacity(); i++ ) {
CPPUNIT_ASSERT( testBuffer1->position() == i );
- array[0] = i;
+ array[0] = (unsigned char)i;
ByteBuffer& ret = testBuffer1->put( array );
CPPUNIT_ASSERT( testBuffer1->get(i) == i );
CPPUNIT_ASSERT( &ret == testBuffer1 );
@@ -487,7 +487,7 @@
ByteBuffer& ret = testBuffer1->put( array, 0, testBuffer1->capacity() );
CPPUNIT_ASSERT( testBuffer1->position() == testBuffer1->capacity() );
- for( std::size_t ix; ix < testBuffer1->capacity() - 1; ix++ ) {
+ for( std::size_t ix = 0; ix < testBuffer1->capacity() - 1; ix++ ) {
CPPUNIT_ASSERT( testBuffer1->get( ix ) == array[ix] );
}
CPPUNIT_ASSERT( &ret == testBuffer1 );
@@ -528,7 +528,7 @@
ByteBuffer& ret = testBuffer1->put( *other );
CPPUNIT_ASSERT( other->position() == other->capacity() );
CPPUNIT_ASSERT( testBuffer1->position() == testBuffer1->capacity() );
- for( std::size_t ix; ix < testBuffer1->capacity() - 1; ix++ ) {
+ for( std::size_t ix = 0; ix < testBuffer1->capacity() - 1; ix++ ) {
CPPUNIT_ASSERT( testBuffer1->get( ix ) == other->get( ix ) );
}
CPPUNIT_ASSERT( &ret == testBuffer1 );
Modified: activemq/activemq-cpp/decaf/trunk/src/test/decaf/internal/nio/CharArrayBufferTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/decaf/trunk/src/test/decaf/internal/nio/CharArrayBufferTest.cpp?rev=617560&r1=617559&r2=617560&view=diff
==============================================================================
--- activemq/activemq-cpp/decaf/trunk/src/test/decaf/internal/nio/CharArrayBufferTest.cpp (original)
+++ activemq/activemq-cpp/decaf/trunk/src/test/decaf/internal/nio/CharArrayBufferTest.cpp Fri Feb 1 09:07:46 2008
@@ -263,7 +263,7 @@
CPPUNIT_ASSERT( testBuffer1->limit() == duplicate->limit() );
CPPUNIT_ASSERT( testBuffer1->isReadOnly() == duplicate->isReadOnly() );
- for( std::size_t ix; ix < testBuffer1->capacity(); ix++ ) {
+ for( std::size_t ix = 0; ix < testBuffer1->capacity(); ix++ ) {
CPPUNIT_ASSERT( testBuffer1->get( ix ) == duplicate->get( ix ) );
}
@@ -367,7 +367,7 @@
testBuffer1->clear();
CharBuffer& ret = testBuffer1->get( array, 0, testBuffer1->capacity() );
CPPUNIT_ASSERT( testBuffer1->position() == testBuffer1->capacity() );
- for( std::size_t ix; ix < testBuffer1->capacity() - 1; ix++ ) {
+ for( std::size_t ix = 0; ix < testBuffer1->capacity() - 1; ix++ ) {
CPPUNIT_ASSERT( testBuffer1->get( ix ) == array[ix] );
}
@@ -410,7 +410,7 @@
testBuffer1->clear();
for( size_t i = 0; i < testBuffer1->capacity(); i++) {
CPPUNIT_ASSERT( testBuffer1->position() == i );
- CharBuffer& ret = testBuffer1->put( i );
+ CharBuffer& ret = testBuffer1->put( (char)i );
CPPUNIT_ASSERT( testBuffer1->get(i) == (char)i );
CPPUNIT_ASSERT( &ret == testBuffer1 );
}
@@ -438,7 +438,7 @@
testBuffer1->clear();
for( std::size_t i = 0; i < testBuffer1->capacity(); i++ ) {
CPPUNIT_ASSERT( testBuffer1->position() == i );
- array[0] = i;
+ array[0] = (char)i;
CharBuffer& ret = testBuffer1->put( array );
CPPUNIT_ASSERT( testBuffer1->get(i) == (char)i );
CPPUNIT_ASSERT( &ret == testBuffer1 );
@@ -487,7 +487,7 @@
CharBuffer& ret = testBuffer1->put( array, 0, testBuffer1->capacity() );
CPPUNIT_ASSERT( testBuffer1->position() == testBuffer1->capacity() );
- for( std::size_t ix; ix < testBuffer1->capacity() - 1; ix++ ) {
+ for( std::size_t ix = 0; ix < testBuffer1->capacity() - 1; ix++ ) {
CPPUNIT_ASSERT( testBuffer1->get( ix ) == array[ix] );
}
CPPUNIT_ASSERT( &ret == testBuffer1 );
@@ -528,7 +528,7 @@
CharBuffer& ret = testBuffer1->put( *other );
CPPUNIT_ASSERT( other->position() == other->capacity() );
CPPUNIT_ASSERT( testBuffer1->position() == testBuffer1->capacity() );
- for( std::size_t ix; ix < testBuffer1->capacity() - 1; ix++ ) {
+ for( std::size_t ix = 0; ix < testBuffer1->capacity() - 1; ix++ ) {
CPPUNIT_ASSERT( testBuffer1->get( ix ) == other->get( ix ) );
}
CPPUNIT_ASSERT( &ret == testBuffer1 );
@@ -551,7 +551,7 @@
for( std::size_t i = 0; i < testBuffer1->capacity(); i++ ) {
CPPUNIT_ASSERT( testBuffer1->position() == 0 );
- CharBuffer& ret = testBuffer1->put(i, i );
+ CharBuffer& ret = testBuffer1->put( i, (char)i );
CPPUNIT_ASSERT( testBuffer1->get(i) == (char)i );
CPPUNIT_ASSERT( &ret == testBuffer1 );
}
Modified: activemq/activemq-cpp/decaf/trunk/src/test/decaf/io/FilterInputStreamTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/decaf/trunk/src/test/decaf/io/FilterInputStreamTest.h?rev=617560&r1=617559&r2=617560&view=diff
==============================================================================
--- activemq/activemq-cpp/decaf/trunk/src/test/decaf/io/FilterInputStreamTest.h (original)
+++ activemq/activemq-cpp/decaf/trunk/src/test/decaf/io/FilterInputStreamTest.h Fri Feb 1 09:07:46 2008
@@ -130,7 +130,7 @@
pos += numToRead;
- return numToRead;
+ return (int)numToRead;
}
virtual void close() throw(lang::Exception){
Modified: activemq/activemq-cpp/decaf/trunk/src/test/testRegistry.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/decaf/trunk/src/test/testRegistry.cpp?rev=617560&r1=617559&r2=617560&view=diff
==============================================================================
--- activemq/activemq-cpp/decaf/trunk/src/test/testRegistry.cpp (original)
+++ activemq/activemq-cpp/decaf/trunk/src/test/testRegistry.cpp Fri Feb 1 09:07:46 2008
@@ -42,25 +42,25 @@
#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/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/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>
@@ -84,33 +84,33 @@
#include <decaf/lang/SystemTest.h>
CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::SystemTest );
-//#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/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/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/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/MapTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::MapTest );
-//#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/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/DateTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::DateTest );
+#include <decaf/util/UUIDTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::UUIDTest );
+#include <decaf/util/MapTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::MapTest );
+#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 );