summaryrefslogtreecommitdiff
path: root/test/core
diff options
context:
space:
mode:
authorAndreas Stöckel <astoecke@techfak.uni-bielefeld.de>2015-02-16 11:39:03 +0100
committerAndreas Stöckel <andreas@somweyr.de>2015-02-16 11:39:03 +0100
commit0a60bc28b222451a5ed20318ceff3a93564d5d8e (patch)
tree519b07eba0db710a47a351865f93b98b4f686d09 /test/core
parent39fa4b6d0f6492c46b83489e16a7cbdbf279bbda (diff)
Implemented support for numeric arguments in Argument
Diffstat (limited to 'test/core')
-rw-r--r--test/core/common/ArgumentTest.cpp24
1 files changed, 21 insertions, 3 deletions
diff --git a/test/core/common/ArgumentTest.cpp b/test/core/common/ArgumentTest.cpp
index 0a2dcfa..ca93f45 100644
--- a/test/core/common/ArgumentTest.cpp
+++ b/test/core/common/ArgumentTest.cpp
@@ -792,8 +792,8 @@ TEST(Arguments, invalid)
Variant::arrayType arr{1};
- ASSERT_TRUE(argsInvalid.validateArray(arr, logger)); // No error message
- ASSERT_FALSE(argsValid.validateArray(arr, logger)); // Too many arguments
+ ASSERT_TRUE(argsInvalid.validateArray(arr, logger)); // No error message
+ ASSERT_FALSE(argsValid.validateArray(arr, logger)); // Too many arguments
}
TEST(Arguments, validateArray)
@@ -879,6 +879,25 @@ TEST(Arguments, validateMap)
{{"a", 2}, {"b", "test"}, {"c", true}, {"d", nullptr}}),
map);
}
+
+ {
+ Variant::mapType map{{"#0", 2}, {"#1", "bla"}, {"#2", false}};
+ ASSERT_FALSE(args.validateMap(map, logger, false, false));
+ ASSERT_EQ(Variant::mapType({{"#0", 2},
+ {"#1", "bla"},
+ {"#2", false},
+ {"a", 0},
+ {"b", "test"},
+ {"c", true}}),
+ map);
+ }
+
+ {
+ Variant::mapType map{{"#0", 2}, {"#1", "bla"}, {"#2", false}};
+ ASSERT_TRUE(args.validateMap(map, logger, false, true));
+ ASSERT_EQ(Variant::mapType({{"a", 2}, {"b", "bla"}, {"c", false}}),
+ map);
+ }
}
TEST(Arguments, validateMissing)
@@ -897,6 +916,5 @@ TEST(Arguments, validateMissing)
ASSERT_EQ(Variant::arrayType({""}), arr);
}
}
-
}