svn commit: r541436 - in /activemq/activemq-cpp/trunk/src/test/activemq/connector: openwire/commands/ActiveMQDestinationTest2.cpp stomp/StompDestinationTest.cpp

[nmittler]

Author: nmittler
Date: Thu May 24 14:23:28 2007
New Revision: 541436

URL: http://svn.apache.org/viewvc?view=rev&rev=541436
Log:
AMQCPP-115 - fixed build for unit tests to use new properties scheme

Modified:
    
activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQDestinationTest2.cpp
    
activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompDestinationTest.cpp

Modified: 
activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQDestinationTest2.cpp
URL: 
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQDestinationTest2.cpp?view=diff&rev=541436&r1=541435&r2=541436
==============================================================================
--- 
activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQDestinationTest2.cpp
 (original)
+++ 
activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQDestinationTest2.cpp
 Thu May 24 14:23:28 2007
@@ -88,7 +88,7 @@
 
     dest.setPhysicalName( "test?option1=test1&option2=test2" );
 
-    const util::Properties& properties = dest.getOptions();
+    const util::ActiveMQProperties& properties = dest.getOptions();
 
     CPPUNIT_ASSERT( properties.hasProperty( "option1" ) == true );
     CPPUNIT_ASSERT( properties.hasProperty( "option2" ) == true );

Modified: 
activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompDestinationTest.cpp
URL: 
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompDestinationTest.cpp?view=diff&rev=541436&r1=541435&r2=541436
==============================================================================
--- 
activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompDestinationTest.cpp
 (original)
+++ 
activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompDestinationTest.cpp
 Thu May 24 14:23:28 2007
@@ -34,12 +34,12 @@
     MyDestination dest1( "test1?value1=1&value2=2" );
 
     CPPUNIT_ASSERT( dest1.getTopicName() == "test1" );
-    CPPUNIT_ASSERT( dest1.getProperties().hasProperty( "value1" ) == true );
-    CPPUNIT_ASSERT( dest1.getProperties().hasProperty( "value2" ) == true );
-    CPPUNIT_ASSERT( dest1.getProperties().hasProperty( "value3" ) != true );
+    CPPUNIT_ASSERT( dest1.getCMSProperties().hasProperty( "value1" ) == true );
+    CPPUNIT_ASSERT( dest1.getCMSProperties().hasProperty( "value2" ) == true );
+    CPPUNIT_ASSERT( dest1.getCMSProperties().hasProperty( "value3" ) != true );
 
-    std::string value1 = dest1.getProperties().getProperty( "value1" );
-    std::string value2 = dest1.getProperties().getProperty( "value2" );
+    std::string value1 = dest1.getCMSProperties().getProperty( "value1" );
+    std::string value2 = dest1.getCMSProperties().getProperty( "value2" );
 
     CPPUNIT_ASSERT( value1 == "1" );
     CPPUNIT_ASSERT( value2 == "2" );
@@ -50,12 +50,12 @@
     CPPUNIT_ASSERT( dest2 != NULL );
 
     CPPUNIT_ASSERT( dest2->getTopicName() == "test1" );
-    CPPUNIT_ASSERT( dest2->getProperties().hasProperty( "value1" ) == true );
-    CPPUNIT_ASSERT( dest2->getProperties().hasProperty( "value2" ) == true );
-    CPPUNIT_ASSERT( dest2->getProperties().hasProperty( "value3" ) != true );
+    CPPUNIT_ASSERT( dest2->getCMSProperties().hasProperty( "value1" ) == true 
);
+    CPPUNIT_ASSERT( dest2->getCMSProperties().hasProperty( "value2" ) == true 
);
+    CPPUNIT_ASSERT( dest2->getCMSProperties().hasProperty( "value3" ) != true 
);
 
-    value1 = dest2->getProperties().getProperty( "value1" );
-    value2 = dest2->getProperties().getProperty( "value2" );
+    value1 = dest2->getCMSProperties().getProperty( "value1" );
+    value2 = dest2->getCMSProperties().getProperty( "value2" );
 
     CPPUNIT_ASSERT( value1 == "1" );
     CPPUNIT_ASSERT( value2 == "2" );
@@ -66,12 +66,12 @@
     dest3.copy( dest1 );
 
     CPPUNIT_ASSERT( dest3.getTopicName() == "test1" );
-    CPPUNIT_ASSERT( dest3.getProperties().hasProperty( "value1" ) == true );
-    CPPUNIT_ASSERT( dest3.getProperties().hasProperty( "value2" ) == true );
-    CPPUNIT_ASSERT( dest3.getProperties().hasProperty( "value3" ) != true );
+    CPPUNIT_ASSERT( dest3.getCMSProperties().hasProperty( "value1" ) == true );
+    CPPUNIT_ASSERT( dest3.getCMSProperties().hasProperty( "value2" ) == true );
+    CPPUNIT_ASSERT( dest3.getCMSProperties().hasProperty( "value3" ) != true );
 
-    value1 = dest3.getProperties().getProperty( "value1" );
-    value2 = dest3.getProperties().getProperty( "value2" );
+    value1 = dest3.getCMSProperties().getProperty( "value1" );
+    value2 = dest3.getCMSProperties().getProperty( "value2" );
 
     CPPUNIT_ASSERT( value1 == "1" );
     CPPUNIT_ASSERT( value2 == "2" );