From 379ac755ec0a1ba84a4b246c4e5b574ca1fa1b9d Mon Sep 17 00:00:00 2001 From: Jeff Becker Date: Thu, 15 Sep 2022 10:19:29 -0400 Subject: [PATCH] make unit tests pass changes to how config defaults, specifically allowing defaults to be a vector, broke unit test compilation. this makes them compile again. --- test/config/test_llarp_config_definition.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/test/config/test_llarp_config_definition.cpp b/test/config/test_llarp_config_definition.cpp index 010789cde..e3edec29c 100644 --- a/test/config/test_llarp_config_definition.cpp +++ b/test/config/test_llarp_config_definition.cpp @@ -10,20 +10,21 @@ TEST_CASE("OptionDefinition int parse test", "[config]") CHECK(def.getValue() == 42); CHECK(def.getNumberFound() == 0); - - CHECK(def.defaultValueAsString() == "42"); + CHECK(def.defaultValuesAsString().size() == 1); + CHECK(def.defaultValuesAsString()[0] == "42"); CHECK_NOTHROW(def.parseValue("43")); CHECK(def.getValue() == 43); CHECK(def.getNumberFound() == 1); - CHECK(def.defaultValueAsString() == "42"); + CHECK(def.defaultValuesAsString().size() == 1); + CHECK(def.defaultValuesAsString()[0] == "42"); constexpr Default sqrt_625{25}; llarp::OptionDefinition def2("a", "b", sqrt_625); CHECK(def2.getValue() == 25); - CHECK(def2.defaultValueAsString() == "25"); - + CHECK(def2.defaultValuesAsString().size() == 1); + CHECK(def2.defaultValuesAsString()[0] == "25"); CHECK_NOTHROW(def2.parseValue("99")); CHECK(def2.getValue() == 99); CHECK(def2.getNumberFound() == 1); @@ -34,7 +35,8 @@ TEST_CASE("OptionDefinition string parse test", "[config]") llarp::OptionDefinition def("foo", "bar", Default{"test"}); CHECK(def.getValue() == "test"); - CHECK(def.defaultValueAsString() == "test"); + CHECK(not def.defaultValuesAsString().empty()); + CHECK(def.defaultValuesAsString()[0] == "test"); CHECK_NOTHROW(def.parseValue("foo")); CHECK(def.getValue() == "foo"); @@ -80,8 +82,8 @@ TEST_CASE("OptionDefinition acceptor test", "[config]") CHECK_NOTHROW(def.tryAccept()); CHECK(def.getValue() == 42); - CHECK(def.defaultValue); - CHECK(*def.defaultValue == 42); + CHECK(not def.defaultValues.empty()); + CHECK(def.defaultValues[0] == 42); CHECK(test == 42); def.parseValue("43");