From 88bf2cc94424d54ab79ff46be11a2408c4519336 Mon Sep 17 00:00:00 2001 From: Gabi Melman Date: Fri, 17 Sep 2021 06:18:23 +0300 Subject: [PATCH] Update test_cfg.cpp --- tests/test_cfg.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/test_cfg.cpp b/tests/test_cfg.cpp index 8bd11952..c4341420 100644 --- a/tests/test_cfg.cpp +++ b/tests/test_cfg.cpp @@ -23,69 +23,69 @@ TEST_CASE("env", "[cfg]") TEST_CASE("argv1", "[cfg]") { const char *argv[] = {"ignore", "SPDLOG_LEVEL=l1=warn"}; - auto levels = load_argv_levels(sizeof(argv) / sizeof(const char *), argv); + auto levels = load_argv_levels((int)(sizeof(argv) / sizeof(const char *)), argv); REQUIRE(levels == spdlog::cfg::level_map{{"l1", spdlog::level::warn}}); } TEST_CASE("argv2", "[cfg]") { const char *argv[] = {"ignore", "SPDLOG_LEVEL=l1=warn,trace"}; - auto levels = load_argv_levels(sizeof(argv) / sizeof(const char *), argv); + auto levels = load_argv_levels((int)(sizeof(argv) / sizeof(const char *)), argv); REQUIRE(levels == spdlog::cfg::level_map{{"l1", spdlog::level::warn}, {"", spdlog::level::trace}}); } TEST_CASE("argv3", "[cfg]") { const char *argv[] = {"ignore", "SPDLOG_LEVEL=junk_name=warn"}; - auto levels = load_argv_levels(sizeof(argv) / sizeof(const char *), argv); + auto levels = load_argv_levels((int)(sizeof(argv) / sizeof(const char *)), argv); REQUIRE(levels == spdlog::cfg::level_map{{"junk_name", spdlog::level::warn}}); } TEST_CASE("argv4", "[cfg]") { const char *argv[] = {"ignore", "SPDLOG_LEVEL=junk"}; - auto levels = load_argv_levels(sizeof(argv) / sizeof(const char *), argv); + auto levels = load_argv_levels((int)(sizeof(argv) / sizeof(const char *)), argv); REQUIRE(levels.empty()); } TEST_CASE("argv5", "[cfg]") { const char *argv[] = {"ignore", "ignore", "SPDLOG_LEVEL=l1=warn,trace"}; - auto levels = load_argv_levels(sizeof(argv) / sizeof(const char *), argv); + auto levels = load_argv_levels((int)(sizeof(argv) / sizeof(const char *)), argv); REQUIRE(levels == spdlog::cfg::level_map{{"l1", spdlog::level::warn}, {"", spdlog::level::trace}}); } TEST_CASE("argv6", "[cfg]") { const char *argv[] = {"SPDLOG_LEVEL=info"}; - auto levels = load_argv_levels(sizeof(argv) / sizeof(const char *), argv); + auto levels = load_argv_levels((int)(sizeof(argv) / sizeof(const char *)), argv); REQUIRE(levels.empty()); } TEST_CASE("argv7", "[cfg]") { const char *argv[] = {"ignore", ""}; - auto levels = load_argv_levels(sizeof(argv) / sizeof(const char *), argv); + auto levels = load_argv_levels((int)(sizeof(argv) / sizeof(const char *)), argv); REQUIRE(levels.empty()); } TEST_CASE("argv8", "[cfg]") { const char *argv[] = {"ignore"}; - auto levels = load_argv_levels(sizeof(argv) / sizeof(const char *), argv); + auto levels = load_argv_levels((int)(sizeof(argv) / sizeof(const char *)), argv); REQUIRE(levels.empty()); } TEST_CASE("argv9", "[cfg]") { const char *argv[] = {"ignore", "arg1"}; - auto levels = load_argv_levels(sizeof(argv) / sizeof(const char *), argv); + auto levels = load_argv_levels((int)(sizeof(argv) / sizeof(const char *)), argv); REQUIRE(levels.empty()); } TEST_CASE("argv10", "[cfg]") { const char *argv[] = {"ignore", "junk", "SPDLOG_LEVEL=info"}; - auto levels = load_argv_levels(sizeof(argv) / sizeof(const char *), argv); + auto levels = load_argv_levels((int)(sizeof(argv) / sizeof(const char *)), argv); REQUIRE(levels == spdlog::cfg::level_map{{"", spdlog::level::info}}); } @@ -99,7 +99,7 @@ TEST_CASE("argv11", "[cfg]") TEST_CASE("argv12", "[cfg]") { const char *argv[] = {"ignore", "junk", "SPDLOG_LEVEL=info,l1=debug,l2=warn,l3=off"}; - auto levels = load_argv_levels(sizeof(argv) / sizeof(const char *), argv); + auto levels = load_argv_levels((int)(sizeof(argv) / sizeof(const char *)), argv); REQUIRE(levels == spdlog::cfg::level_map{{"", spdlog::level::info}, {"l1", spdlog::level::debug}, {"l2", spdlog::level::warn}, {"l3", spdlog::level::off}}); } @@ -108,7 +108,7 @@ TEST_CASE("argv13", "[cfg]") { // test that only first SPDLOG_LEVEL is handled const char *argv[] = {"ignore", "junk", "SPDLOG_LEVEL=info,l1=debug,l2=warn,l3=off", "SPDLOG_LEVEL=off"}; - auto levels = load_argv_levels(sizeof(argv) / sizeof(const char *), argv); + auto levels = load_argv_levels((int)(sizeof(argv) / sizeof(const char *)), argv); REQUIRE(levels == spdlog::cfg::level_map{{"", spdlog::level::info}, {"l1", spdlog::level::debug}, {"l2", spdlog::level::warn}, {"l3", spdlog::level::off}}); } @@ -117,7 +117,7 @@ TEST_CASE("argv14", "[cfg]") { // test that only first SPDLOG_LEVEL is handled const char *argv[] = {"ignore", "SPDLOG_LEVEL="}; - auto levels = load_argv_levels(sizeof(argv) / sizeof(const char *), argv); + auto levels = load_argv_levels((int)(sizeof(argv) / sizeof(const char *)), argv); REQUIRE(levels.empty()); } @@ -125,7 +125,7 @@ TEST_CASE("argv15", "[cfg]") { // test that only first SPDLOG_LEVEL is handled const char *argv[] = {"ignore", "SPDLOG_LEVEL=info,l1=junk,l2=debug"}; - auto levels = load_argv_levels(sizeof(argv) / sizeof(const char *), argv); + auto levels = load_argv_levels((int)(sizeof(argv) / sizeof(const char *)), argv); REQUIRE(levels == spdlog::cfg::level_map{ {"", spdlog::level::info}, {"l2", spdlog::level::debug},