You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by nm...@apache.org on 2007/10/27 14:37:46 UTC
svn commit: r589087 - in
/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal:
BaseDataStreamMarshallerTest.cpp BaseDataStreamMarshallerTest.h
Author: nmittler
Date: Sat Oct 27 05:37:44 2007
New Revision: 589087
URL: http://svn.apache.org/viewvc?rev=589087&view=rev
Log:
[AMQCPP-150] Moved setup and teardown methods for BaseDataStreamMarshallerTest to cpp file
Modified:
activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/BaseDataStreamMarshallerTest.cpp
activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/BaseDataStreamMarshallerTest.h
Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/BaseDataStreamMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/BaseDataStreamMarshallerTest.cpp?rev=589087&r1=589086&r2=589087&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/BaseDataStreamMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/BaseDataStreamMarshallerTest.cpp Sat Oct 27 05:37:44 2007
@@ -40,6 +40,35 @@
using namespace activemq::connector::openwire::marshal;
////////////////////////////////////////////////////////////////////////////////
+void BaseDataStreamMarshallerTest::setUp(){
+
+ dataStructure = new ComplexDataStructure();
+ dataStructure->boolValue = true;
+ dataStructure->setCachedChild( new SimpleDataStructure() );
+ dataStructure->cachedChild->boolValue = true;
+ dataStructure->cachedChild->charValue = 'a';
+ dataStructure->cachedChild->shortValue = 1000;
+ dataStructure->cachedChild->intValue = 100000;
+ dataStructure->cachedChild->longValue1 = 1000000;
+ dataStructure->cachedChild->longValue2 = 256;
+ dataStructure->cachedChild->longValue3 = 65536;
+ dataStructure->cachedChild->longValue4 = 65535;
+ dataStructure->cachedChild->longValue5 = 32769;
+ dataStructure->cachedChild->floatValue = 10.3f;
+ dataStructure->cachedChild->doubleValue = 20.1;
+ dataStructure->cachedChild->stringValue = "hello world";
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void BaseDataStreamMarshallerTest::tearDown(){
+
+ if( dataStructure != NULL ) {
+ delete dataStructure;
+ dataStructure = NULL;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////////////
void BaseDataStreamMarshallerTest::testLooseMarshal()
{
SimpleDataStructureMarshaller* simpleMarshaller = new SimpleDataStructureMarshaller();
Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/BaseDataStreamMarshallerTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/BaseDataStreamMarshallerTest.h?rev=589087&r1=589086&r2=589087&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/BaseDataStreamMarshallerTest.h (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/BaseDataStreamMarshallerTest.h Sat Oct 27 05:37:44 2007
@@ -366,31 +366,8 @@
BaseDataStreamMarshallerTest() {}
virtual ~BaseDataStreamMarshallerTest() {}
- virtual void setUp(){
- dataStructure = new ComplexDataStructure();
- dataStructure->boolValue = true;
- dataStructure->setCachedChild( new SimpleDataStructure() );
- dataStructure->cachedChild->boolValue = true;
- dataStructure->cachedChild->charValue = 'a';
- dataStructure->cachedChild->shortValue = 1000;
- dataStructure->cachedChild->intValue = 100000;
- dataStructure->cachedChild->longValue1 = 1000000;
- dataStructure->cachedChild->longValue2 = 256;
- dataStructure->cachedChild->longValue3 = 65536;
- dataStructure->cachedChild->longValue4 = 65535;
- dataStructure->cachedChild->longValue5 = 32769;
- dataStructure->cachedChild->floatValue = 10.3f;
- dataStructure->cachedChild->doubleValue = 20.1;
- dataStructure->cachedChild->stringValue = "hello world";
- }
-
- virtual void tearDown(){
-
- if( dataStructure != NULL ) {
- delete dataStructure;
- dataStructure = NULL;
- }
- }
+ virtual void setUp();
+ virtual void tearDown();
void testLooseMarshal();
void testTightMarshal();