Fixed return of acquired message ranges (and added tests)

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

1 files changed, 48 insertions, 0 deletions

diff --git a/qpid/cpp/src/tests/SequenceNumberTest.cpp b/qpid/cpp/src/tests/SequenceNumberTest.cpp
index 941eb9bf2e..d227b78323 100644
--- a/qpid/cpp/src/tests/SequenceNumberTest.cpp
+++ b/qpid/cpp/src/tests/SequenceNumberTest.cpp
@@ -22,6 +22,7 @@
 #include "qpid_test_plugin.h"
 #include <iostream>
 #include "qpid/framing/SequenceNumber.h"
+#include "qpid/framing/SequenceNumberSet.h"
 
 using namespace qpid::framing;
 
@@ -31,6 +32,9 @@ class SequenceNumberTest : public CppUnit::TestCase
     CPPUNIT_TEST(testIncrementPostfix);
     CPPUNIT_TEST(testIncrementPrefix);
     CPPUNIT_TEST(testWrapAround);
+    CPPUNIT_TEST(testCondense);
+    CPPUNIT_TEST(testCondenseSingleRange);
+    CPPUNIT_TEST(testCondenseSingleItem);
     CPPUNIT_TEST(testDifference);
     CPPUNIT_TEST(testDifferenceWithWrapAround1);
     CPPUNIT_TEST(testDifferenceWithWrapAround2);
@@ -112,6 +116,50 @@ class SequenceNumberTest : public CppUnit::TestCase
         CPPUNIT_ASSERT(++a > b);
     }
 
+    void testCondense()
+    {
+        SequenceNumberSet set;
+        for (uint i = 0; i < 6; i++) {
+            set.push_back(SequenceNumber(i));
+        }
+        set.push_back(SequenceNumber(7));
+        for (uint i = 9; i < 13; i++) {
+            set.push_back(SequenceNumber(i));
+        }
+        set.push_back(SequenceNumber(13));
+        SequenceNumberSet actual = set.condense();
+
+        SequenceNumberSet expected;
+        expected.addRange(SequenceNumber(0), SequenceNumber(5));
+        expected.addRange(SequenceNumber(7), SequenceNumber(7));
+        expected.addRange(SequenceNumber(9), SequenceNumber(13));
+        CPPUNIT_ASSERT_EQUAL(expected, actual);
+    }
+
+    void testCondenseSingleRange()
+    {
+        SequenceNumberSet set;
+        for (uint i = 0; i < 6; i++) {
+            set.push_back(SequenceNumber(i));
+        }
+        SequenceNumberSet actual = set.condense();
+
+        SequenceNumberSet expected;
+        expected.addRange(SequenceNumber(0), SequenceNumber(5));
+        CPPUNIT_ASSERT_EQUAL(expected, actual);
+    }
+
+    void testCondenseSingleItem()
+    {
+        SequenceNumberSet set;
+        set.push_back(SequenceNumber(1));
+        SequenceNumberSet actual = set.condense();
+
+        SequenceNumberSet expected;
+        expected.addRange(SequenceNumber(1), SequenceNumber(1));
+        CPPUNIT_ASSERT_EQUAL(expected, actual);
+    }
+
     void testDifference()
     {
         SequenceNumber a;