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...

2 files changed, 126 insertions, 126 deletions

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>