diff options
author | Dieter Verfaillie <dieterv@optionexplicit.be> | 2013-05-15 14:42:09 +0200 |
---|---|---|
committer | Dieter Verfaillie <dieterv@optionexplicit.be> | 2013-10-08 20:53:39 +0200 |
commit | 146a56f7f358dc14989e198fee4c2dd01b55be07 (patch) | |
tree | b327e81dde1ed0b9691cf98d11c0aafbb6977c96 /tests | |
parent | 94a7d4b4af283bf46b81411699f10ffcf3937a29 (diff) | |
download | gobject-introspection-146a56f7f358dc14989e198fee4c2dd01b55be07.tar.gz |
tests: rename <commentblock> element to <input>
We'll start testing parser warning/error messages and
serialized output later on so this will make it easier to
see what's parser input and output...
Diffstat (limited to 'tests')
45 files changed, 402 insertions, 402 deletions
diff --git a/tests/scanner/annotationparser/gi/annotation_allow_none.xml b/tests/scanner/annotationparser/gi/annotation_allow_none.xml index 02db79a9..7398478d 100644 --- a/tests/scanner/annotationparser/gi/annotation_allow_none.xml +++ b/tests/scanner/annotationparser/gi/annotation_allow_none.xml @@ -3,7 +3,7 @@ <tests> <test> - <commentblock>/** + <input>/** * annotation_object_inout: * @object: a #GObject * @inoutarg: (inout) (allow-none): This is an argument test @@ -11,7 +11,7 @@ * This is a test for out arguments * * Return value: an int - */</commentblock> + */</input> <docblock> <identifier> <name>annotation_object_inout</name> diff --git a/tests/scanner/annotationparser/gi/annotation_array.xml b/tests/scanner/annotationparser/gi/annotation_array.xml index 26bb1104..2957900c 100644 --- a/tests/scanner/annotationparser/gi/annotation_array.xml +++ b/tests/scanner/annotationparser/gi/annotation_array.xml @@ -3,12 +3,12 @@ <tests> <test> - <commentblock>/** + <input>/** * annotation_object_compute_sum: * @nums: (array): Sequence of numbers * * Test taking a zero-terminated array - **/</commentblock> + **/</input> <docblock> <identifier> <name>annotation_object_compute_sum</name> @@ -29,7 +29,7 @@ </test> <test> - <commentblock>/** + <input>/** * annotation_object_compute_sum_n: * @object: a #AnnotationObject * @nums: (array length=n_nums zero-terminated=0): Sequence of @@ -37,7 +37,7 @@ * @n_nums: Length of number array * * Test taking an array with length parameter - **/</commentblock> + **/</input> <docblock> <identifier> <name>annotation_object_compute_sum_n</name> @@ -76,7 +76,7 @@ </test> <test> - <commentblock>/** + <input>/** * annotation_object_compute_sum_nz: * @object: a #AnnotationObject * @nums: (array length=n_nums zero-terminated=1): Sequence of numbers that @@ -84,7 +84,7 @@ * @n_nums: Length of number array * * Test taking a zero-terminated array with length parameter - **/</commentblock> + **/</input> <docblock> <identifier> <name>annotation_object_compute_sum_nz</name> @@ -123,14 +123,14 @@ </test> <test> - <commentblock>/** + <input>/** * annotation_object_parse_args: * @object: a #AnnotationObject * @argc: (inout): Length of the argument vector * @argv: (inout) (array length=argc zero-terminated=1): Argument vector * * Test taking a zero-terminated array with length parameter - **/</commentblock> + **/</input> <docblock> <identifier> <name>annotation_object_parse_args</name> @@ -177,14 +177,14 @@ </test> <test> - <commentblock>/** + <input>/** * annotation_object_set_data: * @object: a #AnnotationObject * @data: (array length=length): The data * @length: Length of the data * * Test taking a guchar * with a length. - **/</commentblock> + **/</input> <docblock> <identifier> <name>annotation_object_set_data</name> @@ -219,12 +219,12 @@ </test> <test> - <commentblock>/** + <input>/** * annotation_string_zero_terminated: * @data: (array fixed-size=2): a third value * * Return value: (transfer full) (array zero-terminated=1): The return value - */</commentblock> + */</input> <docblock> <identifier> <name>annotation_string_zero_terminated</name> diff --git a/tests/scanner/annotationparser/gi/annotation_closure.xml b/tests/scanner/annotationparser/gi/annotation_closure.xml index 8211dc7b..e406ae18 100644 --- a/tests/scanner/annotationparser/gi/annotation_closure.xml +++ b/tests/scanner/annotationparser/gi/annotation_closure.xml @@ -3,13 +3,13 @@ <tests> <test> - <commentblock>/** + <input>/** * AnnotationNotifyFunc: * @data: (closure): The user data * * This is a callback with a 'closure' argument that is not named * 'user_data' and hence has to be annotated. - */</commentblock> + */</input> <docblock> <identifier> <name>AnnotationNotifyFunc</name> @@ -31,13 +31,13 @@ </test> <test> - <commentblock>/** + <input>/** * annotation_custom_destroy: * @callback: (destroy destroy) (closure data): Destroy notification * * Test messing up the heuristic of closure/destroy-notification * detection, and fixing it via annotations. - */</commentblock> + */</input> <docblock> <identifier> <name>annotation_custom_destroy</name> diff --git a/tests/scanner/annotationparser/gi/annotation_constructor.xml b/tests/scanner/annotationparser/gi/annotation_constructor.xml index 4bf3b038..314a4ad1 100644 --- a/tests/scanner/annotationparser/gi/annotation_constructor.xml +++ b/tests/scanner/annotationparser/gi/annotation_constructor.xml @@ -3,9 +3,9 @@ <tests> <test> - <commentblock>/** + <input>/** * regress_constructor: (constructor) - */</commentblock> + */</input> <docblock> <identifier> <name>regress_constructor</name> diff --git a/tests/scanner/annotationparser/gi/annotation_destroy.xml b/tests/scanner/annotationparser/gi/annotation_destroy.xml index 449dd8e1..229a11be 100644 --- a/tests/scanner/annotationparser/gi/annotation_destroy.xml +++ b/tests/scanner/annotationparser/gi/annotation_destroy.xml @@ -3,13 +3,13 @@ <tests> <test> - <commentblock>/** + <input>/** * annotation_custom_destroy: * @callback: (destroy destroy) (closure data): Destroy notification * * Test messing up the heuristic of closure/destroy-notification * detection, and fixing it via annotations. - */</commentblock> + */</input> <docblock> <identifier> <name>annotation_custom_destroy</name> diff --git a/tests/scanner/annotationparser/gi/annotation_element_type.xml b/tests/scanner/annotationparser/gi/annotation_element_type.xml index d03c4268..a656e9a6 100644 --- a/tests/scanner/annotationparser/gi/annotation_element_type.xml +++ b/tests/scanner/annotationparser/gi/annotation_element_type.xml @@ -3,11 +3,11 @@ <tests> <test> - <commentblock>/** + <input>/** * foo_test_array: * * Returns: (element-type utf8) (transfer container): returns %NULL. - */</commentblock> + */</input> <docblock> <identifier> <name>foo_test_array</name> @@ -40,14 +40,14 @@ </test> <test> - <commentblock>/** + <input>/** * RegressTestObj::sig-with-hash-prop: * @self: an object * @hash: (element-type utf8 GObject.Value): * * This test signal is like TelepathyGlib's * TpAccount::status-changed - */</commentblock> + */</input> <docblock> <identifier> <name>RegressTestObj::sig-with-hash-prop</name> @@ -80,14 +80,14 @@ </test> <test> - <commentblock><![CDATA[/** + <input><![CDATA[/** * regress_test_ghash_nested_everything_return2: * * Another way of specifying nested parameterized types: using the * element-type annotation. * * Return value: (element-type utf8 GLib.HashTable<utf8,utf8>) (transfer full): - */]]></commentblock> + */]]></input> <docblock> <identifier> <name>regress_test_ghash_nested_everything_return2</name> diff --git a/tests/scanner/annotationparser/gi/annotation_foreign.xml b/tests/scanner/annotationparser/gi/annotation_foreign.xml index 11e589c5..f9674ded 100644 --- a/tests/scanner/annotationparser/gi/annotation_foreign.xml +++ b/tests/scanner/annotationparser/gi/annotation_foreign.xml @@ -3,10 +3,10 @@ <tests> <test> - <commentblock>/** + <input>/** * FooForeignStruct: (foreign) * - */</commentblock> + */</input> <docblock> <identifier> <name>FooForeignStruct</name> diff --git a/tests/scanner/annotationparser/gi/annotation_get_value_func.xml b/tests/scanner/annotationparser/gi/annotation_get_value_func.xml index bc779943..e9097ff0 100644 --- a/tests/scanner/annotationparser/gi/annotation_get_value_func.xml +++ b/tests/scanner/annotationparser/gi/annotation_get_value_func.xml @@ -6,13 +6,13 @@ <!-- "Get value func:" tag syntax --> - <commentblock>/** + <input>/** * RegressTestFundamentalObject: * * This object tests regressions... * * Get value func: regress_test_value_get_fundamental_object - */</commentblock> + */</input> <docblock> <identifier> <name>RegressTestFundamentalObject</name> diff --git a/tests/scanner/annotationparser/gi/annotation_in.xml b/tests/scanner/annotationparser/gi/annotation_in.xml index 517f1a3f..b2f9c6d6 100644 --- a/tests/scanner/annotationparser/gi/annotation_in.xml +++ b/tests/scanner/annotationparser/gi/annotation_in.xml @@ -3,7 +3,7 @@ <tests> <test> - <commentblock>/** + <input>/** * annotation_object_in: * @object: a #GObject * @inarg: (in) (transfer none): This is an argument test @@ -11,7 +11,7 @@ * This is a test for in arguments * * Return value: an int - */</commentblock> + */</input> <docblock> <identifier> <name>annotation_object_in</name> diff --git a/tests/scanner/annotationparser/gi/annotation_in_out.xml b/tests/scanner/annotationparser/gi/annotation_in_out.xml index c8d36f45..d6482631 100644 --- a/tests/scanner/annotationparser/gi/annotation_in_out.xml +++ b/tests/scanner/annotationparser/gi/annotation_in_out.xml @@ -3,7 +3,7 @@ <tests> <test> - <commentblock>/** + <input>/** * annotation_object_inout: * @object: a #GObject * @inoutarg: (inout): This is an argument test @@ -12,7 +12,7 @@ * This is a test for inout arguments * * Return value: an int - */</commentblock> + */</input> <docblock> <identifier> <name>annotation_object_inout</name> diff --git a/tests/scanner/annotationparser/gi/annotation_method.xml b/tests/scanner/annotationparser/gi/annotation_method.xml index e4d44389..038923ab 100644 --- a/tests/scanner/annotationparser/gi/annotation_method.xml +++ b/tests/scanner/annotationparser/gi/annotation_method.xml @@ -3,10 +3,10 @@ <tests> <test> - <commentblock>/** + <input>/** * regress_forced_method: (method) * @obj: A #RegressTestObj - */</commentblock> + */</input> <docblock> <identifier> <name>regress_forced_method</name> diff --git a/tests/scanner/annotationparser/gi/annotation_out.xml b/tests/scanner/annotationparser/gi/annotation_out.xml index cca5e12e..39d889f1 100644 --- a/tests/scanner/annotationparser/gi/annotation_out.xml +++ b/tests/scanner/annotationparser/gi/annotation_out.xml @@ -3,7 +3,7 @@ <tests> <test> - <commentblock>/** + <input>/** * annotation_object_out: * @object: a #GObject * @outarg: (out): This is an argument test @@ -11,7 +11,7 @@ * This is a test for out arguments * * Return value: an int - */</commentblock> + */</input> <docblock> <identifier> <name>annotation_object_out</name> @@ -42,11 +42,11 @@ </test> <test> - <commentblock>/** + <input>/** * regress_test_struct_a_clone: * @a: the structure * @a_out: (out caller-allocates): the cloned structure - */</commentblock> + */</input> <docblock> <identifier> <name>regress_test_struct_a_clone</name> @@ -75,11 +75,11 @@ </test> <test> - <commentblock>/** + <input>/** * regress_test_struct_a_clone: * @a: the structure * @a_out: (out callee-allocates): the cloned structure - */</commentblock> + */</input> <docblock> <identifier> <name>regress_test_struct_a_clone</name> diff --git a/tests/scanner/annotationparser/gi/annotation_ref_func.xml b/tests/scanner/annotationparser/gi/annotation_ref_func.xml index 7850fc3f..0d15c54e 100644 --- a/tests/scanner/annotationparser/gi/annotation_ref_func.xml +++ b/tests/scanner/annotationparser/gi/annotation_ref_func.xml @@ -6,13 +6,13 @@ <!-- "Ref func:" tag syntax --> - <commentblock>/** + <input>/** * RegressTestFundamentalObject: * * This object tests regressions... * * Ref func: regress_test_fundamental_object_ref - */</commentblock> + */</input> <docblock> <identifier> <name>RegressTestFundamentalObject</name> diff --git a/tests/scanner/annotationparser/gi/annotation_rename_to.xml b/tests/scanner/annotationparser/gi/annotation_rename_to.xml index 390f4878..e63679c2 100644 --- a/tests/scanner/annotationparser/gi/annotation_rename_to.xml +++ b/tests/scanner/annotationparser/gi/annotation_rename_to.xml @@ -6,7 +6,7 @@ <!-- "Rename to:" tag syntax --> - <commentblock>/** + <input>/** * annotation_object_watch_full: * @object: A #AnnotationObject * @func: The callback @@ -16,7 +16,7 @@ * Test overriding via the "Rename To" annotation. * * Rename to: annotation_object_watch - */</commentblock> + */</input> <docblock> <identifier> <name>annotation_object_watch_full</name> diff --git a/tests/scanner/annotationparser/gi/annotation_scope.xml b/tests/scanner/annotationparser/gi/annotation_scope.xml index 7f05a4c6..7ae9c8ab 100644 --- a/tests/scanner/annotationparser/gi/annotation_scope.xml +++ b/tests/scanner/annotationparser/gi/annotation_scope.xml @@ -3,14 +3,14 @@ <tests> <test> - <commentblock>/** + <input>/** * annotation_object_foreach: * @object: a #AnnotationObject * @func: (scope call): Callback to invoke * @user_data: Callback user data * * Test taking a call-scoped callback - **/</commentblock> + **/</input> <docblock> <identifier> <name>annotation_object_foreach</name> @@ -44,13 +44,13 @@ </test> <test> - <commentblock>/** + <input>/** * regress_test_callback_destroy_notify: * @callback: (scope notified): * * Notified - callback persists until a DestroyNotify delegate * is invoked. - **/</commentblock> + **/</input> <docblock> <identifier> <name>regress_test_callback_destroy_notify</name> @@ -76,11 +76,11 @@ is invoked.</description> </test> <test> - <commentblock>/** + <input>/** * regress_test_callback_async: * @callback: (scope async): * - **/</commentblock> + **/</input> <docblock> <identifier> <name>regress_test_callback_async</name> diff --git a/tests/scanner/annotationparser/gi/annotation_set_value_func.xml b/tests/scanner/annotationparser/gi/annotation_set_value_func.xml index 1f3a44d3..4b931139 100644 --- a/tests/scanner/annotationparser/gi/annotation_set_value_func.xml +++ b/tests/scanner/annotationparser/gi/annotation_set_value_func.xml @@ -6,13 +6,13 @@ <!-- "Set value func:" tag syntax --> - <commentblock>/** + <input>/** * RegressTestFundamentalObject: * * This object tests regressions... * * Set value func: regress_test_value_set_fundamental_object - */</commentblock> + */</input> <docblock> <identifier> <name>RegressTestFundamentalObject</name> diff --git a/tests/scanner/annotationparser/gi/annotation_skip.xml b/tests/scanner/annotationparser/gi/annotation_skip.xml index 030b0c42..42afdd6a 100644 --- a/tests/scanner/annotationparser/gi/annotation_skip.xml +++ b/tests/scanner/annotationparser/gi/annotation_skip.xml @@ -3,7 +3,7 @@ <tests> <test> - <commentblock>/** + <input>/** * annotation_object_watch: (skip) * @object: A #AnnotationObject * @func: The callback @@ -11,7 +11,7 @@ * * This is here just for the sake of being overriden by its * annotation_object_watch_full(). - */</commentblock> + */</input> <docblock> <identifier> <name>annotation_object_watch</name> diff --git a/tests/scanner/annotationparser/gi/annotation_transfer.xml b/tests/scanner/annotationparser/gi/annotation_transfer.xml index 49df32fd..680ada1a 100644 --- a/tests/scanner/annotationparser/gi/annotation_transfer.xml +++ b/tests/scanner/annotationparser/gi/annotation_transfer.xml @@ -3,14 +3,14 @@ <tests> <test> - <commentblock>/** + <input>/** * AnnotationObject::list-signal: * @annotation: the annotation object * @list: (type GLib.List) (element-type utf8) (transfer container): a list of strings * * This is a signal which takes a list of strings, but it's not * known by GObject as it's only marked as G_TYPE_POINTER - */</commentblock> + */</input> <docblock> <identifier> <name>AnnotationObject::list-signal</name> @@ -57,7 +57,7 @@ known by GObject as it's only marked as G_TYPE_POINTER</description> </test> <test> - <commentblock>/** + <input>/** * annotation_object_in: * @object: a #GObject * @inarg: (in) (transfer none): This is an argument test @@ -65,7 +65,7 @@ known by GObject as it's only marked as G_TYPE_POINTER</description> * This is a test for in arguments * * Return value: an int - */</commentblock> + */</input> <docblock> <identifier> <name>annotation_object_in</name> @@ -104,11 +104,11 @@ known by GObject as it's only marked as G_TYPE_POINTER</description> </test> <test> - <commentblock>/** + <input>/** * annotation_transfer_floating: * * Returns: (transfer floating): A floating object - */</commentblock> + */</input> <docblock> <identifier> <name>annotation_transfer_floating</name> @@ -136,14 +136,14 @@ known by GObject as it's only marked as G_TYPE_POINTER</description> <!-- "Transfer:" tag syntax --> - <commentblock>/** + <input>/** * FsSession:codecs-without-config: * * This is the same list of codecs as #FsSession:codecs * without.... * * Transfer: full - */</commentblock> + */</input> <docblock> <identifier> <name>FsSession:codecs-without-config</name> diff --git a/tests/scanner/annotationparser/gi/annotation_type.xml b/tests/scanner/annotationparser/gi/annotation_type.xml index d357423a..5258f372 100644 --- a/tests/scanner/annotationparser/gi/annotation_type.xml +++ b/tests/scanner/annotationparser/gi/annotation_type.xml @@ -3,14 +3,14 @@ <tests> <test> - <commentblock>/** + <input>/** * AnnotationObject::list-signal: * @annotation: the annotation object * @list: (type GLib.List) (element-type utf8) (transfer container): a list of strings * * This is a signal which takes a list of strings, but it's not * known by GObject as it's only marked as G_TYPE_POINTER - */</commentblock> + */</input> <docblock> <identifier> <name>AnnotationObject::list-signal</name> @@ -60,13 +60,13 @@ known by GObject as it's only marked as G_TYPE_POINTER</description> <!-- "Type:" tag syntax --> - <commentblock>/** + <input>/** * RegressTestObj:hash-table: * * Test. * * Type: GLib.HashTable(utf8,gint8) - */</commentblock> + */</input> <docblock> <identifier> <name>RegressTestObj:hash-table</name> diff --git a/tests/scanner/annotationparser/gi/annotation_unref_func.xml b/tests/scanner/annotationparser/gi/annotation_unref_func.xml index 98ac0a3e..0adbeff8 100644 --- a/tests/scanner/annotationparser/gi/annotation_unref_func.xml +++ b/tests/scanner/annotationparser/gi/annotation_unref_func.xml @@ -6,13 +6,13 @@ <!-- "Unref func:" tag syntax --> - <commentblock>/** + <input>/** * RegressTestFundamentalObject: * * This object tests regressions... * * Unref func: regress_test_fundamental_object_unref - */</commentblock> + */</input> <docblock> <identifier> <name>RegressTestFundamentalObject</name> diff --git a/tests/scanner/annotationparser/gi/annotation_value.xml b/tests/scanner/annotationparser/gi/annotation_value.xml index 4a1a0785..3745de66 100644 --- a/tests/scanner/annotationparser/gi/annotation_value.xml +++ b/tests/scanner/annotationparser/gi/annotation_value.xml @@ -6,13 +6,13 @@ <!-- "Value:" tag syntax --> - <commentblock>/** + <input>/** * ANNOTATION_CALCULATED_LARGE: * * Constant to define a calculated large value * * Value: 10000000000UL - */</commentblock> + */</input> <docblock> <identifier> <name>ANNOTATION_CALCULATED_LARGE</name> diff --git a/tests/scanner/annotationparser/gi/annotation_virtual.xml b/tests/scanner/annotationparser/gi/annotation_virtual.xml index f2b6b23a..db211b4e 100644 --- a/tests/scanner/annotationparser/gi/annotation_virtual.xml +++ b/tests/scanner/annotationparser/gi/annotation_virtual.xml @@ -6,7 +6,7 @@ <!-- "Virtual:" tag syntax --> - <commentblock>/** + <input>/** * foo_object_read: * @object: obj * @offset: offset @@ -15,7 +15,7 @@ * Read some stuff. * * Virtual: read_fn - */</commentblock> + */</input> <docblock> <identifier> <name>foo_object_read</name> diff --git a/tests/scanner/annotationparser/gi/syntax.xml b/tests/scanner/annotationparser/gi/syntax.xml index f07e4fbd..7dd7b914 100644 --- a/tests/scanner/annotationparser/gi/syntax.xml +++ b/tests/scanner/annotationparser/gi/syntax.xml @@ -6,84 +6,84 @@ <!-- Not GTK-Doc --> - <commentblock>//Test</commentblock> + <input>//Test</input> </test> <test> <!-- Not GTK-Doc --> - <commentblock>// Test</commentblock> + <input>// Test</input> </test> <test> <!-- Not GTK-Doc --> - <commentblock>/*Test*/</commentblock> + <input>/*Test*/</input> </test> <test> <!-- Not GTK-Doc --> - <commentblock>/* Test */</commentblock> + <input>/* Test */</input> </test> <test> <!-- Not GTK-Doc --> - <commentblock>/* Test -something */</commentblock> + <input>/* Test +something */</input> </test> <test> <!-- Not GTK-Doc --> - <commentblock>/* + <input>/* Test -something */</commentblock> +something */</input> </test> <test> <!-- Not GTK-Doc --> - <commentblock>/**Test*/</commentblock> + <input>/**Test*/</input> </test> <test> <!-- Not GTK-Doc --> - <commentblock>/** Test */</commentblock> + <input>/** Test */</input> </test> <test> <!-- Not GTK-Doc --> - <commentblock>/** Test -something */</commentblock> + <input>/** Test +something */</input> </test> <test> <!-- Not GTK-Doc --> - <commentblock>/** -*/</commentblock> + <input>/** +*/</input> </test> <test> <!-- Technically not GTK-Doc, but we need to support this for backwards compatibility --> - <commentblock>/** + <input>/** Test -something */</commentblock> +something */</input> <docblock> <identifier> <name>Test</name> @@ -96,9 +96,9 @@ something */</commentblock> <!-- Technically not GTK-Doc, but we need to support this for backwards compatibility --> - <commentblock>/** + <input>/** Test -something **/</commentblock> +something **/</input> <docblock> <identifier> <name>Test</name> @@ -112,13 +112,13 @@ something **/</commentblock> Broken comment block, signal the start of the comment block description followed by a parameter instead. --> - <commentblock>/** + <input>/** * SECTION:meepapp * * @short_description: the application class * * The application class handles ... - */</commentblock> + */</input> <docblock> <identifier> <name>SECTION:meepapp</name> diff --git a/tests/scanner/annotationparser/gi/syntax_identifier.xml b/tests/scanner/annotationparser/gi/syntax_identifier.xml index 69dcf328..374d0071 100644 --- a/tests/scanner/annotationparser/gi/syntax_identifier.xml +++ b/tests/scanner/annotationparser/gi/syntax_identifier.xml @@ -6,23 +6,23 @@ <!-- Identifier part not on the first line. --> - <commentblock>/** + <input>/** * * SECTION:meepapp -*/</commentblock> +*/</input> </test> <test> <!-- Multiple identifier parts --> - <commentblock>/** + <input>/** * SECTION:meepapp * SECTION:meepapp2 * @short_description: the application class * * The application class handles ... - */</commentblock> + */</input> <docblock> <identifier> <name>SECTION:meepapp</name> @@ -42,7 +42,7 @@ The application class handles ...</description> <!-- Section documentation including all optional metadata. --> - <commentblock>/** + <input>/** * SECTION:meepapp * @short_description: the application class * @title: Meep application @@ -53,7 +53,7 @@ The application class handles ...</description> * @image: application.png * * The application class handles ... - */</commentblock> + */</input> <docblock> <identifier> <name>SECTION:meepapp</name> @@ -95,7 +95,7 @@ The application class handles ...</description> <!-- Broken comment block with empty line between identifier and parameters parts. --> - <commentblock>/** + <input>/** * SECTION:meepapp * * @short_description: the application class @@ -107,7 +107,7 @@ The application class handles ...</description> * @image: application.png * * The application class handles ... - */</commentblock> + */</input> <docblock> <identifier> <name>SECTION:meepapp</name> @@ -149,7 +149,7 @@ The application class handles ...</description> <!-- Broken comment block with description part before parameters part, without empty line. --> - <commentblock>/** + <input>/** * SECTION:meepapp * * The application class handles ... @@ -160,7 +160,7 @@ The application class handles ...</description> * @stability: Stable * @include: meep/app.h * @image: application.png - */</commentblock> + */</input> <docblock> <identifier> <name>SECTION:meepapp</name> @@ -202,7 +202,7 @@ The application class handles ...</description> <!-- Broken comment block with description part before parameters part, with empty line. --> - <commentblock>/** + <input>/** * SECTION:meepapp * * The application class handles ... @@ -214,7 +214,7 @@ The application class handles ...</description> * @stability: Stable * @include: meep/app.h * @image: application.png - */</commentblock> + */</input> <docblock> <identifier> <name>SECTION:meepapp</name> @@ -257,7 +257,7 @@ The application class handles ...</description> Old style implicit returns. https://bugzilla.gnome.org/show_bug.cgi?id=457077 --> - <commentblock>/** + <input>/** * SECTION:tester * @short_description: module for gtk-doc unit test * @@ -265,7 +265,7 @@ The application class handles ...</description> * * As described in http://bugzilla.gnome.org/show_bug.cgi?id=457077 it * returns nothing. - */</commentblock> + */</input> <docblock> <identifier> <name>SECTION:tester</name> @@ -287,7 +287,7 @@ returns nothing.</description> <!-- Invalid identifier --> - <commentblock>/** + <input>/** * gnm_cell_set_expr_and_value: Stores (WITHOUT COPYING) the supplied value, and * references the supplied expression and links it into the expression * list. It marks the sheet as dirty. It is intended for use by import @@ -298,7 +298,7 @@ returns nothing.</description> * not render the value. * * NOTE : This DOES check for array partitioning. - */</commentblock> + */</input> </test> </tests> diff --git a/tests/scanner/annotationparser/gi/syntax_nested_tags.xml b/tests/scanner/annotationparser/gi/syntax_nested_tags.xml index d07b6f12..8fd7a76d 100644 --- a/tests/scanner/annotationparser/gi/syntax_nested_tags.xml +++ b/tests/scanner/annotationparser/gi/syntax_nested_tags.xml @@ -7,7 +7,7 @@ Well, not really nested tags as the Since: 2.30 is considered to be part of the description of the @G_APPLICATION_NON_UNIQUE parameter. --> - <commentblock>/** + <input>/** * GApplicationFlags: * @G_APPLICATION_NON_UNIQUE: Make no attempts to do any of the typical * single-instance application negotiation, even if the application @@ -19,7 +19,7 @@ * Flags used to define the behaviour of a #GApplication. * * Since: 2.28 - **/</commentblock> + **/</input> <docblock> <identifier> <name>GApplicationFlags</name> diff --git a/tests/scanner/annotationparser/gi/syntax_paragraph_breaks.xml b/tests/scanner/annotationparser/gi/syntax_paragraph_breaks.xml index 4ae1e036..80c4fb8f 100644 --- a/tests/scanner/annotationparser/gi/syntax_paragraph_breaks.xml +++ b/tests/scanner/annotationparser/gi/syntax_paragraph_breaks.xml @@ -7,13 +7,13 @@ All lines (outside program- listings and CDATA sections) just containing a ' *' (blank-asterisk) are converted to paragraph breaks. --> - <commentblock>/** + <input>/** * SECTION:test * * The following line is ' *' (blank-asterisk). * * So this is considered a new paragraph. - */</commentblock> + */</input> <docblock> <identifier> <name>SECTION:test</name> @@ -29,13 +29,13 @@ So this is considered a new paragraph.</description> Description: tag, all lines (outside program- listings and CDATA sections) just containing a ' *' (blank-asterisk) are converted to paragraph breaks. --> - <commentblock>/** + <input>/** * SECTION:test * * Description: The following line is ' *' (blank-asterisk). * * So this is considered a new paragraph. - */</commentblock> + */</input> <docblock> <identifier> <name>SECTION:test</name> @@ -50,13 +50,13 @@ So this is considered a new paragraph.</description> <!-- ' * ' (blank-asterisk-blank) are also converted to paragraph breaks. --> - <commentblock>/** + <input>/** * SECTION:test * * The following line is ' * ' (blank-asterisk-blank). * * So this is considered a new paragraph. - */</commentblock> + */</input> <docblock> <identifier> <name>SECTION:test</name> @@ -71,13 +71,13 @@ So this is considered a new paragraph.</description> <!-- Description: tag, ' * ' (blank-asterisk-blank) are also converted to paragraph breaks. --> - <commentblock>/** + <input>/** * SECTION:test * * Description: The following line is ' * ' (blank-asterisk-blank). * * So this is considered a new paragraph. - */</commentblock> + */</input> <docblock> <identifier> <name>SECTION:test</name> @@ -94,13 +94,13 @@ So this is considered a new paragraph.</description> (blank-asterisk-blank-blank). The "empty line" can be easily recognized in the output as it contains a single space character. --> - <commentblock>/** + <input>/** * SECTION:test * * The following line is (blank-asterisk-blank-blank). * * So this is preceded by an empty line and is not considered a new paragraph. - */</commentblock> + */</input> <docblock> <identifier> <name>SECTION:test</name> @@ -117,13 +117,13 @@ So this is preceded by an empty line and is not considered a new paragraph.</des (blank-asterisk-blank-blank). The "empty line" can be easily recognized in the output as it contains a single space character. --> - <commentblock>/** + <input>/** * SECTION:test * * Description: The following line is (blank-asterisk-blank-blank). * * So this is preceded by an empty line and is not considered a new paragraph. - */</commentblock> + */</input> <docblock> <identifier> <name>SECTION:test</name> @@ -140,7 +140,7 @@ So this is preceded by an empty line and is not considered a new paragraph.</des (blank-asterisk-blank-blank). The "empty line" can be easily recognized in the output as it contains a single space character. --> - <commentblock><![CDATA[/** + <input><![CDATA[/** * SECTION:test * * <example> @@ -160,7 +160,7 @@ So this is preceded by an empty line and is not considered a new paragraph.</des * } * </programlisting> * </example> - */]]></commentblock> + */]]></input> <docblock> <identifier> <name>SECTION:test</name> @@ -191,7 +191,7 @@ print_attributes (GIBaseInfo *info) (blank-asterisk-blank-blank). The "empty line" can be easily recognized in the output as it contains a single space character. --> - <commentblock><![CDATA[/** + <input><![CDATA[/** * SECTION:test * * Description: <example> @@ -211,7 +211,7 @@ print_attributes (GIBaseInfo *info) * } * </programlisting> * </example> - */]]></commentblock> + */]]></input> <docblock> <identifier> <name>SECTION:test</name> diff --git a/tests/scanner/annotationparser/gi/tag_deprecated.xml b/tests/scanner/annotationparser/gi/tag_deprecated.xml index 6374bf81..c6cef976 100644 --- a/tests/scanner/annotationparser/gi/tag_deprecated.xml +++ b/tests/scanner/annotationparser/gi/tag_deprecated.xml @@ -3,11 +3,11 @@ <tests> <test> - <commentblock>/** + <input>/** * annotation_versioned: * * Deprecated: 0.6: Use something else instead - **/</commentblock> + **/</input> <docblock> <identifier> <name>annotation_versioned</name> @@ -22,11 +22,11 @@ </test> <test> - <commentblock>/** + <input>/** * annotation_versioned: * * Deprecated: 0.6 - **/</commentblock> + **/</input> <docblock> <identifier> <name>annotation_versioned</name> diff --git a/tests/scanner/annotationparser/gi/tag_description.xml b/tests/scanner/annotationparser/gi/tag_description.xml index 75860f60..317ff5c5 100644 --- a/tests/scanner/annotationparser/gi/tag_description.xml +++ b/tests/scanner/annotationparser/gi/tag_description.xml @@ -3,12 +3,12 @@ <tests> <test> - <commentblock>/** + <input>/** * shiny_function: * * Description: This is a callback with a 'closure' argument that is not named * 'user_data' and hence has to be annotated. - **/</commentblock> + **/</input> <docblock> <identifier> <name>shiny_function</name> diff --git a/tests/scanner/annotationparser/gi/tag_returns.xml b/tests/scanner/annotationparser/gi/tag_returns.xml index 302d8cf6..94d6b627 100644 --- a/tests/scanner/annotationparser/gi/tag_returns.xml +++ b/tests/scanner/annotationparser/gi/tag_returns.xml @@ -3,13 +3,13 @@ <tests> <test> - <commentblock>/** + <input>/** * annotation_object_string_out: * * Test returning a string as an out parameter * * Returns: some boolean - **/</commentblock> + **/</input> <docblock> <identifier> <name>annotation_object_string_out</name> @@ -28,13 +28,13 @@ <!-- Deprecated "Return value:" tag --> - <commentblock>/** + <input>/** * annotation_object_string_out: * * Test returning a string as an out parameter * * Return value: some boolean - **/</commentblock> + **/</input> <docblock> <identifier> <name>annotation_object_string_out</name> @@ -53,12 +53,12 @@ <!-- Deprecated "@returns" as a parameter --> - <commentblock>/** + <input>/** * annotation_object_string_out: * @returns: some boolean * * Test returning a string as an out parameter - **/</commentblock> + **/</input> <docblock> <identifier> <name>annotation_object_string_out</name> diff --git a/tests/scanner/annotationparser/gi/tag_since.xml b/tests/scanner/annotationparser/gi/tag_since.xml index 2bd8c5c2..760311ed 100644 --- a/tests/scanner/annotationparser/gi/tag_since.xml +++ b/tests/scanner/annotationparser/gi/tag_since.xml @@ -3,11 +3,11 @@ <tests> <test> - <commentblock>/** + <input>/** * annotation_versioned: * * Since: 0.6 - **/</commentblock> + **/</input> <docblock> <identifier> <name>annotation_versioned</name> @@ -22,11 +22,11 @@ </test> <test> - <commentblock>/** + <input>/** * annotation_versioned: * * Since: this function is available since version 0.6 - **/</commentblock> + **/</input> <docblock> <identifier> <name>annotation_versioned</name> diff --git a/tests/scanner/annotationparser/gi/tag_stability.xml b/tests/scanner/annotationparser/gi/tag_stability.xml index 154b8385..6636bdcb 100644 --- a/tests/scanner/annotationparser/gi/tag_stability.xml +++ b/tests/scanner/annotationparser/gi/tag_stability.xml @@ -3,11 +3,11 @@ <tests> <test> - <commentblock>/** + <input>/** * annotation_versioned: * * Stability: Stable - **/</commentblock> + **/</input> <docblock> <identifier> <name>annotation_versioned</name> @@ -22,11 +22,11 @@ </test> <test> - <commentblock>/** + <input>/** * annotation_versioned: * * Stability: Unstable - **/</commentblock> + **/</input> <docblock> <identifier> <name>annotation_versioned</name> @@ -41,11 +41,11 @@ </test> <test> - <commentblock>/** + <input>/** * annotation_versioned: * * Stability: Private - **/</commentblock> + **/</input> <docblock> <identifier> <name>annotation_versioned</name> @@ -60,11 +60,11 @@ </test> <test> - <commentblock>/** + <input>/** * annotation_versioned: * * Stability: behavior tends to vary depending on the phase of the moon. - **/</commentblock> + **/</input> <docblock> <identifier> <name>annotation_versioned</name> diff --git a/tests/scanner/annotationparser/gtkdoc/annotations/tester.c.xml b/tests/scanner/annotationparser/gtkdoc/annotations/tester.c.xml index 9be3db76..3ef19929 100644 --- a/tests/scanner/annotationparser/gtkdoc/annotations/tester.c.xml +++ b/tests/scanner/annotationparser/gtkdoc/annotations/tester.c.xml @@ -3,12 +3,12 @@ <tests> <test> - <commentblock>/** + <input>/** * SECTION:tester * @short_description: module for gtk-doc unit test * * This file contains non-sense code for the sole purpose of testing the docs. - */</commentblock> + */</input> <docblock> <identifier> <name>SECTION:tester</name> @@ -24,14 +24,14 @@ </test> <test> - <commentblock>/** + <input>/** * annotation_array_length: * @list: a #GtkListStore * @n_columns: number of columns * @types: (array length=n_columns): list of types * * Document parameter relation for array length. - */</commentblock> + */</input> <docblock> <identifier> <name>annotation_array_length</name> @@ -66,7 +66,7 @@ </test> <test> - <commentblock>/** + <input>/** * annotation_nullable: * @uri: a uri * @label: (allow-none): an optional string, which is used in ways too @@ -76,7 +76,7 @@ * * Returns: (transfer full) (allow-none): Returns stuff which you have to * free after use, whose description is also rather long - */</commentblock> + */</input> <docblock> <identifier> <name>annotation_nullable</name> @@ -120,14 +120,14 @@ </test> <test> - <commentblock>/** + <input>/** * annotation_elementtype: * @list: (element-type GObject): list of #GObject instances to search * * Document optional parameters. * * Returns: %TRUE for success - */</commentblock> + */</input> <docblock> <identifier> <name>annotation_elementtype</name> @@ -159,14 +159,14 @@ </test> <test> - <commentblock>/** + <input>/** * annotation_elementtype_transfer: * @list: (element-type utf8) (transfer full): list of #GObject instances to search * * Document optional parameters. * * Returns: %TRUE for success - */</commentblock> + */</input> <docblock> <identifier> <name>annotation_elementtype_transfer</name> @@ -206,13 +206,13 @@ </test> <test> - <commentblock>/** + <input>/** * annotation_elementtype_returns: * * Document optional parameters. * * Returns: (element-type GObject): A list of #GObject instances. - */</commentblock> + */</input> <docblock> <identifier> <name>annotation_elementtype_returns</name> @@ -238,14 +238,14 @@ </test> <test> - <commentblock>/** + <input>/** * annotation_outparams: * @list: (out) (transfer none): a pointer to take a list * * Document optional parameters. * * Returns: %TRUE for success - */</commentblock> + */</input> <docblock> <identifier> <name>annotation_outparams</name> @@ -280,12 +280,12 @@ </test> <test> - <commentblock>/** + <input>/** * annotation_skip: (skip) * @list: a pointer to take a list * * Documentation for this function. - */</commentblock> + */</input> <docblock> <identifier> <name>annotation_skip</name> @@ -306,13 +306,13 @@ </test> <test> - <commentblock>/** + <input>/** * annotation_scope: * @callback: (scope async): a callback * @user_data: data to pass to callback * * Documentation for this function. - */</commentblock> + */</input> <docblock> <identifier> <name>annotation_scope</name> diff --git a/tests/scanner/annotationparser/gtkdoc/annotations/tester.h.xml b/tests/scanner/annotationparser/gtkdoc/annotations/tester.h.xml index b79e1bcd..71e5863f 100644 --- a/tests/scanner/annotationparser/gtkdoc/annotations/tester.h.xml +++ b/tests/scanner/annotationparser/gtkdoc/annotations/tester.h.xml @@ -3,12 +3,12 @@ <tests> <test> - <commentblock>/** + <input>/** * GtkdocAnnotation: * @that: (allow-none): eventualy points to something * * small struct - */</commentblock> + */</input> <docblock> <identifier> <name>GtkdocAnnotation</name> diff --git a/tests/scanner/annotationparser/gtkdoc/bugs/tester.c.xml b/tests/scanner/annotationparser/gtkdoc/bugs/tester.c.xml index f0a2b225..250b1626 100644 --- a/tests/scanner/annotationparser/gtkdoc/bugs/tester.c.xml +++ b/tests/scanner/annotationparser/gtkdoc/bugs/tester.c.xml @@ -3,7 +3,7 @@ <tests> <test> - <commentblock><![CDATA[/** + <input><![CDATA[/** * SECTION:tester * @short_description: module for gtk-doc unit test * @@ -21,7 +21,7 @@ * Second paragraph inside subsection. * </para> * </refsect2> - */]]></commentblock> + */]]></input> <docblock> <identifier> <name>SECTION:tester</name> @@ -50,12 +50,12 @@ Second paragraph inside subsection. </test> <test> - <commentblock>/** + <input>/** * bug_141869_a: * @pid: arg * * http://bugzilla.gnome.org/show_bug.cgi?id=141869 - */</commentblock> + */</input> <docblock> <identifier> <name>bug_141869_a</name> @@ -71,12 +71,12 @@ Second paragraph inside subsection. </test> <test> - <commentblock>/** + <input>/** * bug_141869_b: * @pid: arg * * http://bugzilla.gnome.org/show_bug.cgi?id=141869 - */</commentblock> + */</input> <docblock> <identifier> <name>bug_141869_b</name> @@ -92,12 +92,12 @@ Second paragraph inside subsection. </test> <test> - <commentblock>/** + <input>/** * bug_379466: * @pid: arg * * http://bugzilla.gnome.org/show_bug.cgi?id=379466 - */</commentblock> + */</input> <docblock> <identifier> <name>bug_379466</name> @@ -113,7 +113,7 @@ Second paragraph inside subsection. </test> <test> - <commentblock>/** + <input>/** * bug_380824: * @arg: arg * @@ -123,7 +123,7 @@ Second paragraph inside subsection. * Since: 0.1 * * Returns: result - */</commentblock> + */</input> <docblock> <identifier> <name>bug_380824</name> @@ -150,13 +150,13 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description> </test> <test> - <commentblock>/** + <input>/** * bug_411739: * * http://bugzilla.gnome.org/show_bug.cgi?id=411739 * * Returns: result - */</commentblock> + */</input> <docblock> <identifier> <name>bug_411739</name> @@ -172,12 +172,12 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description> </test> <test> - <commentblock>/** + <input>/** * bug_419997: * @const_values: arg * * http://bugzilla.gnome.org/show_bug.cgi?id=419997 - */</commentblock> + */</input> <docblock> <identifier> <name>bug_419997</name> @@ -193,12 +193,12 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description> </test> <test> - <commentblock>/** + <input>/** * bug_445693: * @pid: arg * * http://bugzilla.gnome.org/show_bug.cgi?id=445693 - */</commentblock> + */</input> <docblock> <identifier> <name>bug_445693</name> @@ -214,13 +214,13 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description> </test> <test> - <commentblock>/** + <input>/** * bug_471014: * * http://bugzilla.gnome.org/show_bug.cgi?id=471014 * * Returns: result - */</commentblock> + */</input> <docblock> <identifier> <name>bug_471014</name> @@ -236,12 +236,12 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description> </test> <test> - <commentblock>/** + <input>/** * Bug446648: * @BUG_446648_FOO: foo * * http://bugzilla.gnome.org/show_bug.cgi?id=446648 - **/</commentblock> + **/</input> <docblock> <identifier> <name>Bug446648</name> @@ -257,13 +257,13 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description> </test> <test> - <commentblock>/** + <input>/** * bug_552602: * * http://bugzilla.gnome.org/show_bug.cgi?id=552602 * * Returns: result - */</commentblock> + */</input> <docblock> <identifier> <name>bug_552602</name> @@ -279,13 +279,13 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description> </test> <test> - <commentblock>/** + <input>/** * bug_574654a: * * http://bugzilla.gnome.org/show_bug.cgi?id=574654 * * Returns: result - */</commentblock> + */</input> <docblock> <identifier> <name>bug_574654a</name> @@ -301,12 +301,12 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description> </test> <test> - <commentblock>/** + <input>/** * bug_574654b: * @offset: skip this many items * * http://bugzilla.gnome.org/show_bug.cgi?id=574654 - */</commentblock> + */</input> <docblock> <identifier> <name>bug_574654b</name> @@ -322,11 +322,11 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description> </test> <test> - <commentblock>/** + <input>/** * bug_580300a_get_type: * * http://bugzilla.gnome.org/show_bug.cgi?id=580300 - */</commentblock> + */</input> <docblock> <identifier> <name>bug_580300a_get_type</name> @@ -336,12 +336,12 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description> </test> <test> - <commentblock>/** + <input>/** * bug_580300b_get_type: * @a: value * * http://bugzilla.gnome.org/show_bug.cgi?id=580300 - */</commentblock> + */</input> <docblock> <identifier> <name>bug_580300b_get_type</name> @@ -357,11 +357,11 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description> </test> <test> - <commentblock>/** + <input>/** * bug_580300c_get_type: * * http://bugzilla.gnome.org/show_bug.cgi?id=580300 - */</commentblock> + */</input> <docblock> <identifier> <name>bug_580300c_get_type</name> @@ -371,13 +371,13 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description> </test> <test> - <commentblock>/** + <input>/** * bug_580300d_get_type: * * http://bugzilla.gnome.org/show_bug.cgi?id=580300 * * Returns: result - */</commentblock> + */</input> <docblock> <identifier> <name>bug_580300d_get_type</name> @@ -393,12 +393,12 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description> </test> <test> - <commentblock>/** + <input>/** * bug_597937: * @function_arg: value * * http://bugzilla.gnome.org/show_bug.cgi?id=597937 - */</commentblock> + */</input> <docblock> <identifier> <name>bug_597937</name> @@ -414,13 +414,13 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description> </test> <test> - <commentblock>/** + <input>/** * bug_602518a: * * http://bugzilla.gnome.org/show_bug.cgi?id=602518 * * Returns: result - */</commentblock> + */</input> <docblock> <identifier> <name>bug_602518a</name> @@ -436,13 +436,13 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description> </test> <test> - <commentblock>/** + <input>/** * bug_602518b: * * http://bugzilla.gnome.org/show_bug.cgi?id=602518 * * Returns: result - */</commentblock> + */</input> <docblock> <identifier> <name>bug_602518b</name> @@ -458,13 +458,13 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description> </test> <test> - <commentblock>/** + <input>/** * bug_602518c: * * http://bugzilla.gnome.org/show_bug.cgi?id=602518 * * Returns: result - */</commentblock> + */</input> <docblock> <identifier> <name>bug_602518c</name> @@ -480,13 +480,13 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description> </test> <test> - <commentblock>/** + <input>/** * bug_607445: * @a: parameter * @n: parameter * * http://bugzilla.gnome.org/show_bug.cgi?id=607445 - */</commentblock> + */</input> <docblock> <identifier> <name>bug_607445</name> @@ -506,13 +506,13 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description> </test> <test> - <commentblock>/** + <input>/** * bug_610257: * @der: parameter * @len: parameter * * http://bugzilla.gnome.org/show_bug.cgi?id=610257 - */</commentblock> + */</input> <docblock> <identifier> <name>bug_610257</name> @@ -532,7 +532,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description> </test> <test> - <commentblock><![CDATA[/** + <input><![CDATA[/** * bug_623968a: * * <para>test</para> @@ -540,7 +540,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description> * <title>subsect</title> * <para>test</para> * </refsect3> - **/]]></commentblock> + **/]]></input> <docblock> <identifier> <name>bug_623968a</name> @@ -554,7 +554,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description> </test> <test> - <commentblock><![CDATA[/** + <input><![CDATA[/** * bug_623968b: * * test @@ -563,7 +563,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description> * <title>subsect</title> * <para>test</para> * </refsect3> - **/]]></commentblock> + **/]]></input> <docblock> <identifier> <name>bug_623968b</name> @@ -578,11 +578,11 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description> </test> <test> - <commentblock><![CDATA[/** + <input><![CDATA[/** * bug_623968c: * * <para>test</para> - **/]]></commentblock> + **/]]></input> <docblock> <identifier> <name>bug_623968c</name> @@ -592,13 +592,13 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description> </test> <test> - <commentblock>/** + <input>/** * bug_624200a: * * http://bugzilla.gnome.org/show_bug.cgi?id=624200 * * Returns: result - */</commentblock> + */</input> <docblock> <identifier> <name>bug_624200a</name> @@ -614,13 +614,13 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description> </test> <test> - <commentblock>/** + <input>/** * bug_624200b: * * http://bugzilla.gnome.org/show_bug.cgi?id=624200 * * Returns: result - */</commentblock> + */</input> <docblock> <identifier> <name>bug_624200b</name> @@ -636,14 +636,14 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description> </test> <test> - <commentblock>/** + <input>/** * bug_638330: * @arg1: arg1 * @data: data * @length: length * * http://bugzilla.gnome.org/show_bug.cgi?id=638330 - */</commentblock> + */</input> <docblock> <identifier> <name>bug_638330</name> @@ -667,13 +667,13 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description> </test> <test> - <commentblock>/** + <input>/** * bug_000000_va1: * @name: a name * @...: A printf-style message to output * * Outputs a message. - */</commentblock> + */</input> <docblock> <identifier> <name>bug_000000_va1</name> @@ -693,11 +693,11 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description> </test> <test> - <commentblock>/** + <input>/** * bug_624001a: * * http://bugzilla.gnome.org/show_bug.cgi?id=624001 - */</commentblock> + */</input> <docblock> <identifier> <name>bug_624001a</name> @@ -707,11 +707,11 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description> </test> <test> - <commentblock>/** + <input>/** * bug_624001b: * * http://bugzilla.gnome.org/show_bug.cgi?id=624001 - */</commentblock> + */</input> <docblock> <identifier> <name>bug_624001b</name> @@ -721,11 +721,11 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description> </test> <test> - <commentblock>/** + <input>/** * bug_624001c: * * http://bugzilla.gnome.org/show_bug.cgi?id=624001 - */</commentblock> + */</input> <docblock> <identifier> <name>bug_624001c</name> @@ -735,11 +735,11 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description> </test> <test> - <commentblock>/** + <input>/** * bug_624001d: * * http://bugzilla.gnome.org/show_bug.cgi?id=624001 - */</commentblock> + */</input> <docblock> <identifier> <name>bug_624001d</name> @@ -749,11 +749,11 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description> </test> <test> - <commentblock>/** + <input>/** * bug_624001e: * * http://bugzilla.gnome.org/show_bug.cgi?id=624001 - */</commentblock> + */</input> <docblock> <identifier> <name>bug_624001e</name> diff --git a/tests/scanner/annotationparser/gtkdoc/bugs/tester.h.xml b/tests/scanner/annotationparser/gtkdoc/bugs/tester.h.xml index da7c7919..7973f322 100644 --- a/tests/scanner/annotationparser/gtkdoc/bugs/tester.h.xml +++ b/tests/scanner/annotationparser/gtkdoc/bugs/tester.h.xml @@ -3,14 +3,14 @@ <tests> <test> - <commentblock>/** + <input>/** * Bug324535: * @BUG_324535_A: enum 1 * @BUG_324535_B: enum 2 * @BUG_324535_C: enum 3 * * http://bugzilla.gnome.org/show_bug.cgi?id=324535 - */</commentblock> + */</input> <docblock> <identifier> <name>Bug324535</name> @@ -34,12 +34,12 @@ </test> <test> - <commentblock>/** + <input>/** * bug_481811: * @x: argument * * http://bugzilla.gnome.org/show_bug.cgi?id=481811 - **/</commentblock> + **/</input> <docblock> <identifier> <name>bug_481811</name> @@ -55,14 +55,14 @@ </test> <test> - <commentblock>/** + <input>/** * bug_501038: * @a: value * @b: deprecated value * @_b: scrambled deprecated value * * http://bugzilla.gnome.org/show_bug.cgi?id=501038 - */</commentblock> + */</input> <docblock> <identifier> <name>bug_501038</name> @@ -86,12 +86,12 @@ </test> <test> - <commentblock>/** + <input>/** * bug_460127: * @a: field * * http://bugzilla.gnome.org/show_bug.cgi?id=460127 - */</commentblock> + */</input> <docblock> <identifier> <name>bug_460127</name> @@ -107,11 +107,11 @@ </test> <test> - <commentblock>/** + <input>/** * bug_477532: * * http://bugzilla.gnome.org/show_bug.cgi?id=477532 - */</commentblock> + */</input> <docblock> <identifier> <name>bug_477532</name> @@ -121,12 +121,12 @@ </test> <test> - <commentblock>/** + <input>/** * Bug446648: * @BUG_446648_FOO: field * * http://bugzilla.gnome.org/show_bug.cgi?id=446648 - */</commentblock> + */</input> <docblock> <identifier> <name>Bug446648</name> @@ -142,12 +142,12 @@ </test> <test> - <commentblock>/** + <input>/** * Bug512154: * @index: field * * http://bugzilla.gnome.org/show_bug.cgi?id=512154 - */</commentblock> + */</input> <docblock> <identifier> <name>Bug512154</name> @@ -163,14 +163,14 @@ </test> <test> - <commentblock>/** + <input>/** * bug_512155a_function_pointer_t: * @arg1: param 1 * @arg2: param 1 * @arg3: param 1 * * http://bugzilla.gnome.org/show_bug.cgi?id=512155 - */</commentblock> + */</input> <docblock> <identifier> <name>bug_512155a_function_pointer_t</name> @@ -194,14 +194,14 @@ </test> <test> - <commentblock>/** + <input>/** * bug_512155b_function_pointer_t: * @arg1: param 1 * @arg2: param 1 * @arg3: param 1 * * http://bugzilla.gnome.org/show_bug.cgi?id=512155 - */</commentblock> + */</input> <docblock> <identifier> <name>bug_512155b_function_pointer_t</name> @@ -225,14 +225,14 @@ </test> <test> - <commentblock>/** + <input>/** * bug_512155c_function_pointer_t: * @arg1: param 1 * @arg2: param 1 * @arg3: param 1 * * http://bugzilla.gnome.org/show_bug.cgi?id=512155 - */</commentblock> + */</input> <docblock> <identifier> <name>bug_512155c_function_pointer_t</name> @@ -256,13 +256,13 @@ </test> <test> - <commentblock><![CDATA[/** + <input><![CDATA[/** * BUG_530758: * * {{![CDATA[http://bugzilla.gnome.org/show_bug.cgi?id=530758#c1]]!}} * * <ulink url="http://bugzilla.gnome.org/show_bug.cgi?id=530758#c1">Test</ulink> - */]]></commentblock> + */]]></input> <docblock> <identifier> <name>BUG_530758</name> @@ -274,14 +274,14 @@ </test> <test> - <commentblock>/** + <input>/** * bug_532395a: * @number: a number * * http://bugzilla.gnome.org/show_bug.cgi?id=532395 * * Returns: number - */</commentblock> + */</input> <docblock> <identifier> <name>bug_532395a</name> @@ -303,11 +303,11 @@ </test> <test> - <commentblock>/** + <input>/** * bug_532395b: * * http://bugzilla.gnome.org/show_bug.cgi?id=532395 - */</commentblock> + */</input> <docblock> <identifier> <name>bug_532395b</name> @@ -317,14 +317,14 @@ </test> <test> - <commentblock>/** + <input>/** * bug_544172: * @self: object pointer. * * http://bugzilla.gnome.org/show_bug.cgi?id=544172 * * Returns: result or %NULL. - */</commentblock> + */</input> <docblock> <identifier> <name>bug_544172</name> @@ -346,12 +346,12 @@ </test> <test> - <commentblock>/** + <input>/** * bug_554833: * @i: value; * * http://bugzilla.gnome.org/show_bug.cgi?id=554833 - */</commentblock> + */</input> <docblock> <identifier> <name>bug_554833</name> @@ -367,13 +367,13 @@ </test> <test> - <commentblock>/** + <input>/** * bug_554833_new: * * http://bugzilla.gnome.org/show_bug.cgi?id=554833 * * Returns: result - */</commentblock> + */</input> <docblock> <identifier> <name>bug_554833_new</name> @@ -389,13 +389,13 @@ </test> <test> - <commentblock>/** + <input>/** * Bug165425a: * @i: data as int * @f: data as float * * http://bugzilla.gnome.org/show_bug.cgi?id=165425 - */</commentblock> + */</input> <docblock> <identifier> <name>Bug165425a</name> @@ -415,13 +415,13 @@ </test> <test> - <commentblock>/** + <input>/** * Bug165425b: * @i: data as int * @f: data as float * * http://bugzilla.gnome.org/show_bug.cgi?id=165425 - */</commentblock> + */</input> <docblock> <identifier> <name>Bug165425b</name> @@ -441,14 +441,14 @@ </test> <test> - <commentblock>/** + <input>/** * Bug642998: * @red: red color intensity, from 0–255 * @green: green color intensity, from 0–255 * @blue: blue color intensity, from 0–255 * * https://bugzilla.gnome.org/show_bug.cgi?id=642998 - */</commentblock> + */</input> <docblock> <identifier> <name>Bug642998</name> @@ -472,7 +472,7 @@ </test> <test> - <commentblock>/** + <input>/** * Bug644291: * @BUG_644291_START: foo * @BUG_644291_TEXT: bar @@ -482,7 +482,7 @@ * @BUG_644291_ASSIGN_TO: cows * * https://bugzilla.gnome.org/show_bug.cgi?id=644291 - */</commentblock> + */</input> <docblock> <identifier> <name>Bug644291</name> @@ -518,13 +518,13 @@ </test> <test> - <commentblock>/** + <input>/** * BUG_000000_VA2: * @name: a name * @...: A printf-style message to output * * Outputs a message. - */</commentblock> + */</input> <docblock> <identifier> <name>BUG_000000_VA2</name> @@ -544,13 +544,13 @@ </test> <test> - <commentblock>/** + <input>/** * BUG_000000_VA3: * @name: a name * @...: A printf-style message to output * * Outputs a message. - */</commentblock> + */</input> <docblock> <identifier> <name>BUG_000000_VA3</name> @@ -570,13 +570,13 @@ </test> <test> - <commentblock>/** + <input>/** * Bug000000Scope: * * Opaque structure. * "warning: Field descriptions for Bug000000Scope are missing in source code comment block." * but not if we remove the blank line before "int b"; - */</commentblock> + */</input> <docblock> <identifier> <name>Bug000000Scope</name> @@ -588,14 +588,14 @@ but not if we remove the blank line before "int b";</description> </test> <test> - <commentblock>/** + <input>/** * gst_play_marshal_BUFFER__BOXED: * @closure: test * @return_value: test * @marshal_data: test * * test. - */</commentblock> + */</input> <docblock> <identifier> <name>gst_play_marshal_BUFFER__BOXED</name> @@ -619,11 +619,11 @@ but not if we remove the blank line before "int b";</description> </test> <test> - <commentblock>/** + <input>/** * BUG_656773a: * * https://bugzilla.gnome.org/show_bug.cgi?id=656773 - */</commentblock> + */</input> <docblock> <identifier> <name>BUG_656773a</name> @@ -633,11 +633,11 @@ but not if we remove the blank line before "int b";</description> </test> <test> - <commentblock>/** + <input>/** * BUG_656773b: * * https://bugzilla.gnome.org/show_bug.cgi?id=656773 - */</commentblock> + */</input> <docblock> <identifier> <name>BUG_656773b</name> @@ -647,11 +647,11 @@ but not if we remove the blank line before "int b";</description> </test> <test> - <commentblock>/** + <input>/** * BUG_656773c: * * https://bugzilla.gnome.org/show_bug.cgi?id=656773 - */</commentblock> + */</input> <docblock> <identifier> <name>BUG_656773c</name> @@ -661,11 +661,11 @@ but not if we remove the blank line before "int b";</description> </test> <test> - <commentblock>/** + <input>/** * BUG_656946: * * https://bugzilla.gnome.org/show_bug.cgi?id=656946 - */</commentblock> + */</input> <docblock> <identifier> <name>BUG_656946</name> diff --git a/tests/scanner/annotationparser/gtkdoc/empty/tester.c.xml b/tests/scanner/annotationparser/gtkdoc/empty/tester.c.xml index c18e29fd..e345fc76 100644 --- a/tests/scanner/annotationparser/gtkdoc/empty/tester.c.xml +++ b/tests/scanner/annotationparser/gtkdoc/empty/tester.c.xml @@ -3,7 +3,7 @@ <tests> <test> - <commentblock><![CDATA[/** + <input><![CDATA[/** * SECTION:tester * @short_description: module for gtk-doc unit test * @@ -11,7 +11,7 @@ * * As described in http://bugzilla.gnome.org/show_bug.cgi?id=457077 it * returns nothing. - */]]></commentblock> + */]]></input> <docblock> <identifier> <name>SECTION:tester</name> @@ -30,12 +30,12 @@ returns nothing.]]></description> </test> <test> - <commentblock>/** + <input>/** * test: * @a: arg * * lonely function - */</commentblock> + */</input> <docblock> <identifier> <name>test</name> diff --git a/tests/scanner/annotationparser/gtkdoc/fail/tester.c.xml b/tests/scanner/annotationparser/gtkdoc/fail/tester.c.xml index 7ebf440b..f4aac1d4 100644 --- a/tests/scanner/annotationparser/gtkdoc/fail/tester.c.xml +++ b/tests/scanner/annotationparser/gtkdoc/fail/tester.c.xml @@ -3,21 +3,21 @@ <tests> <test> - <commentblock>/* + <input>/* * SECTION:tester_nodocs * @short_description: module for gtk-doc unit test * @title: GtkdocTesterNoDocs * * This file contains non-sense code for the sole purpose of testing the docs. - */</commentblock> + */</input> </test> <test> - <commentblock>/** + <input>/** * SECTION:tester_nolongdesc * @short_description: module for gtk-doc unit test * @title: GtkdocTesterNoLongDesc - */</commentblock> + */</input> <docblock> <identifier> <name>SECTION:tester_nolongdesc</name> @@ -36,12 +36,12 @@ </test> <test> - <commentblock>/** + <input>/** * SECTION:tester_noshortdesc * @title: GtkdocTesterNoShortDesc * * This file contains non-sense code for the sole purpose of testing the docs. - */</commentblock> + */</input> <docblock> <identifier> <name>SECTION:tester_noshortdesc</name> @@ -57,13 +57,13 @@ </test> <test> - <commentblock>/** + <input>/** * SECTION:tester_brokendocs * @short_description: module for gtk-doc unit test * @title: GtkdocTesterBrokenDocs * * This file contains non-sense code for the sole purpose of testing the docs. - */</commentblock> + */</input> <docblock> <identifier> <name>SECTION:tester_brokendocs</name> @@ -83,9 +83,9 @@ </test> <test> - <commentblock>/** + <input>/** * func_no_docs: - */</commentblock> + */</input> <docblock> <identifier> <name>func_no_docs</name> @@ -94,11 +94,11 @@ </test> <test> - <commentblock>/** + <input>/** * func_no_item_docs: * * Here we document the function but not the parameters. - */</commentblock> + */</input> <docblock> <identifier> <name>func_no_item_docs</name> @@ -108,12 +108,12 @@ </test> <test> - <commentblock>/** + <input>/** * func_incomplete_docs: * @a: a value * * Here we document the function but not all the parameters. - */</commentblock> + */</input> <docblock> <identifier> <name>func_incomplete_docs</name> @@ -129,14 +129,14 @@ </test> <test> - <commentblock>/** + <input>/** * func_unused_docs: * @a: a value * @b: a value * @c: an unexisting value * * Here we document the function and more than the actual parameters. - */</commentblock> + */</input> <docblock> <identifier> <name>func_unused_docs</name> diff --git a/tests/scanner/annotationparser/gtkdoc/fail/tester.h.xml b/tests/scanner/annotationparser/gtkdoc/fail/tester.h.xml index 3e51b761..eafb98ea 100644 --- a/tests/scanner/annotationparser/gtkdoc/fail/tester.h.xml +++ b/tests/scanner/annotationparser/gtkdoc/fail/tester.h.xml @@ -3,11 +3,11 @@ <tests> <test> -<commentblock>/** +<input>/** * MACRO_NO_ITEM_DOCS: * * Here we document the macro but not the parameters. - */</commentblock> + */</input> <docblock> <identifier> <name>MACRO_NO_ITEM_DOCS</name> @@ -17,12 +17,12 @@ </test> <test> -<commentblock>/** +<input>/** * MACRO_INCOMPLETE_DOCS: * @a: a value * * Here we document the macro but not all the parameters. - */</commentblock> + */</input> <docblock> <identifier> <name>MACRO_INCOMPLETE_DOCS</name> @@ -38,14 +38,14 @@ </test> <test> -<commentblock>/** +<input>/** * MACRO_UNUSED_DOCS: * @a: a value * @b: a value * @c: an unexisting value * * Here we document the macro and more than the actual parameters. - */</commentblock> + */</input> <docblock> <identifier> <name>MACRO_UNUSED_DOCS</name> @@ -69,12 +69,12 @@ </test> <test> -<commentblock>/** +<input>/** * EnumNoItemDocs: * * Here we document the enum but not the values. * http://bugzilla.gnome.org/show_bug.cgi?id=568711 - */</commentblock> + */</input> <docblock> <identifier> <name>EnumNoItemDocs</name> @@ -85,12 +85,12 @@ http://bugzilla.gnome.org/show_bug.cgi?id=568711</description> </test> <test> -<commentblock>/** +<input>/** * EnumIncompleteDocs: * @ENUM_INCOMPLETE_DOCS_1: a value * * Here we document the enum but not all the values. - */</commentblock> + */</input> <docblock> <identifier> <name>EnumIncompleteDocs</name> @@ -106,14 +106,14 @@ http://bugzilla.gnome.org/show_bug.cgi?id=568711</description> </test> <test> -<commentblock>/** +<input>/** * EnumUnusedDocs: * @ENUM_UNUSED_DOCS_1: a value * @ENUM_UNUSED_DOCS_2: a value * @ENUM_UNUSED_DOCS_3: an unexisting value * * Here we document the enum and more than the actual values. - */</commentblock> + */</input> <docblock> <identifier> <name>EnumUnusedDocs</name> @@ -137,11 +137,11 @@ http://bugzilla.gnome.org/show_bug.cgi?id=568711</description> </test> <test> -<commentblock>/** +<input>/** * StructNoItemDocs: * * Here we document the struct but not the values. - */</commentblock> + */</input> <docblock> <identifier> <name>StructNoItemDocs</name> @@ -151,12 +151,12 @@ http://bugzilla.gnome.org/show_bug.cgi?id=568711</description> </test> <test> -<commentblock>/** +<input>/** * StructIncompleteDocs: * @a: a value * * Here we document the struct but not all the values. - */</commentblock> + */</input> <docblock> <identifier> <name>StructIncompleteDocs</name> @@ -172,14 +172,14 @@ http://bugzilla.gnome.org/show_bug.cgi?id=568711</description> </test> <test> -<commentblock>/** +<input>/** * StructUnusedDocs: * @a: a value * @b: a value * @c: an unexisting value * * Here we document the struct and more than the actual values. - */</commentblock> + */</input> <docblock> <identifier> <name>StructUnusedDocs</name> diff --git a/tests/scanner/annotationparser/gtkdoc/gobject/giface.c.xml b/tests/scanner/annotationparser/gtkdoc/gobject/giface.c.xml index ea09d126..b8daf7f9 100644 --- a/tests/scanner/annotationparser/gtkdoc/gobject/giface.c.xml +++ b/tests/scanner/annotationparser/gtkdoc/gobject/giface.c.xml @@ -3,7 +3,7 @@ <tests> <test> - <commentblock><![CDATA[/** + <input><![CDATA[/** * SECTION:iface * @title: GtkdocIface * @short_description: interface for gtk-doc unit test @@ -22,7 +22,7 @@ * * Just incase you wonder, special caracters can be escaped with a \ like in \% * or \# or even \@. - */]]></commentblock> + */]]></input> <docblock> <identifier> <name>SECTION:iface</name> @@ -58,14 +58,14 @@ or \# or even \@.]]></description> </test> <test> - <commentblock>/** + <input>/** * SECTION:iface2 * @title: GtkdocIface2 * @short_description: interface with a prerequisite for gtk-doc unit test * @see_also: #GtkdocObject, #GtkdocIface * * This file contains non-sense code for the sole purpose of testing the docs. - */</commentblock> + */</input> <docblock> <identifier> <name>SECTION:iface2</name> @@ -89,7 +89,7 @@ or \# or even \@.]]></description> </test> <test> - <commentblock>/** + <input>/** * gtkdoc_iface_configure: * @config: settings * @@ -98,7 +98,7 @@ or \# or even \@.]]></description> * Returns: %TRUE for sucess or %FALSE in case of an error * * Since: 0.1 - */</commentblock> + */</input> <docblock> <identifier> <name>gtkdoc_iface_configure</name> @@ -124,12 +124,12 @@ or \# or even \@.]]></description> </test> <test> - <commentblock>/** + <input>/** * GtkdocIface::itest: * @self: myself * * The event has been triggered. - */</commentblock> + */</input> <docblock> <identifier> <name>GtkdocIface::itest</name> diff --git a/tests/scanner/annotationparser/gtkdoc/gobject/giface.h.xml b/tests/scanner/annotationparser/gtkdoc/gobject/giface.h.xml index 7185ad0b..076647e6 100644 --- a/tests/scanner/annotationparser/gtkdoc/gobject/giface.h.xml +++ b/tests/scanner/annotationparser/gtkdoc/gobject/giface.h.xml @@ -3,11 +3,11 @@ <tests> <test> - <commentblock>/** + <input>/** * GtkdocIface: * * opaque instance of gtk-doc unit test interface - */</commentblock> + */</input> <docblock> <identifier> <name>GtkdocIface</name> @@ -17,11 +17,11 @@ </test> <test> - <commentblock>/** + <input>/** * GtkdocIface2: * * opaque instance of gtk-doc unit test interface - */</commentblock> + */</input> <docblock> <identifier> <name>GtkdocIface2</name> @@ -31,13 +31,13 @@ </test> <test> - <commentblock>/** + <input>/** * GtkdocIfaceInterface: * @parent: this is a bug :/ * @test: overideable method * * class data of gtk-doc unit test interface - */</commentblock> + */</input> <docblock> <identifier> <name>GtkdocIfaceInterface</name> @@ -57,13 +57,13 @@ </test> <test> - <commentblock>/** + <input>/** * GTKDOC_IFACE_MACRO_DUMMY: * @parameter_1: first arg * @parameter_2: second arg * * This macro does nothing. - */</commentblock> + */</input> <docblock> <identifier> <name>GTKDOC_IFACE_MACRO_DUMMY</name> @@ -83,7 +83,7 @@ </test> <test> - <commentblock>/** + <input>/** * GTKDOC_IFACE_MACRO_SUM: * @parameter_1: first arg * @parameter_2: second arg @@ -91,7 +91,7 @@ * This macro adds its args. * * Returns: the sum of @parameter_1 and @parameter_2 - */</commentblock> + */</input> <docblock> <identifier> <name>GTKDOC_IFACE_MACRO_SUM</name> diff --git a/tests/scanner/annotationparser/gtkdoc/gobject/gobject.c.xml b/tests/scanner/annotationparser/gtkdoc/gobject/gobject.c.xml index e6ac5f97..2d501f8a 100644 --- a/tests/scanner/annotationparser/gtkdoc/gobject/gobject.c.xml +++ b/tests/scanner/annotationparser/gtkdoc/gobject/gobject.c.xml @@ -3,7 +3,7 @@ <tests> <test> - <commentblock><![CDATA[/** + <input><![CDATA[/** * SECTION:object * @title: GtkdocObject * @short_description: class for gtk-doc unit test @@ -42,7 +42,7 @@ * - having an example * * Nothing more to say. - */]]></commentblock> + */]]></input> <docblock> <identifier> <name>SECTION:object</name> @@ -101,7 +101,7 @@ Nothing more to say.]]></description> </test> <test> - <commentblock>/** + <input>/** * SECTION:object2 * @title: GtkdocObject2 * @short_description: class with interface for gtk-doc unit test @@ -114,7 +114,7 @@ Nothing more to say.]]></description> * * All the internal details go here or not: * - single item list - */</commentblock> + */</input> <docblock> <identifier> <name>SECTION:object2</name> @@ -144,7 +144,7 @@ All the internal details go here or not: </test> <test> - <commentblock><![CDATA[/** + <input><![CDATA[/** * gtkdoc_object_new: * * Create a new instance @@ -154,7 +154,7 @@ All the internal details go here or not: * Returns: the instance or %NULL in case of an error * * Since: 0.1 - */]]></commentblock> + */]]></input> <docblock> <identifier> <name>gtkdoc_object_new</name> @@ -177,7 +177,7 @@ All the internal details go here or not: </test> <test> - <commentblock><![CDATA[/** + <input><![CDATA[/** * gtkdoc_object_set_otest: * @self: the object * @value: the new otest value, whose description extends further than one @@ -188,7 +188,7 @@ All the internal details go here or not: * Deprecated: Use g_object_set(obj,"otest",value,NULL); instead. * * Since: 0.5 - */]]></commentblock> + */]]></input> <docblock> <identifier> <name>gtkdoc_object_set_otest</name> @@ -218,7 +218,7 @@ All the internal details go here or not: </test> <test> - <commentblock><![CDATA[/** + <input><![CDATA[/** * gtkdoc_object_frobnicate: * @self: the object * @n: number of iterations @@ -232,7 +232,7 @@ All the internal details go here or not: * </footnote> * * Since: 0.5 - */]]></commentblock> + */]]></input> <docblock> <identifier> <name>gtkdoc_object_frobnicate</name> @@ -264,7 +264,7 @@ complex algorithm (http://en.wikipedia.org/wiki/Algorithm). </test> <test> - <commentblock>/** + <input>/** * gtkdoc_object_fooify: * @self: the object * @...: a NULL terminated list of arguments @@ -272,7 +272,7 @@ complex algorithm (http://en.wikipedia.org/wiki/Algorithm). * Fooify the content of @self. * * Returns: %TRUE for success - */</commentblock> + */</input> <docblock> <identifier> <name>gtkdoc_object_fooify</name> @@ -298,12 +298,12 @@ complex algorithm (http://en.wikipedia.org/wiki/Algorithm). </test> <test> - <commentblock>/** + <input>/** * GtkdocObject::otest: * @self: myself * * The event has been triggered. - */</commentblock> + */</input> <docblock> <identifier> <name>GtkdocObject::otest</name> @@ -319,14 +319,14 @@ complex algorithm (http://en.wikipedia.org/wiki/Algorithm). </test> <test> - <commentblock>/** + <input>/** * GtkdocObject::dep-otest: * @self: myself * * The event has been triggered. * * Deprecated: Use the #GtkdocObject::otest signal instead. - */</commentblock> + */</input> <docblock> <identifier> <name>GtkdocObject::dep-otest</name> @@ -348,11 +348,11 @@ complex algorithm (http://en.wikipedia.org/wiki/Algorithm). </test> <test> - <commentblock>/** + <input>/** * GtkdocObject::strings-changed: * * Something has happened. - */</commentblock> + */</input> <docblock> <identifier> <name>GtkdocObject::strings-changed</name> @@ -362,11 +362,11 @@ complex algorithm (http://en.wikipedia.org/wiki/Algorithm). </test> <test> - <commentblock>/** + <input>/** * GtkdocObject::variant-changed: * * Something has happened. - */</commentblock> + */</input> <docblock> <identifier> <name>GtkdocObject::variant-changed</name> @@ -376,11 +376,11 @@ complex algorithm (http://en.wikipedia.org/wiki/Algorithm). </test> <test> - <commentblock>/** + <input>/** * GtkdocObject:otest: * * Since: 0.1 - */</commentblock> + */</input> <docblock> <identifier> <name>GtkdocObject:otest</name> @@ -395,11 +395,11 @@ complex algorithm (http://en.wikipedia.org/wiki/Algorithm). </test> <test> - <commentblock>/** + <input>/** * GtkdocObject:dep-otest: * * Deprecated: use #GtkdocObject:otest property - */</commentblock> + */</input> <docblock> <identifier> <name>GtkdocObject:dep-otest</name> diff --git a/tests/scanner/annotationparser/gtkdoc/gobject/gobject.h.xml b/tests/scanner/annotationparser/gtkdoc/gobject/gobject.h.xml index 42fcc664..032a118b 100644 --- a/tests/scanner/annotationparser/gtkdoc/gobject/gobject.h.xml +++ b/tests/scanner/annotationparser/gtkdoc/gobject/gobject.h.xml @@ -3,11 +3,11 @@ <tests> <test> - <commentblock>/** + <input>/** * GtkdocObject: * * instance data of gtk-doc unit test class - */</commentblock> + */</input> <docblock> <identifier> <name>GtkdocObject</name> @@ -17,7 +17,7 @@ </test> <test> - <commentblock>/** + <input>/** * GtkdocObjectClass: * @parent: this is a bug :/ * @test: overideable method @@ -25,7 +25,7 @@ * @foo_bar: lets you refine your frobnicator * * class data of gtk-doc unit test class - */</commentblock> + */</input> <docblock> <identifier> <name>GtkdocObjectClass</name> @@ -53,11 +53,11 @@ </test> <test> - <commentblock>/** + <input>/** * GtkdocObject2: * * instance data of gtk-doc unit test class - */</commentblock> + */</input> <docblock> <identifier> <name>GtkdocObject2</name> @@ -67,12 +67,12 @@ </test> <test> - <commentblock>/** + <input>/** * GtkdocObject2Class: * @parent: this is a bug :/ * * class data of gtk-doc unit test class - */</commentblock> + */</input> <docblock> <identifier> <name>GtkdocObject2Class</name> @@ -88,7 +88,7 @@ </test> <test> - <commentblock>/** + <input>/** * GTKDOC_OBJECT_MACRO_DUMMY: * @parameter_1: first arg * @parameter_2: second arg @@ -96,7 +96,7 @@ * This macro does nothing. * * Since: 0.1 - */</commentblock> + */</input> <docblock> <identifier> <name>GTKDOC_OBJECT_MACRO_DUMMY</name> @@ -122,7 +122,7 @@ </test> <test> - <commentblock>/** + <input>/** * GTKDOC_OBJECT_MACRO_SUM: * @parameter_1: first arg * @parameter_2: second arg @@ -130,7 +130,7 @@ * This macro adds its args. * * Returns: the sum of @parameter_1 and @parameter_2 - */</commentblock> + */</input> <docblock> <identifier> <name>GTKDOC_OBJECT_MACRO_SUM</name> diff --git a/tests/scanner/annotationparser/gtkdoc/gobject/gtypes.c.xml b/tests/scanner/annotationparser/gtkdoc/gobject/gtypes.c.xml index 72dcdf90..c5f338cd 100644 --- a/tests/scanner/annotationparser/gtkdoc/gobject/gtypes.c.xml +++ b/tests/scanner/annotationparser/gtkdoc/gobject/gtypes.c.xml @@ -3,14 +3,14 @@ <tests> <test> - <commentblock>/** + <input>/** * SECTION:types * @title: GtkdocTypes * @short_description: other gobject types for gtk-doc unit test * @see_also: #GtkdocObject, #GtkdocIface * * This file contains non-sense code for the sole purpose of testing the docs. - */</commentblock> + */</input> <docblock> <identifier> <name>SECTION:types</name> diff --git a/tests/scanner/annotationparser/gtkdoc/gobject/gtypes.h.xml b/tests/scanner/annotationparser/gtkdoc/gobject/gtypes.h.xml index 1d188271..df5d74a3 100644 --- a/tests/scanner/annotationparser/gtkdoc/gobject/gtypes.h.xml +++ b/tests/scanner/annotationparser/gtkdoc/gobject/gtypes.h.xml @@ -3,14 +3,14 @@ <tests> <test> - <commentblock>/** + <input>/** * GtkdocEnum: * @GTKDOC_ENUM_V1: first * @GTKDOC_ENUM_V2: second * Since: 0.10 * * Enum values for the #GtkdocEnum type. - */</commentblock> + */</input> <docblock> <identifier> <name>GtkdocEnum</name> @@ -30,13 +30,13 @@ </test> <test> - <commentblock>/** + <input>/** * GtkdocPlainOldData: * @n: Some integer member. * @x: Some floating point member. * * Unboxed plain old data that should default to public members. - **/</commentblock> + **/</input> <docblock> <identifier> <name>GtkdocPlainOldData</name> @@ -56,13 +56,13 @@ </test> <test> - <commentblock>/** + <input>/** * GtkdocBoxedPlainOldData: * @n: Some integer member. * @x: Some floating point member. * * Boxed plain old data that should default to public members. - **/</commentblock> + **/</input> <docblock> <identifier> <name>GtkdocBoxedPlainOldData</name> diff --git a/tests/scanner/annotationparser/test_parser.py b/tests/scanner/annotationparser/test_parser.py index 4e03c510..3968d3b6 100644 --- a/tests/scanner/annotationparser/test_parser.py +++ b/tests/scanner/annotationparser/test_parser.py @@ -42,7 +42,7 @@ class TestCommentBlock(unittest.TestCase): def __create_test__(cls, testcase): def do_test(self): # Parse GTK-Doc comment block - commentblock = testcase.find('commentblock').text + commentblock = testcase.find('input').text parsed_docblock = AnnotationParser().parse_comment_block((commentblock, 'test.c', 1)) parsed_tree = self.parsed2tree(parsed_docblock).split('\n') @@ -261,7 +261,7 @@ def create_tests(tests_dir, tests_file): tests_tree = etree.parse(tests_file).getroot() - fix_cdata_elements = tests_tree.findall('test/commentblock') + fix_cdata_elements = tests_tree.findall('test/input') fix_cdata_elements += tests_tree.findall('.//description') for element in fix_cdata_elements: |