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_allow_none.xml | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 tests/scanner/annotationparser/gi/annotation_allow_none.xml (limited to 'tests/scanner/annotationparser/gi/annotation_allow_none.xml') diff --git a/tests/scanner/annotationparser/gi/annotation_allow_none.xml b/tests/scanner/annotationparser/gi/annotation_allow_none.xml new file mode 100644 index 00000000..02db79a9 --- /dev/null +++ b/tests/scanner/annotationparser/gi/annotation_allow_none.xml @@ -0,0 +1,47 @@ + + + + + + /** + * annotation_object_inout: + * @object: a #GObject + * @inoutarg: (inout) (allow-none): This is an argument test + * + * This is a test for out arguments + * + * Return value: an int + */ + + + annotation_object_inout + + + + object + a #GObject + + + inoutarg + + + inout + + + allow-none + + + This is an argument test + + + This is a test for out arguments + + + returns + an int + + + + + + -- 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_allow_none.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/scanner/annotationparser/gi/annotation_allow_none.xml') 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 @@ - /** + /** * 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 - */ + */ annotation_object_inout -- 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_allow_none.xml | 62 +++++++++++----------- 1 file changed, 32 insertions(+), 30 deletions(-) (limited to 'tests/scanner/annotationparser/gi/annotation_allow_none.xml') diff --git a/tests/scanner/annotationparser/gi/annotation_allow_none.xml b/tests/scanner/annotationparser/gi/annotation_allow_none.xml index 7398478d..dba0f93d 100644 --- a/tests/scanner/annotationparser/gi/annotation_allow_none.xml +++ b/tests/scanner/annotationparser/gi/annotation_allow_none.xml @@ -12,36 +12,38 @@ * * Return value: an int */ - - - annotation_object_inout - - - - object - a #GObject - - - inoutarg - - - inout - - - allow-none - - - This is an argument test - - - This is a test for out arguments - - - returns - an int - - - + + + + annotation_object_inout + + + + object + a #GObject + + + inoutarg + + + inout + + + allow-none + + + This is an argument test + + + This is a test for out arguments + + + returns + an int + + + + -- 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_allow_none.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/scanner/annotationparser/gi/annotation_allow_none.xml') diff --git a/tests/scanner/annotationparser/gi/annotation_allow_none.xml b/tests/scanner/annotationparser/gi/annotation_allow_none.xml index dba0f93d..8b8ca3ec 100644 --- a/tests/scanner/annotationparser/gi/annotation_allow_none.xml +++ b/tests/scanner/annotationparser/gi/annotation_allow_none.xml @@ -1,6 +1,6 @@ - + /** -- cgit v1.2.1 From 4b690b187bf8d0b7b571faaa050986b796e797a4 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Tue, 13 Aug 2013 15:01:00 +0200 Subject: giscanner: add missing tests --- tests/scanner/annotationparser/gi/annotation_allow_none.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'tests/scanner/annotationparser/gi/annotation_allow_none.xml') diff --git a/tests/scanner/annotationparser/gi/annotation_allow_none.xml b/tests/scanner/annotationparser/gi/annotation_allow_none.xml index 8b8ca3ec..7c9c3b38 100644 --- a/tests/scanner/annotationparser/gi/annotation_allow_none.xml +++ b/tests/scanner/annotationparser/gi/annotation_allow_none.xml @@ -10,7 +10,7 @@ * * This is a test for out arguments * - * Return value: an int + * Return value: (allow-none): an int */ @@ -39,6 +39,11 @@ returns + + + allow-none + + an int -- 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 --- tests/scanner/annotationparser/gi/annotation_allow_none.xml | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'tests/scanner/annotationparser/gi/annotation_allow_none.xml') diff --git a/tests/scanner/annotationparser/gi/annotation_allow_none.xml b/tests/scanner/annotationparser/gi/annotation_allow_none.xml index 7c9c3b38..ae6b3b37 100644 --- a/tests/scanner/annotationparser/gi/annotation_allow_none.xml +++ b/tests/scanner/annotationparser/gi/annotation_allow_none.xml @@ -49,6 +49,15 @@ + /** + * annotation_object_inout: + * @object: a #GObject + * @inoutarg: (inout) (allow-none): This is an argument test + * + * This is a test for out arguments + * + * Returns: (allow-none): an int + */ -- cgit v1.2.1