_dbus_marshal_validate_test: Uncomment commented-out test coverage
authorSimon McVittie <smcv@collabora.com>
Tue, 4 Jul 2017 16:04:16 +0000 (17:04 +0100)
committerSimon McVittie <smcv@collabora.com>
Wed, 5 Jul 2017 12:13:01 +0000 (13:13 +0100)
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 <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=101568

dbus/dbus-marshal-validate-util.c

index 79671a4..9e75a7e 100644 (file)
@@ -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