resolved a few TODOs, also fixing old for except of public functions virtual calls

This commit is contained in:
Lorenzo Caminiti
2016-09-27 20:54:23 -07:00
parent b702d4b13c
commit b36dc64d18
35 changed files with 632 additions and 359 deletions

View File

@@ -4,143 +4,113 @@
// file LICENSE_1_0.txt or a copy at http://www.boost.org/LICENSE_1_0.txt).
// See: http://www.boost.org/doc/libs/release/libs/contract/doc/html/index.html
// Test throw from public function (derived) body.
// Test public member function body throws with subcontracting.
#include "../detail/oteststream.hpp"
#include <boost/contract/public_function.hpp>
#include <boost/contract/assert.hpp>
#include <boost/contract/base_types.hpp>
#include <boost/contract/override.hpp>
#include <boost/contract/check.hpp>
#include "contracts.hpp"
#include <boost/optional.hpp>
#include <boost/preprocessor/control/iif.hpp>
#include <boost/detail/lightweight_test.hpp>
#include <sstream>
boost::contract::test::detail::oteststream out;
struct c {
static void static_invariant() { out << "c::static_inv" << std::endl; }
void invariant() const { out << "c::inv" << std::endl; }
struct err {};
virtual void f(boost::contract::virtual_* v = 0) {
boost::contract::check c = boost::contract::public_function(v, this)
.precondition([] {
out << "c::f::pre" << std::endl;
BOOST_CONTRACT_ASSERT(false); // To check derived pre.
})
.old([] { out << "c::f::old" << std::endl; })
.postcondition([] { out << "c::f::post" << std::endl; })
.except([] { out << "c::f::except" << std::endl; })
;
out << "c::f::body" << std::endl;
throw c::err(); // Test body throws.
}
};
struct b
#define BASES public c
: BASES
{
typedef BOOST_CONTRACT_BASE_TYPES(BASES) base_types;
#undef BASES
static void static_invariant() { out << "b::static_inv" << std::endl; }
void invariant() const { out << "b::inv" << std::endl; }
struct err {};
virtual void f(boost::contract::virtual_* v = 0) /* override */ {
boost::contract::check c = boost::contract::public_function<override_f>(
v, &b::f, this)
.precondition([] {
out << "b::f::pre" << std::endl;
BOOST_CONTRACT_ASSERT(false); // To check derived pre.
})
.old([] { out << "b::f::old" << std::endl; })
.postcondition([] { out << "b::f::post" << std::endl; })
.except([] { out << "b::f::except" << std::endl; })
;
out << "b::f::body" << std::endl;
throw b::err(); // Test body throws.
}
BOOST_CONTRACT_OVERRIDE(f)
};
struct a
#define BASES public b
: BASES
{
typedef BOOST_CONTRACT_BASE_TYPES(BASES) base_types;
#undef BASES
static void static_invariant() { out << "a::static_inv" << std::endl; }
void invariant() const { out << "a::inv" << std::endl; }
struct err {};
void f(boost::contract::virtual_* v = 0) /* override */ {
boost::contract::check c = boost::contract::public_function<override_f>(
v, &a::f, this)
.precondition([] { out << "a::f::pre" << std::endl; })
.old([] { out << "a::f::old" << std::endl; })
.postcondition([] { out << "a::f::post" << std::endl; })
.except([] { out << "a::f::except" << std::endl; })
;
out << "a::f::body" << std::endl;
throw a::err(); // Test body throws.
}
BOOST_CONTRACT_OVERRIDE(f)
};
int main() {
std::ostringstream ok;
a aa;
b& ba = aa; // Test as virtual call via polymorphism.
a aa; // Test call to derived out-most leaf.
s_type s; s.value = "X"; // So body will throw.
out.str("");
boost::optional<result_type&> r;
try {
out.str("");
ba.f();
r = aa.f(s);
BOOST_TEST(false);
} catch(a::err const&) {
} catch(except_error const&) {
ok.str(""); ok
#ifndef BOOST_CONTRACT_NO_ENTRY_INVARIANTS
<< "d::static_inv" << std::endl
<< "d::inv" << std::endl
<< "e::static_inv" << std::endl
<< "e::inv" << std::endl
<< "c::static_inv" << std::endl
<< "c::inv" << std::endl
<< "b::static_inv" << std::endl
<< "b::inv" << std::endl
<< "a::static_inv" << std::endl
<< "a::inv" << std::endl
#endif
#ifndef BOOST_CONTRACT_NO_PRECONDITIONS
<< "c::f::pre" << std::endl
<< "b::f::pre" << std::endl
<< "a::f::pre" << std::endl
<< "d::f::pre" << std::endl
#endif
#ifndef BOOST_CONTRACT_NO_POSTCONDITIONS
<< "d::f::old" << std::endl
<< "e::f::old" << std::endl
<< "c::f::old" << std::endl
<< "b::f::old" << std::endl
<< "a::f::old" << std::endl
#endif
<< "a::f::body" << std::endl // Test this threw.
<< "a::f::body" << std::endl
#ifndef BOOST_CONTRACT_NO_EXIT_INVARIANTS
// Test no post (but still subcon inv and except) as body threw.
<< "d::static_inv" << std::endl
<< "d::inv" << std::endl
<< "e::static_inv" << std::endl
<< "e::inv" << std::endl
<< "c::static_inv" << std::endl
<< "c::inv" << std::endl
<< "b::static_inv" << std::endl
<< "b::inv" << std::endl
<< "a::static_inv" << std::endl
<< "a::inv" << std::endl
#endif
#ifndef BOOST_CONTRACT_NO_EXCEPTS
<< "d::f::old" << std::endl
<< "d::f::except" << std::endl
<< "e::f::old" << std::endl
<< "e::f::except" << std::endl
<< "c::f::old" << std::endl
<< "c::f::except" << std::endl
<< "b::f::except" << std::endl
// No old call here because not a base object.
<< "a::f::except" << std::endl
#endif
;
BOOST_TEST(out.eq(ok.str()));
} catch(...) { BOOST_TEST(false); }
#ifdef BOOST_CONTRACT_NO_EXEPTS
#define BOOST_CONTRACT_TEST_except 0
#else
#define BOOST_CONTRACT_TEST_except 1
#endif
BOOST_TEST(!r); // Boost.Optional result not init (as body threw).
BOOST_TEST_EQ(s.value, "X");
BOOST_TEST_EQ(s.copies(),
BOOST_PP_IIF(BOOST_CONTRACT_TEST_except, 4u, 0u));
BOOST_TEST_EQ(s.evals(),
BOOST_PP_IIF(BOOST_CONTRACT_TEST_except, 4u, 0u));
BOOST_TEST_EQ(s.ctors(), s.dtors() + 1); // 1 for local var.
BOOST_TEST_EQ(aa.x.value, "a");
BOOST_TEST_EQ(aa.x.copies(),
BOOST_PP_IIF(BOOST_CONTRACT_TEST_except, 1u, 0u));
BOOST_TEST_EQ(aa.x.evals(),
BOOST_PP_IIF(BOOST_CONTRACT_TEST_except, 1u, 0u));
BOOST_TEST_EQ(aa.x.ctors(), aa.x.dtors() + 1); // 1 for member var.
BOOST_TEST_EQ(aa.y.value, "c");
BOOST_TEST_EQ(aa.y.copies(),
BOOST_PP_IIF(BOOST_CONTRACT_TEST_except, 1u, 0u));
BOOST_TEST_EQ(aa.y.evals(),
BOOST_PP_IIF(BOOST_CONTRACT_TEST_except, 1u, 0u));
BOOST_TEST_EQ(aa.y.ctors(), aa.y.dtors() + 1); // 1 for member var.
BOOST_TEST_EQ(aa.t<'d'>::z.value, "d");
BOOST_TEST_EQ(aa.t<'d'>::z.copies(),
BOOST_PP_IIF(BOOST_CONTRACT_TEST_except, 1u, 0u));
BOOST_TEST_EQ(aa.t<'d'>::z.evals(),
BOOST_PP_IIF(BOOST_CONTRACT_TEST_except, 1u, 0u));
BOOST_TEST_EQ(aa.t<'d'>::z.ctors(), aa.t<'d'>::z.dtors() + 1); // 1 mem.
BOOST_TEST_EQ(aa.t<'e'>::z.value, "e");
BOOST_TEST_EQ(aa.t<'e'>::z.copies(),
BOOST_PP_IIF(BOOST_CONTRACT_TEST_except, 1u, 0u));
BOOST_TEST_EQ(aa.t<'e'>::z.evals(),
BOOST_PP_IIF(BOOST_CONTRACT_TEST_except, 1u, 0u));
BOOST_TEST_EQ(aa.t<'e'>::z.ctors(), aa.t<'e'>::z.dtors() + 1); // 1 mem.
#undef BOOST_CONTRACT_TEST_except
}
return boost::report_errors();
}