From af2e146f5f24b93322ad0112d37a8e41222c3085 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Wed, 4 Jul 2012 11:58:13 +0200 Subject: giscanner: add AnnotationParser tests The tests in giscanner/annotationpatters.py only test the regular expression programs used when parsing GTK-Doc comment blocks but do not test the structure of the resulting "parse tree". This patch adds 193 GTK-Doc comment blocks and the expected results AnnotationParser should return (with it's current level of understanding of GTK-Doc comment block syntax). These are compared by tests/scanner/annotationparser/test_parser.py which complains with a diff on failure. https://bugzilla.gnome.org/show_bug.cgi?id=688897 --- .../annotationparser/gi/annotation_virtual.xml | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 tests/scanner/annotationparser/gi/annotation_virtual.xml (limited to 'tests/scanner/annotationparser/gi/annotation_virtual.xml') diff --git a/tests/scanner/annotationparser/gi/annotation_virtual.xml b/tests/scanner/annotationparser/gi/annotation_virtual.xml new file mode 100644 index 00000000..f2b6b23a --- /dev/null +++ b/tests/scanner/annotationparser/gi/annotation_virtual.xml @@ -0,0 +1,47 @@ + + + + + + + /** + * foo_object_read: + * @object: obj + * @offset: offset + * @length: length + * + * Read some stuff. + * + * Virtual: read_fn + */ + + + foo_object_read + + + + object + obj + + + offset + offset + + + length + length + + + Read some stuff. + + + virtual + read_fn + + + + + + -- cgit v1.2.1 From 146a56f7f358dc14989e198fee4c2dd01b55be07 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Wed, 15 May 2013 14:42:09 +0200 Subject: tests: rename element to 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... --- tests/scanner/annotationparser/gi/annotation_virtual.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/scanner/annotationparser/gi/annotation_virtual.xml') 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 @@ - /** + /** * foo_object_read: * @object: obj * @offset: offset @@ -15,7 +15,7 @@ * Read some stuff. * * Virtual: read_fn - */ + */ foo_object_read -- cgit v1.2.1 From 1359fb6d7a76609ec07e22af9cd79ae604d23d20 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Wed, 15 May 2013 17:31:14 +0200 Subject: tests: put element inside a element The element can then hold both the expected parse tree and the warning/error messages emitted by the parser in a future child element. --- .../annotationparser/gi/annotation_virtual.xml | 54 +++++++++++----------- 1 file changed, 28 insertions(+), 26 deletions(-) (limited to 'tests/scanner/annotationparser/gi/annotation_virtual.xml') diff --git a/tests/scanner/annotationparser/gi/annotation_virtual.xml b/tests/scanner/annotationparser/gi/annotation_virtual.xml index db211b4e..189d56bd 100644 --- a/tests/scanner/annotationparser/gi/annotation_virtual.xml +++ b/tests/scanner/annotationparser/gi/annotation_virtual.xml @@ -16,32 +16,34 @@ * * Virtual: read_fn */ - - - foo_object_read - - - - object - obj - - - offset - offset - - - length - length - - - Read some stuff. - - - virtual - read_fn - - - + + + + foo_object_read + + + + object + obj + + + offset + offset + + + length + length + + + Read some stuff. + + + virtual + read_fn + + + + -- cgit v1.2.1 From d464fb1f18173fea1aa3028cf44002944419b6ee Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Wed, 22 May 2013 07:39:32 +0200 Subject: tests: validate GTK-Doc test files This is more of a handy developer tool than something that is always expected to be executed as part of the test suite, so we don't add a hard dependency on xmllint. https://bugzilla.gnome.org/show_bug.cgi?id=688897 --- tests/scanner/annotationparser/gi/annotation_virtual.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/scanner/annotationparser/gi/annotation_virtual.xml') diff --git a/tests/scanner/annotationparser/gi/annotation_virtual.xml b/tests/scanner/annotationparser/gi/annotation_virtual.xml index 189d56bd..ae8c3be6 100644 --- a/tests/scanner/annotationparser/gi/annotation_virtual.xml +++ b/tests/scanner/annotationparser/gi/annotation_virtual.xml @@ -1,6 +1,6 @@ - + /** * foo_object_read: @@ -20,6 +63,16 @@ foo_object_read + + + virtual + + + + + @@ -36,13 +89,48 @@ Read some stuff. - - - virtual - read_fn - - + + 9: Warning: Test: GObject-Introspection specific GTK-Doc tag "Virtual" has been deprecated, please use annotations on the identifier instead: + * Virtual: read_fn + ^ + + + + + + + /** + * foo_object_read: + * + * Virtual: read_fn + * + * Read some stuff. + */ + + + + foo_object_read + + + virtual + + + + + + + Read some stuff. + + + 4: Warning: Test: GObject-Introspection specific GTK-Doc tag "Virtual" has been deprecated, please use annotations on the identifier instead: + * Virtual: read_fn + ^ + -- cgit v1.2.1 From 6a874b86a1b9aae0c50a30b8cd3033870797eb1c Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Tue, 23 Jul 2013 17:34:07 +0200 Subject: giscanner: refactor GTK-Doc comment block serialization --- .../annotationparser/gi/annotation_virtual.xml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'tests/scanner/annotationparser/gi/annotation_virtual.xml') diff --git a/tests/scanner/annotationparser/gi/annotation_virtual.xml b/tests/scanner/annotationparser/gi/annotation_virtual.xml index 7439a699..3321eea0 100644 --- a/tests/scanner/annotationparser/gi/annotation_virtual.xml +++ b/tests/scanner/annotationparser/gi/annotation_virtual.xml @@ -43,6 +43,14 @@ Read some stuff. + /** + * foo_object_read: (virtual read_fn) + * @object: obj + * @offset: offset + * @length: length + * + * Read some stuff. + */ @@ -96,6 +104,14 @@ ^ + /** + * foo_object_read: (virtual read_fn) + * @object: obj + * @offset: offset + * @length: length + * + * Read some stuff. + */ @@ -132,6 +148,11 @@ ^ + /** + * foo_object_read: (virtual read_fn) + * + * Read some stuff. + */ -- cgit v1.2.1