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/03/04 16:10:24 UTC
svn commit: r750042 - in /activemq/activemq-cpp/trunk/src:
main/activemq/state/ main/activemq/transport/failover/ test/
test/activemq/transport/failover/ test/activemq/transport/mock/
test/decaf/lang/
Author: tabish
Date: Wed Mar 4 15:10:23 2009
New Revision: 750042
URL: http://svn.apache.org/viewvc?rev=750042&view=rev
Log:
http://issues.apache.org/activemq/browse/AMQCPP-100
Some additional code needed for Failover. Added a start on a Unit test, and fixed a segfault caused by use of a Static Pointer instance that was causing APR to segfault.
Added:
activemq/activemq-cpp/trunk/src/test/activemq/transport/failover/
activemq/activemq-cpp/trunk/src/test/activemq/transport/failover/FailoverTransportTest.cpp (with props)
activemq/activemq-cpp/trunk/src/test/activemq/transport/failover/FailoverTransportTest.h (with props)
Modified:
activemq/activemq-cpp/trunk/src/main/activemq/state/ConnectionStateTracker.cpp
activemq/activemq-cpp/trunk/src/main/activemq/state/ConnectionStateTracker.h
activemq/activemq-cpp/trunk/src/main/activemq/transport/failover/FailoverTransportFactory.h
activemq/activemq-cpp/trunk/src/main/activemq/transport/failover/ReconnectTask.cpp
activemq/activemq-cpp/trunk/src/test/Makefile.am
activemq/activemq-cpp/trunk/src/test/activemq/transport/mock/MockTransportFactoryTest.cpp
activemq/activemq-cpp/trunk/src/test/decaf/lang/PointerTest.cpp
activemq/activemq-cpp/trunk/src/test/testRegistry.cpp
Modified: activemq/activemq-cpp/trunk/src/main/activemq/state/ConnectionStateTracker.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/state/ConnectionStateTracker.cpp?rev=750042&r1=750041&r2=750042&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/state/ConnectionStateTracker.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/state/ConnectionStateTracker.cpp Wed Mar 4 15:10:23 2009
@@ -30,7 +30,6 @@
using namespace decaf::lang::exceptions;
////////////////////////////////////////////////////////////////////////////////
-const Pointer<Tracked> ConnectionStateTracker::TRACKED_RESPONSE_MARKER( new Tracked() );
////////////////////////////////////////////////////////////////////////////////
namespace activemq {
@@ -60,7 +59,7 @@
}}
////////////////////////////////////////////////////////////////////////////////
-ConnectionStateTracker::ConnectionStateTracker() {
+ConnectionStateTracker::ConnectionStateTracker() : TRACKED_RESPONSE_MARKER( new Tracked() ) {
this->trackTransactions = false;
this->restoreSessions = true;
Modified: activemq/activemq-cpp/trunk/src/main/activemq/state/ConnectionStateTracker.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/state/ConnectionStateTracker.h?rev=750042&r1=750041&r2=750042&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/state/ConnectionStateTracker.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/state/ConnectionStateTracker.h Wed Mar 4 15:10:23 2009
@@ -42,7 +42,8 @@
class AMQCPP_API ConnectionStateTracker : public CommandVisitorAdapter {
private:
- static const Pointer<Tracked> TRACKED_RESPONSE_MARKER;
+ /** Creates a unique marker for this state tracker */
+ const Pointer<Tracked> TRACKED_RESPONSE_MARKER;
// TODO - Create a Thread Safe impl of Map.
decaf::util::StlMap< Pointer<ConnectionId>, Pointer<ConnectionState>,
Modified: activemq/activemq-cpp/trunk/src/main/activemq/transport/failover/FailoverTransportFactory.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/transport/failover/FailoverTransportFactory.h?rev=750042&r1=750041&r2=750042&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/transport/failover/FailoverTransportFactory.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/transport/failover/FailoverTransportFactory.h Wed Mar 4 15:10:23 2009
@@ -41,8 +41,7 @@
class AMQCPP_API FailoverTransportFactory : public AbstractTransportFactory {
public:
- FailoverTransportFactory();
- virtual ~FailoverTransportFactory();
+ virtual ~FailoverTransportFactory() {}
/**
* Creates a slimed down Transport instance which can be used in composite
Modified: activemq/activemq-cpp/trunk/src/main/activemq/transport/failover/ReconnectTask.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/transport/failover/ReconnectTask.cpp?rev=750042&r1=750041&r2=750042&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/transport/failover/ReconnectTask.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/transport/failover/ReconnectTask.cpp Wed Mar 4 15:10:23 2009
@@ -104,3 +104,44 @@
return result;
}
+
+////////////////////////////////////////////////////////////////////////////////
+void ReconnectTask::run() {
+
+ try {
+
+ while( true ) {
+
+ synchronized( &mutex ) {
+ pending = false;
+ if( shutDown ) {
+ return;
+ }
+ }
+
+ if( !this->iterate() ) {
+
+ // wait to be notified.
+ synchronized( &mutex ) {
+ if( shutDown ) {
+ return;
+ }
+ while( !pending ) {
+ mutex.wait();
+ }
+ }
+ }
+
+ }
+ }
+ AMQ_CATCH_NOTHROW( Exception )
+ AMQ_CATCHALL_NOTHROW()
+
+ // Make sure we notify any waiting threads that thread
+ // has terminated.
+ synchronized( &mutex ) {
+ threadTerminated = true;
+ mutex.notifyAll();
+ }
+
+}
Modified: activemq/activemq-cpp/trunk/src/test/Makefile.am
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/Makefile.am?rev=750042&r1=750041&r2=750042&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/Makefile.am (original)
+++ activemq/activemq-cpp/trunk/src/test/Makefile.am Wed Mar 4 15:10:23 2009
@@ -40,6 +40,7 @@
activemq/transport/IOTransportTest.cpp \
activemq/transport/correlator/ResponseCorrelatorTest.cpp \
activemq/transport/mock/MockTransportFactoryTest.cpp \
+ activemq/transport/failover/FailoverTransportTest.cpp \
activemq/util/PrimitiveValueNodeTest.cpp \
activemq/util/PrimitiveListTest.cpp \
activemq/util/PrimitiveMapTest.cpp \
@@ -139,6 +140,7 @@
activemq/transport/IOTransportTest.h \
activemq/transport/correlator/ResponseCorrelatorTest.h \
activemq/transport/mock/MockTransportFactoryTest.h \
+ activemq/transport/failover/FailoverTransportTest.h \
activemq/util/PrimitiveValueNodeTest.h \
activemq/util/PrimitiveListTest.h \
activemq/util/PrimitiveMapTest.h \
Added: activemq/activemq-cpp/trunk/src/test/activemq/transport/failover/FailoverTransportTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/transport/failover/FailoverTransportTest.cpp?rev=750042&view=auto
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/transport/failover/FailoverTransportTest.cpp (added)
+++ activemq/activemq-cpp/trunk/src/test/activemq/transport/failover/FailoverTransportTest.cpp Wed Mar 4 15:10:23 2009
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "FailoverTransportTest.h"
+
+#include <activemq/transport/failover/FailoverTransportFactory.h>
+#include <activemq/transport/failover/FailoverTransport.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Pointer.h>
+
+using namespace activemq;
+using namespace activemq::transport;
+using namespace activemq::transport::failover;
+using namespace activemq::exceptions;
+using namespace decaf::util;
+
+////////////////////////////////////////////////////////////////////////////////
+FailoverTransportTest::FailoverTransportTest() {
+}
+
+////////////////////////////////////////////////////////////////////////////////
+FailoverTransportTest::~FailoverTransportTest() {
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void FailoverTransportTest::testTransportCreate() {
+
+ std::string uri = "failover://(mock://localhost:61616)?randomize=false";
+
+ FailoverTransportFactory factory;
+
+ Pointer<Transport> transport( factory.create( uri ) );
+
+ CPPUNIT_ASSERT( transport != NULL );
+
+ FailoverTransport* failover = dynamic_cast<FailoverTransport*>(
+ transport->narrow( typeid( FailoverTransport ) ) );
+
+ CPPUNIT_ASSERT( failover != NULL );
+ CPPUNIT_ASSERT( failover->isRandomize() == false );
+
+ transport->close();
+}
+
Propchange: activemq/activemq-cpp/trunk/src/test/activemq/transport/failover/FailoverTransportTest.cpp
------------------------------------------------------------------------------
svn:eol-style = native
Added: activemq/activemq-cpp/trunk/src/test/activemq/transport/failover/FailoverTransportTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/transport/failover/FailoverTransportTest.h?rev=750042&view=auto
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/transport/failover/FailoverTransportTest.h (added)
+++ activemq/activemq-cpp/trunk/src/test/activemq/transport/failover/FailoverTransportTest.h Wed Mar 4 15:10:23 2009
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _ACTIVEMQ_TRANSPORT_FAILOVER_FAILOVERTRANSPORTTEST_H_
+#define _ACTIVEMQ_TRANSPORT_FAILOVER_FAILOVERTRANSPORTTEST_H_
+
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <activemq/util/Config.h>
+
+namespace activemq {
+namespace transport {
+namespace failover {
+
+ class FailoverTransportTest : public CppUnit::TestFixture {
+
+ CPPUNIT_TEST_SUITE( FailoverTransportTest );
+ CPPUNIT_TEST( testTransportCreate );
+ CPPUNIT_TEST_SUITE_END();
+
+ public:
+
+ FailoverTransportTest();
+ virtual ~FailoverTransportTest();
+
+ void testTransportCreate();
+
+ };
+
+}}}
+
+#endif /*_ACTIVEMQ_TRANSPORT_FAILOVER_FAILOVERTRANSPORTTEST_H_*/
Propchange: activemq/activemq-cpp/trunk/src/test/activemq/transport/failover/FailoverTransportTest.h
------------------------------------------------------------------------------
svn:eol-style = native
Modified: activemq/activemq-cpp/trunk/src/test/activemq/transport/mock/MockTransportFactoryTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/transport/mock/MockTransportFactoryTest.cpp?rev=750042&r1=750041&r2=750042&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/transport/mock/MockTransportFactoryTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/transport/mock/MockTransportFactoryTest.cpp Wed Mar 4 15:10:23 2009
@@ -46,4 +46,6 @@
CPPUNIT_ASSERT( transport.get() != NULL );
+ transport.reset( NULL );
+
}
Modified: activemq/activemq-cpp/trunk/src/test/decaf/lang/PointerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/decaf/lang/PointerTest.cpp?rev=750042&r1=750041&r2=750042&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/decaf/lang/PointerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/decaf/lang/PointerTest.cpp Wed Mar 4 15:10:23 2009
@@ -125,7 +125,6 @@
Pointer<ExceptionThrowingClass> ex( new ExceptionThrowingClass() );
CPPUNIT_FAIL( "Should Have Thrown." );
} catch(...) {}
-
}
////////////////////////////////////////////////////////////////////////////////
Modified: activemq/activemq-cpp/trunk/src/test/testRegistry.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/testRegistry.cpp?rev=750042&r1=750041&r2=750042&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/testRegistry.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/testRegistry.cpp Wed Mar 4 15:10:23 2009
@@ -18,28 +18,28 @@
// 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/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/wireformat/openwire/marshal/BaseDataStreamMarshallerTest.h>
//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::openwire::marshal::BaseDataStreamMarshallerTest );
@@ -68,14 +68,17 @@
//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/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/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 );
//
@@ -86,10 +89,10 @@
//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/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>
@@ -178,13 +181,13 @@
//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/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>
@@ -192,8 +195,8 @@
//#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/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>
@@ -214,15 +217,15 @@
//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/QueueTest.h>
-CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::QueueTest );
+//#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/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/SetTest.h>
+//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::SetTest );
//#include <decaf/util/StringTokenizerTest.h>
//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::StringTokenizerTest );