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_value.xml | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 tests/scanner/annotationparser/gi/annotation_value.xml (limited to 'tests/scanner/annotationparser/gi/annotation_value.xml') diff --git a/tests/scanner/annotationparser/gi/annotation_value.xml b/tests/scanner/annotationparser/gi/annotation_value.xml new file mode 100644 index 00000000..4a1a0785 --- /dev/null +++ b/tests/scanner/annotationparser/gi/annotation_value.xml @@ -0,0 +1,30 @@ + + + + + + + /** + * ANNOTATION_CALCULATED_LARGE: + * + * Constant to define a calculated large value + * + * Value: 10000000000UL + */ + + + ANNOTATION_CALCULATED_LARGE + + Constant to define a calculated large value + + + value + 10000000000UL + + + + + + -- 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_value.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/scanner/annotationparser/gi/annotation_value.xml') 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 @@ - /** + /** * ANNOTATION_CALCULATED_LARGE: * * Constant to define a calculated large value * * Value: 10000000000UL - */ + */ ANNOTATION_CALCULATED_LARGE -- 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_value.xml | 26 ++++++++++++---------- 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'tests/scanner/annotationparser/gi/annotation_value.xml') diff --git a/tests/scanner/annotationparser/gi/annotation_value.xml b/tests/scanner/annotationparser/gi/annotation_value.xml index 3745de66..f111d6b7 100644 --- a/tests/scanner/annotationparser/gi/annotation_value.xml +++ b/tests/scanner/annotationparser/gi/annotation_value.xml @@ -13,18 +13,20 @@ * * Value: 10000000000UL */ - - - ANNOTATION_CALCULATED_LARGE - - Constant to define a calculated large value - - - value - 10000000000UL - - - + + + + ANNOTATION_CALCULATED_LARGE + + Constant to define a calculated large value + + + value + 10000000000UL + + + + -- 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_value.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/scanner/annotationparser/gi/annotation_value.xml') diff --git a/tests/scanner/annotationparser/gi/annotation_value.xml b/tests/scanner/annotationparser/gi/annotation_value.xml index f111d6b7..e7c7d6f1 100644 --- a/tests/scanner/annotationparser/gi/annotation_value.xml +++ b/tests/scanner/annotationparser/gi/annotation_value.xml @@ -1,6 +1,6 @@ - + /** * ANNOTATION_CALCULATED_LARGE: @@ -17,15 +43,60 @@ ANNOTATION_CALCULATED_LARGE + + + value + + + + + Constant to define a calculated large value - - - value - 10000000000UL - - + + 6: Warning: Test: GObject-Introspection specific GTK-Doc tag "Value" has been deprecated, please use annotations on the identifier instead: + * Value: 10000000000UL + ^ + + + + + + + /** + * ANNOTATION_CALCULATED_LARGE: + * + * Value: 10000000000UL + * + * Constant to define a calculated large value + */ + + + + ANNOTATION_CALCULATED_LARGE + + + value + + + + + + + Constant to define a calculated large value + + + 4: Warning: Test: GObject-Introspection specific GTK-Doc tag "Value" has been deprecated, please use annotations on the identifier instead: + * Value: 10000000000UL + ^ + -- 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_value.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'tests/scanner/annotationparser/gi/annotation_value.xml') diff --git a/tests/scanner/annotationparser/gi/annotation_value.xml b/tests/scanner/annotationparser/gi/annotation_value.xml index 06f2bf2c..7d72ef71 100644 --- a/tests/scanner/annotationparser/gi/annotation_value.xml +++ b/tests/scanner/annotationparser/gi/annotation_value.xml @@ -26,6 +26,11 @@ Constant to define a calculated large value + /** + * ANNOTATION_CALCULATED_LARGE: (value 10000000000UL) + * + * Constant to define a calculated large value + */ @@ -62,6 +67,11 @@ ^ + /** + * ANNOTATION_CALCULATED_LARGE: (value 10000000000UL) + * + * Constant to define a calculated large value + */ @@ -98,6 +108,11 @@ ^ + /** + * ANNOTATION_CALCULATED_LARGE: (value 10000000000UL) + * + * Constant to define a calculated large value + */ -- cgit v1.2.1