Merge branch 'master' into v3

This commit is contained in:
ToruNiina
2019-06-19 15:36:27 +09:00
6 changed files with 230 additions and 31 deletions

View File

@@ -87,7 +87,7 @@ add_definitions(-DUNITTEST_FRAMEWORK_LIBRARY_EXIST)
foreach(TEST_NAME ${TEST_NAMES})
add_executable(${TEST_NAME} ${TEST_NAME}.cpp)
target_link_libraries(${TEST_NAME} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
target_link_libraries(${TEST_NAME} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} toml11::toml11)
target_include_directories(${TEST_NAME} PRIVATE ${Boost_INCLUDE_DIRS})
add_test(NAME ${TEST_NAME} COMMAND ${TEST_NAME} WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
@@ -104,3 +104,4 @@ endforeach(TEST_NAME)
add_executable(test_multiple_translation_unit
test_multiple_translation_unit_1.cpp
test_multiple_translation_unit_2.cpp)
target_link_libraries(test_multiple_translation_unit toml11::toml11)

View File

@@ -12,9 +12,8 @@
#include <deque>
#include <array>
BOOST_AUTO_TEST_CASE(test_find_for_value)
BOOST_AUTO_TEST_CASE(test_find)
{
// value itself is not a table
{
toml::value v(true);
bool thrown = false;
@@ -43,16 +42,6 @@ BOOST_AUTO_TEST_CASE(test_find_for_value)
BOOST_CHECK(thrown);
}
{
toml::value v = toml::table{{"num", 42}};
BOOST_CHECK_EQUAL(42, toml::find<int>(v, "num"));
// reference that can be used to modify the content
auto& num = toml::find<toml::integer>(v, "num");
num = 54;
BOOST_CHECK_EQUAL(54, toml::find<int>(v, "num"));
}
// recursively search tables
{
toml::value v = toml::table{