boostorg/optional
1
0
Fork 1
mirror of https://github.com/boostorg/optional.git synced 2025-07-17 06:12:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed noexcept tests, added opt ref tests

Browse Source
This commit is contained in:
Andrzej Krzemienski
2014-12-06 23:03:39 +01:00
parent 8bc63106d3
commit 0818b0a25c
2 changed files with 229 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
test/optional_test_noexcept_move.cpp
View File

@ -41,6 +41,7 @@ struct NothrowNone {
void operator=(NothrowNone&&) BOOST_NOEXCEPT_IF(false) {}; void operator=(NothrowNone&&) BOOST_NOEXCEPT_IF(false) {};
}; };
#if 0 // these also test type_traits, which are wrong
void test_noexcept_as_defined() // this is a compile-time test void test_noexcept_as_defined() // this is a compile-time test
{ {
BOOST_STATIC_ASSERT(::boost::is_nothrow_move_constructible<NothrowBoth>::value); BOOST_STATIC_ASSERT(::boost::is_nothrow_move_constructible<NothrowBoth>::value);
@ -56,7 +57,7 @@ void test_noexcept_as_defined() // this is a compile-time test
BOOST_STATIC_ASSERT(!::boost::is_nothrow_move_assignable<NothrowNone>::value); BOOST_STATIC_ASSERT(!::boost::is_nothrow_move_assignable<NothrowNone>::value);
} }
void test_noexcept_on_optional() // this is a compile-time test void test_noexcept_on_optional_with_type_traits() // this is a compile-time test
{ {
BOOST_STATIC_ASSERT(::boost::is_nothrow_move_constructible<optional<NothrowBoth> >::value); BOOST_STATIC_ASSERT(::boost::is_nothrow_move_constructible<optional<NothrowBoth> >::value);
BOOST_STATIC_ASSERT(::boost::is_nothrow_move_assignable<optional<NothrowBoth> >::value); BOOST_STATIC_ASSERT(::boost::is_nothrow_move_assignable<optional<NothrowBoth> >::value);
@ -74,6 +75,35 @@ void test_noexcept_on_optional() // this is a compile-time test
BOOST_STATIC_ASSERT(!::boost::is_nothrow_move_assignable<optional<NothrowNone> >::value); BOOST_STATIC_ASSERT(!::boost::is_nothrow_move_assignable<optional<NothrowNone> >::value);
BOOST_STATIC_ASSERT(BOOST_NOEXCEPT_EXPR(optional<NothrowNone>())); BOOST_STATIC_ASSERT(BOOST_NOEXCEPT_EXPR(optional<NothrowNone>()));
} }
#endif
void test_noexcept_optional_with_operator() // compile-time test
{
typedef optional<NothrowBoth> ONx2;
typedef optional<NothrowCtor> ONxC;
typedef optional<NothrowAssign> ONxA;
typedef optional<NothrowNone> ONx0;
ONx2 onx2;
ONxC onxC;
ONxA onxA;
ONx0 onx0;
BOOST_STATIC_ASSERT( BOOST_NOEXCEPT_EXPR( ONx2() ));
BOOST_STATIC_ASSERT( BOOST_NOEXCEPT_EXPR( ONx2(boost::move(onx2)) ));
BOOST_STATIC_ASSERT( BOOST_NOEXCEPT_EXPR( onx2 = ONx2() ));
BOOST_STATIC_ASSERT( BOOST_NOEXCEPT_EXPR( ONxC() ));
BOOST_STATIC_ASSERT( BOOST_NOEXCEPT_EXPR( ONxC(boost::move(onxC)) ));
BOOST_STATIC_ASSERT(!BOOST_NOEXCEPT_EXPR( onxC = ONxC() ));
BOOST_STATIC_ASSERT( BOOST_NOEXCEPT_EXPR( ONxA() ));
BOOST_STATIC_ASSERT(!BOOST_NOEXCEPT_EXPR( ONxA(boost::move(onxA)) ));
BOOST_STATIC_ASSERT(!BOOST_NOEXCEPT_EXPR( onxA = ONxA() ));
BOOST_STATIC_ASSERT( BOOST_NOEXCEPT_EXPR( ONx0() ));
BOOST_STATIC_ASSERT(!BOOST_NOEXCEPT_EXPR( ONx0(boost::move(onx0)) ));
BOOST_STATIC_ASSERT(!BOOST_NOEXCEPT_EXPR( onx0 = ONx0() ));
}
#endif // !defned BOOST_NO_NOEXCEPT #endif // !defned BOOST_NO_NOEXCEPT
#endif // !defined BOOST_NO_CXX11_RVALUE_REFERENCES #endif // !defined BOOST_NO_CXX11_RVALUE_REFERENCES

198
test/optional_test_ref_portable_minimum.cpp
View File

@ -28,6 +28,7 @@ struct ScopeGuard // no copy/move ctor/assign
int val_; int val_;
explicit ScopeGuard(int v) : val_(v) {} explicit ScopeGuard(int v) : val_(v) {}
int& val() { return val_; } int& val() { return val_; }
const int& val() const { return val_; }
private: private:
ScopeGuard(ScopeGuard const&); ScopeGuard(ScopeGuard const&);
@ -37,6 +38,7 @@ private:
struct Abstract struct Abstract
{ {
virtual int& val() = 0; virtual int& val() = 0;
virtual const int& val() const = 0;
virtual ~Abstract() {} virtual ~Abstract() {}
Abstract(){} Abstract(){}
@ -50,6 +52,7 @@ struct Impl : Abstract
int val_; int val_;
Impl(int v) : val_(v) {} Impl(int v) : val_(v) {}
int& val() { return val_; } int& val() { return val_; }
const int& val() const { return val_; }
}; };
template <typename T> template <typename T>
@ -80,6 +83,11 @@ int& val(int& i) { return i; }
int& val(Abstract& a) { return a.val(); } int& val(Abstract& a) { return a.val(); }
int& val(ScopeGuard& g) { return g.val(); } int& val(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 // end testable classes
template <typename T> template <typename T>
@ -222,6 +230,193 @@ void test_rebinding_assignment_semantics()
BOOST_TEST_EQ(val(v), 2); BOOST_TEST_EQ(val(v), 2);
} }
template <typename T>
void test_equality()
{
typename concrete_type_of<T>::type v1(1), v2(2), v2_(2), v3(3);
optional<T&> o1(v1), o2(v2), o2_(v2_), o3(v3), o3_(v3), oN, oN_;
// o2 and o2_ point to different objects; o3 and o3_ point to the same object
BOOST_TEST(oN == oN);
BOOST_TEST(oN == oN_);
BOOST_TEST(oN_ == oN);
BOOST_TEST(o1 == o1);
BOOST_TEST(o2 == o2);
BOOST_TEST(o2 == o2_);
BOOST_TEST(o2_ == o2);
BOOST_TEST(o3 == o3);
BOOST_TEST(o3 == o3_);
BOOST_TEST(!(oN == o1));
BOOST_TEST(!(o1 == oN));
BOOST_TEST(!(o2 == o1));
BOOST_TEST(!(o2 == oN));
BOOST_TEST(!(oN != oN));
BOOST_TEST(!(oN != oN_));
BOOST_TEST(!(oN_ != oN));
BOOST_TEST(!(o1 != o1));
BOOST_TEST(!(o2 != o2));
BOOST_TEST(!(o2 != o2_));
BOOST_TEST(!(o2_ != o2));
BOOST_TEST(!(o3 != o3));
BOOST_TEST(!(o3 != o3_));
BOOST_TEST( (oN != o1));
BOOST_TEST( (o1 != oN));
BOOST_TEST( (o2 != o1));
BOOST_TEST( (o2 != oN));
}
template <typename T>
void test_order()
{
typename concrete_type_of<T>::type v1(1), v2(2), v2_(2), v3(3);
optional<T&> o1(v1), o2(v2), o2_(v2_), o3(v3), o3_(v3), oN, oN_;
// o2 and o2_ point to different objects; o3 and o3_ point to the same object
BOOST_TEST(!(oN < oN));
BOOST_TEST(!(oN < oN_));
BOOST_TEST(!(oN_ < oN));
BOOST_TEST(!(o1 < o1));
BOOST_TEST(!(o2 < o2));
BOOST_TEST(!(o2 < o2_));
BOOST_TEST(!(o2_ < o2));
BOOST_TEST(!(o3 < o3));
BOOST_TEST(!(o3 < o3_));
BOOST_TEST( (oN <= oN));
BOOST_TEST( (oN <= oN_));
BOOST_TEST( (oN_ <= oN));
BOOST_TEST( (o1 <= o1));
BOOST_TEST( (o2 <= o2));
BOOST_TEST( (o2 <= o2_));
BOOST_TEST( (o2_ <= o2));
BOOST_TEST( (o3 <= o3));
BOOST_TEST( (o3 <= o3_));
BOOST_TEST(!(oN > oN));
BOOST_TEST(!(oN > oN_));
BOOST_TEST(!(oN_ > oN));
BOOST_TEST(!(o1 > o1));
BOOST_TEST(!(o2 > o2));
BOOST_TEST(!(o2 > o2_));
BOOST_TEST(!(o2_ > o2));
BOOST_TEST(!(o3 > o3));
BOOST_TEST(!(o3 > o3_));
BOOST_TEST( (oN >= oN));
BOOST_TEST( (oN >= oN_));
BOOST_TEST( (oN_ >= oN));
BOOST_TEST( (o1 >= o1));
BOOST_TEST( (o2 >= o2));
BOOST_TEST( (o2 >= o2_));
BOOST_TEST( (o2_ >= o2));
BOOST_TEST( (o3 >= o3));
BOOST_TEST( (o3 >= o3_));
BOOST_TEST( (oN < o1));
BOOST_TEST( (oN_ < o1));
BOOST_TEST( (oN < o2));
BOOST_TEST( (oN_ < o2));
BOOST_TEST( (oN < o2_));
BOOST_TEST( (oN_ < o2_));
BOOST_TEST( (oN < o3));
BOOST_TEST( (oN_ < o3));
BOOST_TEST( (oN < o3_));
BOOST_TEST( (oN_ < o3_));
BOOST_TEST( (o1 < o2));
BOOST_TEST( (o1 < o2_));
BOOST_TEST( (o1 < o3));
BOOST_TEST( (o1 < o3_));
BOOST_TEST( (o2 < o3));
BOOST_TEST( (o2_ < o3));
BOOST_TEST( (o2 < o3_));
BOOST_TEST( (o2_ < o3_));
BOOST_TEST( (oN <= o1));
BOOST_TEST( (oN_ <= o1));
BOOST_TEST( (oN <= o2));
BOOST_TEST( (oN_ <= o2));
BOOST_TEST( (oN <= o2_));
BOOST_TEST( (oN_ <= o2_));
BOOST_TEST( (oN <= o3));
BOOST_TEST( (oN_ <= o3));
BOOST_TEST( (oN <= o3_));
BOOST_TEST( (oN_ <= o3_));
BOOST_TEST( (o1 <= o2));
BOOST_TEST( (o1 <= o2_));
BOOST_TEST( (o1 <= o3));
BOOST_TEST( (o1 <= o3_));
BOOST_TEST( (o2 <= o3));
BOOST_TEST( (o2_ <= o3));
BOOST_TEST( (o2 <= o3_));
BOOST_TEST( (o2_ <= o3_));
BOOST_TEST(!(oN > o1));
BOOST_TEST(!(oN_ > o1));
BOOST_TEST(!(oN > o2));
BOOST_TEST(!(oN_ > o2));
BOOST_TEST(!(oN > o2_));
BOOST_TEST(!(oN_ > o2_));
BOOST_TEST(!(oN > o3));
BOOST_TEST(!(oN_ > o3));
BOOST_TEST(!(oN > o3_));
BOOST_TEST(!(oN_ > o3_));
BOOST_TEST(!(o1 > o2));
BOOST_TEST(!(o1 > o2_));
BOOST_TEST(!(o1 > o3));
BOOST_TEST(!(o1 > o3_));
BOOST_TEST(!(o2 > o3));
BOOST_TEST(!(o2_ > o3));
BOOST_TEST(!(o2 > o3_));
BOOST_TEST(!(o2_ > o3_));
BOOST_TEST(!(oN >= o1));
BOOST_TEST(!(oN_ >= o1));
BOOST_TEST(!(oN >= o2));
BOOST_TEST(!(oN_ >= o2));
BOOST_TEST(!(oN >= o2_));
BOOST_TEST(!(oN_ >= o2_));
BOOST_TEST(!(oN >= o3));
BOOST_TEST(!(oN_ >= o3));
BOOST_TEST(!(oN >= o3_));
BOOST_TEST(!(oN_ >= o3_));
BOOST_TEST(!(o1 >= o2));
BOOST_TEST(!(o1 >= o2_));
BOOST_TEST(!(o1 >= o3));
BOOST_TEST(!(o1 >= o3_));
BOOST_TEST(!(o2 >= o3));
BOOST_TEST(!(o2_ >= o3));
BOOST_TEST(!(o2 >= o3_));
BOOST_TEST(!(o2_ >= o3_));
BOOST_TEST(!(o1 < oN));
BOOST_TEST(!(o1 < oN_));
BOOST_TEST(!(o2 < oN));
BOOST_TEST(!(o2 < oN_));
BOOST_TEST(!(o2_ < oN));
BOOST_TEST(!(o2_ < oN_));
BOOST_TEST(!(o3 < oN));
BOOST_TEST(!(o3 < oN_));
BOOST_TEST(!(o3_ < oN));
BOOST_TEST(!(o3_ < oN_));
BOOST_TEST(!(o2 < oN));
BOOST_TEST(!(o2_ < oN_));
BOOST_TEST(!(o3 < oN));
BOOST_TEST(!(o3_ < oN_));
BOOST_TEST(!(o3 < oN));
BOOST_TEST(!(o3 < oN_));
BOOST_TEST(!(o3_ < oN));
BOOST_TEST(!(o3_ < oN_));
}
template <typename T>
void test_swap()
{
typename concrete_type_of<T>::type v1(1), v2(2);
optional<T&> o1(v1), o1_(v1), o2(v2), o2_(v2), oN, oN_;
// swap(o1, o1); DOESN'T WORK
}
template <typename T> template <typename T>
void test_optional_ref() void test_optional_ref()
@ -232,6 +427,9 @@ void test_optional_ref()
test_rebinding_assignment_semantics<T>(); test_rebinding_assignment_semantics<T>();
test_clearing_the_value<T>(); test_clearing_the_value<T>();
test_arrow<T>(); test_arrow<T>();
test_equality<T>();
test_order<T>();
test_swap<T>();
} }
int main() int main()