Commit 3e1ae2ba authored by Dominik Charousset's avatar Dominik Charousset

Integrate review feedback, round 2

parent ea11a6e9
...@@ -171,6 +171,8 @@ public: ...@@ -171,6 +171,8 @@ public:
bool value(span<byte> x) override; bool value(span<byte> x) override;
private: private:
// Sets `type` according to the `@type` field in `obj` or to the type ID of
// `settings` as fallback if no such field exists.
bool fetch_object_type(const settings* obj, type_id_t& type); bool fetch_object_type(const settings* obj, type_id_t& type);
stack_type st_; stack_type st_;
......
...@@ -251,14 +251,26 @@ SCENARIO("get_as can convert config values to integers") { ...@@ -251,14 +251,26 @@ SCENARIO("get_as can convert config values to integers") {
} }
} }
GIVEN("config_values of null, URI, boolean, list or dictionary") { GIVEN("config_values of null, URI, boolean, list or dictionary") {
WHEN("using get_as with integer types") { WHEN("using get_as with floating point types") {
THEN("conversion fails") { THEN("conversion fails") {
CHECK_EQ(get_as<int64_t>(cv_null), sec::conversion_failed); CHECK_EQ(get_as<float>(cv_null), sec::conversion_failed);
CHECK_EQ(get_as<int64_t>(cv_true), sec::conversion_failed); CHECK_EQ(get_as<float>(cv_true), sec::conversion_failed);
CHECK_EQ(get_as<int64_t>(cv_false), sec::conversion_failed); CHECK_EQ(get_as<float>(cv_false), sec::conversion_failed);
CHECK_EQ(get_as<int64_t>(cv_empty_uri), sec::conversion_failed); CHECK_EQ(get_as<float>(cv_empty_uri), sec::conversion_failed);
CHECK_EQ(get_as<int64_t>(cv_empty_list), sec::conversion_failed); CHECK_EQ(get_as<float>(cv_empty_list), sec::conversion_failed);
CHECK_EQ(get_as<int64_t>(cv_empty_dict), sec::conversion_failed); CHECK_EQ(get_as<float>(cv_empty_dict), sec::conversion_failed);
CHECK_EQ(get_as<double>(cv_null), sec::conversion_failed);
CHECK_EQ(get_as<double>(cv_true), sec::conversion_failed);
CHECK_EQ(get_as<double>(cv_false), sec::conversion_failed);
CHECK_EQ(get_as<double>(cv_empty_uri), sec::conversion_failed);
CHECK_EQ(get_as<double>(cv_empty_list), sec::conversion_failed);
CHECK_EQ(get_as<double>(cv_empty_dict), sec::conversion_failed);
CHECK_EQ(get_as<long double>(cv_null), sec::conversion_failed);
CHECK_EQ(get_as<long double>(cv_true), sec::conversion_failed);
CHECK_EQ(get_as<long double>(cv_false), sec::conversion_failed);
CHECK_EQ(get_as<long double>(cv_empty_uri), sec::conversion_failed);
CHECK_EQ(get_as<long double>(cv_empty_list), sec::conversion_failed);
CHECK_EQ(get_as<long double>(cv_empty_dict), sec::conversion_failed);
} }
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment