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/02/01 01:51:22 UTC
svn commit: r502061 - in /activemq/activemq-cpp/trunk/activemq-cpp/src:
main/activemq/connector/stomp/commands/
test/activemq/connector/stomp/commands/
Author: nmittler
Date: Wed Jan 31 16:51:21 2007
New Revision: 502061
URL: http://svn.apache.org/viewvc?view=rev&rev=502061
Log:
[AMQCPP-60] Removing inclusion of request-id from stomp messages
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/AbstractCommand.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/ConnectCommand.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/ConnectedCommand.h
activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/AbortCommandTest.h
activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/AckCommandTest.h
activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BeginCommandTest.h
activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h
activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/CommitCommandTest.h
activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/ConnectCommandTest.h
activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/ConnectedCommandTest.h
activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/DisconnectCommandTest.h
activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/ErrorCommandTest.h
activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/MessageCommandTest.h
activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/ReceiptCommandTest.h
activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/SubscribeCommandTest.h
activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/TextMessageCommandTest.h
activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/UnsubscribeCommandTest.h
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/AbstractCommand.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/AbstractCommand.h?view=diff&rev=502061&r1=502060&r2=502061
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/AbstractCommand.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/AbstractCommand.h Wed Jan 31 16:51:21 2007
@@ -133,14 +133,14 @@
}
/**
- * Sets the Command Id of this Message
+ * Default implementation - does nothing.
+ * Most stomp messages don't require a command ID - only
+ * ones that have a request/response handshake with the broker
+ * require it.
* @param id Command Id
*/
- virtual void setCommandId( const unsigned int id ){
- setPropertyValue(
- CommandConstants::toString(
- CommandConstants::HEADER_REQUESTID),
- util::Integer::toString( id ) );
+ virtual void setCommandId( const unsigned int id AMQCPP_UNUSED){
+ /* do nothing */
}
/**
@@ -156,10 +156,11 @@
}
/**
- * Set if this Message requires a Response
+ * Not used by stomp.
* @param required true if response is required
*/
virtual void setResponseRequired( const bool required AMQCPP_UNUSED) {
+ /* does nothing */
}
/**
@@ -185,14 +186,11 @@
}
/**
- * Sets the Correlation Id if this Command
+ * Default implementation - does nothing.
* @param corrId Id
*/
- virtual void setCorrelationId( const unsigned int corrId ) {
- setPropertyValue(
- CommandConstants::toString(
- CommandConstants::HEADER_RESPONSEID),
- util::Integer::toString( corrId ) );
+ virtual void setCorrelationId( const unsigned int corrId AMQCPP_UNUSED ) {
+ /* do nothing */
}
/**
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/ConnectCommand.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/ConnectCommand.h?view=diff&rev=502061&r1=502060&r2=502061
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/ConnectCommand.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/ConnectCommand.h Wed Jan 31 16:51:21 2007
@@ -45,6 +45,17 @@
virtual ~ConnectCommand(void) {};
/**
+ * Sets the Command Id of this Message
+ * @param id Command Id
+ */
+ virtual void setCommandId( const unsigned int id ){
+ setPropertyValue(
+ CommandConstants::toString(
+ CommandConstants::HEADER_REQUESTID),
+ util::Integer::toString( id ) );
+ }
+
+ /**
* Get the login
* @return char* to login, can be ""
*/
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/ConnectedCommand.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/ConnectedCommand.h?view=diff&rev=502061&r1=502060&r2=502061
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/ConnectedCommand.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/ConnectedCommand.h Wed Jan 31 16:51:21 2007
@@ -46,6 +46,17 @@
virtual ~ConnectedCommand(void) {}
/**
+ * Sets the Correlation Id if this Command
+ * @param corrId Id
+ */
+ virtual void setCorrelationId( const unsigned int corrId ) {
+ setPropertyValue(
+ CommandConstants::toString(
+ CommandConstants::HEADER_RESPONSEID),
+ util::Integer::toString( corrId ) );
+ }
+
+ /**
* Get the Session Id
* @return the mew Sessoin Id String
*/
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/AbortCommandTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/AbortCommandTest.h?view=diff&rev=502061&r1=502060&r2=502061
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/AbortCommandTest.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/AbortCommandTest.h Wed Jan 31 16:51:21 2007
@@ -49,10 +49,10 @@
CPPUNIT_ASSERT( cmd.isResponseRequired() == false );
cmd.setResponseRequired( true );
cmd.setCommandId( 123 );
- CPPUNIT_ASSERT( cmd.isResponseRequired() == true );
- CPPUNIT_ASSERT( cmd.getCommandId() == 123 );
+ CPPUNIT_ASSERT( cmd.isResponseRequired() == false );
+ CPPUNIT_ASSERT( cmd.getCommandId() == 0 );
cmd.setCorrelationId( 99 );
- CPPUNIT_ASSERT( cmd.getCorrelationId() == 99 );
+ CPPUNIT_ASSERT( cmd.getCorrelationId() == 0 );
CPPUNIT_ASSERT( cmd.getTransactionId() == "" );
cmd.setTransactionId( "ID:123456" );
CPPUNIT_ASSERT( std::string( cmd.getTransactionId() ) ==
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/AckCommandTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/AckCommandTest.h?view=diff&rev=502061&r1=502060&r2=502061
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/AckCommandTest.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/AckCommandTest.h Wed Jan 31 16:51:21 2007
@@ -49,10 +49,10 @@
CPPUNIT_ASSERT( cmd.isResponseRequired() == false );
cmd.setResponseRequired( true );
cmd.setCommandId( 123 );
- CPPUNIT_ASSERT( cmd.isResponseRequired() == true );
- CPPUNIT_ASSERT( cmd.getCommandId() == 123 );
+ CPPUNIT_ASSERT( cmd.isResponseRequired() == false );
+ CPPUNIT_ASSERT( cmd.getCommandId() == 0 );
cmd.setCorrelationId( 99 );
- CPPUNIT_ASSERT( cmd.getCorrelationId() == 99 );
+ CPPUNIT_ASSERT( cmd.getCorrelationId() == 0 );
CPPUNIT_ASSERT( cmd.getTransactionId() == "" );
cmd.setTransactionId( "ID:123456" );
CPPUNIT_ASSERT( std::string( cmd.getTransactionId() ) ==
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BeginCommandTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BeginCommandTest.h?view=diff&rev=502061&r1=502060&r2=502061
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BeginCommandTest.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BeginCommandTest.h Wed Jan 31 16:51:21 2007
@@ -49,10 +49,10 @@
CPPUNIT_ASSERT( cmd.isResponseRequired() == false );
cmd.setResponseRequired( true );
cmd.setCommandId( 123 );
- CPPUNIT_ASSERT( cmd.isResponseRequired() == true );
- CPPUNIT_ASSERT( cmd.getCommandId() == 123 );
+ CPPUNIT_ASSERT( cmd.isResponseRequired() == false );
+ CPPUNIT_ASSERT( cmd.getCommandId() == 0 );
cmd.setCorrelationId( 99 );
- CPPUNIT_ASSERT( cmd.getCorrelationId() == 99 );
+ CPPUNIT_ASSERT( cmd.getCorrelationId() == 0 );
CPPUNIT_ASSERT( cmd.getTransactionId() == "" );
cmd.setTransactionId( "ID:123456" );
CPPUNIT_ASSERT( std::string( cmd.getTransactionId() ) ==
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h?view=diff&rev=502061&r1=502060&r2=502061
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h Wed Jan 31 16:51:21 2007
@@ -76,10 +76,10 @@
CPPUNIT_ASSERT( cmd.isResponseRequired() == false );
cmd.setResponseRequired( true );
cmd.setCommandId( 123 );
- CPPUNIT_ASSERT( cmd.isResponseRequired() == true );
- CPPUNIT_ASSERT( cmd.getCommandId() == 123 );
+ CPPUNIT_ASSERT( cmd.isResponseRequired() == false );
+ CPPUNIT_ASSERT( cmd.getCommandId() == 0 );
cmd.setCorrelationId( 99 );
- CPPUNIT_ASSERT( cmd.getCorrelationId() == 99 );
+ CPPUNIT_ASSERT( cmd.getCorrelationId() == 0 );
CPPUNIT_ASSERT( cmd.getTransactionId() == "" );
cmd.setTransactionId( "ID:123456" );
CPPUNIT_ASSERT( std::string( cmd.getTransactionId() ) ==
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/CommitCommandTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/CommitCommandTest.h?view=diff&rev=502061&r1=502060&r2=502061
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/CommitCommandTest.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/CommitCommandTest.h Wed Jan 31 16:51:21 2007
@@ -49,10 +49,10 @@
CPPUNIT_ASSERT( cmd.isResponseRequired() == false );
cmd.setResponseRequired( true );
cmd.setCommandId( 123 );
- CPPUNIT_ASSERT( cmd.isResponseRequired() == true );
- CPPUNIT_ASSERT( cmd.getCommandId() == 123 );
+ CPPUNIT_ASSERT( cmd.isResponseRequired() == false );
+ CPPUNIT_ASSERT( cmd.getCommandId() == 0 );
cmd.setCorrelationId( 99 );
- CPPUNIT_ASSERT( cmd.getCorrelationId() == 99 );
+ CPPUNIT_ASSERT( cmd.getCorrelationId() == 0 );
CPPUNIT_ASSERT( cmd.getTransactionId() == "" );
cmd.setTransactionId( "ID:123456" );
CPPUNIT_ASSERT( std::string( cmd.getTransactionId() ) ==
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/ConnectCommandTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/ConnectCommandTest.h?view=diff&rev=502061&r1=502060&r2=502061
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/ConnectCommandTest.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/ConnectCommandTest.h Wed Jan 31 16:51:21 2007
@@ -52,7 +52,7 @@
CPPUNIT_ASSERT( cmd.isResponseRequired() == true );
CPPUNIT_ASSERT( cmd.getCommandId() == 123 );
cmd.setCorrelationId( 99 );
- CPPUNIT_ASSERT( cmd.getCorrelationId() == 99 );
+ CPPUNIT_ASSERT( cmd.getCorrelationId() == 0 );
CPPUNIT_ASSERT( cmd.getTransactionId() == "" );
cmd.setTransactionId( "ID:123456" );
CPPUNIT_ASSERT( std::string( cmd.getTransactionId() ) ==
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/ConnectedCommandTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/ConnectedCommandTest.h?view=diff&rev=502061&r1=502060&r2=502061
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/ConnectedCommandTest.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/ConnectedCommandTest.h Wed Jan 31 16:51:21 2007
@@ -49,8 +49,8 @@
CPPUNIT_ASSERT( cmd.isResponseRequired() == false );
cmd.setResponseRequired( true );
cmd.setCommandId( 123 );
- CPPUNIT_ASSERT( cmd.isResponseRequired() == true );
- CPPUNIT_ASSERT( cmd.getCommandId() == 123 );
+ CPPUNIT_ASSERT( cmd.isResponseRequired() == false );
+ CPPUNIT_ASSERT( cmd.getCommandId() == 0 );
cmd.setCorrelationId( 99 );
CPPUNIT_ASSERT( cmd.getCorrelationId() == 99 );
CPPUNIT_ASSERT( cmd.getTransactionId() == "" );
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/DisconnectCommandTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/DisconnectCommandTest.h?view=diff&rev=502061&r1=502060&r2=502061
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/DisconnectCommandTest.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/DisconnectCommandTest.h Wed Jan 31 16:51:21 2007
@@ -49,10 +49,10 @@
CPPUNIT_ASSERT( cmd.isResponseRequired() == false );
cmd.setResponseRequired( true );
cmd.setCommandId( 123 );
- CPPUNIT_ASSERT( cmd.isResponseRequired() == true );
- CPPUNIT_ASSERT( cmd.getCommandId() == 123 );
+ CPPUNIT_ASSERT( cmd.isResponseRequired() == false );
+ CPPUNIT_ASSERT( cmd.getCommandId() == 0 );
cmd.setCorrelationId( 99 );
- CPPUNIT_ASSERT( cmd.getCorrelationId() == 99 );
+ CPPUNIT_ASSERT( cmd.getCorrelationId() == 0 );
CPPUNIT_ASSERT( cmd.getTransactionId() == "" );
cmd.setTransactionId( "ID:123456" );
CPPUNIT_ASSERT( std::string( cmd.getTransactionId() ) ==
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/ErrorCommandTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/ErrorCommandTest.h?view=diff&rev=502061&r1=502060&r2=502061
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/ErrorCommandTest.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/ErrorCommandTest.h Wed Jan 31 16:51:21 2007
@@ -49,10 +49,10 @@
CPPUNIT_ASSERT( cmd.isResponseRequired() == false );
cmd.setResponseRequired( true );
cmd.setCommandId( 123 );
- CPPUNIT_ASSERT( cmd.isResponseRequired() == true );
- CPPUNIT_ASSERT( cmd.getCommandId() == 123 );
+ CPPUNIT_ASSERT( cmd.isResponseRequired() == false );
+ CPPUNIT_ASSERT( cmd.getCommandId() == 0 );
cmd.setCorrelationId( 99 );
- CPPUNIT_ASSERT( cmd.getCorrelationId() == 99 );
+ CPPUNIT_ASSERT( cmd.getCorrelationId() == 0 );
CPPUNIT_ASSERT( cmd.getTransactionId() == "" );
cmd.setTransactionId( "ID:123456" );
CPPUNIT_ASSERT( std::string( cmd.getTransactionId() ) ==
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/MessageCommandTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/MessageCommandTest.h?view=diff&rev=502061&r1=502060&r2=502061
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/MessageCommandTest.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/MessageCommandTest.h Wed Jan 31 16:51:21 2007
@@ -79,10 +79,10 @@
CPPUNIT_ASSERT( cmd.isResponseRequired() == false );
cmd.setResponseRequired( true );
cmd.setCommandId( 123 );
- CPPUNIT_ASSERT( cmd.isResponseRequired() == true );
- CPPUNIT_ASSERT( cmd.getCommandId() == 123 );
+ CPPUNIT_ASSERT( cmd.isResponseRequired() == false );
+ CPPUNIT_ASSERT( cmd.getCommandId() == 0 );
cmd.setCorrelationId( 99 );
- CPPUNIT_ASSERT( cmd.getCorrelationId() == 99 );
+ CPPUNIT_ASSERT( cmd.getCorrelationId() == 0 );
CPPUNIT_ASSERT( cmd.getTransactionId() == "" );
cmd.setTransactionId( "ID:123456" );
CPPUNIT_ASSERT( std::string( cmd.getTransactionId() ) ==
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/ReceiptCommandTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/ReceiptCommandTest.h?view=diff&rev=502061&r1=502060&r2=502061
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/ReceiptCommandTest.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/ReceiptCommandTest.h Wed Jan 31 16:51:21 2007
@@ -49,10 +49,10 @@
CPPUNIT_ASSERT( cmd.isResponseRequired() == false );
cmd.setResponseRequired( true );
cmd.setCommandId( 123 );
- CPPUNIT_ASSERT( cmd.isResponseRequired() == true );
- CPPUNIT_ASSERT( cmd.getCommandId() == 123 );
+ CPPUNIT_ASSERT( cmd.isResponseRequired() == false );
+ CPPUNIT_ASSERT( cmd.getCommandId() == 0 );
cmd.setCorrelationId( 99 );
- CPPUNIT_ASSERT( cmd.getCorrelationId() == 99 );
+ CPPUNIT_ASSERT( cmd.getCorrelationId() == 0 );
CPPUNIT_ASSERT( cmd.getTransactionId() == "" );
cmd.setTransactionId( "ID:123456" );
CPPUNIT_ASSERT( std::string( cmd.getTransactionId() ) ==
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/SubscribeCommandTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/SubscribeCommandTest.h?view=diff&rev=502061&r1=502060&r2=502061
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/SubscribeCommandTest.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/SubscribeCommandTest.h Wed Jan 31 16:51:21 2007
@@ -49,10 +49,10 @@
CPPUNIT_ASSERT( cmd.isResponseRequired() == false );
cmd.setResponseRequired( true );
cmd.setCommandId( 123 );
- CPPUNIT_ASSERT( cmd.isResponseRequired() == true );
- CPPUNIT_ASSERT( cmd.getCommandId() == 123 );
+ CPPUNIT_ASSERT( cmd.isResponseRequired() == false );
+ CPPUNIT_ASSERT( cmd.getCommandId() == 0 );
cmd.setCorrelationId( 99 );
- CPPUNIT_ASSERT( cmd.getCorrelationId() == 99 );
+ CPPUNIT_ASSERT( cmd.getCorrelationId() == 0 );
CPPUNIT_ASSERT( cmd.getTransactionId() == "" );
cmd.setTransactionId( "ID:123456" );
CPPUNIT_ASSERT( std::string( cmd.getTransactionId() ) ==
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/TextMessageCommandTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/TextMessageCommandTest.h?view=diff&rev=502061&r1=502060&r2=502061
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/TextMessageCommandTest.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/TextMessageCommandTest.h Wed Jan 31 16:51:21 2007
@@ -74,10 +74,10 @@
CPPUNIT_ASSERT( cmd.isResponseRequired() == false );
cmd.setResponseRequired( true );
cmd.setCommandId( 123 );
- CPPUNIT_ASSERT( cmd.isResponseRequired() == true );
- CPPUNIT_ASSERT( cmd.getCommandId() == 123 );
+ CPPUNIT_ASSERT( cmd.isResponseRequired() == false );
+ CPPUNIT_ASSERT( cmd.getCommandId() == 0 );
cmd.setCorrelationId( 99 );
- CPPUNIT_ASSERT( cmd.getCorrelationId() == 99 );
+ CPPUNIT_ASSERT( cmd.getCorrelationId() == 0 );
CPPUNIT_ASSERT( cmd.getTransactionId() == "" );
cmd.setTransactionId( "ID:123456" );
CPPUNIT_ASSERT( std::string( cmd.getTransactionId() ) ==
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/UnsubscribeCommandTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/UnsubscribeCommandTest.h?view=diff&rev=502061&r1=502060&r2=502061
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/UnsubscribeCommandTest.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/UnsubscribeCommandTest.h Wed Jan 31 16:51:21 2007
@@ -48,10 +48,10 @@
CPPUNIT_ASSERT( cmd.isResponseRequired() == false );
cmd.setResponseRequired( true );
cmd.setCommandId( 123 );
- CPPUNIT_ASSERT( cmd.isResponseRequired() == true );
- CPPUNIT_ASSERT( cmd.getCommandId() == 123 );
+ CPPUNIT_ASSERT( cmd.isResponseRequired() == false );
+ CPPUNIT_ASSERT( cmd.getCommandId() == 0 );
cmd.setCorrelationId( 99 );
- CPPUNIT_ASSERT( cmd.getCorrelationId() == 99 );
+ CPPUNIT_ASSERT( cmd.getCorrelationId() == 0 );
CPPUNIT_ASSERT( cmd.getTransactionId() == "" );
cmd.setTransactionId( "ID:123456" );
CPPUNIT_ASSERT( std::string( cmd.getTransactionId() ) ==