Author: gordonsim Date: 2008-05-14 03:11:53 -0400 (Wed, 14 May 2008) New Revision: 2047 Modified: store/trunk/cpp/tests/MessageUtils.h store/trunk/cpp/tests/OrderingTest.cpp store/trunk/cpp/tests/SimpleTest.cpp store/trunk/cpp/tests/TransactionalTest.cpp store/trunk/cpp/tests/TwoPhaseCommitTest.cpp Log: Fixed tests for recent changes to qpid code. Modified: store/trunk/cpp/tests/MessageUtils.h =================================================================== --- store/trunk/cpp/tests/MessageUtils.h 2008-05-13 22:44:04 UTC (rev 2046) +++ store/trunk/cpp/tests/MessageUtils.h 2008-05-14 07:11:53 UTC (rev 2047) @@ -33,10 +33,10 @@ struct MessageUtils { - static Message::shared_ptr createMessage(const string& exchange, const string& routingKey, + static boost::intrusive_ptr<Message> createMessage(const string& exchange, const string& routingKey, const Uuid& messageId=Uuid(), uint64_t contentSize = 0) { - Message::shared_ptr msg(new Message()); + boost::intrusive_ptr<Message> msg(new Message()); AMQFrame method(in_place<MessageTransferBody>(ProtocolVersion(), exchange, 0, 0)); AMQFrame header(in_place<AMQHeaderBody>()); @@ -50,7 +50,7 @@ return msg; } - static void addContent(Message::shared_ptr msg, const string& data) + static void addContent(boost::intrusive_ptr<Message> msg, const string& data) { AMQFrame content(in_place<AMQContentBody>(data)); msg->getFrames().append(content); Modified: store/trunk/cpp/tests/OrderingTest.cpp =================================================================== --- store/trunk/cpp/tests/OrderingTest.cpp 2008-05-13 22:44:04 UTC (rev 2046) +++ store/trunk/cpp/tests/OrderingTest.cpp 2008-05-14 07:11:53 UTC (rev 2047) @@ -69,7 +69,7 @@ Uuid messageId(true); ids.push(messageId); - Message::shared_ptr msg = MessageUtils::createMessage("exchange", "routing_key", messageId, 0); + boost::intrusive_ptr<Message> msg = MessageUtils::createMessage("exchange", "routing_key", messageId, 0); msg->getProperties<DeliveryProperties>()->setDeliveryMode(PERSISTENT); queue->deliver(msg); @@ -77,7 +77,7 @@ bool pop() { - Message::shared_ptr msg = queue->dequeue().payload; + boost::intrusive_ptr<Message> msg = queue->dequeue().payload; if (msg) { queue->dequeue(0, msg); BOOST_CHECK_EQUAL(ids.front(), msg->getProperties<MessageProperties>()->getMessageId()); Modified: store/trunk/cpp/tests/SimpleTest.cpp =================================================================== --- store/trunk/cpp/tests/SimpleTest.cpp 2008-05-13 22:44:04 UTC (rev 2046) +++ store/trunk/cpp/tests/SimpleTest.cpp 2008-05-14 07:11:53 UTC (rev 2047) @@ -202,7 +202,7 @@ FieldTable settings; queue->create(settings); - Message::shared_ptr msg = MessageUtils::createMessage(exchange, routingKey, messageId, 14); + boost::intrusive_ptr<Message> msg = MessageUtils::createMessage(exchange, routingKey, messageId, 14); MessageUtils::addContent(msg, data1); MessageUtils::addContent(msg, data2); @@ -222,7 +222,7 @@ Queue::shared_ptr queue = registry.find(name); BOOST_REQUIRE(queue); BOOST_CHECK_EQUAL((u_int32_t) 1, queue->getMessageCount()); - Message::shared_ptr msg = queue->dequeue().payload; + boost::intrusive_ptr<Message> msg = queue->dequeue().payload; BOOST_CHECK_EQUAL(exchange, msg->getExchangeName()); BOOST_CHECK_EQUAL(routingKey, msg->getRoutingKey()); @@ -258,7 +258,7 @@ FieldTable settings; queue->create(settings); - Message::shared_ptr msg = MessageUtils::createMessage(exchange, routingKey, messageId, 7); + boost::intrusive_ptr<Message> msg = MessageUtils::createMessage(exchange, routingKey, messageId, 7); MessageUtils::addContent(msg, data); msg->getProperties<DeliveryProperties>()->setDeliveryMode(PERSISTENT); @@ -291,7 +291,7 @@ store.truncate();//make sure it is empty to begin with //create & stage a message - Message::shared_ptr msg = MessageUtils::createMessage(exchange, routingKey, messageId, (data1.size() + data2.size())); + boost::intrusive_ptr<Message> msg = MessageUtils::createMessage(exchange, routingKey, messageId, (data1.size() + data2.size())); intrusive_ptr<PersistableMessage> pmsg = static_pointer_cast<PersistableMessage>(msg); intrusive_ptr<const PersistableMessage> cpmsg = static_pointer_cast<const PersistableMessage>(msg); msg->getProperties<DeliveryProperties>()->setDeliveryMode(PERSISTENT); @@ -343,7 +343,7 @@ Queue::shared_ptr queue = registry.find(name); BOOST_REQUIRE(queue); BOOST_CHECK_EQUAL((u_int32_t) 1, queue->getMessageCount()); - Message::shared_ptr msg = queue->dequeue().payload; + boost::intrusive_ptr<Message> msg = queue->dequeue().payload; //check headers BOOST_CHECK_EQUAL(exchange, msg->getExchangeName()); @@ -381,7 +381,7 @@ store.truncate();//make sure it is empty to begin with const string data("abcdefg"); - Message::shared_ptr msg(MessageUtils::createMessage("my_exchange", "my_routing_key", "my_message", data.length())); + boost::intrusive_ptr<Message> msg(MessageUtils::createMessage("my_exchange", "my_routing_key", "my_message", data.length())); intrusive_ptr<PersistableMessage> pmsg = static_pointer_cast<PersistableMessage>(msg); intrusive_ptr<const PersistableMessage> cpmsg = static_pointer_cast<const PersistableMessage>(msg); MessageUtils::addContent(msg, data); @@ -405,7 +405,7 @@ store.truncate();//make sure it is empty to begin with const string data("abcdefg"); - Message::shared_ptr msg(MessageUtils::createMessage("my_exchange", "my_routing_key", "my_message", data.length())); + boost::intrusive_ptr<Message> msg(MessageUtils::createMessage("my_exchange", "my_routing_key", "my_message", data.length())); intrusive_ptr<PersistableMessage> pmsg = static_pointer_cast<PersistableMessage>(msg); intrusive_ptr<const PersistableMessage> cpmsg = static_pointer_cast<const PersistableMessage>(msg); MessageUtils::addContent(msg, data); Modified: store/trunk/cpp/tests/TransactionalTest.cpp =================================================================== --- store/trunk/cpp/tests/TransactionalTest.cpp 2008-05-13 22:44:04 UTC (rev 2046) +++ store/trunk/cpp/tests/TransactionalTest.cpp 2008-05-14 07:11:53 UTC (rev 2047) @@ -69,7 +69,7 @@ queueB->create(settings); //create message and enqueue it onto first queue: - Message::shared_ptr msg = MessageUtils::createMessage("exchange", "routing_key", messageId, 0); + boost::intrusive_ptr<Message> msg = MessageUtils::createMessage("exchange", "routing_key", messageId, 0); msg->getProperties<DeliveryProperties>()->setDeliveryMode(PERSISTENT); queueA->deliver(msg); @@ -112,7 +112,7 @@ BOOST_CHECK_EQUAL((u_int32_t) 0, x->getMessageCount()); BOOST_CHECK_EQUAL((u_int32_t) 1, y->getMessageCount()); - Message::shared_ptr msg = y->dequeue().payload; + boost::intrusive_ptr<Message> msg = y->dequeue().payload; BOOST_REQUIRE(msg); BOOST_CHECK_EQUAL(messageId, msg->getProperties<MessageProperties>()->getMessageId()); } @@ -121,7 +121,7 @@ { setup(async); - Message::shared_ptr msg = queueA->dequeue().payload; + boost::intrusive_ptr<Message> msg = queueA->dequeue().payload; BOOST_REQUIRE(msg); //move the message from one queue to the other as a transaction std::auto_ptr<TransactionContext> txn = store->begin(); Modified: store/trunk/cpp/tests/TwoPhaseCommitTest.cpp =================================================================== --- store/trunk/cpp/tests/TwoPhaseCommitTest.cpp 2008-05-13 22:44:04 UTC (rev 2046) +++ store/trunk/cpp/tests/TwoPhaseCommitTest.cpp 2008-05-14 07:11:53 UTC (rev 2047) @@ -63,7 +63,7 @@ { TwoPhaseCommitTest* const test; const string messageId; - Message::shared_ptr msg; + boost::intrusive_ptr<Message> msg; public: Swap(TwoPhaseCommitTest* const test_, const string& messageId_): test(test_), messageId(messageId_) {} void init(){ msg = test->deliver(messageId, test->queueA); } @@ -74,9 +74,9 @@ class Enqueue : public Strategy { TwoPhaseCommitTest* const test; - Message::shared_ptr msg1; - Message::shared_ptr msg2; - Message::shared_ptr msg3; + boost::intrusive_ptr<Message> msg1; + boost::intrusive_ptr<Message> msg2; + boost::intrusive_ptr<Message> msg3; public: Enqueue(TwoPhaseCommitTest* const test_): test(test_) {} void init() {} @@ -98,9 +98,9 @@ class Dequeue : public Strategy { TwoPhaseCommitTest* const test; - Message::shared_ptr msg1; - Message::shared_ptr msg2; - Message::shared_ptr msg3; + boost::intrusive_ptr<Message> msg1; + boost::intrusive_ptr<Message> msg2; + boost::intrusive_ptr<Message> msg3; public: Dequeue(TwoPhaseCommitTest* const test_): test(test_) {} void init() { @@ -131,9 +131,9 @@ LinkRegistry links; Queue::shared_ptr queueA; Queue::shared_ptr queueB; - Message::shared_ptr msg1; - Message::shared_ptr msg2; - Message::shared_ptr msg4; + boost::intrusive_ptr<Message> msg1; + boost::intrusive_ptr<Message> msg2; + boost::intrusive_ptr<Message> msg4; bool async; void recoverPrepared(bool commit) @@ -204,14 +204,14 @@ queueA->dequeue(txn, msg2); } - Message::shared_ptr enqueue(TPCTransactionContext* txn, const string& msgid) + boost::intrusive_ptr<Message> enqueue(TPCTransactionContext* txn, const string& msgid) { - Message::shared_ptr msg = createMessage(msgid); + boost::intrusive_ptr<Message> msg = createMessage(msgid); queueA->enqueue(txn, msg); return msg; } - Message::shared_ptr deliver(const string& msgid, Queue::shared_ptr& queue) + boost::intrusive_ptr<Message> deliver(const string& msgid, Queue::shared_ptr& queue) { msg4 = createMessage(msgid); queue->deliver(msg4); @@ -232,9 +232,9 @@ queueB->create(settings); } - Message::shared_ptr createMessage(const string& id, const string& exchange="exchange", const string& key="routing_key") + boost::intrusive_ptr<Message> createMessage(const string& id, const string& exchange="exchange", const string& key="routing_key") { - Message::shared_ptr msg = MessageUtils::createMessage(exchange, key); + boost::intrusive_ptr<Message> msg = MessageUtils::createMessage(exchange, key); msg->getProperties<MessageProperties>()->setCorrelationId(id); msg->getProperties<DeliveryProperties>()->setDeliveryMode(PERSISTENT); return msg; @@ -276,7 +276,7 @@ BOOST_CHECK_EQUAL((u_int32_t) 0, x->getMessageCount()); BOOST_CHECK_EQUAL((u_int32_t) 1, y->getMessageCount()); - Message::shared_ptr msg = y->dequeue().payload; + boost::intrusive_ptr<Message> msg = y->dequeue().payload; BOOST_REQUIRE(msg); BOOST_CHECK_EQUAL(msgid, msg->getProperties<MessageProperties>()->getCorrelationId()); } @@ -286,7 +286,7 @@ BOOST_REQUIRE(queueA); BOOST_CHECK_EQUAL(size, queueA->getMessageCount()); if (size > 0) { - Message::shared_ptr msg = queueA->dequeue().payload; + boost::intrusive_ptr<Message> msg = queueA->dequeue().payload; BOOST_REQUIRE(msg); BOOST_CHECK_EQUAL(msgid, msg->getProperties<MessageProperties>()->getCorrelationId()); }