ci: downgrade test modules, use BOOST_CHECK

Because travis.CI installs old, out-of-date version of Boost,
BOOST_TEST is not supported. we need to use BOOST_CHECK to link
with it.
This commit is contained in:
ToruNiina
2018-12-02 18:25:09 +09:00
parent 6c0a12148b
commit b53d11ce79

View File

@@ -8,49 +8,49 @@ BOOST_AUTO_TEST_CASE(test_construct)
{ {
auto s = toml::ok(42); auto s = toml::ok(42);
toml::result<int, std::string> result(s); toml::result<int, std::string> result(s);
BOOST_TEST(!!result); BOOST_CHECK(!!result);
BOOST_TEST(result.is_ok()); BOOST_CHECK(result.is_ok());
BOOST_TEST(!result.is_err()); BOOST_CHECK(!result.is_err());
BOOST_TEST(result.unwrap() == 42); BOOST_CHECK_EQUAL(result.unwrap(), 42);
} }
{ {
const auto s = toml::ok(42); const auto s = toml::ok(42);
toml::result<int, std::string> result(s); toml::result<int, std::string> result(s);
BOOST_TEST(!!result); BOOST_CHECK(!!result);
BOOST_TEST(result.is_ok()); BOOST_CHECK(result.is_ok());
BOOST_TEST(!result.is_err()); BOOST_CHECK(!result.is_err());
BOOST_TEST(result.unwrap() == 42); BOOST_CHECK_EQUAL(result.unwrap(), 42);
} }
{ {
toml::result<int, std::string> result(toml::ok(42)); toml::result<int, std::string> result(toml::ok(42));
BOOST_TEST(!!result); BOOST_CHECK(!!result);
BOOST_TEST(result.is_ok()); BOOST_CHECK(result.is_ok());
BOOST_TEST(!result.is_err()); BOOST_CHECK(!result.is_err());
BOOST_TEST(result.unwrap() == 42); BOOST_CHECK_EQUAL(result.unwrap(), 42);
} }
{ {
auto f = toml::err<std::string>("foobar"); auto f = toml::err<std::string>("foobar");
toml::result<int, std::string> result(f); toml::result<int, std::string> result(f);
BOOST_TEST(!result); BOOST_CHECK(!result);
BOOST_TEST(!result.is_ok()); BOOST_CHECK(!result.is_ok());
BOOST_TEST(result.is_err()); BOOST_CHECK(result.is_err());
BOOST_TEST(result.unwrap_err() == "foobar"); BOOST_CHECK_EQUAL(result.unwrap_err(), "foobar");
} }
{ {
const auto f = toml::err<std::string>("foobar"); const auto f = toml::err<std::string>("foobar");
toml::result<int, std::string> result(f); toml::result<int, std::string> result(f);
BOOST_TEST(!result); BOOST_CHECK(!result);
BOOST_TEST(!result.is_ok()); BOOST_CHECK(!result.is_ok());
BOOST_TEST(result.is_err()); BOOST_CHECK(result.is_err());
BOOST_TEST(result.unwrap_err() == "foobar"); BOOST_CHECK_EQUAL(result.unwrap_err(), "foobar");
} }
{ {
toml::result<int, std::string> result(toml::err<std::string>("foobar")); toml::result<int, std::string> result(toml::err<std::string>("foobar"));
BOOST_TEST(!result); BOOST_CHECK(!result);
BOOST_TEST(!result.is_ok()); BOOST_CHECK(!result.is_ok());
BOOST_TEST(result.is_err()); BOOST_CHECK(result.is_err());
BOOST_TEST(result.unwrap_err() == "foobar"); BOOST_CHECK_EQUAL(result.unwrap_err(), "foobar");
} }
} }
@@ -59,53 +59,53 @@ BOOST_AUTO_TEST_CASE(test_assignment)
{ {
toml::result<int, std::string> result(toml::err<std::string>("foobar")); toml::result<int, std::string> result(toml::err<std::string>("foobar"));
result = toml::ok(42); result = toml::ok(42);
BOOST_TEST(!!result); BOOST_CHECK(!!result);
BOOST_TEST(result.is_ok()); BOOST_CHECK(result.is_ok());
BOOST_TEST(!result.is_err()); BOOST_CHECK(!result.is_err());
BOOST_TEST(result.unwrap() == 42); BOOST_CHECK_EQUAL(result.unwrap(), 42);
} }
{ {
toml::result<int, std::string> result(toml::err<std::string>("foobar")); toml::result<int, std::string> result(toml::err<std::string>("foobar"));
auto s = toml::ok(42); auto s = toml::ok(42);
result = s; result = s;
BOOST_TEST(!!result); BOOST_CHECK(!!result);
BOOST_TEST(result.is_ok()); BOOST_CHECK(result.is_ok());
BOOST_TEST(!result.is_err()); BOOST_CHECK(!result.is_err());
BOOST_TEST(result.unwrap() == 42); BOOST_CHECK_EQUAL(result.unwrap(), 42);
} }
{ {
toml::result<int, std::string> result(toml::err<std::string>("foobar")); toml::result<int, std::string> result(toml::err<std::string>("foobar"));
const auto s = toml::ok(42); const auto s = toml::ok(42);
result = s; result = s;
BOOST_TEST(!!result); BOOST_CHECK(!!result);
BOOST_TEST(result.is_ok()); BOOST_CHECK(result.is_ok());
BOOST_TEST(!result.is_err()); BOOST_CHECK(!result.is_err());
BOOST_TEST(result.unwrap() == 42); BOOST_CHECK_EQUAL(result.unwrap(), 42);
} }
{ {
toml::result<int, std::string> result(toml::err<std::string>("foobar")); toml::result<int, std::string> result(toml::err<std::string>("foobar"));
result = toml::err<std::string>("hoge"); result = toml::err<std::string>("hoge");
BOOST_TEST(!result); BOOST_CHECK(!result);
BOOST_TEST(!result.is_ok()); BOOST_CHECK(!result.is_ok());
BOOST_TEST(result.is_err()); BOOST_CHECK(result.is_err());
BOOST_TEST(result.unwrap_err() == "hoge"); BOOST_CHECK_EQUAL(result.unwrap_err(), "hoge");
} }
{ {
toml::result<int, std::string> result(toml::err<std::string>("foobar")); toml::result<int, std::string> result(toml::err<std::string>("foobar"));
auto f = toml::err<std::string>("hoge"); auto f = toml::err<std::string>("hoge");
result = f; result = f;
BOOST_TEST(!result); BOOST_CHECK(!result);
BOOST_TEST(!result.is_ok()); BOOST_CHECK(!result.is_ok());
BOOST_TEST(result.is_err()); BOOST_CHECK(result.is_err());
BOOST_TEST(result.unwrap_err() == "hoge"); BOOST_CHECK_EQUAL(result.unwrap_err(), "hoge");
} }
{ {
toml::result<int, std::string> result(toml::err<std::string>("foobar")); toml::result<int, std::string> result(toml::err<std::string>("foobar"));
const auto f = toml::err<std::string>("hoge"); const auto f = toml::err<std::string>("hoge");
result = f; result = f;
BOOST_TEST(!result); BOOST_CHECK(!result);
BOOST_TEST(!result.is_ok()); BOOST_CHECK(!result.is_ok());
BOOST_TEST(result.is_err()); BOOST_CHECK(result.is_err());
BOOST_TEST(result.unwrap_err() == "hoge"); BOOST_CHECK_EQUAL(result.unwrap_err(), "hoge");
} }
} }