From e79e6150f28f5e63f482b0fa88753e470a82c95e Mon Sep 17 00:00:00 2001 From: ToruNiina Date: Tue, 11 Dec 2018 23:25:23 +0900 Subject: [PATCH] update testing macro --- tests/test_parse_aux.hpp | 4 +- tests/test_parse_boolean.cpp | 4 +- tests/test_parse_floating.cpp | 70 +++++++++++++++++------------------ tests/test_parse_integer.cpp | 48 ++++++++++++------------ 4 files changed, 63 insertions(+), 63 deletions(-) diff --git a/tests/test_parse_aux.hpp b/tests/test_parse_aux.hpp index 956669a..4ef9541 100644 --- a/tests/test_parse_aux.hpp +++ b/tests/test_parse_aux.hpp @@ -21,11 +21,11 @@ do { \ } while(false); \ /**/ -#define TOML11_TEST_PARSE_EQUAL_VALUE(tkn, expct) \ +#define TOML11_TEST_PARSE_EQUAL_VALUE(psr, tkn, expct) \ do { \ const std::string token(tkn); \ toml::detail::location loc("test", token); \ - const auto result = toml::detail::parse_value(loc); \ + const auto result = psr(loc); \ BOOST_CHECK(result.is_ok()); \ if(result.is_ok()){ \ BOOST_CHECK(result.unwrap() == expct); \ diff --git a/tests/test_parse_boolean.cpp b/tests/test_parse_boolean.cpp index 119ffde..5224a93 100644 --- a/tests/test_parse_boolean.cpp +++ b/tests/test_parse_boolean.cpp @@ -19,6 +19,6 @@ BOOST_AUTO_TEST_CASE(test_boolean) BOOST_AUTO_TEST_CASE(test_boolean_value) { - TOML11_TEST_PARSE_EQUAL_VALUE( "true", toml::value( true)); - TOML11_TEST_PARSE_EQUAL_VALUE("false", toml::value(false)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "true", toml::value( true)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "false", toml::value(false)); } diff --git a/tests/test_parse_floating.cpp b/tests/test_parse_floating.cpp index 898dbf6..e98dbe7 100644 --- a/tests/test_parse_floating.cpp +++ b/tests/test_parse_floating.cpp @@ -32,20 +32,20 @@ BOOST_AUTO_TEST_CASE(test_fractional) BOOST_AUTO_TEST_CASE(test_fractional_value) { - TOML11_TEST_PARSE_EQUAL_VALUE("1.0", value( 1.0)); - TOML11_TEST_PARSE_EQUAL_VALUE("0.1", value( 0.1)); - TOML11_TEST_PARSE_EQUAL_VALUE("0.001", value( 0.001)); - TOML11_TEST_PARSE_EQUAL_VALUE("0.100", value( 0.1)); - TOML11_TEST_PARSE_EQUAL_VALUE("+3.14", value( 3.14)); - TOML11_TEST_PARSE_EQUAL_VALUE("-3.14", value(-3.14)); - TOML11_TEST_PARSE_EQUAL_VALUE("3.1415_9265_3589", value( 3.141592653589)); - TOML11_TEST_PARSE_EQUAL_VALUE("+3.1415_9265_3589", value( 3.141592653589)); - TOML11_TEST_PARSE_EQUAL_VALUE("-3.1415_9265_3589", value(-3.141592653589)); - TOML11_TEST_PARSE_EQUAL_VALUE("123_456.789", value( 123456.789)); - TOML11_TEST_PARSE_EQUAL_VALUE("+123_456.789", value( 123456.789)); - TOML11_TEST_PARSE_EQUAL_VALUE("-123_456.789", value(-123456.789)); - TOML11_TEST_PARSE_EQUAL_VALUE("+0.0", value( 0.0)); - TOML11_TEST_PARSE_EQUAL_VALUE("-0.0", value(-0.0)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "1.0", value( 1.0)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "0.1", value( 0.1)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "0.001", value( 0.001)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "0.100", value( 0.1)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "+3.14", value( 3.14)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "-3.14", value(-3.14)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "3.1415_9265_3589", value( 3.141592653589)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "+3.1415_9265_3589", value( 3.141592653589)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "-3.1415_9265_3589", value(-3.141592653589)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "123_456.789", value( 123456.789)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "+123_456.789", value( 123456.789)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "-123_456.789", value(-123456.789)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "+0.0", value( 0.0)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "-0.0", value(-0.0)); } BOOST_AUTO_TEST_CASE(test_exponential) @@ -72,24 +72,24 @@ BOOST_AUTO_TEST_CASE(test_exponential) BOOST_AUTO_TEST_CASE(test_exponential_value) { - TOML11_TEST_PARSE_EQUAL_VALUE("1e10", value(1e10)); - TOML11_TEST_PARSE_EQUAL_VALUE("1e+10", value(1e10)); - TOML11_TEST_PARSE_EQUAL_VALUE("1e-10", value(1e-10)); - TOML11_TEST_PARSE_EQUAL_VALUE("+1e10", value(1e10)); - TOML11_TEST_PARSE_EQUAL_VALUE("+1e+10", value(1e10)); - TOML11_TEST_PARSE_EQUAL_VALUE("+1e-10", value(1e-10)); - TOML11_TEST_PARSE_EQUAL_VALUE("-1e10", value(-1e10)); - TOML11_TEST_PARSE_EQUAL_VALUE("-1e+10", value(-1e10)); - TOML11_TEST_PARSE_EQUAL_VALUE("-1e-10", value(-1e-10)); - TOML11_TEST_PARSE_EQUAL_VALUE("123e-10", value(123e-10)); - TOML11_TEST_PARSE_EQUAL_VALUE("1E10", value(1e10)); - TOML11_TEST_PARSE_EQUAL_VALUE("1E+10", value(1e10)); - TOML11_TEST_PARSE_EQUAL_VALUE("1E-10", value(1e-10)); - TOML11_TEST_PARSE_EQUAL_VALUE("123E-10", value(123e-10)); - TOML11_TEST_PARSE_EQUAL_VALUE("1_2_3E-10", value(123e-10)); - TOML11_TEST_PARSE_EQUAL_VALUE("1_2_3E-1_0", value(123e-10)); - TOML11_TEST_PARSE_EQUAL_VALUE("+0e0", value( 0.0)); - TOML11_TEST_PARSE_EQUAL_VALUE("-0e0", value(-0.0)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "1e10", value(1e10)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "1e+10", value(1e10)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "1e-10", value(1e-10)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "+1e10", value(1e10)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "+1e+10", value(1e10)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "+1e-10", value(1e-10)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "-1e10", value(-1e10)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "-1e+10", value(-1e10)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "-1e-10", value(-1e-10)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "123e-10", value(123e-10)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "1E10", value(1e10)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "1E+10", value(1e10)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "1E-10", value(1e-10)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "123E-10", value(123e-10)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "1_2_3E-10", value(123e-10)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "1_2_3E-1_0", value(123e-10)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "+0e0", value( 0.0)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "-0e0", value(-0.0)); } BOOST_AUTO_TEST_CASE(test_fe) { @@ -99,9 +99,9 @@ BOOST_AUTO_TEST_CASE(test_fe) } BOOST_AUTO_TEST_CASE(test_fe_vaule) { - TOML11_TEST_PARSE_EQUAL_VALUE("6.02e23", value(6.02e23)); - TOML11_TEST_PARSE_EQUAL_VALUE("6.02e+23", value(6.02e23)); - TOML11_TEST_PARSE_EQUAL_VALUE("1.112_650_06e-17", value(1.11265006e-17)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "6.02e23", value(6.02e23)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "6.02e+23", value(6.02e23)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "1.112_650_06e-17", value(1.11265006e-17)); } BOOST_AUTO_TEST_CASE(test_inf) diff --git a/tests/test_parse_integer.cpp b/tests/test_parse_integer.cpp index e1d1f12..6b5c515 100644 --- a/tests/test_parse_integer.cpp +++ b/tests/test_parse_integer.cpp @@ -25,14 +25,14 @@ BOOST_AUTO_TEST_CASE(test_decimal) BOOST_AUTO_TEST_CASE(test_decimal_value) { - TOML11_TEST_PARSE_EQUAL_VALUE( "1234", toml::value( 1234)); - TOML11_TEST_PARSE_EQUAL_VALUE( "+1234", toml::value( 1234)); - TOML11_TEST_PARSE_EQUAL_VALUE( "-1234", toml::value( -1234)); - TOML11_TEST_PARSE_EQUAL_VALUE( "0", toml::value( 0)); - TOML11_TEST_PARSE_EQUAL_VALUE( "1_2_3_4", toml::value( 1234)); - TOML11_TEST_PARSE_EQUAL_VALUE( "+1_2_3_4", toml::value( +1234)); - TOML11_TEST_PARSE_EQUAL_VALUE( "-1_2_3_4", toml::value( -1234)); - TOML11_TEST_PARSE_EQUAL_VALUE("123_456_789", toml::value(123456789)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "1234", toml::value( 1234)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "+1234", toml::value( 1234)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "-1234", toml::value( -1234)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "0", toml::value( 0)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "1_2_3_4", toml::value( 1234)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "+1_2_3_4", toml::value( +1234)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "-1_2_3_4", toml::value( -1234)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "123_456_789", toml::value(123456789)); } BOOST_AUTO_TEST_CASE(test_hex) @@ -50,15 +50,15 @@ BOOST_AUTO_TEST_CASE(test_hex) BOOST_AUTO_TEST_CASE(test_hex_value) { - TOML11_TEST_PARSE_EQUAL_VALUE("0xDEADBEEF", value(0xDEADBEEF)); - TOML11_TEST_PARSE_EQUAL_VALUE("0xdeadbeef", value(0xDEADBEEF)); - TOML11_TEST_PARSE_EQUAL_VALUE("0xDEADbeef", value(0xDEADBEEF)); - TOML11_TEST_PARSE_EQUAL_VALUE("0xDEAD_BEEF", value(0xDEADBEEF)); - TOML11_TEST_PARSE_EQUAL_VALUE("0xdead_beef", value(0xDEADBEEF)); - TOML11_TEST_PARSE_EQUAL_VALUE("0xdead_BEEF", value(0xDEADBEEF)); - TOML11_TEST_PARSE_EQUAL_VALUE("0xFF", value(0xFF)); - TOML11_TEST_PARSE_EQUAL_VALUE("0x00FF", value(0xFF)); - TOML11_TEST_PARSE_EQUAL_VALUE("0x0000FF", value(0xFF)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "0xDEADBEEF", value(0xDEADBEEF)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "0xdeadbeef", value(0xDEADBEEF)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "0xDEADbeef", value(0xDEADBEEF)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "0xDEAD_BEEF", value(0xDEADBEEF)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "0xdead_beef", value(0xDEADBEEF)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "0xdead_BEEF", value(0xDEADBEEF)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "0xFF", value(0xFF)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "0x00FF", value(0xFF)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "0x0000FF", value(0xFF)); } BOOST_AUTO_TEST_CASE(test_oct) @@ -70,9 +70,9 @@ BOOST_AUTO_TEST_CASE(test_oct) BOOST_AUTO_TEST_CASE(test_oct_value) { - TOML11_TEST_PARSE_EQUAL_VALUE("0o777", value(64*7+8*7+7)); - TOML11_TEST_PARSE_EQUAL_VALUE("0o7_7_7", value(64*7+8*7+7)); - TOML11_TEST_PARSE_EQUAL_VALUE("0o007", value(7)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "0o777", value(64*7+8*7+7)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "0o7_7_7", value(64*7+8*7+7)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "0o007", value(7)); } BOOST_AUTO_TEST_CASE(test_bin) @@ -85,8 +85,8 @@ BOOST_AUTO_TEST_CASE(test_bin) BOOST_AUTO_TEST_CASE(test_bin_value) { - TOML11_TEST_PARSE_EQUAL_VALUE("0b10000", value(16)); - TOML11_TEST_PARSE_EQUAL_VALUE("0b010000", value(16)); - TOML11_TEST_PARSE_EQUAL_VALUE("0b01_00_00", value(16)); - TOML11_TEST_PARSE_EQUAL_VALUE("0b111111", value(63)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "0b10000", value(16)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "0b010000", value(16)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "0b01_00_00", value(16)); + TOML11_TEST_PARSE_EQUAL_VALUE(parse_value, "0b111111", value(63)); }