summaryrefslogtreecommitdiff
path: root/cpp/src/tests
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/tests')
-rw-r--r--cpp/src/tests/Address.cpp18
-rw-r--r--cpp/src/tests/MessagingSessionTests.cpp70
-rw-r--r--cpp/src/tests/qpid_recv.cpp2
-rw-r--r--cpp/src/tests/qpid_send.cpp5
-rw-r--r--cpp/src/tests/qpid_stream.cpp2
5 files changed, 47 insertions, 50 deletions
diff --git a/cpp/src/tests/Address.cpp b/cpp/src/tests/Address.cpp
index 01d8683efe..a0b87e25af 100644
--- a/cpp/src/tests/Address.cpp
+++ b/cpp/src/tests/Address.cpp
@@ -49,9 +49,9 @@ QPID_AUTO_TEST_CASE(testParseOptions)
{
Address address("my-topic; {a:bc, x:101, y:'a string'}");
BOOST_CHECK_EQUAL(std::string("my-topic"), address.getName());
- BOOST_CHECK_EQUAL(std::string("bc"), address.getOption("a").asString());
- BOOST_CHECK_EQUAL((uint16_t) 101, address.getOption("x").asInt64());
- BOOST_CHECK_EQUAL(std::string("a string"), address.getOption("y").asString());
+ BOOST_CHECK_EQUAL(std::string("bc"), address.getOptions()["a"].asString());
+ BOOST_CHECK_EQUAL((uint16_t) 101, address.getOptions()["x"].asInt64());
+ BOOST_CHECK_EQUAL(std::string("a string"), address.getOptions()["y"].asString());
}
QPID_AUTO_TEST_CASE(testParseSubjectAndOptions)
@@ -59,9 +59,9 @@ QPID_AUTO_TEST_CASE(testParseSubjectAndOptions)
Address address("my-topic/my-subject; {a:bc, x:101, y:'a string'}");
BOOST_CHECK_EQUAL(std::string("my-topic"), address.getName());
BOOST_CHECK_EQUAL(std::string("my-subject"), address.getSubject());
- BOOST_CHECK_EQUAL(std::string("bc"), address.getOption("a").asString());
- BOOST_CHECK_EQUAL((uint16_t) 101, address.getOption("x").asInt64());
- BOOST_CHECK_EQUAL(std::string("a string"), address.getOption("y").asString());
+ BOOST_CHECK_EQUAL(std::string("bc"), address.getOptions()["a"].asString());
+ BOOST_CHECK_EQUAL((uint16_t) 101, address.getOptions()["x"].asInt64());
+ BOOST_CHECK_EQUAL(std::string("a string"), address.getOptions()["y"].asString());
}
QPID_AUTO_TEST_CASE(testParseNestedOptions)
@@ -70,8 +70,8 @@ QPID_AUTO_TEST_CASE(testParseNestedOptions)
BOOST_CHECK_EQUAL(std::string("my-topic"), address.getName());
BOOST_CHECK_EQUAL((uint16_t) 202, address.getOptions()["a"].asMap()["p"].asInt64());
BOOST_CHECK_EQUAL(std::string("another string"), address.getOptions()["a"].asMap()["q"].asString());
- BOOST_CHECK_EQUAL((uint16_t) 101, address.getOption("x").asInt64());
- BOOST_CHECK_EQUAL(std::string("a string"), address.getOption("y").asString());
+ BOOST_CHECK_EQUAL((uint16_t) 101, address.getOptions()["x"].asInt64());
+ BOOST_CHECK_EQUAL(std::string("a string"), address.getOptions()["y"].asString());
}
QPID_AUTO_TEST_CASE(testParseOptionsWithList)
@@ -84,7 +84,7 @@ QPID_AUTO_TEST_CASE(testParseOptionsWithList)
BOOST_CHECK_EQUAL((uint16_t) 202, i->asInt64());
BOOST_CHECK(++i != list.end());
BOOST_CHECK_EQUAL(std::string("another string"), i->asString());
- BOOST_CHECK_EQUAL((uint16_t) 101, address.getOption("x").asInt64());
+ BOOST_CHECK_EQUAL((uint16_t) 101, address.getOptions()["x"].asInt64());
}
QPID_AUTO_TEST_CASE(testParseQuotedNameAndSubject)
diff --git a/cpp/src/tests/MessagingSessionTests.cpp b/cpp/src/tests/MessagingSessionTests.cpp
index d1f7441216..bdfb8b389c 100644
--- a/cpp/src/tests/MessagingSessionTests.cpp
+++ b/cpp/src/tests/MessagingSessionTests.cpp
@@ -23,10 +23,6 @@
#include "BrokerFixture.h"
#include "qpid/messaging/Address.h"
#include "qpid/messaging/Connection.h"
-#include "qpid/messaging/ListContent.h"
-#include "qpid/messaging/ListView.h"
-#include "qpid/messaging/MapContent.h"
-#include "qpid/messaging/MapView.h"
#include "qpid/messaging/Message.h"
#include "qpid/messaging/Receiver.h"
#include "qpid/messaging/Sender.h"
@@ -112,7 +108,7 @@ struct MessagingFixture : public BrokerFixture
MessagingFixture(Broker::Options opts = Broker::Options()) :
BrokerFixture(opts),
connection(open(broker->getPort(Broker::TCP_TRANSPORT))),
- session(connection.newSession()),
+ session(connection.createSession()),
admin(broker->getPort(Broker::TCP_TRANSPORT))
{
}
@@ -259,7 +255,7 @@ QPID_AUTO_TEST_CASE(testSenderError)
MessagingFixture fix;
ScopedSuppressLogging sl;
BOOST_CHECK_THROW(fix.session.createSender("NonExistentAddress"), qpid::messaging::InvalidAddress);
- fix.session = fix.connection.newSession();
+ fix.session = fix.connection.createSession();
BOOST_CHECK_THROW(fix.session.createSender("NonExistentAddress; {create:receiver}"),
qpid::messaging::InvalidAddress);
}
@@ -269,7 +265,7 @@ QPID_AUTO_TEST_CASE(testReceiverError)
MessagingFixture fix;
ScopedSuppressLogging sl;
BOOST_CHECK_THROW(fix.session.createReceiver("NonExistentAddress"), qpid::messaging::InvalidAddress);
- fix.session = fix.connection.newSession();
+ fix.session = fix.connection.createSession();
BOOST_CHECK_THROW(fix.session.createReceiver("NonExistentAddress; {create:sender}"),
qpid::messaging::InvalidAddress);
}
@@ -334,7 +330,7 @@ QPID_AUTO_TEST_CASE(testMapMessage)
QueueFixture fix;
Sender sender = fix.session.createSender(fix.queue);
Message out;
- MapContent content(out);
+ Variant::Map content;
content["abc"] = "def";
content["pi"] = 3.14f;
Variant utf8("A utf 8 string");
@@ -343,11 +339,12 @@ QPID_AUTO_TEST_CASE(testMapMessage)
Variant utf16("\x00\x61\x00\x62\x00\x63");
utf16.setEncoding("utf16");
content["utf16"] = utf16;
- content.encode();
+ encode(content, out);
sender.send(out);
Receiver receiver = fix.session.createReceiver(fix.queue);
Message in = receiver.fetch(5 * Duration::SECOND);
- MapView view(in);
+ Variant::Map view;
+ decode(in, view);
BOOST_CHECK_EQUAL(view["abc"].asString(), "def");
BOOST_CHECK_EQUAL(view["pi"].asFloat(), 3.14f);
BOOST_CHECK_EQUAL(view["utf8"].asString(), utf8.asString());
@@ -365,12 +362,12 @@ QPID_AUTO_TEST_CASE(testMapMessageWithInitial)
Variant::Map imap;
imap["abc"] = "def";
imap["pi"] = 3.14f;
- MapContent content(out, imap);
- content.encode();
+ encode(imap, out);
sender.send(out);
Receiver receiver = fix.session.createReceiver(fix.queue);
Message in = receiver.fetch(5 * Duration::SECOND);
- MapView view(in);
+ Variant::Map view;
+ decode(in, view);
BOOST_CHECK_EQUAL(view["abc"].asString(), "def");
BOOST_CHECK_EQUAL(view["pi"].asFloat(), 3.14f);
fix.session.acknowledge();
@@ -381,21 +378,22 @@ QPID_AUTO_TEST_CASE(testListMessage)
QueueFixture fix;
Sender sender = fix.session.createSender(fix.queue);
Message out;
- ListContent content(out);
+ Variant::List content;
content.push_back(Variant("abc"));
content.push_back(Variant(1234));
content.push_back(Variant("def"));
content.push_back(Variant(56.789));
- content.encode();
+ encode(content, out);
sender.send(out);
Receiver receiver = fix.session.createReceiver(fix.queue);
Message in = receiver.fetch(5 * Duration::SECOND);
- ListView view(in);
+ Variant::List view;
+ decode(in, view);
BOOST_CHECK_EQUAL(view.size(), content.size());
BOOST_CHECK_EQUAL(view.front().asString(), "abc");
BOOST_CHECK_EQUAL(view.back().asDouble(), 56.789);
- ListView::const_iterator i = view.begin();
+ Variant::List::const_iterator i = view.begin();
BOOST_CHECK(i != view.end());
BOOST_CHECK_EQUAL(i->asString(), "abc");
BOOST_CHECK(++i != view.end());
@@ -419,17 +417,17 @@ QPID_AUTO_TEST_CASE(testListMessageWithInitial)
ilist.push_back(Variant(1234));
ilist.push_back(Variant("def"));
ilist.push_back(Variant(56.789));
- ListContent content(out, ilist);
- content.encode();
+ encode(ilist, out);
sender.send(out);
Receiver receiver = fix.session.createReceiver(fix.queue);
Message in = receiver.fetch(5 * Duration::SECOND);
- ListView view(in);
- BOOST_CHECK_EQUAL(view.size(), content.size());
+ Variant::List view;
+ decode(in, view);
+ BOOST_CHECK_EQUAL(view.size(), ilist.size());
BOOST_CHECK_EQUAL(view.front().asString(), "abc");
BOOST_CHECK_EQUAL(view.back().asDouble(), 56.789);
- ListView::const_iterator i = view.begin();
+ Variant::List::const_iterator i = view.begin();
BOOST_CHECK(i != view.end());
BOOST_CHECK_EQUAL(i->asString(), "abc");
BOOST_CHECK(++i != view.end());
@@ -481,16 +479,16 @@ QPID_AUTO_TEST_CASE(testAvailable)
}
qpid::sys::sleep(1);//is there any avoid an arbitrary sleep while waiting for messages to be dispatched?
for (uint i = 0; i < 5; ++i) {
- BOOST_CHECK_EQUAL(fix.session.available(), 15u - 2*i);
- BOOST_CHECK_EQUAL(r1.available(), 10u - i);
+ BOOST_CHECK_EQUAL(fix.session.getAvailable(), 15u - 2*i);
+ BOOST_CHECK_EQUAL(r1.getAvailable(), 10u - i);
BOOST_CHECK_EQUAL(r1.fetch().getContent(), (boost::format("A_%1%") % (i+1)).str());
- BOOST_CHECK_EQUAL(r2.available(), 5u - i);
+ BOOST_CHECK_EQUAL(r2.getAvailable(), 5u - i);
BOOST_CHECK_EQUAL(r2.fetch().getContent(), (boost::format("B_%1%") % (i+1)).str());
fix.session.acknowledge();
}
for (uint i = 5; i < 10; ++i) {
- BOOST_CHECK_EQUAL(fix.session.available(), 10u - i);
- BOOST_CHECK_EQUAL(r1.available(), 10u - i);
+ BOOST_CHECK_EQUAL(fix.session.getAvailable(), 10u - i);
+ BOOST_CHECK_EQUAL(r1.getAvailable(), 10u - i);
BOOST_CHECK_EQUAL(r1.fetch().getContent(), (boost::format("A_%1%") % (i+1)).str());
}
}
@@ -506,11 +504,11 @@ QPID_AUTO_TEST_CASE(testPendingAck)
for (uint i = 0; i < 10; ++i) {
BOOST_CHECK_EQUAL(receiver.fetch().getContent(), (boost::format("Message_%1%") % (i+1)).str());
}
- BOOST_CHECK_EQUAL(fix.session.pendingAck(), 0u);
+ BOOST_CHECK_EQUAL(fix.session.getPendingAck(), 0u);
fix.session.acknowledge();
- BOOST_CHECK_EQUAL(fix.session.pendingAck(), 10u);
+ BOOST_CHECK_EQUAL(fix.session.getPendingAck(), 10u);
fix.session.sync();
- BOOST_CHECK_EQUAL(fix.session.pendingAck(), 0u);
+ BOOST_CHECK_EQUAL(fix.session.getPendingAck(), 0u);
}
QPID_AUTO_TEST_CASE(testPendingSend)
@@ -522,9 +520,9 @@ QPID_AUTO_TEST_CASE(testPendingSend)
//implementation and the fact that the simple test case makes it
//possible to predict when completion information will be sent to
//the client. TODO: is there a better way of testing this?
- BOOST_CHECK_EQUAL(sender.pending(), 10u);
+ BOOST_CHECK_EQUAL(sender.getPending(), 10u);
fix.session.sync();
- BOOST_CHECK_EQUAL(sender.pending(), 0u);
+ BOOST_CHECK_EQUAL(sender.getPending(), 0u);
Receiver receiver = fix.session.createReceiver(fix.queue);
receive(receiver, 10);
@@ -797,7 +795,7 @@ QPID_AUTO_TEST_CASE(testGetReceiver)
QPID_AUTO_TEST_CASE(testGetSessionFromConnection)
{
QueueFixture fix;
- fix.connection.newSession("my-session");
+ fix.connection.createSession("my-session");
Session session = fix.connection.getSession("my-session");
Message out(Uuid(true).str());
session.createSender(fix.queue).send(out);
@@ -814,7 +812,7 @@ QPID_AUTO_TEST_CASE(testGetConnectionFromSession)
Sender sender = fix.session.createSender(fix.queue);
sender.send(out);
Message in;
- sender.getSession().getConnection().newSession("incoming");
+ sender.getSession().getConnection().createSession("incoming");
BOOST_CHECK(fix.connection.getSession("incoming").createReceiver(fix.queue).fetch(in));
BOOST_CHECK_EQUAL(out.getContent(), in.getContent());
}
@@ -822,8 +820,8 @@ QPID_AUTO_TEST_CASE(testGetConnectionFromSession)
QPID_AUTO_TEST_CASE(testTx)
{
QueueFixture fix;
- Session ssn1 = fix.connection.newSession(true);
- Session ssn2 = fix.connection.newSession(true);
+ Session ssn1 = fix.connection.createTransactionalSession();
+ Session ssn2 = fix.connection.createTransactionalSession();
Sender sender1 = ssn1.createSender(fix.queue);
Sender sender2 = ssn2.createSender(fix.queue);
Receiver receiver1 = ssn1.createReceiver(fix.queue);
diff --git a/cpp/src/tests/qpid_recv.cpp b/cpp/src/tests/qpid_recv.cpp
index 0a268ad6cf..160830c826 100644
--- a/cpp/src/tests/qpid_recv.cpp
+++ b/cpp/src/tests/qpid_recv.cpp
@@ -153,7 +153,7 @@ int main(int argc, char ** argv)
try {
connection.open(opts.url);
std::auto_ptr<FailoverUpdates> updates(opts.failoverUpdates ? new FailoverUpdates(connection) : 0);
- Session session = connection.newSession(opts.tx > 0);
+ Session session = opts.tx ? connection.createTransactionalSession() : connection.createSession();
Receiver receiver = session.createReceiver(opts.address);
receiver.setCapacity(opts.capacity);
Message msg;
diff --git a/cpp/src/tests/qpid_send.cpp b/cpp/src/tests/qpid_send.cpp
index 564007958e..f828e6077c 100644
--- a/cpp/src/tests/qpid_send.cpp
+++ b/cpp/src/tests/qpid_send.cpp
@@ -21,7 +21,6 @@
#include <qpid/messaging/Address.h>
#include <qpid/messaging/Connection.h>
-#include <qpid/messaging/MapContent.h>
#include <qpid/messaging/Message.h>
#include <qpid/messaging/Sender.h>
#include <qpid/messaging/Session.h>
@@ -158,7 +157,7 @@ struct Options : public qpid::Options
}
}
- void setEntries(MapContent& content) const
+ void setEntries(Variant::Map& content) const
{
for (string_vector::const_iterator i = entries.begin(); i != entries.end(); ++i) {
std::string name;
@@ -186,7 +185,7 @@ int main(int argc, char ** argv)
try {
connection.open(opts.url);
std::auto_ptr<FailoverUpdates> updates(opts.failoverUpdates ? new FailoverUpdates(connection) : 0);
- Session session = connection.newSession(opts.tx > 0);
+ Session session = opts.tx ? connection.createTransactionalSession() : connection.createSession();
Sender sender = session.createSender(opts.address);
if (opts.capacity) sender.setCapacity(opts.capacity);
Message msg;
diff --git a/cpp/src/tests/qpid_stream.cpp b/cpp/src/tests/qpid_stream.cpp
index 642b7a821f..eafa6e96fa 100644
--- a/cpp/src/tests/qpid_stream.cpp
+++ b/cpp/src/tests/qpid_stream.cpp
@@ -91,7 +91,7 @@ struct Client : qpid::sys::Runnable
Connection connection;
try {
connection.open(opts.url);
- Session session = connection.newSession();
+ Session session = connection.createSession();
doWork(session);
session.close();
connection.close();
View Lorry Controller Status