52 changes: 29 additions & 23 deletions test/test_range.cpp
View file
@@ -1,6 +1,6 @@
/* Boost.MultiIndex test for range().
*
* Copyright 2003-2013 Joaquin M Lopez Munoz.
* Copyright 2003-2015 Joaquin M Lopez Munoz.
* Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at
* http://www.boost.org/LICENSE_1_0.txt)
Expand All @@ -12,14 +12,14 @@

#include <boost/config.hpp> /* keep it first to prevent nasty warns in MSVC */
#include <algorithm>
#include <functional>
#include <boost/bind.hpp>
#include <boost/detail/lightweight_test.hpp>
#include "pre_multi_index.hpp"
#include <boost/multi_index_container.hpp>
#include <boost/multi_index/identity.hpp>
#include <boost/multi_index/ordered_index.hpp>
#include <boost/preprocessor/seq/enum.hpp>

#include <functional>

using namespace boost::multi_index;

Expand All @@ -38,6 +38,12 @@ typedef int_set::iterator int_set_iterator;
#undef CHECK_VOID_RANGE
#define CHECK_VOID_RANGE(p) BOOST_TEST((p).first==(p).second)

#undef BIND1ST
#define BIND1ST(f,x) ::boost::bind(f,x,::boost::arg<1>())

#undef BIND2ND
#define BIND2ND(f,x) ::boost::bind(f,::boost::arg<1>(),x)

void test_range()
{
int_set is;
Expand All @@ -50,70 +56,70 @@ void test_range()
CHECK_RANGE(p,(1)(2)(3)(4)(5)(6)(7)(8)(9)(10));

p=is.range(
std::bind1st(std::less<int>(),5), /* 5 < x */
BIND1ST(std::less<int>(),5), /* 5 < x */
unbounded);
CHECK_RANGE(p,(6)(7)(8)(9)(10));

p=is.range(
std::bind1st(std::less_equal<int>(),8), /* 8 <= x */
BIND1ST(std::less_equal<int>(),8), /* 8 <= x */
unbounded);
CHECK_RANGE(p,(8)(9)(10));

p=is.range(
std::bind1st(std::less_equal<int>(),11), /* 11 <= x */
BIND1ST(std::less_equal<int>(),11), /* 11 <= x */
unbounded);
CHECK_VOID_RANGE(p);

p=is.range(
unbounded,
std::bind2nd(std::less<int>(),8)); /* x < 8 */
BIND2ND(std::less<int>(),8)); /* x < 8 */
CHECK_RANGE(p,(1)(2)(3)(4)(5)(6)(7));

p=is.range(
unbounded,
std::bind2nd(std::less_equal<int>(),4)); /* x <= 4 */
BIND2ND(std::less_equal<int>(),4)); /* x <= 4 */
CHECK_RANGE(p,(1)(2)(3)(4));

p=is.range(
unbounded,
std::bind2nd(std::less_equal<int>(),0)); /* x <= 0 */
BIND2ND(std::less_equal<int>(),0)); /* x <= 0 */
CHECK_VOID_RANGE(p);

p=is.range(
std::bind1st(std::less<int>(),6), /* 6 < x */
std::bind2nd(std::less_equal<int>(),9)); /* x <= 9 */
BIND1ST(std::less<int>(),6), /* 6 < x */
BIND2ND(std::less_equal<int>(),9)); /* x <= 9 */
CHECK_RANGE(p,(7)(8)(9));

p=is.range(
std::bind1st(std::less_equal<int>(),4), /* 4 <= x */
std::bind2nd(std::less<int>(),5)); /* x < 5 */
BIND1ST(std::less_equal<int>(),4), /* 4 <= x */
BIND2ND(std::less<int>(),5)); /* x < 5 */
CHECK_RANGE(p,(4));

p=is.range(
std::bind1st(std::less_equal<int>(),10), /* 10 <= x */
std::bind2nd(std::less_equal<int>(),10)); /* x <= 10 */
BIND1ST(std::less_equal<int>(),10), /* 10 <= x */
BIND2ND(std::less_equal<int>(),10)); /* x <= 10 */
CHECK_RANGE(p,(10));

p=is.range(
std::bind1st(std::less<int>(),0), /* 0 < x */
std::bind2nd(std::less<int>(),11)); /* x < 11 */
BIND1ST(std::less<int>(),0), /* 0 < x */
BIND2ND(std::less<int>(),11)); /* x < 11 */
CHECK_RANGE(p,(1)(2)(3)(4)(5)(6)(7)(8)(9)(10));

p=is.range(
std::bind1st(std::less<int>(),7), /* 7 < x */
std::bind2nd(std::less_equal<int>(),7)); /* x <= 7 */
BIND1ST(std::less<int>(),7), /* 7 < x */
BIND2ND(std::less_equal<int>(),7)); /* x <= 7 */
CHECK_VOID_RANGE(p);
BOOST_TEST(p.first==is.upper_bound(7));

p=is.range(
std::bind1st(std::less_equal<int>(),8), /* 8 <= x */
std::bind2nd(std::less<int>(),2)); /* x < 2 */
BIND1ST(std::less_equal<int>(),8), /* 8 <= x */
BIND2ND(std::less<int>(),2)); /* x < 2 */
CHECK_VOID_RANGE(p);
BOOST_TEST(p.first==is.lower_bound(8));

p=is.range(
std::bind1st(std::less<int>(),4), /* 4 < x */
std::bind2nd(std::less<int>(),5)); /* x < 5 */
BIND1ST(std::less<int>(),4), /* 4 < x */
BIND2ND(std::less<int>(),5)); /* x < 5 */
CHECK_VOID_RANGE(p);
BOOST_TEST(p.first!=is.end());
}