QPID-2402 & QPID-2406: Documented the units for the ttl property of Message. Eliminated use of qpid::sys::Duration from API.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@918575 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 12 insertions, 12 deletions

diff --git a/qpid/cpp/src/tests/MessagingSessionTests.cpp b/qpid/cpp/src/tests/MessagingSessionTests.cpp
index 9e6cd59feb..dea98216b4 100644
--- a/qpid/cpp/src/tests/MessagingSessionTests.cpp
+++ b/qpid/cpp/src/tests/MessagingSessionTests.cpp
@@ -130,7 +130,7 @@ struct MessagingFixture : public BrokerFixture
         Message out(Uuid(true).str());
         s.send(out);
         Message in;
-        BOOST_CHECK(r.fetch(in, 5*qpid::sys::TIME_SEC));
+        BOOST_CHECK(r.fetch(in, 5*DURATION_SEC));
         BOOST_CHECK_EQUAL(out.getContent(), in.getContent());
         r.close();
         s.close();
@@ -196,7 +196,7 @@ struct MultiQueueFixture : MessagingFixture
     }
 
 };
-std::vector<std::string> fetch(Receiver& receiver, int count, qpid::sys::Duration timeout=qpid::sys::TIME_SEC*5)
+std::vector<std::string> fetch(Receiver& receiver, int count, Duration timeout=DURATION_SEC*5)
 {
     std::vector<std::string> data;
     Message message;
@@ -215,7 +215,7 @@ void send(Sender& sender, uint count = 1, uint start = 1, const std::string& bas
 }
 
 void receive(Receiver& receiver, uint count = 1, uint start = 1,
-             const std::string& base = "Message", qpid::sys::Duration timeout=qpid::sys::TIME_SEC*5)
+             const std::string& base = "Message", Duration timeout=DURATION_SEC*5)
 {
     for (uint i = start; i < start + count; ++i) {
         BOOST_CHECK_EQUAL(receiver.fetch(timeout).getContent(), (boost::format("%1%_%2%") % base % i).str());
@@ -229,7 +229,7 @@ QPID_AUTO_TEST_CASE(testSimpleSendReceive)
     Message out("test-message");
     sender.send(out);
     Receiver receiver = fix.session.createReceiver(fix.queue);
-    Message in = receiver.fetch(5 * qpid::sys::TIME_SEC);
+    Message in = receiver.fetch(5 * DURATION_SEC);
     fix.session.acknowledge();
     BOOST_CHECK_EQUAL(in.getContent(), out.getContent());
 }
@@ -246,7 +246,7 @@ QPID_AUTO_TEST_CASE(testSendReceiveHeaders)
     Receiver receiver = fix.session.createReceiver(fix.queue);
     Message in;
     for (uint i = 0; i < 10; ++i) {
-        BOOST_CHECK(receiver.fetch(in, 5 * qpid::sys::TIME_SEC));
+        BOOST_CHECK(receiver.fetch(in, 5 * DURATION_SEC));
         BOOST_CHECK_EQUAL(in.getContent(), out.getContent());
         BOOST_CHECK_EQUAL(in.getHeaders()["a"].asUint32(), i);
         fix.session.acknowledge();
@@ -323,7 +323,7 @@ QPID_AUTO_TEST_CASE(testNextReceiver)
 
     for (uint i = 0; i < fix.queues.size(); i++) {
         Message msg;
-        BOOST_CHECK(fix.session.nextReceiver().fetch(msg, qpid::sys::TIME_SEC));
+        BOOST_CHECK(fix.session.nextReceiver().fetch(msg, DURATION_SEC));
         BOOST_CHECK_EQUAL(msg.getContent(), (boost::format("Message_%1%") % (i+1)).str());
     }
 }
@@ -339,7 +339,7 @@ QPID_AUTO_TEST_CASE(testMapMessage)
     content.encode();
     sender.send(out);
     Receiver receiver = fix.session.createReceiver(fix.queue);
-    Message in = receiver.fetch(5 * qpid::sys::TIME_SEC);
+    Message in = receiver.fetch(5 * DURATION_SEC);
     MapView view(in);
     BOOST_CHECK_EQUAL(view["abc"].asString(), "def");
     BOOST_CHECK_EQUAL(view["pi"].asFloat(), 3.14f);
@@ -358,7 +358,7 @@ QPID_AUTO_TEST_CASE(testMapMessageWithInitial)
     content.encode();
     sender.send(out);
     Receiver receiver = fix.session.createReceiver(fix.queue);
-    Message in = receiver.fetch(5 * qpid::sys::TIME_SEC);
+    Message in = receiver.fetch(5 * DURATION_SEC);
     MapView view(in);
     BOOST_CHECK_EQUAL(view["abc"].asString(), "def");
     BOOST_CHECK_EQUAL(view["pi"].asFloat(), 3.14f);
@@ -378,7 +378,7 @@ QPID_AUTO_TEST_CASE(testListMessage)
     content.encode();
     sender.send(out);
     Receiver receiver = fix.session.createReceiver(fix.queue);
-    Message in = receiver.fetch(5 * qpid::sys::TIME_SEC);
+    Message in = receiver.fetch(5 * DURATION_SEC);
     ListView view(in);
     BOOST_CHECK_EQUAL(view.size(), content.size());
     BOOST_CHECK_EQUAL(view.front().asString(), "abc");
@@ -412,7 +412,7 @@ QPID_AUTO_TEST_CASE(testListMessageWithInitial)
     content.encode();
     sender.send(out);
     Receiver receiver = fix.session.createReceiver(fix.queue);
-    Message in = receiver.fetch(5 * qpid::sys::TIME_SEC);
+    Message in = receiver.fetch(5 * DURATION_SEC);
     ListView view(in);
     BOOST_CHECK_EQUAL(view.size(), content.size());
     BOOST_CHECK_EQUAL(view.front().asString(), "abc");
@@ -441,10 +441,10 @@ QPID_AUTO_TEST_CASE(testReject)
     Message m2("accept-me");
     sender.send(m2);
     Receiver receiver = fix.session.createReceiver(fix.queue);
-    Message in = receiver.fetch(5 * qpid::sys::TIME_SEC);
+    Message in = receiver.fetch(5 * DURATION_SEC);
     BOOST_CHECK_EQUAL(in.getContent(), m1.getContent());
     fix.session.reject(in);
-    in = receiver.fetch(5 * qpid::sys::TIME_SEC);
+    in = receiver.fetch(5 * DURATION_SEC);
     BOOST_CHECK_EQUAL(in.getContent(), m2.getContent());
     fix.session.acknowledge();
 }