From ff757c027f8b7142364360f0ee800c9743355903 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Mon, 21 Apr 2008 16:36:08 +0000 Subject: src/qpid/RangeSet.h: generic set implementation using ranges. - no heap allocation for simple sets (<= 3 ranges) - binary searches for o(log(n)) performance in complex sets git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@650198 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/RangeSet.cpp | 117 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 qpid/cpp/src/tests/RangeSet.cpp (limited to 'qpid/cpp/src/tests/RangeSet.cpp') diff --git a/qpid/cpp/src/tests/RangeSet.cpp b/qpid/cpp/src/tests/RangeSet.cpp new file mode 100644 index 0000000000..bc125ed4e2 --- /dev/null +++ b/qpid/cpp/src/tests/RangeSet.cpp @@ -0,0 +1,117 @@ +/* + * + * Copyright (c) 2006 The Apache Software Foundation + * + * Licensed 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 "unit_test.h" +#include "test_tools.h" +#include "qpid/RangeSet.h" + +using namespace std; +using namespace qpid; + +QPID_AUTO_TEST_SUITE(RangeSetTestSuite) + +typedef qpid::Range Range; +typedef qpid::RangeSet RangeSet; + +QPID_AUTO_TEST_CASE(testEmptyRange) { + Range r; + BOOST_CHECK(r.empty()); + BOOST_CHECK(!r.contains(0)); + // BOOST_CHECK(r.contiguous(0)); +} + +QPID_AUTO_TEST_CASE(testRangeSetAddPoint) { + RangeSet r; + BOOST_CHECK(r.empty()); + r += 3; + BOOST_CHECK_MESSAGE(r.contains(3), r); + BOOST_CHECK_MESSAGE(r.contains(Range(3,4)), r); + BOOST_CHECK(!r.empty()); + r += 5; + BOOST_CHECK_MESSAGE(r.contains(5), r); + BOOST_CHECK_MESSAGE(r.contains(Range(5,6)), r); + BOOST_CHECK_MESSAGE(!r.contains(Range(3,6)), r); + r += 4; + BOOST_CHECK_MESSAGE(r.contains(Range(3,6)), r); +} + +QPID_AUTO_TEST_CASE(testRangeSetAddRange) { + RangeSet r; + r += Range(0,3); + BOOST_CHECK(r.contains(Range(0,3))); + r += Range(4,6); + BOOST_CHECK_MESSAGE(r.contains(Range(4,6)), r); + r += 3; + BOOST_CHECK_MESSAGE(r.contains(Range(0,6)), r); + BOOST_CHECK(r.front() == 0); + BOOST_CHECK(r.back() == 6); +} + +QPID_AUTO_TEST_CASE(testRangeSetIterate) { + RangeSet r; + (((r += 1) += 10) += Range(4,7)) += 2; + BOOST_MESSAGE(r); + std::vector actual; + std::copy(r.begin(), r.end(), std::back_inserter(actual)); + std::vector expect = boost::assign::list_of(1)(2)(4)(5)(6)(10); + BOOST_CHECK_EQUAL(expect, actual); +} + +QPID_AUTO_TEST_CASE(testRangeSetRemove) { + BOOST_CHECK_EQUAL(RangeSet(0,5)-3, RangeSet(0,3)+Range(4,5)); + BOOST_CHECK_EQUAL(RangeSet(1,5)-5, RangeSet(1,5)); + BOOST_CHECK_EQUAL(RangeSet(1,5)-0, RangeSet(1,5)); + + RangeSet r(RangeSet(0,5)+Range(10,15)+Range(20,25)); + + BOOST_CHECK_EQUAL(r-Range(0,5), RangeSet(10,15)+Range(20,25)); + BOOST_CHECK_EQUAL(r-Range(10,15), RangeSet(0,5)+Range(20,25)); + BOOST_CHECK_EQUAL(r-Range(20,25), RangeSet(0,5)+Range(10,15)); + + BOOST_CHECK_EQUAL(r-Range(-5, 30), RangeSet()); + + BOOST_CHECK_EQUAL(r-Range(-5, 7), RangeSet(10,15)+Range(20,25)); + BOOST_CHECK_EQUAL(r-Range(8,19), RangeSet(0,5)+Range(20,25)); + BOOST_CHECK_EQUAL(r-Range(17,30), RangeSet(0,5)+Range(10,15)); + + BOOST_CHECK_EQUAL(r-Range(-5, 5), RangeSet(10,15)+Range(20,25)); + BOOST_CHECK_EQUAL(r-Range(10,19), RangeSet(0,5)+Range(20,25)); + BOOST_CHECK_EQUAL(r-Range(18,25), RangeSet(0,5)+Range(10,15)); + + BOOST_CHECK_EQUAL(r-Range(-3, 3), RangeSet(3,5)+Range(10,15)+Range(20,25)); + BOOST_CHECK_EQUAL(r-Range(3, 7), RangeSet(0,2)+Range(10,15)+Range(20,25)); + BOOST_CHECK_EQUAL(r-Range(3, 12), RangeSet(0,3)+Range(12,15)+Range(20,25)); + BOOST_CHECK_EQUAL(r-Range(3, 22), RangeSet(12,15)+Range(22,25)); + BOOST_CHECK_EQUAL(r-Range(12, 22), RangeSet(0,5)+Range(10,11)+Range(22,25)); +} + +QPID_AUTO_TEST_CASE(testRangeContaining) { + RangeSet r; + (((r += 1) += Range(3,5)) += 7); + BOOST_CHECK_EQUAL(r.rangeContaining(0), Range(0,0)); + BOOST_CHECK_EQUAL(r.rangeContaining(1), Range(1,2)); + BOOST_CHECK_EQUAL(r.rangeContaining(2), Range(2,2)); + BOOST_CHECK_EQUAL(r.rangeContaining(3), Range(3,5)); + BOOST_CHECK_EQUAL(r.rangeContaining(4), Range(3,5)); + BOOST_CHECK_EQUAL(r.rangeContaining(5), Range(5,5)); + BOOST_CHECK_EQUAL(r.rangeContaining(6), Range(6,6)); + BOOST_CHECK_EQUAL(r.rangeContaining(7), Range(7,8)); +} + +QPID_AUTO_TEST_SUITE_END() -- cgit v1.2.1 From bae3a0ffaac56f35ed2b8c8d758cecfa1f7fcc83 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Mon, 21 Apr 2008 17:34:49 +0000 Subject: Fix compile error on rhel5. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@650210 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/RangeSet.cpp | 90 ++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 45 deletions(-) (limited to 'qpid/cpp/src/tests/RangeSet.cpp') diff --git a/qpid/cpp/src/tests/RangeSet.cpp b/qpid/cpp/src/tests/RangeSet.cpp index bc125ed4e2..e16339ab84 100644 --- a/qpid/cpp/src/tests/RangeSet.cpp +++ b/qpid/cpp/src/tests/RangeSet.cpp @@ -26,46 +26,46 @@ using namespace qpid; QPID_AUTO_TEST_SUITE(RangeSetTestSuite) -typedef qpid::Range Range; -typedef qpid::RangeSet RangeSet; +typedef qpid::Range TestRange; +typedef qpid::RangeSet TestRangeSet; QPID_AUTO_TEST_CASE(testEmptyRange) { - Range r; + TestRange r; BOOST_CHECK(r.empty()); BOOST_CHECK(!r.contains(0)); // BOOST_CHECK(r.contiguous(0)); } QPID_AUTO_TEST_CASE(testRangeSetAddPoint) { - RangeSet r; + TestRangeSet r; BOOST_CHECK(r.empty()); r += 3; BOOST_CHECK_MESSAGE(r.contains(3), r); - BOOST_CHECK_MESSAGE(r.contains(Range(3,4)), r); + BOOST_CHECK_MESSAGE(r.contains(TestRange(3,4)), r); BOOST_CHECK(!r.empty()); r += 5; BOOST_CHECK_MESSAGE(r.contains(5), r); - BOOST_CHECK_MESSAGE(r.contains(Range(5,6)), r); - BOOST_CHECK_MESSAGE(!r.contains(Range(3,6)), r); + BOOST_CHECK_MESSAGE(r.contains(TestRange(5,6)), r); + BOOST_CHECK_MESSAGE(!r.contains(TestRange(3,6)), r); r += 4; - BOOST_CHECK_MESSAGE(r.contains(Range(3,6)), r); + BOOST_CHECK_MESSAGE(r.contains(TestRange(3,6)), r); } QPID_AUTO_TEST_CASE(testRangeSetAddRange) { - RangeSet r; - r += Range(0,3); - BOOST_CHECK(r.contains(Range(0,3))); - r += Range(4,6); - BOOST_CHECK_MESSAGE(r.contains(Range(4,6)), r); + TestRangeSet r; + r += TestRange(0,3); + BOOST_CHECK(r.contains(TestRange(0,3))); + r += TestRange(4,6); + BOOST_CHECK_MESSAGE(r.contains(TestRange(4,6)), r); r += 3; - BOOST_CHECK_MESSAGE(r.contains(Range(0,6)), r); + BOOST_CHECK_MESSAGE(r.contains(TestRange(0,6)), r); BOOST_CHECK(r.front() == 0); BOOST_CHECK(r.back() == 6); } QPID_AUTO_TEST_CASE(testRangeSetIterate) { - RangeSet r; - (((r += 1) += 10) += Range(4,7)) += 2; + TestRangeSet r; + (((r += 1) += 10) += TestRange(4,7)) += 2; BOOST_MESSAGE(r); std::vector actual; std::copy(r.begin(), r.end(), std::back_inserter(actual)); @@ -74,44 +74,44 @@ QPID_AUTO_TEST_CASE(testRangeSetIterate) { } QPID_AUTO_TEST_CASE(testRangeSetRemove) { - BOOST_CHECK_EQUAL(RangeSet(0,5)-3, RangeSet(0,3)+Range(4,5)); - BOOST_CHECK_EQUAL(RangeSet(1,5)-5, RangeSet(1,5)); - BOOST_CHECK_EQUAL(RangeSet(1,5)-0, RangeSet(1,5)); + BOOST_CHECK_EQUAL(TestRangeSet(0,5)-3, TestRangeSet(0,3)+TestRange(4,5)); + BOOST_CHECK_EQUAL(TestRangeSet(1,5)-5, TestRangeSet(1,5)); + BOOST_CHECK_EQUAL(TestRangeSet(1,5)-0, TestRangeSet(1,5)); - RangeSet r(RangeSet(0,5)+Range(10,15)+Range(20,25)); + TestRangeSet r(TestRangeSet(0,5)+TestRange(10,15)+TestRange(20,25)); - BOOST_CHECK_EQUAL(r-Range(0,5), RangeSet(10,15)+Range(20,25)); - BOOST_CHECK_EQUAL(r-Range(10,15), RangeSet(0,5)+Range(20,25)); - BOOST_CHECK_EQUAL(r-Range(20,25), RangeSet(0,5)+Range(10,15)); + BOOST_CHECK_EQUAL(r-TestRange(0,5), TestRangeSet(10,15)+TestRange(20,25)); + BOOST_CHECK_EQUAL(r-TestRange(10,15), TestRangeSet(0,5)+TestRange(20,25)); + BOOST_CHECK_EQUAL(r-TestRange(20,25), TestRangeSet(0,5)+TestRange(10,15)); - BOOST_CHECK_EQUAL(r-Range(-5, 30), RangeSet()); + BOOST_CHECK_EQUAL(r-TestRange(-5, 30), TestRangeSet()); - BOOST_CHECK_EQUAL(r-Range(-5, 7), RangeSet(10,15)+Range(20,25)); - BOOST_CHECK_EQUAL(r-Range(8,19), RangeSet(0,5)+Range(20,25)); - BOOST_CHECK_EQUAL(r-Range(17,30), RangeSet(0,5)+Range(10,15)); + BOOST_CHECK_EQUAL(r-TestRange(-5, 7), TestRangeSet(10,15)+TestRange(20,25)); + BOOST_CHECK_EQUAL(r-TestRange(8,19), TestRangeSet(0,5)+TestRange(20,25)); + BOOST_CHECK_EQUAL(r-TestRange(17,30), TestRangeSet(0,5)+TestRange(10,15)); - BOOST_CHECK_EQUAL(r-Range(-5, 5), RangeSet(10,15)+Range(20,25)); - BOOST_CHECK_EQUAL(r-Range(10,19), RangeSet(0,5)+Range(20,25)); - BOOST_CHECK_EQUAL(r-Range(18,25), RangeSet(0,5)+Range(10,15)); + BOOST_CHECK_EQUAL(r-TestRange(-5, 5), TestRangeSet(10,15)+TestRange(20,25)); + BOOST_CHECK_EQUAL(r-TestRange(10,19), TestRangeSet(0,5)+TestRange(20,25)); + BOOST_CHECK_EQUAL(r-TestRange(18,25), TestRangeSet(0,5)+TestRange(10,15)); - BOOST_CHECK_EQUAL(r-Range(-3, 3), RangeSet(3,5)+Range(10,15)+Range(20,25)); - BOOST_CHECK_EQUAL(r-Range(3, 7), RangeSet(0,2)+Range(10,15)+Range(20,25)); - BOOST_CHECK_EQUAL(r-Range(3, 12), RangeSet(0,3)+Range(12,15)+Range(20,25)); - BOOST_CHECK_EQUAL(r-Range(3, 22), RangeSet(12,15)+Range(22,25)); - BOOST_CHECK_EQUAL(r-Range(12, 22), RangeSet(0,5)+Range(10,11)+Range(22,25)); + BOOST_CHECK_EQUAL(r-TestRange(-3, 3), TestRangeSet(3,5)+TestRange(10,15)+TestRange(20,25)); + BOOST_CHECK_EQUAL(r-TestRange(3, 7), TestRangeSet(0,2)+TestRange(10,15)+TestRange(20,25)); + BOOST_CHECK_EQUAL(r-TestRange(3, 12), TestRangeSet(0,3)+TestRange(12,15)+TestRange(20,25)); + BOOST_CHECK_EQUAL(r-TestRange(3, 22), TestRangeSet(12,15)+TestRange(22,25)); + BOOST_CHECK_EQUAL(r-TestRange(12, 22), TestRangeSet(0,5)+TestRange(10,11)+TestRange(22,25)); } QPID_AUTO_TEST_CASE(testRangeContaining) { - RangeSet r; - (((r += 1) += Range(3,5)) += 7); - BOOST_CHECK_EQUAL(r.rangeContaining(0), Range(0,0)); - BOOST_CHECK_EQUAL(r.rangeContaining(1), Range(1,2)); - BOOST_CHECK_EQUAL(r.rangeContaining(2), Range(2,2)); - BOOST_CHECK_EQUAL(r.rangeContaining(3), Range(3,5)); - BOOST_CHECK_EQUAL(r.rangeContaining(4), Range(3,5)); - BOOST_CHECK_EQUAL(r.rangeContaining(5), Range(5,5)); - BOOST_CHECK_EQUAL(r.rangeContaining(6), Range(6,6)); - BOOST_CHECK_EQUAL(r.rangeContaining(7), Range(7,8)); + TestRangeSet r; + (((r += 1) += TestRange(3,5)) += 7); + BOOST_CHECK_EQUAL(r.rangeContaining(0), TestRange(0,0)); + BOOST_CHECK_EQUAL(r.rangeContaining(1), TestRange(1,2)); + BOOST_CHECK_EQUAL(r.rangeContaining(2), TestRange(2,2)); + BOOST_CHECK_EQUAL(r.rangeContaining(3), TestRange(3,5)); + BOOST_CHECK_EQUAL(r.rangeContaining(4), TestRange(3,5)); + BOOST_CHECK_EQUAL(r.rangeContaining(5), TestRange(5,5)); + BOOST_CHECK_EQUAL(r.rangeContaining(6), TestRange(6,6)); + BOOST_CHECK_EQUAL(r.rangeContaining(7), TestRange(7,8)); } QPID_AUTO_TEST_SUITE_END() -- cgit v1.2.1 From 53df5c6c3931748bbb873b49b9dce3fadd60c82a Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 23 Apr 2008 15:31:57 +0000 Subject: - SequenceSet implemented on RangeSet. - Reduced #include dependencides on SequenceSet.h git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@650906 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/RangeSet.cpp | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'qpid/cpp/src/tests/RangeSet.cpp') diff --git a/qpid/cpp/src/tests/RangeSet.cpp b/qpid/cpp/src/tests/RangeSet.cpp index e16339ab84..9c602de78d 100644 --- a/qpid/cpp/src/tests/RangeSet.cpp +++ b/qpid/cpp/src/tests/RangeSet.cpp @@ -63,6 +63,22 @@ QPID_AUTO_TEST_CASE(testRangeSetAddRange) { BOOST_CHECK(r.back() == 6); } +QPID_AUTO_TEST_CASE(testRangeSetAddSet) { + TestRangeSet r; + TestRangeSet s = TestRangeSet(0,3)+TestRange(5,10); + r += s; + BOOST_CHECK_EQUAL(r,s); + r += TestRangeSet(3,5) + TestRange(7,12) + 15; + BOOST_CHECK_EQUAL(r, TestRangeSet(0,12) + 15); + + r.clear(); + BOOST_CHECK(r.empty()); + r += TestRange::makeClosed(6,10); + BOOST_CHECK_EQUAL(r, TestRangeSet(6,11)); + r += TestRangeSet(2,6)+8; + BOOST_CHECK_EQUAL(r, TestRangeSet(2,11)); +} + QPID_AUTO_TEST_CASE(testRangeSetIterate) { TestRangeSet r; (((r += 1) += 10) += TestRange(4,7)) += 2; @@ -74,12 +90,14 @@ QPID_AUTO_TEST_CASE(testRangeSetIterate) { } QPID_AUTO_TEST_CASE(testRangeSetRemove) { + // points BOOST_CHECK_EQUAL(TestRangeSet(0,5)-3, TestRangeSet(0,3)+TestRange(4,5)); BOOST_CHECK_EQUAL(TestRangeSet(1,5)-5, TestRangeSet(1,5)); BOOST_CHECK_EQUAL(TestRangeSet(1,5)-0, TestRangeSet(1,5)); TestRangeSet r(TestRangeSet(0,5)+TestRange(10,15)+TestRange(20,25)); + // TestRanges BOOST_CHECK_EQUAL(r-TestRange(0,5), TestRangeSet(10,15)+TestRange(20,25)); BOOST_CHECK_EQUAL(r-TestRange(10,15), TestRangeSet(0,5)+TestRange(20,25)); BOOST_CHECK_EQUAL(r-TestRange(20,25), TestRangeSet(0,5)+TestRange(10,15)); @@ -89,16 +107,22 @@ QPID_AUTO_TEST_CASE(testRangeSetRemove) { BOOST_CHECK_EQUAL(r-TestRange(-5, 7), TestRangeSet(10,15)+TestRange(20,25)); BOOST_CHECK_EQUAL(r-TestRange(8,19), TestRangeSet(0,5)+TestRange(20,25)); BOOST_CHECK_EQUAL(r-TestRange(17,30), TestRangeSet(0,5)+TestRange(10,15)); + BOOST_CHECK_EQUAL(r-TestRange(17,30), TestRangeSet(0,5)+TestRange(10,15)); BOOST_CHECK_EQUAL(r-TestRange(-5, 5), TestRangeSet(10,15)+TestRange(20,25)); BOOST_CHECK_EQUAL(r-TestRange(10,19), TestRangeSet(0,5)+TestRange(20,25)); BOOST_CHECK_EQUAL(r-TestRange(18,25), TestRangeSet(0,5)+TestRange(10,15)); + BOOST_CHECK_EQUAL(r-TestRange(23,25), TestRangeSet(0,5)+TestRange(10,15)+TestRange(20,23)); BOOST_CHECK_EQUAL(r-TestRange(-3, 3), TestRangeSet(3,5)+TestRange(10,15)+TestRange(20,25)); BOOST_CHECK_EQUAL(r-TestRange(3, 7), TestRangeSet(0,2)+TestRange(10,15)+TestRange(20,25)); BOOST_CHECK_EQUAL(r-TestRange(3, 12), TestRangeSet(0,3)+TestRange(12,15)+TestRange(20,25)); BOOST_CHECK_EQUAL(r-TestRange(3, 22), TestRangeSet(12,15)+TestRange(22,25)); BOOST_CHECK_EQUAL(r-TestRange(12, 22), TestRangeSet(0,5)+TestRange(10,11)+TestRange(22,25)); + + // Sets + BOOST_CHECK_EQUAL(r-(TestRangeSet(-1,6)+TestRange(11,14)+TestRange(23,25)), + TestRangeSet(10,11)+TestRange(14,15)+TestRange(20,23)); } QPID_AUTO_TEST_CASE(testRangeContaining) { -- cgit v1.2.1 From ffd20ee19a5fd027e0007c27a12dd402dbeca4f8 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 14 Jul 2009 14:32:39 +0000 Subject: Add directory to #include git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@793909 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/RangeSet.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'qpid/cpp/src/tests/RangeSet.cpp') diff --git a/qpid/cpp/src/tests/RangeSet.cpp b/qpid/cpp/src/tests/RangeSet.cpp index 9c602de78d..4c5760f697 100644 --- a/qpid/cpp/src/tests/RangeSet.cpp +++ b/qpid/cpp/src/tests/RangeSet.cpp @@ -17,8 +17,8 @@ */ -#include "unit_test.h" -#include "test_tools.h" +#include "tests/unit_test.h" +#include "tests/test_tools.h" #include "qpid/RangeSet.h" using namespace std; -- cgit v1.2.1 From 795b3bb9e5c033abf33635119694e21e7143fc0a Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 14 Jul 2009 14:41:22 +0000 Subject: Remove incorrect directory from #include git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@793912 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/RangeSet.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'qpid/cpp/src/tests/RangeSet.cpp') diff --git a/qpid/cpp/src/tests/RangeSet.cpp b/qpid/cpp/src/tests/RangeSet.cpp index 4c5760f697..9c602de78d 100644 --- a/qpid/cpp/src/tests/RangeSet.cpp +++ b/qpid/cpp/src/tests/RangeSet.cpp @@ -17,8 +17,8 @@ */ -#include "tests/unit_test.h" -#include "tests/test_tools.h" +#include "unit_test.h" +#include "test_tools.h" #include "qpid/RangeSet.h" using namespace std; -- cgit v1.2.1 From 9259c46ecb8c5f3e98441080a26914bdea59bffe Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Wed, 9 Sep 2009 19:46:56 +0000 Subject: Tidied up namespace usage Miscelleneous whitespace fixes git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@813094 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/RangeSet.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'qpid/cpp/src/tests/RangeSet.cpp') diff --git a/qpid/cpp/src/tests/RangeSet.cpp b/qpid/cpp/src/tests/RangeSet.cpp index 9c602de78d..db3a964086 100644 --- a/qpid/cpp/src/tests/RangeSet.cpp +++ b/qpid/cpp/src/tests/RangeSet.cpp @@ -24,6 +24,9 @@ using namespace std; using namespace qpid; +namespace qpid { +namespace tests { + QPID_AUTO_TEST_SUITE(RangeSetTestSuite) typedef qpid::Range TestRange; @@ -44,8 +47,8 @@ QPID_AUTO_TEST_CASE(testRangeSetAddPoint) { BOOST_CHECK_MESSAGE(r.contains(TestRange(3,4)), r); BOOST_CHECK(!r.empty()); r += 5; - BOOST_CHECK_MESSAGE(r.contains(5), r); - BOOST_CHECK_MESSAGE(r.contains(TestRange(5,6)), r); + BOOST_CHECK_MESSAGE(r.contains(5), r); + BOOST_CHECK_MESSAGE(r.contains(TestRange(5,6)), r); BOOST_CHECK_MESSAGE(!r.contains(TestRange(3,6)), r); r += 4; BOOST_CHECK_MESSAGE(r.contains(TestRange(3,6)), r); @@ -139,3 +142,5 @@ QPID_AUTO_TEST_CASE(testRangeContaining) { } QPID_AUTO_TEST_SUITE_END() + +}} // namespace qpid::tests -- cgit v1.2.1