forked from boostorg/optional
More fine grained optional ref assign tests
This commit is contained in:
@ -18,87 +18,11 @@
|
||||
#include "boost/core/addressof.hpp"
|
||||
#include "boost/core/enable_if.hpp"
|
||||
#include "boost/core/lightweight_test.hpp"
|
||||
#include "testable_classes.hpp"
|
||||
|
||||
using boost::optional;
|
||||
using boost::none;
|
||||
|
||||
// testable classes
|
||||
struct ScopeGuard // no copy/move ctor/assign
|
||||
{
|
||||
int val_;
|
||||
explicit ScopeGuard(int v) : val_(v) {}
|
||||
int& val() { return val_; }
|
||||
const int& val() const { return val_; }
|
||||
|
||||
private:
|
||||
ScopeGuard(ScopeGuard const&);
|
||||
void operator=(ScopeGuard const&);
|
||||
};
|
||||
|
||||
struct Abstract
|
||||
{
|
||||
virtual int& val() = 0;
|
||||
virtual const int& val() const = 0;
|
||||
virtual ~Abstract() {}
|
||||
Abstract(){}
|
||||
|
||||
private:
|
||||
Abstract(Abstract const&);
|
||||
void operator=(Abstract const&);
|
||||
};
|
||||
|
||||
struct Impl : Abstract
|
||||
{
|
||||
int val_;
|
||||
Impl(int v) : val_(v) {}
|
||||
int& val() { return val_; }
|
||||
const int& val() const { return val_; }
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
struct concrete_type_of
|
||||
{
|
||||
typedef T type;
|
||||
};
|
||||
|
||||
template <>
|
||||
struct concrete_type_of<Abstract>
|
||||
{
|
||||
typedef Impl type;
|
||||
};
|
||||
|
||||
template <>
|
||||
struct concrete_type_of<const Abstract>
|
||||
{
|
||||
typedef const Impl type;
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
struct has_arrow
|
||||
{
|
||||
static const bool value = true;
|
||||
};
|
||||
|
||||
template <>
|
||||
struct has_arrow<int>
|
||||
{
|
||||
static const bool value = false;
|
||||
};
|
||||
|
||||
int& val(int& i) { return i; }
|
||||
int& val(Abstract& a) { return a.val(); }
|
||||
int& val(ScopeGuard& g) { return g.val(); }
|
||||
|
||||
const int& val(const int& i) { return i; }
|
||||
const int& val(const Abstract& a) { return a.val(); }
|
||||
const int& val(const ScopeGuard& g) { return g.val(); }
|
||||
|
||||
bool operator==(const Abstract& l, const Abstract& r) { return l.val() == r.val(); }
|
||||
bool operator==(const ScopeGuard& l, const ScopeGuard& r) { return l.val() == r.val(); }
|
||||
|
||||
bool operator<(const Abstract& l, const Abstract& r) { return l.val() < r.val(); }
|
||||
bool operator<(const ScopeGuard& l, const ScopeGuard& r) { return l.val() < r.val(); }
|
||||
// end testable classes
|
||||
|
||||
template <typename T>
|
||||
typename boost::enable_if< has_arrow<T> >::type
|
||||
@ -264,145 +188,6 @@ void test_clearing_the_value()
|
||||
BOOST_TEST_EQ(val(v), 2);
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
void test_copy_assignment_for_const()
|
||||
{
|
||||
const typename concrete_type_of<T>::type v(2);
|
||||
optional<const T&> o;
|
||||
o = optional<const T&>(v);
|
||||
|
||||
BOOST_TEST(o);
|
||||
BOOST_TEST(o != none);
|
||||
BOOST_TEST(boost::addressof(*o) == boost::addressof(v));
|
||||
BOOST_TEST(val(*o) == val(v));
|
||||
BOOST_TEST(val(*o) == 2);
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
void test_copy_assignment_for_noconst_const()
|
||||
{
|
||||
typename concrete_type_of<T>::type v(2);
|
||||
optional<const T&> o;
|
||||
o = optional<const T&>(v);
|
||||
|
||||
BOOST_TEST(o);
|
||||
BOOST_TEST(o != none);
|
||||
BOOST_TEST(boost::addressof(*o) == boost::addressof(v));
|
||||
BOOST_TEST(val(*o) == val(v));
|
||||
BOOST_TEST(val(*o) == 2);
|
||||
|
||||
val(v) = 9;
|
||||
BOOST_TEST(boost::addressof(*o) == boost::addressof(v));
|
||||
BOOST_TEST_EQ(val(*o), val(v));
|
||||
BOOST_TEST_EQ(val(*o), 9);
|
||||
BOOST_TEST_EQ(val(v), 9);
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
void test_copy_assignment_for()
|
||||
{
|
||||
typename concrete_type_of<T>::type v(2);
|
||||
optional<T&> o;
|
||||
o = optional<T&>(v);
|
||||
|
||||
BOOST_TEST(o);
|
||||
BOOST_TEST(o != none);
|
||||
BOOST_TEST(boost::addressof(*o) == boost::addressof(v));
|
||||
BOOST_TEST(val(*o) == val(v));
|
||||
BOOST_TEST(val(*o) == 2);
|
||||
|
||||
val(v) = 9;
|
||||
BOOST_TEST(boost::addressof(*o) == boost::addressof(v));
|
||||
BOOST_TEST_EQ(val(*o), val(v));
|
||||
BOOST_TEST_EQ(val(*o), 9);
|
||||
BOOST_TEST_EQ(val(v), 9);
|
||||
|
||||
val(*o) = 7;
|
||||
BOOST_TEST(boost::addressof(*o) == boost::addressof(v));
|
||||
BOOST_TEST_EQ(val(*o), val(v));
|
||||
BOOST_TEST_EQ(val(*o), 7);
|
||||
BOOST_TEST_EQ(val(v), 7);
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
void test_rebinding_assignment_semantics_const()
|
||||
{
|
||||
const typename concrete_type_of<T>::type v(2), w(7);
|
||||
optional<const T&> o(v);
|
||||
|
||||
BOOST_TEST(o);
|
||||
BOOST_TEST(boost::addressof(*o) == boost::addressof(v));
|
||||
BOOST_TEST_EQ(val(*o), val(v));
|
||||
BOOST_TEST_EQ(val(*o), 2);
|
||||
|
||||
o = optional<const T&>(w);
|
||||
BOOST_TEST_EQ(val(v), 2);
|
||||
|
||||
BOOST_TEST(o);
|
||||
BOOST_TEST(boost::addressof(*o) != boost::addressof(v));
|
||||
BOOST_TEST_NE(val(*o), val(v));
|
||||
BOOST_TEST_NE(val(*o), 2);
|
||||
|
||||
BOOST_TEST(boost::addressof(*o) == boost::addressof(w));
|
||||
BOOST_TEST_EQ(val(*o), val(w));
|
||||
BOOST_TEST_EQ(val(*o), 7);
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
void test_rebinding_assignment_semantics_noconst_const()
|
||||
{
|
||||
typename concrete_type_of<T>::type v(2), w(7);
|
||||
optional<const T&> o(v);
|
||||
|
||||
BOOST_TEST(o);
|
||||
BOOST_TEST(boost::addressof(*o) == boost::addressof(v));
|
||||
BOOST_TEST_EQ(val(*o), val(v));
|
||||
BOOST_TEST_EQ(val(*o), 2);
|
||||
|
||||
o = optional<const T&>(w);
|
||||
BOOST_TEST_EQ(val(v), 2);
|
||||
|
||||
BOOST_TEST(o);
|
||||
BOOST_TEST(boost::addressof(*o) != boost::addressof(v));
|
||||
BOOST_TEST_NE(val(*o), val(v));
|
||||
BOOST_TEST_NE(val(*o), 2);
|
||||
|
||||
BOOST_TEST(boost::addressof(*o) == boost::addressof(w));
|
||||
BOOST_TEST_EQ(val(*o), val(w));
|
||||
BOOST_TEST_EQ(val(*o), 7);
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
void test_rebinding_assignment_semantics()
|
||||
{
|
||||
typename concrete_type_of<T>::type v(2), w(7);
|
||||
optional<T&> o(v);
|
||||
|
||||
BOOST_TEST(o);
|
||||
BOOST_TEST(boost::addressof(*o) == boost::addressof(v));
|
||||
BOOST_TEST_EQ(val(*o), val(v));
|
||||
BOOST_TEST_EQ(val(*o), 2);
|
||||
|
||||
o = optional<T&>(w);
|
||||
BOOST_TEST_EQ(val(v), 2);
|
||||
|
||||
BOOST_TEST(o);
|
||||
BOOST_TEST(boost::addressof(*o) != boost::addressof(v));
|
||||
BOOST_TEST_NE(val(*o), val(v));
|
||||
BOOST_TEST_NE(val(*o), 2);
|
||||
|
||||
BOOST_TEST(boost::addressof(*o) == boost::addressof(w));
|
||||
BOOST_TEST_EQ(val(*o), val(w));
|
||||
BOOST_TEST_EQ(val(*o), 7);
|
||||
|
||||
val(*o) = 8;
|
||||
BOOST_TEST(boost::addressof(*o) == boost::addressof(w));
|
||||
BOOST_TEST_EQ(val(*o), val(w));
|
||||
BOOST_TEST_EQ(val(*o), 8);
|
||||
BOOST_TEST_EQ(val(w), 8);
|
||||
BOOST_TEST_EQ(val(v), 2);
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
void test_equality()
|
||||
{
|
||||
@ -596,8 +381,6 @@ void test_optional_ref()
|
||||
{
|
||||
test_not_containing_value_for<T>();
|
||||
test_direct_init_for<T>();
|
||||
test_copy_assignment_for<T>();
|
||||
test_rebinding_assignment_semantics<T>();
|
||||
test_clearing_the_value<T>();
|
||||
test_arrow<T>();
|
||||
test_equality<T>();
|
||||
@ -611,10 +394,6 @@ void test_optional_const_ref()
|
||||
test_not_containing_value_for<const T>();
|
||||
test_direct_init_for_const<T>();
|
||||
test_direct_init_for_noconst_const<T>();
|
||||
test_copy_assignment_for_const<T>();
|
||||
test_copy_assignment_for_noconst_const<T>();
|
||||
test_rebinding_assignment_semantics_const<T>();
|
||||
test_rebinding_assignment_semantics_noconst_const<T>();
|
||||
test_clearing_the_value<const T>();
|
||||
test_arrow_const<T>();
|
||||
test_arrow_noconst_const<T>();
|
||||
|
Reference in New Issue
Block a user