From 1e65265b8f266c2755124a32fefc32e5011df9a0 Mon Sep 17 00:00:00 2001 From: Antony Polukhin Date: Tue, 11 Feb 2014 12:13:17 +0400 Subject: [PATCH] Minor fixes in tests --- test/lexical_cast_try_lexical_convert.cpp | 32 +++++++++++------------ 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/test/lexical_cast_try_lexical_convert.cpp b/test/lexical_cast_try_lexical_convert.cpp index 0c7c4de..1c795c2 100644 --- a/test/lexical_cast_try_lexical_convert.cpp +++ b/test/lexical_cast_try_lexical_convert.cpp @@ -13,63 +13,63 @@ #include #include -using namespace boost; +using namespace boost::conversion; void try_uncommon_cases() { std::string sres; - const bool res1 = conversion::try_lexical_convert(std::string("Test string"), sres); + const bool res1 = try_lexical_convert(std::string("Test string"), sres); BOOST_CHECK(res1); BOOST_CHECK_EQUAL(sres, "Test string"); volatile int vires; - const bool res2 = conversion::try_lexical_convert(100, vires); + const bool res2 = try_lexical_convert(100, vires); BOOST_CHECK(res2); BOOST_CHECK_EQUAL(vires, 100); - const bool res3 = conversion::try_lexical_convert("Test string", sres); + const bool res3 = try_lexical_convert("Test string", sres); BOOST_CHECK(res3); BOOST_CHECK_EQUAL(sres, "Test string"); - const bool res4 = conversion::try_lexical_convert("Test string", sizeof("Test string") - 1, sres); + const bool res4 = try_lexical_convert("Test string", sizeof("Test string") - 1, sres); BOOST_CHECK(res4); BOOST_CHECK_EQUAL(sres, "Test string"); int ires; - BOOST_CHECK(!conversion::try_lexical_convert("Test string", ires)); - BOOST_CHECK(!conversion::try_lexical_convert(1.1, ires)); - BOOST_CHECK(!conversion::try_lexical_convert(-1.9, ires)); - BOOST_CHECK(!conversion::try_lexical_convert("1.1", ires)); - BOOST_CHECK(!conversion::try_lexical_convert("1000000000000000000000000000000000000000", ires)); + BOOST_CHECK(!try_lexical_convert("Test string", ires)); + BOOST_CHECK(!try_lexical_convert(1.1, ires)); + BOOST_CHECK(!try_lexical_convert(-1.9, ires)); + BOOST_CHECK(!try_lexical_convert("1.1", ires)); + BOOST_CHECK(!try_lexical_convert("1000000000000000000000000000000000000000", ires)); } void try_common_cases() { int ires = 0; - const bool res1 = conversion::try_lexical_convert(std::string("100"), ires); + const bool res1 = try_lexical_convert(std::string("100"), ires); BOOST_CHECK(res1); BOOST_CHECK_EQUAL(ires, 100); ires = 0; - const bool res2 = conversion::try_lexical_convert("-100", ires); + const bool res2 = try_lexical_convert("-100", ires); BOOST_CHECK(res2); BOOST_CHECK_EQUAL(ires, -100); float fres = 1.0f; - const bool res3 = conversion::try_lexical_convert("0.0", fres); + const bool res3 = try_lexical_convert("0.0", fres); BOOST_CHECK(res3); BOOST_CHECK_EQUAL(fres, 0.0f); fres = 1.0f; - const bool res4 = conversion::try_lexical_convert("0.0", sizeof("0.0") - 1, fres); + const bool res4 = try_lexical_convert("0.0", sizeof("0.0") - 1, fres); BOOST_CHECK(res4); BOOST_CHECK_EQUAL(fres, 0.0f); } -unit_test::test_suite *init_unit_test_suite(int, char *[]) +boost::unit_test::test_suite *init_unit_test_suite(int, char *[]) { - unit_test::test_suite *suite = + boost::unit_test::test_suite *suite = BOOST_TEST_SUITE("Tests for try_lexical_convert"); suite->add(BOOST_TEST_CASE(&try_uncommon_cases)); suite->add(BOOST_TEST_CASE(&try_common_cases));