From ec04cecd62ce6a6d62c6fc4fd9115ac73602a82c Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 4 Jul 2017 17:04:16 +0100 Subject: [PATCH 06/19] _dbus_marshal_validate_test: Uncomment commented-out test coverage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was added around 12½ years ago, in a commented-out state, and has remained commented out ever since. It turns out these test vectors do pass, although perhaps they didn't at the time. Signed-off-by: Simon McVittie --- dbus/dbus-marshal-validate-util.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dbus/dbus-marshal-validate-util.c b/dbus/dbus-marshal-validate-util.c index 79671a4f..9e75a7e7 100644 --- a/dbus/dbus-marshal-validate-util.c +++ b/dbus/dbus-marshal-validate-util.c @@ -103,10 +103,9 @@ static const ValidityTest signature_tests[] = { { ".", DBUS_INVALID_UNKNOWN_TYPECODE }, /* https://bugs.freedesktop.org/show_bug.cgi?id=17803 */ { "a{(ii)i}", DBUS_INVALID_DICT_KEY_MUST_BE_BASIC_TYPE }, - - /* { "a{i}", DBUS_INVALID_DICT_ENTRY_HAS_ONLY_ONE_FIELD }, */ - /* { "{is}", DBUS_INVALID_DICT_ENTRY_NOT_INSIDE_ARRAY }, */ - /* { "a{isi}", DBUS_INVALID_DICT_ENTRY_HAS_TOO_MANY_FIELDS }, */ + { "a{i}", DBUS_INVALID_DICT_ENTRY_HAS_ONLY_ONE_FIELD }, + { "{is}", DBUS_INVALID_DICT_ENTRY_NOT_INSIDE_ARRAY }, + { "a{isi}", DBUS_INVALID_DICT_ENTRY_HAS_TOO_MANY_FIELDS }, }; dbus_bool_t -- 2.13.2