removed the need to pass MethodContext/RequestId through proxy and handler/adapter interfaces

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

9 files changed, 121 insertions, 27 deletions

diff --git a/cpp/src/tests/BrokerChannelTest.cpp b/cpp/src/tests/BrokerChannelTest.cpp
index acbe867cfa..05bdb7b3f0 100644
--- a/cpp/src/tests/BrokerChannelTest.cpp
+++ b/cpp/src/tests/BrokerChannelTest.cpp
@@ -225,9 +225,7 @@ class BrokerChannelTest : public CppUnit::TestCase
         Channel channel(connection, 1, &store);
         const string data[] = {"abcde", "fghij", "klmno"};
         
-        Message* msg = new BasicMessage(
-            0, "my_exchange", "my_routing_key", false, false,
-            MockChannel::basicGetBody());
+        Message* msg = new BasicMessage(0, "my_exchange", "my_routing_key", false, false);
 
         store.expect();
         store.stage(*msg);
@@ -347,8 +345,7 @@ class BrokerChannelTest : public CppUnit::TestCase
     Message* createMessage(const string& exchange, const string& routingKey, const string& messageId, uint64_t contentSize)
     {
         BasicMessage* msg = new BasicMessage(
-            0, exchange, routingKey, false, false,
-            MockChannel::basicGetBody());
+            0, exchange, routingKey, false, false);
         AMQHeaderBody::shared_ptr header(new AMQHeaderBody(BASIC));
         header->setContentSize(contentSize);        
         msg->setHeader(header);
diff --git a/cpp/src/tests/ExchangeTest.cpp b/cpp/src/tests/ExchangeTest.cpp
index 595b025e86..ef2646519d 100644
--- a/cpp/src/tests/ExchangeTest.cpp
+++ b/cpp/src/tests/ExchangeTest.cpp
@@ -63,11 +63,7 @@ class ExchangeTest : public CppUnit::TestCase
         queue.reset();
         queue2.reset();
 
-        Message::shared_ptr msgPtr(
-            new BasicMessage(
-                0, "e", "A", true, true,
-                AMQMethodBody::shared_ptr(
-                    new BasicGetBody(ProtocolVersion()))));
+        Message::shared_ptr msgPtr(new BasicMessage(0, "e", "A", true, true));
         DeliverableMessage msg(msgPtr);
         topic.route(msg, "abc", 0);
         direct.route(msg, "abc", 0);
diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am
index 69d1d8def1..255f6348b9 100644
--- a/cpp/src/tests/Makefile.am
+++ b/cpp/src/tests/Makefile.am
@@ -84,7 +84,8 @@ broker_unit_tests =	\
 framing_unit_tests =	\
   FieldTableTest	\
   FramingTest		\
-  HeaderTest
+  HeaderTest		\
+  SequenceNumberTest
 
 misc_unit_tests =	\
   ProducerConsumerTest
diff --git a/cpp/src/tests/MessageBuilderTest.cpp b/cpp/src/tests/MessageBuilderTest.cpp
index 526db85c31..3d2ee1aaea 100644
--- a/cpp/src/tests/MessageBuilderTest.cpp
+++ b/cpp/src/tests/MessageBuilderTest.cpp
@@ -118,8 +118,7 @@ class MessageBuilderTest : public CppUnit::TestCase
 
         Message::shared_ptr message(
             new BasicMessage(
-                0, "test", "my_routing_key", false, false,
-                MockChannel::basicGetBody()));
+                0, "test", "my_routing_key", false, false));
         AMQHeaderBody::shared_ptr header(new AMQHeaderBody(BASIC));
         header->setContentSize(0);
         
@@ -137,8 +136,7 @@ class MessageBuilderTest : public CppUnit::TestCase
         string data1("abcdefg");
 
         Message::shared_ptr message(
-            new BasicMessage(0, "test", "my_routing_key", false, false,
-                             MockChannel::basicGetBody()));
+            new BasicMessage(0, "test", "my_routing_key", false, false));
         AMQHeaderBody::shared_ptr header(new AMQHeaderBody(BASIC));
         header->setContentSize(7);
         AMQContentBody::shared_ptr part1(new AMQContentBody(data1));
@@ -160,8 +158,7 @@ class MessageBuilderTest : public CppUnit::TestCase
         string data2("hijklmn");
 
         Message::shared_ptr message(
-            new BasicMessage(0, "test", "my_routing_key", false, false,
-                             MockChannel::basicGetBody()));
+            new BasicMessage(0, "test", "my_routing_key", false, false));
         AMQHeaderBody::shared_ptr header(new AMQHeaderBody(BASIC));
         header->setContentSize(14);
         AMQContentBody::shared_ptr part1(new AMQContentBody(data1));
@@ -191,8 +188,7 @@ class MessageBuilderTest : public CppUnit::TestCase
             string data2("hijklmn");
             
             Message::shared_ptr message(
-                new BasicMessage(0, "test", "my_routing_key", false, false,
-                                 MockChannel::basicGetBody()));
+                new BasicMessage(0, "test", "my_routing_key", false, false));
             AMQHeaderBody::shared_ptr header(new AMQHeaderBody(BASIC));
             header->setContentSize(14);
             BasicHeaderProperties* properties = dynamic_cast<BasicHeaderProperties*>(header->getProperties());
diff --git a/cpp/src/tests/MessageTest.cpp b/cpp/src/tests/MessageTest.cpp
index d3869b552e..1e976312be 100644
--- a/cpp/src/tests/MessageTest.cpp
+++ b/cpp/src/tests/MessageTest.cpp
@@ -46,8 +46,7 @@ class MessageTest : public CppUnit::TestCase
         string data2("hijklmn");
 
         BasicMessage::shared_ptr msg(
-            new BasicMessage(0, exchange, routingKey, false, false,
-                             MockChannel::basicGetBody()));
+            new BasicMessage(0, exchange, routingKey, false, false));
         AMQHeaderBody::shared_ptr header(new AMQHeaderBody(BASIC));
         header->setContentSize(14);        
         AMQContentBody::shared_ptr part1(new AMQContentBody(data1));
diff --git a/cpp/src/tests/QueueTest.cpp b/cpp/src/tests/QueueTest.cpp
index ddf2314f8d..eb9d567b82 100644
--- a/cpp/src/tests/QueueTest.cpp
+++ b/cpp/src/tests/QueueTest.cpp
@@ -69,8 +69,7 @@ class QueueTest : public CppUnit::TestCase
   public:
     Message::shared_ptr message(std::string exchange, std::string routingKey) {
         return Message::shared_ptr(
-            new BasicMessage(0, exchange, routingKey, true, true,
-                             MockChannel::basicGetBody()));
+            new BasicMessage(0, exchange, routingKey, true, true));
     }
     
     void testConsumers(){
diff --git a/cpp/src/tests/SequenceNumberTest.cpp b/cpp/src/tests/SequenceNumberTest.cpp
new file mode 100644
index 0000000000..f42ccfc061
--- /dev/null
+++ b/cpp/src/tests/SequenceNumberTest.cpp
@@ -0,0 +1,108 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include "qpid_test_plugin.h"
+#include <iostream>
+#include "qpid/framing/SequenceNumber.h"
+
+using namespace qpid::framing;
+
+class SequenceNumberTest : public CppUnit::TestCase
+{
+    CPPUNIT_TEST_SUITE(SequenceNumberTest);
+    CPPUNIT_TEST(testIncrementPostfix);
+    CPPUNIT_TEST(testIncrementPrefix);
+    CPPUNIT_TEST(testWrapAround);
+    CPPUNIT_TEST_SUITE_END();
+
+  public:
+
+    void testIncrementPostfix() 
+    {
+        SequenceNumber a;
+        SequenceNumber b;
+        CPPUNIT_ASSERT(!(a > b));
+        CPPUNIT_ASSERT(!(b < a));
+        CPPUNIT_ASSERT(a == b);
+
+        SequenceNumber c = a++;
+        CPPUNIT_ASSERT(a > b);
+        CPPUNIT_ASSERT(b < a);
+        CPPUNIT_ASSERT(a != b);
+        CPPUNIT_ASSERT(c < a);
+        CPPUNIT_ASSERT(a != c);
+
+        b++;
+        CPPUNIT_ASSERT(!(a > b));
+        CPPUNIT_ASSERT(!(b < a));
+        CPPUNIT_ASSERT(a == b);
+        CPPUNIT_ASSERT(c < b);
+        CPPUNIT_ASSERT(b != c);
+    }
+
+    void testIncrementPrefix() 
+    {
+        SequenceNumber a;
+        SequenceNumber b;
+        CPPUNIT_ASSERT(!(a > b));
+        CPPUNIT_ASSERT(!(b < a));
+        CPPUNIT_ASSERT(a == b);
+
+        SequenceNumber c = ++a;
+        CPPUNIT_ASSERT(a > b);
+        CPPUNIT_ASSERT(b < a);
+        CPPUNIT_ASSERT(a != b);
+        CPPUNIT_ASSERT(a == c);
+
+        ++b;
+        CPPUNIT_ASSERT(!(a > b));
+        CPPUNIT_ASSERT(!(b < a));
+        CPPUNIT_ASSERT(a == b);
+    }
+
+    void testWrapAround()
+    {
+        const uint32_t max = 0xFFFFFFFF;
+        SequenceNumber a(max - 10);
+        SequenceNumber b(max - 5);
+
+        //increment until b wraps around
+        for (int i = 0; i < 6; i++) {
+            CPPUNIT_ASSERT(++a < ++b);//test prefix
+        }
+        //verify we have wrapped around
+        CPPUNIT_ASSERT(a.getValue() > b.getValue());
+        //keep incrementing until a also wraps around
+        for (int i = 0; i < 6; i++) {            
+            CPPUNIT_ASSERT(a++ < b++);//test postfix
+        }
+        //let a 'catch up'
+        for (int i = 0; i < 5; i++) {
+            a++;
+        }
+        CPPUNIT_ASSERT(a == b);
+        CPPUNIT_ASSERT(++a > b);
+    }
+};
+    
+// Make this test suite a plugin.
+CPPUNIT_PLUGIN_IMPLEMENT();
+CPPUNIT_TEST_SUITE_REGISTRATION(SequenceNumberTest);
diff --git a/cpp/src/tests/TxAckTest.cpp b/cpp/src/tests/TxAckTest.cpp
index 3b9b1db308..df9fa89501 100644
--- a/cpp/src/tests/TxAckTest.cpp
+++ b/cpp/src/tests/TxAckTest.cpp
@@ -69,8 +69,7 @@ public:
     {
         for(int i = 0; i < 10; i++){
             Message::shared_ptr msg(
-                new BasicMessage(0, "exchange", "routing_key", false, false,
-                                 MockChannel::basicGetBody()));
+                new BasicMessage(0, "exchange", "routing_key", false, false));
             msg->setHeader(AMQHeaderBody::shared_ptr(new AMQHeaderBody(BASIC)));
             msg->getHeaderProperties()->setDeliveryMode(PERSISTENT);
             messages.push_back(msg);
diff --git a/cpp/src/tests/TxPublishTest.cpp b/cpp/src/tests/TxPublishTest.cpp
index 8c3c7afe31..05c03754f9 100644
--- a/cpp/src/tests/TxPublishTest.cpp
+++ b/cpp/src/tests/TxPublishTest.cpp
@@ -69,8 +69,7 @@ public:
     TxPublishTest() :
         queue1(new Queue("queue1", false, &store, 0)), 
         queue2(new Queue("queue2", false, &store, 0)), 
-        msg(new BasicMessage(0, "exchange", "routing_key", false, false,
-                             MockChannel::basicGetBody())),
+        msg(new BasicMessage(0, "exchange", "routing_key", false, false)),
         op(msg)
     {
         msg->setHeader(AMQHeaderBody::shared_ptr(new AMQHeaderBody(BASIC)));