From e70bd100853827b9bafb21103f78ebaa74a2af20 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Wed, 8 Nov 2023 12:05:15 +0100 Subject: apparently we can have nice things --- test/wall-atlas.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'test') diff --git a/test/wall-atlas.cpp b/test/wall-atlas.cpp index 92439800..2d1e4f85 100644 --- a/test/wall-atlas.cpp +++ b/test/wall-atlas.cpp @@ -8,7 +8,7 @@ namespace floormat::Wall::detail { using nlohmann::json; -using namespace std::string_literals; +using namespace std::string_view_literals; namespace { @@ -37,13 +37,13 @@ void test_read_empty_direction(StringView filename) test_read_header(filename); fm_assert(!jroot.empty()); - fm_assert( jroot.contains("n"s) ); - fm_assert(!jroot.contains("e"s) ); - fm_assert(!jroot.contains("s"s) ); - fm_assert( jroot.contains("w"s) ); + fm_assert( jroot.contains("n"sv) ); + fm_assert(!jroot.contains("e"sv) ); + fm_assert(!jroot.contains("s"sv) ); + fm_assert( jroot.contains("w"sv) ); - fm_assert(jroot["n"s].is_object() && jroot["n"s].empty()); - fm_assert(jroot["w"s].is_object() && jroot["w"s].empty()); + fm_assert(jroot["n"sv].is_object() && jroot["n"sv].empty()); + fm_assert(jroot["w"sv].is_object() && jroot["w"sv].empty()); } void test_read_groups(StringView filename) @@ -52,13 +52,13 @@ void test_read_groups(StringView filename) const auto jroot = json_helper::from_json_(Path::join(json_path(), filename)); read_info_header(jroot); - fm_assert(jroot["depth"s] == 42); - fm_assert( jroot.contains("n"s) ); - fm_assert(!jroot.contains("e"s) ); - fm_assert(!jroot.contains("s"s) ); - fm_assert( jroot.contains("w"s) ); - fm_assert(jroot["n"s].is_object() && jroot["n"s].empty()); - fm_assert(jroot["w"s].is_object() && !jroot["w"s].empty()); + fm_assert(jroot["depth"sv] == 42); + fm_assert( jroot.contains("n"sv) ); + fm_assert(!jroot.contains("e"sv) ); + fm_assert(!jroot.contains("s"sv) ); + fm_assert( jroot.contains("w"sv) ); + fm_assert(jroot["n"sv].is_object() && jroot["n"sv].empty()); + fm_assert(jroot["w"sv].is_object() && !jroot["w"sv].empty()); fm_assert(read_direction_metadata(jroot, Direction_::N).is_empty()); fm_assert(read_direction_metadata(jroot, Direction_::E).is_empty()); fm_assert(read_direction_metadata(jroot, Direction_::S).is_empty()); -- cgit v1.2.3