Attachment 135489 Details for Bug 103758 – Remove test data in the "message builder" domain-specific language

[patch] Remove test data in the "message builder" domain-specific language

0001-Remove-test-data-in-the-message-builder-domain-speci.patch (text/plain), 33.18 KB, created by Simon McVittie on 2017-11-15 13:17:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2017-11-15 13:17:54 UTC

Size: 33.18 KB

patch

obsolete

>From f5c0d303f27dd80c281742cda4202a0afcd5c279 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@collabora.com>
>Date: Wed, 15 Nov 2017 12:28:21 +0000
>Subject: [PATCH] Remove test data in the "message builder" domain-specific
> language
>
>These tests were disabled by commit 9c3d566, which rewrote the D-Bus
>type system to be fully recursive, back in 2005. The message builder
>was subsequently removed by commit 9d21554, also in early 2005.
>
>It will probably take significant work to turn these files into
>test-cases that use the current D-Bus type system and so can be run
>this decade. Until that work is done, let's not ship them: we can
>always fetch them from git history if we want them.
>
>The single .message-raw file can still be read and has been retained,
>although it hasn't actually tested the intended failure mode since
>2005 due to changes to the D-Bus specification (it is a wire-protocol
>version 0 message, and the recursive type system introduced in commit
>9c3d566 changed the wire-protocol version to 1).
>
>Signed-off-by: Simon McVittie <smcv@collabora.com>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103758
>---
> cmake/test/CMakeLists.txt                          |  2 +-
> dbus/dbus-message-util.c                           |  8 +-
> test/Makefile.am                                   | 30 -------
> test/data/incomplete-messages/missing-body.message | 19 -----
> test/data/invalid-messages/array-of-nil.message    | 31 -------
> .../array-with-mixed-types.message                 | 52 ------------
> .../invalid-messages/bad-boolean-array.message     | 27 ------
> test/data/invalid-messages/bad-boolean.message     | 22 -----
> test/data/invalid-messages/bad-endian.message      | 25 ------
> .../bad-header-field-alignment.message             | 38 ---------
> test/data/invalid-messages/local-namespace.message | 21 -----
> test/data/invalid-messages/no-dot-in-name.message  | 19 -----
> .../not-nul-header-padding.message                 | 25 ------
> test/data/invalid-messages/overlong-name.message   | 20 -----
> .../too-little-header-padding.message              | 24 ------
> .../too-much-header-padding-by-far.message         | 26 ------
> .../too-much-header-padding.message                | 23 -----
> test/data/invalid-messages/too-short-dict.message  | 28 ------
> .../array-of-array-of-uint32.message               | 33 --------
> test/data/valid-messages/dict-simple.message       | 15 ----
> test/data/valid-messages/dict.message              | 47 ----------
> test/data/valid-messages/emptiness.message         | 63 --------------
> test/data/valid-messages/lots-of-arguments.message | 65 --------------
> test/data/valid-messages/no-padding.message        | 22 -----
> test/data/valid-messages/opposite-endian.message   | 30 -------
> test/data/valid-messages/recursive-types.message   | 99 ----------------------
> test/data/valid-messages/simplest-manual.message   | 30 -------
> test/data/valid-messages/simplest.message          | 10 ---
> .../standard-acquire-service.message               | 26 ------
> test/data/valid-messages/standard-hello.message    | 22 -----
> .../valid-messages/standard-list-services.message  | 22 -----
> .../valid-messages/standard-service-exists.message | 24 ------
> .../valid-messages/unknown-header-field.message    | 19 -----
> 33 files changed, 2 insertions(+), 965 deletions(-)
> delete mode 100644 test/data/incomplete-messages/missing-body.message
> delete mode 100644 test/data/invalid-messages/array-of-nil.message
> delete mode 100644 test/data/invalid-messages/array-with-mixed-types.message
> delete mode 100644 test/data/invalid-messages/bad-boolean-array.message
> delete mode 100644 test/data/invalid-messages/bad-boolean.message
> delete mode 100644 test/data/invalid-messages/bad-endian.message
> delete mode 100644 test/data/invalid-messages/bad-header-field-alignment.message
> delete mode 100644 test/data/invalid-messages/local-namespace.message
> delete mode 100644 test/data/invalid-messages/no-dot-in-name.message
> delete mode 100644 test/data/invalid-messages/not-nul-header-padding.message
> delete mode 100644 test/data/invalid-messages/overlong-name.message
> delete mode 100644 test/data/invalid-messages/too-little-header-padding.message
> delete mode 100644 test/data/invalid-messages/too-much-header-padding-by-far.message
> delete mode 100644 test/data/invalid-messages/too-much-header-padding.message
> delete mode 100644 test/data/invalid-messages/too-short-dict.message
> delete mode 100644 test/data/valid-messages/array-of-array-of-uint32.message
> delete mode 100644 test/data/valid-messages/dict-simple.message
> delete mode 100644 test/data/valid-messages/dict.message
> delete mode 100644 test/data/valid-messages/emptiness.message
> delete mode 100644 test/data/valid-messages/lots-of-arguments.message
> delete mode 100644 test/data/valid-messages/no-padding.message
> delete mode 100644 test/data/valid-messages/opposite-endian.message
> delete mode 100644 test/data/valid-messages/recursive-types.message
> delete mode 100644 test/data/valid-messages/simplest-manual.message
> delete mode 100644 test/data/valid-messages/simplest.message
> delete mode 100644 test/data/valid-messages/standard-acquire-service.message
> delete mode 100644 test/data/valid-messages/standard-hello.message
> delete mode 100644 test/data/valid-messages/standard-list-services.message
> delete mode 100644 test/data/valid-messages/standard-service-exists.message
> delete mode 100644 test/data/valid-messages/unknown-header-field.message
>
>diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt
>index a75bf0d5..0679fca5 100644
>--- a/cmake/test/CMakeLists.txt
>+++ b/cmake/test/CMakeLists.txt
>@@ -149,7 +149,7 @@ ENDFOREACH(DIR)
> ### copy tests to builddir so that generated tests and static tests 
> ### are all in one place.
> MESSAGE(STATUS "Copying test files to test directory")
>-FOREACH(FILE_TYPE *.message *.message-raw *.auth-script *.sha1 *.txt *.conf *.service)
>+FOREACH(FILE_TYPE *.message-raw *.auth-script *.sha1 *.txt *.conf *.service)
>     FOREACH(DIR ${TESTDIRS})
>         FILE(GLOB FILES "${CMAKE_SOURCE_DIR}/../${DIR}/${FILE_TYPE}" )
>         FOREACH(FILE ${FILES})
>diff --git a/dbus/dbus-message-util.c b/dbus/dbus-message-util.c
>index 96c726f3..1bfc0d00 100644
>--- a/dbus/dbus-message-util.c
>+++ b/dbus/dbus-message-util.c
>@@ -659,13 +659,7 @@ process_test_subdir (const DBusString          *test_base_dir,
>         ;
>       else
>         {
>-          if (_dbus_string_ends_with_c_str (&filename, ".message"))
>-            {
>-              _dbus_test_diag ("SKIP: Could not load %s, message builder language no longer supported",
>-                      _dbus_string_get_const_data (&filename));
>-            }
>-          
>-          _dbus_verbose ("Skipping non-.message file %s\n",
>+          _dbus_verbose ("Skipping non-.message-raw file %s\n",
>                          _dbus_string_get_const_data (&filename));
> 	  _dbus_string_free (&full_path);
>           goto next;
>diff --git a/test/Makefile.am b/test/Makefile.am
>index 719e8653..a748b10a 100644
>--- a/test/Makefile.am
>+++ b/test/Makefile.am
>@@ -466,7 +466,6 @@ static_data = \
> 	data/equiv-config-files/entities/basic.d/basic.conf \
> 	data/equiv-config-files/entities/entities-1.conf \
> 	data/equiv-config-files/entities/entities-2.conf \
>-	data/incomplete-messages/missing-body.message \
> 	data/invalid-config-files/badselinux-1.conf \
> 	data/invalid-config-files/badselinux-2.conf \
> 	data/invalid-config-files/circular-1.conf \
>@@ -476,21 +475,7 @@ static_data = \
> 	data/invalid-config-files/not-well-formed.conf \
> 	data/invalid-config-files/truncated-file.conf \
> 	data/invalid-config-files/send-and-receive.conf \
>-	data/invalid-messages/array-of-nil.message \
>-	data/invalid-messages/array-with-mixed-types.message \
>-	data/invalid-messages/bad-boolean-array.message \
>-	data/invalid-messages/bad-boolean.message \
>-	data/invalid-messages/bad-endian.message \
>-	data/invalid-messages/bad-header-field-alignment.message \
> 	data/invalid-messages/boolean-has-no-value.message-raw \
>-	data/invalid-messages/local-namespace.message \
>-	data/invalid-messages/no-dot-in-name.message \
>-	data/invalid-messages/not-nul-header-padding.message \
>-	data/invalid-messages/overlong-name.message \
>-	data/invalid-messages/too-little-header-padding.message \
>-	data/invalid-messages/too-much-header-padding-by-far.message \
>-	data/invalid-messages/too-much-header-padding.message \
>-	data/invalid-messages/too-short-dict.message \
> 	data/sha-1/Readme.txt \
> 	data/sha-1/bit-hashes.sha1 \
> 	data/sha-1/bit-messages.sha1 \
>@@ -511,21 +496,6 @@ static_data = \
> 	data/valid-config-files/standard-session-dirs.conf \
> 	data/valid-config-files-system/many-rules.conf \
> 	data/valid-config-files-system/system.d/test.conf \
>-	data/valid-messages/array-of-array-of-uint32.message \
>-	data/valid-messages/dict-simple.message \
>-	data/valid-messages/dict.message \
>-	data/valid-messages/emptiness.message \
>-	data/valid-messages/lots-of-arguments.message \
>-	data/valid-messages/no-padding.message \
>-	data/valid-messages/opposite-endian.message \
>-	data/valid-messages/recursive-types.message \
>-	data/valid-messages/simplest-manual.message \
>-	data/valid-messages/simplest.message \
>-	data/valid-messages/standard-acquire-service.message \
>-	data/valid-messages/standard-hello.message \
>-	data/valid-messages/standard-list-services.message \
>-	data/valid-messages/standard-service-exists.message \
>-	data/valid-messages/unknown-header-field.message \
> 	$(NULL)
> 
> EXTRA_DIST += $(static_data)
>diff --git a/test/data/incomplete-messages/missing-body.message b/test/data/incomplete-messages/missing-body.message
>deleted file mode 100644
>index 138e9ea5..00000000
>--- a/test/data/incomplete-messages/missing-body.message
>+++ /dev/null
>@@ -1,19 +0,0 @@
>-## message that's missing an expected body
>-
>-VALID_HEADER method_call
>-HEADER_FIELD INTERFACE
>-TYPE STRING
>-STRING 'org.freedesktop.Foo'
>-HEADER_FIELD MEMBER
>-TYPE STRING
>-STRING 'Bar'
>-ALIGN 8
>-END_LENGTH Header
>-
>-## create the body, then chop it off
>-START_LENGTH Body
>-TYPE INT32
>-INT32 37
>-END_LENGTH Body
>-
>-CHOP 8
>diff --git a/test/data/invalid-messages/array-of-nil.message b/test/data/invalid-messages/array-of-nil.message
>deleted file mode 100644
>index 1197a136..00000000
>--- a/test/data/invalid-messages/array-of-nil.message
>+++ /dev/null
>@@ -1,31 +0,0 @@
>-# Message with an array of NIL (not allowed)
>-
>-VALID_HEADER method_call
>-
>-HEADER_FIELD INTERFACE
>-TYPE STRING
>-STRING 'org.freedesktop.Foo'
>-HEADER_FIELD MEMBER
>-TYPE STRING
>-STRING 'Bar'
>-HEADER_FIELD PATH
>-TYPE OBJECT_PATH 
>-OBJECT_PATH '/foo'
>-
>-ALIGN 8
>-END_LENGTH Header
>-
>-START_LENGTH Body
>-TYPE ARRAY
>-TYPE NIL
>-UINT32 5
>-
>-## we want it to fail because of type nil, not because the length is no good
>-## so pad out the message with 5 bytes
>-BYTE 1
>-BYTE 2
>-BYTE 3
>-BYTE 4
>-BYTE 5
>-
>-END_LENGTH Body
>diff --git a/test/data/invalid-messages/array-with-mixed-types.message b/test/data/invalid-messages/array-with-mixed-types.message
>deleted file mode 100644
>index dea2d1e5..00000000
>--- a/test/data/invalid-messages/array-with-mixed-types.message
>+++ /dev/null
>@@ -1,52 +0,0 @@
>-# Message with an array of array where the child arrays are of
>-# different types
>-
>-VALID_HEADER method_call
>-
>-HEADER_FIELD INTERFACE
>-TYPE STRING
>-STRING 'org.freedesktop.Foo'
>-HEADER_FIELD MEMBER
>-TYPE STRING
>-STRING 'Bar'
>-HEADER_FIELD PATH
>-TYPE OBJECT_PATH
>-OBJECT_PATH '/foo'
>-
>-ALIGN 8
>-END_LENGTH Header
>-
>-START_LENGTH Body
>-
>-TYPE ARRAY
>-TYPE ARRAY
>-TYPE UINT32
>-
>-LENGTH Array
>-START_LENGTH Array
>-
>-## array of uint32
>-LENGTH SubArray1
>-START_LENGTH SubArray1
>-UINT32 1
>-UINT32 2
>-UINT32 3
>-END_LENGTH SubArray1
>-
>-## array of uint32
>-LENGTH SubArray2
>-START_LENGTH SubArray2
>-UINT32 4
>-UINT32 5
>-END_LENGTH SubArray2
>-
>-## array of boolean
>-LENGTH SubArray3
>-START_LENGTH SubArray3
>-BOOLEAN false
>-BOOLEAN true
>-END_LENGTH SubArray3
>-
>-END_LENGTH Array
>-
>-END_LENGTH Body
>diff --git a/test/data/invalid-messages/bad-boolean-array.message b/test/data/invalid-messages/bad-boolean-array.message
>deleted file mode 100644
>index 48000afd..00000000
>--- a/test/data/invalid-messages/bad-boolean-array.message
>+++ /dev/null
>@@ -1,27 +0,0 @@
>-## a message with an invalid boolean array
>-
>-## VALID_HEADER includes a LENGTH Header and LENGTH Body
>-VALID_HEADER method_call
>-
>-HEADER_FIELD INTERFACE
>-TYPE STRING
>-STRING 'org.freedesktop.Foo'
>-HEADER_FIELD MEMBER
>-TYPE STRING
>-STRING 'Bar'
>-HEADER_FIELD PATH
>-TYPE OBJECT_PATH
>-OBJECT_PATH '/foo'
>-
>-ALIGN 8
>-END_LENGTH Header
>-
>-START_LENGTH Body
>-TYPE ARRAY
>-TYPE BOOLEAN
>-ALIGN 4
>-INT32 3
>-BYTE 0
>-BYTE 1
>-BYTE 3
>-END_LENGTH Body
>diff --git a/test/data/invalid-messages/bad-boolean.message b/test/data/invalid-messages/bad-boolean.message
>deleted file mode 100644
>index 09026db8..00000000
>--- a/test/data/invalid-messages/bad-boolean.message
>+++ /dev/null
>@@ -1,22 +0,0 @@
>-## a message with an invalid boolean value
>-
>-## VALID_HEADER includes a LENGTH Header and LENGTH Body
>-VALID_HEADER method_call
>-
>-HEADER_FIELD INTERFACE
>-TYPE STRING
>-STRING 'org.freedesktop.Foo'
>-HEADER_FIELD MEMBER
>-TYPE STRING
>-STRING 'Bar'
>-HEADER_FIELD PATH
>-TYPE OBJECT_PATH
>-OBJECT_PATH '/foo'
>-
>-ALIGN 8
>-END_LENGTH Header
>-
>-START_LENGTH Body
>-TYPE BOOLEAN
>-BYTE 3
>-END_LENGTH Body
>diff --git a/test/data/invalid-messages/bad-endian.message b/test/data/invalid-messages/bad-endian.message
>deleted file mode 100644
>index e979baae..00000000
>--- a/test/data/invalid-messages/bad-endian.message
>+++ /dev/null
>@@ -1,25 +0,0 @@
>-## message with invalid endianness tag
>-
>-BYTE 'i'
>-BYTE 1
>-BYTE 0
>-BYTE 0
>-
>-LENGTH Header
>-LENGTH Body
>-
>-HEADER_FIELD INTERFACE
>-TYPE STRING
>-STRING 'org.freedesktop.Foo'
>-HEADER_FIELD MEMBER
>-TYPE STRING
>-STRING 'Bar'
>-HEADER_FIELD PATH
>-TYPE OBJECT_PATH
>-OBJECT_PATH '/foo'
>-
>-ALIGN 8
>-END_LENGTH Header
>-
>-START_LENGTH Body
>-END_LENGTH Body
>diff --git a/test/data/invalid-messages/bad-header-field-alignment.message b/test/data/invalid-messages/bad-header-field-alignment.message
>deleted file mode 100644
>index 22c0d7ee..00000000
>--- a/test/data/invalid-messages/bad-header-field-alignment.message
>+++ /dev/null
>@@ -1,38 +0,0 @@
>-## last field incorrectly aligned to 4 bytes
>-
>-## VALID_HEADER includes a LENGTH Header and LENGTH Body
>-VALID_HEADER method_call
>-
>-HEADER_FIELD INTERFACE
>-TYPE STRING
>-STRING 'org.freedesktop.Foo'
>-
>-HEADER_FIELD MEMBER
>-TYPE STRING
>-STRING 'Bar'
>-
>-HEADER_FIELD PATH
>-TYPE OBJECT_PATH
>-OBJECT_PATH '/foo'
>-
>-HEADER_FIELD UNKNOWN
>-TYPE STRING
>-STRING 'a'
>-
>-ALIGN 4
>-
>-HEADER_FIELD UNKNOWN
>-TYPE ARRAY
>-TYPE BYTE
>-ALIGN 4
>-LENGTH ThisByteArray
>-START_LENGTH ThisByteArray
>-BYTE 1
>-BYTE 2
>-END_LENGTH ThisByteArray
>-
>-
>-ALIGN 8
>-END_LENGTH Header
>-START_LENGTH Body
>-END_LENGTH Body
>diff --git a/test/data/invalid-messages/local-namespace.message b/test/data/invalid-messages/local-namespace.message
>deleted file mode 100644
>index 8a720188..00000000
>--- a/test/data/invalid-messages/local-namespace.message
>+++ /dev/null
>@@ -1,21 +0,0 @@
>-## a message that is in the org.freedesktop.Local. namespace and thus
>-## invalid
>-
>-## VALID_HEADER includes a LENGTH Header and LENGTH Body
>-VALID_HEADER method_call
>-
>-HEADER_FIELD INTERFACE
>-TYPE STRING
>-STRING 'org.freedesktop.DBus.Local'
>-HEADER_FIELD MEMBER
>-TYPE STRING
>-STRING 'Disconnected'
>-HEADER_FIELD PATH
>-TYPE OBJECT_PATH
>-OBJECT_PATH '/foo'
>-
>-ALIGN 8
>-END_LENGTH Header
>-
>-START_LENGTH Body
>-END_LENGTH Body
>diff --git a/test/data/invalid-messages/no-dot-in-name.message b/test/data/invalid-messages/no-dot-in-name.message
>deleted file mode 100644
>index 6d6317a5..00000000
>--- a/test/data/invalid-messages/no-dot-in-name.message
>+++ /dev/null
>@@ -1,19 +0,0 @@
>-## a message with dotless interface
>-
>-## VALID_HEADER includes a LENGTH Header and LENGTH Body
>-VALID_HEADER method_call
>-
>-HEADER_FIELD INTERFACE
>-TYPE STRING
>-STRING 'NoDotInHere'
>-HEADER_FIELD MEMBER
>-TYPE STRING
>-STRING 'Bar'
>-HEADER_FIELD PATH
>-TYPE OBJECT_PATH
>-OBJECT_PATH '/foo'
>-
>-ALIGN 8
>-END_LENGTH Header
>-START_LENGTH Body
>-END_LENGTH Body
>diff --git a/test/data/invalid-messages/not-nul-header-padding.message b/test/data/invalid-messages/not-nul-header-padding.message
>deleted file mode 100644
>index be846da0..00000000
>--- a/test/data/invalid-messages/not-nul-header-padding.message
>+++ /dev/null
>@@ -1,25 +0,0 @@
>-## has one non-nul byte in header padding
>-
>-## VALID_HEADER includes a LENGTH Header and LENGTH Body
>-VALID_HEADER method_call
>-
>-HEADER_FIELD INTERFACE
>-TYPE STRING
>-STRING 'org.freedesktop.Foo'
>-HEADER_FIELD MEMBER
>-TYPE STRING
>-STRING 'Bar'
>-HEADER_FIELD PATH
>-TYPE OBJECT_PATH
>-OBJECT_PATH '/foo'
>-
>-HEADER_FIELD UNKNOWN
>-TYPE STRING
>-STRING 'a'
>-ALIGN 8
>-## kill a padding byte and replace it
>-CHOP 1
>-BYTE 'q'
>-END_LENGTH Header
>-START_LENGTH Body
>-END_LENGTH Body
>diff --git a/test/data/invalid-messages/overlong-name.message b/test/data/invalid-messages/overlong-name.message
>deleted file mode 100644
>index c1f90790..00000000
>--- a/test/data/invalid-messages/overlong-name.message
>+++ /dev/null
>@@ -1,20 +0,0 @@
>-## a message with too-long name field
>-
>-## VALID_HEADER includes a LENGTH Header and LENGTH Body
>-VALID_HEADER method_call
>-HEADER_FIELD INTERFACE
>-TYPE STRING
>-STRING 'org.foo.bar.this.is.really.long 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200'
>-
>-HEADER_FIELD MEMBER
>-TYPE STRING
>-STRING 'Bar'
>-
>-HEADER_FIELD PATH
>-TYPE OBJECT_PATH
>-OBJECT_PATH '/foo'
>-
>-ALIGN 8
>-END_LENGTH Header
>-START_LENGTH Body
>-END_LENGTH Body
>diff --git a/test/data/invalid-messages/too-little-header-padding.message b/test/data/invalid-messages/too-little-header-padding.message
>deleted file mode 100644
>index 358815a5..00000000
>--- a/test/data/invalid-messages/too-little-header-padding.message
>+++ /dev/null
>@@ -1,24 +0,0 @@
>-## has one byte missing from header padding
>-
>-## VALID_HEADER includes a LENGTH Header and LENGTH Body
>-VALID_HEADER method_call
>-
>-HEADER_FIELD INTERFACE
>-TYPE STRING
>-STRING 'org.freedesktop.Foo'
>-HEADER_FIELD MEMBER
>-TYPE STRING
>-STRING 'Bar'
>-HEADER_FIELD PATH
>-TYPE OBJECT_PATH
>-OBJECT_PATH '/foo'
>-
>-HEADER_FIELD UNKNOWN
>-TYPE STRING
>-STRING 'a'
>-ALIGN 8
>-## kill a padding byte
>-CHOP 1
>-END_LENGTH Header
>-START_LENGTH Body
>-END_LENGTH Body
>diff --git a/test/data/invalid-messages/too-much-header-padding-by-far.message b/test/data/invalid-messages/too-much-header-padding-by-far.message
>deleted file mode 100644
>index 2d2be3a5..00000000
>--- a/test/data/invalid-messages/too-much-header-padding-by-far.message
>+++ /dev/null
>@@ -1,26 +0,0 @@
>-## has one byte extra header padding
>-
>-## VALID_HEADER includes a LENGTH Header and LENGTH Body
>-VALID_HEADER method_call
>-
>-HEADER_FIELD INTERFACE
>-TYPE STRING
>-STRING 'org.freedesktop.Foo'
>-HEADER_FIELD MEMBER
>-TYPE STRING
>-STRING 'Bar'
>-HEADER_FIELD PATH
>-TYPE OBJECT_PATH
>-OBJECT_PATH '/foo'
>-
>-HEADER_FIELD UNKNOWN
>-TYPE STRING
>-STRING 'a'
>-ALIGN 8
>-BYTE 0
>-ALIGN 8
>-BYTE 0
>-ALIGN 8
>-END_LENGTH Header
>-START_LENGTH Body
>-END_LENGTH Body
>diff --git a/test/data/invalid-messages/too-much-header-padding.message b/test/data/invalid-messages/too-much-header-padding.message
>deleted file mode 100644
>index 0b1c294c..00000000
>--- a/test/data/invalid-messages/too-much-header-padding.message
>+++ /dev/null
>@@ -1,23 +0,0 @@
>-## has one byte extra header padding
>-
>-## VALID_HEADER includes a LENGTH Header and LENGTH Body
>-VALID_HEADER method_call
>-
>-HEADER_FIELD INTERFACE
>-TYPE STRING
>-STRING 'org.freedesktop.Foo'
>-HEADER_FIELD MEMBER
>-TYPE STRING
>-STRING 'Bar'
>-HEADER_FIELD PATH
>-TYPE OBJECT_PATH
>-OBJECT_PATH '/foo'
>-
>-HEADER_FIELD UNKNOWN
>-TYPE STRING
>-STRING 'a'
>-ALIGN 8
>-BYTE 0
>-END_LENGTH Header
>-START_LENGTH Body
>-END_LENGTH Body
>diff --git a/test/data/invalid-messages/too-short-dict.message b/test/data/invalid-messages/too-short-dict.message
>deleted file mode 100644
>index ffc3cc52..00000000
>--- a/test/data/invalid-messages/too-short-dict.message
>+++ /dev/null
>@@ -1,28 +0,0 @@
>-# Message with lots of different argument types
>-
>-VALID_HEADER method_call
>-
>-HEADER_FIELD INTERFACE
>-TYPE STRING
>-STRING 'org.freedesktop.Foo'
>-HEADER_FIELD MEMBER
>-TYPE STRING
>-STRING 'Bar'
>-HEADER_FIELD PATH
>-TYPE OBJECT_PATH
>-OBJECT_PATH '/foo'
>-
>-ALIGN 8
>-
>-END_LENGTH Header
>-
>-START_LENGTH Body
>-TYPE DICT
>-LENGTH Dict
>-START_LENGTH Dict
>-STRING 'uint32'
>-TYPE UINT32
>-UINT32 0x8765432
>-STRING 'uint32'
>-END_LENGTH Dict
>-END_LENGTH Body
>diff --git a/test/data/valid-messages/array-of-array-of-uint32.message b/test/data/valid-messages/array-of-array-of-uint32.message
>deleted file mode 100644
>index e12186b1..00000000
>--- a/test/data/valid-messages/array-of-array-of-uint32.message
>+++ /dev/null
>@@ -1,33 +0,0 @@
>-# Message with an array of array of uint32
>-
>-VALID_HEADER method_call
>-REQUIRED_FIELDS
>-ALIGN 8
>-END_LENGTH Header
>-START_LENGTH Body
>-
>-TYPE ARRAY
>-TYPE ARRAY
>-TYPE UINT32
>-
>-LENGTH Array
>-START_LENGTH Array
>-
>-## array of uint32
>-LENGTH SubArray1
>-START_LENGTH SubArray1
>-UINT32 1
>-UINT32 2
>-UINT32 3
>-END_LENGTH SubArray1
>-
>-## array of uint32
>-LENGTH SubArray2
>-START_LENGTH SubArray2
>-UINT32 4
>-UINT32 5
>-END_LENGTH SubArray2
>-
>-END_LENGTH Array
>-
>-END_LENGTH Body
>diff --git a/test/data/valid-messages/dict-simple.message b/test/data/valid-messages/dict-simple.message
>deleted file mode 100644
>index fa6927df..00000000
>--- a/test/data/valid-messages/dict-simple.message
>+++ /dev/null
>@@ -1,15 +0,0 @@
>-# A simple dict
>-
>-VALID_HEADER method_call
>-REQUIRED_FIELDS
>-ALIGN 8
>-END_LENGTH Header
>-START_LENGTH Body
>-TYPE DICT
>-LENGTH Dict
>-START_LENGTH Dict
>-STRING 'int32'
>-TYPE INT32
>-INT32 0x12345678
>-END_LENGTH Dict
>-END_LENGTH Body
>diff --git a/test/data/valid-messages/dict.message b/test/data/valid-messages/dict.message
>deleted file mode 100644
>index 0f997b1f..00000000
>--- a/test/data/valid-messages/dict.message
>+++ /dev/null
>@@ -1,47 +0,0 @@
>-# Dict with different values
>-
>-VALID_HEADER method_call
>-REQUIRED_FIELDS
>-ALIGN 8
>-END_LENGTH Header
>-START_LENGTH Body
>-TYPE DICT
>-LENGTH Dict
>-START_LENGTH Dict
>-STRING 'boolean'
>-TYPE BOOLEAN
>-BYTE 1
>-STRING 'int32'
>-TYPE INT32
>-INT32 0x12345678
>-STRING 'uint32'
>-TYPE UINT32
>-UINT32 0x8765432
>-STRING 'double'
>-TYPE DOUBLE
>-DOUBLE 3.141592653589
>-STRING 'string'
>-TYPE STRING
>-STRING 'This is a string'
>-STRING 'boolean_array'
>-TYPE ARRAY
>-TYPE BOOLEAN
>-BOOLEAN_ARRAY { true, false, false, true, false }
>-STRING 'int32_array'
>-TYPE ARRAY
>-TYPE INT32
>-INT32_ARRAY { 1, -2, 3, -4, 5, -6, 7, -8, 9, -10 }
>-STRING 'uint32_array'
>-TYPE ARRAY
>-TYPE UINT32
>-UINT32_ARRAY { 11, 12, 314, 1911, 57692, 1237, 2834 }
>-STRING 'double_array'
>-TYPE ARRAY
>-TYPE DOUBLE
>-DOUBLE_ARRAY { 0.1, 0.2, 3.1415926, 2.7183, 10.0, 9.99 }
>-STRING 'string_array'
>-TYPE ARRAY
>-TYPE STRING
>-STRING_ARRAY { 'Hello', 'This', 'Is', 'A', 'String', 'Array!' }
>-END_LENGTH Dict
>-END_LENGTH Body
>diff --git a/test/data/valid-messages/emptiness.message b/test/data/valid-messages/emptiness.message
>deleted file mode 100644
>index 32042c01..00000000
>--- a/test/data/valid-messages/emptiness.message
>+++ /dev/null
>@@ -1,63 +0,0 @@
>-# Empty arrays and strings
>-
>-VALID_HEADER method_call
>-REQUIRED_FIELDS
>-ALIGN 8
>-END_LENGTH Header
>-START_LENGTH Body
>-TYPE STRING
>-INT32 0
>-BYTE 0 # Strings need to be NULL-terminated
>-TYPE ARRAY
>-TYPE BOOLEAN
>-INT32 0
>-TYPE ARRAY
>-TYPE INT32
>-INT32 0
>-TYPE ARRAY
>-TYPE UINT32
>-INT32 0
>-TYPE ARRAY
>-TYPE DOUBLE
>-INT32 0
>-TYPE ARRAY
>-TYPE BYTE
>-INT32 0
>-TYPE ARRAY
>-TYPE STRING
>-INT32 0
>-TYPE DICT
>-INT32 0
>-
>-# A dict with empty arrays
>-TYPE DICT
>-LENGTH Dict
>-START_LENGTH Dict
>-STRING 'boolean_array'
>-TYPE ARRAY
>-TYPE BOOLEAN
>-INT32 0
>-STRING 'int32_array'
>-TYPE ARRAY
>-TYPE INT32
>-INT32 0
>-STRING 'uint32_array'
>-TYPE ARRAY
>-TYPE UINT32
>-INT32 0
>-STRING 'double_array'
>-TYPE ARRAY
>-TYPE DOUBLE
>-INT32 0
>-STRING 'byte_array'
>-TYPE ARRAY 
>-TYPE BYTE
>-INT32 0
>-STRING 'string_array' }
>-TYPE ARRAY
>-TYPE STRING
>-INT32 0
>-END_LENGTH Dict
>-
>-END_LENGTH Body
>-
>diff --git a/test/data/valid-messages/lots-of-arguments.message b/test/data/valid-messages/lots-of-arguments.message
>deleted file mode 100644
>index bdaae0f8..00000000
>--- a/test/data/valid-messages/lots-of-arguments.message
>+++ /dev/null
>@@ -1,65 +0,0 @@
>-# Message with lots of different argument types
>-
>-VALID_HEADER method_call
>-REQUIRED_FIELDS
>-ALIGN 8
>-END_LENGTH Header
>-START_LENGTH Body
>-TYPE NIL
>-TYPE BYTE
>-BYTE 42
>-TYPE INT32
>-INT32 0x12345678
>-TYPE UINT32
>-UINT32 0x8765432
>-TYPE DOUBLE
>-DOUBLE 3.141592653589
>-TYPE STRING
>-STRING 'This is a string'
>-TYPE ARRAY
>-TYPE BOOLEAN
>-BOOLEAN_ARRAY { true, false, false, true, false }
>-TYPE ARRAY
>-TYPE INT32
>-INT32_ARRAY { 1, -2, 3, -4, 5, -6, 7, -8, 9, -10 }
>-TYPE ARRAY
>-TYPE UINT32
>-UINT32_ARRAY { 11, 12, 314, 1911, 57692, 1237, 2834 }
>-TYPE ARRAY
>-TYPE DOUBLE
>-DOUBLE_ARRAY { 0.1, 0.2, 3.1415926, 2.7183, 10.0, 9.99 }
>-TYPE ARRAY
>-TYPE STRING
>-STRING_ARRAY { 'Hello', 'This', 'Is', 'A', 'String', 'Array!' }
>-TYPE CUSTOM
>-STRING 'named type'
>-BYTE_ARRAY { 'b', 'i', 'n', 'a', 'r', 'y', 'd', 'a', 't', 'a' }
>-
>-TYPE ARRAY
>-TYPE DICT
>-LENGTH Array
>-START_LENGTH Array
>-
>-LENGTH Dict1
>-START_LENGTH Dict1
>-STRING 'key1'
>-TYPE INT32
>-INT32 0x12345678
>-STRING 'key2'
>-TYPE UINT32
>-UINT32 0x8765432
>-END_LENGTH Dict1
>-
>-LENGTH Dict2
>-START_LENGTH Dict2
>-STRING 'key1'
>-TYPE INT32
>-INT32 0x12345678
>-STRING 'key2'
>-TYPE UINT32
>-UINT32 0x8765432
>-END_LENGTH Dict2
>-
>-END_LENGTH Array
>-
>-END_LENGTH Body
>diff --git a/test/data/valid-messages/no-padding.message b/test/data/valid-messages/no-padding.message
>deleted file mode 100644
>index 94df4d45..00000000
>--- a/test/data/valid-messages/no-padding.message
>+++ /dev/null
>@@ -1,22 +0,0 @@
>-## Message with no header padding
>-
>-## VALID_HEADER includes a LENGTH Header and LENGTH Body
>-VALID_HEADER method_call
>-
>-REQUIRED_FIELDS
>-
>-## this byte array is filled with zeros to the natural length 
>-## of the header
>-HEADER_FIELD UNKNOWN
>-TYPE ARRAY
>-TYPE BYTE
>-ALIGN 4
>-LENGTH ThisByteArray
>-START_LENGTH ThisByteArray
>-BYTE 1
>-ALIGN 8 1
>-END_LENGTH ThisByteArray
>-
>-END_LENGTH Header
>-START_LENGTH Body
>-END_LENGTH Body
>diff --git a/test/data/valid-messages/opposite-endian.message b/test/data/valid-messages/opposite-endian.message
>deleted file mode 100644
>index 90949dd2..00000000
>--- a/test/data/valid-messages/opposite-endian.message
>+++ /dev/null
>@@ -1,30 +0,0 @@
>-## Message of opposite endianness, with lots of random fields in it
>-
>-OPPOSITE_ENDIAN
>-
>-## VALID_HEADER includes a LENGTH Header and LENGTH Body
>-VALID_HEADER method_call
>-
>-REQUIRED_FIELDS
>-
>-HEADER_FIELD UNKNOWN
>-TYPE INT32
>-INT32 0xfeeb
>-
>-ALIGN 8
>-END_LENGTH Header
>-
>-START_LENGTH Body
>-
>-TYPE INT32
>-INT32 89765432
>-TYPE UINT32
>-UINT32 0xfffffff
>-TYPE STRING
>-STRING 'Hello this is a string'
>-TYPE DOUBLE
>-DOUBLE 3.14159
>-
>-TYPE NIL
>-
>-END_LENGTH Body
>diff --git a/test/data/valid-messages/recursive-types.message b/test/data/valid-messages/recursive-types.message
>deleted file mode 100644
>index e306fd1f..00000000
>--- a/test/data/valid-messages/recursive-types.message
>+++ /dev/null
>@@ -1,99 +0,0 @@
>-## Message with recursive types
>-
>-## VALID_HEADER includes a LENGTH Header and LENGTH Body
>-VALID_HEADER method_call
>-
>-REQUIRED_FIELDS
>-
>-ALIGN 8
>-END_LENGTH Header
>-START_LENGTH Body
>-
>-# Everything is inside a dict
>-TYPE DICT
>-LENGTH Dict1
>-START_LENGTH Dict1
>-
>-# first dict entry is an array of array of uint32
>-STRING 'mega-uint-array'
>-TYPE ARRAY
>-TYPE ARRAY
>-TYPE ARRAY
>-TYPE UINT32
>-LENGTH Array1
>-START_LENGTH Array1
>-
>-LENGTH Array1_1
>-START_LENGTH Array1_1
>-UINT32_ARRAY { 1, 2, 3, 4, 5}
>-UINT32_ARRAY { 2, 3, 4, 5, 1}
>-UINT32_ARRAY { 3, 4, 5, 1, 2}
>-END_LENGTH Array1_1
>-
>-LENGTH Array1_2
>-START_LENGTH Array1_2
>-UINT32_ARRAY { 4, 5, 6, 7, 8}
>-UINT32_ARRAY { 5, 6, 7, 8, 4}
>-END_LENGTH Array1_2
>-
>-END_LENGTH Array1
>-
>-# second dict entry is an array of strings
>-STRING 'string-array'
>-TYPE ARRAY
>-TYPE STRING
>-STRING_ARRAY { 'a', 'string', 'array'}
>-
>-# third dict entry is another dict
>-STRING 'nested-dict'
>-TYPE DICT
>-LENGTH Dict2
>-START_LENGTH Dict2
>-
>-STRING 'string'
>-TYPE STRING
>-STRING 'a deeply nested string'     
>-
>-STRING 'super-nested-dict'
>-TYPE DICT
>-LENGTH Dict3
>-START_LENGTH Dict3
>-
>-STRING 'double-array'
>-TYPE ARRAY
>-TYPE DOUBLE
>-DOUBLE_ARRAY {1.0, 2.0, 3.0}
>-
>-STRING 'dict-array'
>-TYPE ARRAY
>-TYPE DICT
>-LENGTH Array2
>-START_LENGTH Array2
>-
>-LENGTH Dict4
>-START_LENGTH Dict4
>-STRING 'key4'
>-TYPE BYTE
>-BYTE '4'
>-END_LENGTH Dict4
>-
>-LENGTH Dict5
>-START_LENGTH Dict5
>-STRING 'key5'
>-TYPE BYTE
>-BYTE '5'
>-END_LENGTH Dict5
>-
>-END_LENGTH Array2
>-
>-STRING 'boolean'
>-TYPE BOOLEAN
>-BOOLEAN false
>-
>-END_LENGTH Dict3
>-
>-END_LENGTH Dict2
>-
>-END_LENGTH Dict1
>-
>-END_LENGTH Body
>diff --git a/test/data/valid-messages/simplest-manual.message b/test/data/valid-messages/simplest-manual.message
>deleted file mode 100644
>index d6a960d6..00000000
>--- a/test/data/valid-messages/simplest-manual.message
>+++ /dev/null
>@@ -1,30 +0,0 @@
>-## like simplest.message, but doesn't use VALID_HEADER
>-## convenience command. mostly to test the test framework.
>-
>-LITTLE_ENDIAN
>-BYTE 'l'
>-BYTE 1
>-BYTE 0
>-BYTE 0
>-LENGTH Header
>-LENGTH Body
>-## client serial
>-INT32 7
>-
>-HEADER_FIELD PATH
>-TYPE OBJECT_PATH
>-OBJECT_PATH '/foo'
>-HEADER_FIELD INTERFACE
>-TYPE STRING
>-STRING 'org.freedesktop.Foo'
>-HEADER_FIELD MEMBER
>-TYPE STRING
>-STRING 'Bar'
>-HEADER_FIELD SIGNATURE
>-TYPE STRING
>-STRING ''
>-
>-ALIGN 8
>-END_LENGTH Header
>-START_LENGTH Body
>-END_LENGTH Body
>diff --git a/test/data/valid-messages/simplest.message b/test/data/valid-messages/simplest.message
>deleted file mode 100644
>index b9ddaf6b..00000000
>--- a/test/data/valid-messages/simplest.message
>+++ /dev/null
>@@ -1,10 +0,0 @@
>-## simplest possible valid message
>-
>-## VALID_HEADER includes a LENGTH Header and LENGTH Body
>-VALID_HEADER method_call
>-REQUIRED_FIELDS
>-
>-ALIGN 8
>-END_LENGTH Header
>-START_LENGTH Body
>-END_LENGTH Body
>diff --git a/test/data/valid-messages/standard-acquire-service.message b/test/data/valid-messages/standard-acquire-service.message
>deleted file mode 100644
>index 459f3bb4..00000000
>--- a/test/data/valid-messages/standard-acquire-service.message
>+++ /dev/null
>@@ -1,26 +0,0 @@
>-# Standard org.freedesktop.DBus.AcquireService message
>-
>-VALID_HEADER method_call
>-HEADER_FIELD PATH
>-TYPE OBJECT_PATH
>-OBJECT_PATH '/org/freedesktop/DBus'
>-HEADER_FIELD INTERFACE
>-TYPE STRING
>-STRING 'org.freedesktop.DBus'
>-HEADER_FIELD MEMBER
>-TYPE STRING
>-STRING 'AcquireService'
>-HEADER_FIELD DESTINATION
>-TYPE STRING
>-STRING 'org.freedesktop.DBus'
>-HEADER_FIELD SIGNATURE
>-TYPE STRING
>-STRING 'su'
>-ALIGN 8
>-END_LENGTH Header
>-START_LENGTH Body
>-TYPE STRING
>-STRING 'org.freedesktop.DBus.Sample'
>-TYPE UINT32
>-UINT32 0
>-END_LENGTH Body
>diff --git a/test/data/valid-messages/standard-hello.message b/test/data/valid-messages/standard-hello.message
>deleted file mode 100644
>index a08835e0..00000000
>--- a/test/data/valid-messages/standard-hello.message
>+++ /dev/null
>@@ -1,22 +0,0 @@
>-# Standard org.freedesktop.DBus.Hello message
>-
>-VALID_HEADER method_call
>-HEADER_FIELD PATH
>-TYPE OBJECT_PATH
>-OBJECT_PATH '/org/freedesktop/DBus'
>-HEADER_FIELD INTERFACE
>-TYPE STRING
>-STRING 'org.freedesktop.DBus'
>-HEADER_FIELD MEMBER
>-TYPE STRING
>-STRING 'Hello'
>-HEADER_FIELD DESTINATION
>-TYPE STRING
>-STRING 'org.freedesktop.DBus'
>-HEADER_FIELD SIGNATURE
>-TYPE STRING
>-STRING ''
>-ALIGN 8
>-END_LENGTH Header
>-START_LENGTH Body
>-END_LENGTH Body
>diff --git a/test/data/valid-messages/standard-list-services.message b/test/data/valid-messages/standard-list-services.message
>deleted file mode 100644
>index 3e10aebe..00000000
>--- a/test/data/valid-messages/standard-list-services.message
>+++ /dev/null
>@@ -1,22 +0,0 @@
>-# Standard org.freedesktop.DBus.ListServices message
>-
>-VALID_HEADER method_call
>-HEADER_FIELD PATH
>-TYPE OBJECT_PATH
>-OBJECT_PATH '/org/freedesktop/DBus'
>-HEADER_FIELD INTERFACE
>-TYPE STRING
>-STRING 'org.freedesktop.DBus'
>-HEADER_FIELD MEMBER
>-TYPE STRING
>-STRING 'ListServices'
>-HEADER_FIELD DESTINATION
>-TYPE STRING
>-STRING 'org.freedesktop.DBus'
>-HEADER_FIELD SIGNATURE
>-TYPE STRING
>-STRING ''
>-ALIGN 8
>-END_LENGTH Header
>-START_LENGTH Body
>-END_LENGTH Body
>diff --git a/test/data/valid-messages/standard-service-exists.message b/test/data/valid-messages/standard-service-exists.message
>deleted file mode 100644
>index 6b57eb50..00000000
>--- a/test/data/valid-messages/standard-service-exists.message
>+++ /dev/null
>@@ -1,24 +0,0 @@
>-# Standard org.freedesktop.DBus.ServiceExists message
>-
>-VALID_HEADER method_call
>-HEADER_FIELD PATH
>-TYPE OBJECT_PATH
>-OBJECT_PATH '/org/freedesktop/DBus'
>-HEADER_FIELD INTERFACE
>-TYPE STRING
>-STRING 'org.freedesktop.DBus'
>-HEADER_FIELD MEMBER
>-TYPE STRING
>-STRING 'ServiceExists'
>-HEADER_FIELD DESTINATION
>-TYPE STRING
>-STRING 'org.freedesktop.DBus'
>-HEADER_FIELD SIGNATURE
>-TYPE STRING
>-STRING 's'
>-ALIGN 8
>-END_LENGTH Header
>-START_LENGTH Body
>-TYPE STRING
>-STRING 'org.freedesktop.DBus.Sample'
>-END_LENGTH Body
>diff --git a/test/data/valid-messages/unknown-header-field.message b/test/data/valid-messages/unknown-header-field.message
>deleted file mode 100644
>index ac7d624c..00000000
>--- a/test/data/valid-messages/unknown-header-field.message
>+++ /dev/null
>@@ -1,19 +0,0 @@
>-## message with a 'name' header field and unknown 'unkn' field
>-
>-## VALID_HEADER includes a LENGTH Header and LENGTH Body
>-VALID_HEADER method_call
>-REQUIRED_FIELDS
>-
>-HEADER_FIELD UNKNOWN
>-TYPE DICT
>-LENGTH Dict
>-START_LENGTH Dict
>-STRING 'int32'
>-TYPE INT32
>-INT32 0x12345678
>-END_LENGTH Dict
>-
>-ALIGN 8
>-END_LENGTH Header
>-START_LENGTH Body
>-END_LENGTH Body
>-- 
>2.15.0
>

Actions: View | Splinter Review

Attachments on bug 103758: 135488 | 135489

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.