From fa8fc4baf3ccd75c19f2081ee750264c0aea7f72 Mon Sep 17 00:00:00 2001 From: Marko Klopcic Date: Fri, 15 Feb 2013 23:05:14 +0100 Subject: [PATCH] all doxygen tests pass --- Examples/test-suite/doxygen_misc_constructs.i | 2 +- .../java/doxygen_basic_translate_runme.java | 10 +-- .../java/doxygen_translate_runme.java | 74 +++++++++---------- .../python/doxygen_misc_constructs_runme.py | 5 +- .../doxygen_translate_all_tags_runme.py | 2 +- 5 files changed, 47 insertions(+), 46 deletions(-) diff --git a/Examples/test-suite/doxygen_misc_constructs.i b/Examples/test-suite/doxygen_misc_constructs.i index 0eee8aa9d..9426b5909 100644 --- a/Examples/test-suite/doxygen_misc_constructs.i +++ b/Examples/test-suite/doxygen_misc_constructs.i @@ -60,7 +60,7 @@ * used for unspecified parameters. *

* - * @link advancedWinIDEALaunching.py Python example. @endlink
+ * @link advancedWinIDEALaunching.py Python example.@endlink
*/ class CConnectionConfig { diff --git a/Examples/test-suite/java/doxygen_basic_translate_runme.java b/Examples/test-suite/java/doxygen_basic_translate_runme.java index 395e61139..e6fbd0414 100644 --- a/Examples/test-suite/java/doxygen_basic_translate_runme.java +++ b/Examples/test-suite/java/doxygen_basic_translate_runme.java @@ -28,12 +28,12 @@ public class doxygen_basic_translate_runme { wantedComments.put("doxygen_basic_translate.doxygen_basic_translate.function()", " \n" + - " Brief description. \n" + + " Brief description.\n" + " \n" + - " The comment text \n" + - " @author Some author \n" + - " @return Some number \n" + - " @see function2 \n" + + " The comment text.\n" + + " @author Some author\n" + + " @return Some number\n" + + " @see function2\n" + " \n" + ""); wantedComments.put("doxygen_basic_translate.doxygen_basic_translate.function2()", diff --git a/Examples/test-suite/java/doxygen_translate_runme.java b/Examples/test-suite/java/doxygen_translate_runme.java index b93df89bf..b3db6a816 100644 --- a/Examples/test-suite/java/doxygen_translate_runme.java +++ b/Examples/test-suite/java/doxygen_translate_runme.java @@ -152,45 +152,47 @@ public class doxygen_translate_runme { wantedComments.put("doxygen_translate.doxygen_translate.htmlFunction(int, float)", " Test for html tags. See Doxygen doc for list of tags recognized by Doxygen. \n" + " \n" + - " This is link \n" + + " This is link \n" + " bold \n" + - "

\n" + + "
\n" + " Quotation block. \n" + "
\n" + "
\n" + "
center
\n" + " this is code \n" + - "
Starts an item description. \n" + + "\n" + + "
\n" + + "
Starts an item title.
\n" + + "
Starts an item description.
\n" + + "
\n" + + "\n" + " Starts a piece of text displayed in a typewriter font. \n" + " \n" + "
Starts a section with a specific style (HTML only) \n" + "
\n" + - "
Starts a description list. \n" + - "
Starts an item title.
\n" + - "
\n" + - " Starts a piece of text displayed in an italic font. \n" + - " \n" + + " Starts a piece of text displayed in an italic font. \n" + + "\n" + "
'Form' does not generate any output. \n" + "
\n" + "
\n" + - "

Starts an unnumbered section. \n" + + "

Heading 1 \n" + "

\n" + - "

Starts an unnumbered subsection. \n" + + "

Heading 2 \n" + "

\n" + - "

Starts an unnumbered subsubsection. \n" + + "

Heading 3 \n" + "

\n" + - " Starts a piece of text displayed in an italic font. \n" + - " Does not generate any output. \n" + - " \n" + + " Starts a piece of text displayed in an italic font. \n" + + " Input tag. \n" + + " \n" + " \n" + - " Does not generate any output. \n" + - " ignored by doxygen. \n" + - " ignored by doxygen. \n" + + " Meta tag. \n" + + " Multicol is ignored by doxygen. \n" + + " \n" + " \n" + - "
    Starts a numbered item list. \n" + - "
  1. Starts a new list item. \n" + - "
    2. \n" + - "
Ends a numbered item list. \n" + + "
    \n" + + "
  1. List item 1.
    2. \n" + + "
  2. List item 2.
    3. \n" + + "
\n" + " \n" + "

Starts a new paragraph. \n" + "

\n" + @@ -198,18 +200,15 @@ public class doxygen_translate_runme { " \n" + " Starts a section of text displayed in a smaller font. \n" + " \n" + - " Starts an inline text fragment with a specific style (HTML only) \n" + - " \n" + - " Starts a section of bold text. \n" + - " \n" + - " Starts a piece of text displayed in subscript. \n" + - " \n" + - " Starts a piece of text displayed in superscript. \n" + - " \n" + + " Starts an inline text fragment with a specific style. \n" + + " \n" + + " Starts a section of bold text. \n" + + " Starts a piece of text displayed in subscript. \n" + + " Starts a piece of text displayed in superscript. \n" + " \n" + " \n" + " \n" + - " \n" + + " \n" + " \n" + " \n" + " \n" + @@ -220,18 +219,17 @@ public class doxygen_translate_runme { " Starts a piece of text displayed in a typewriter font. \n" + " \n" + " \n" + - "
    Starts an unnumbered item list. \n" + - "
  • Starts a new list item 1.
    • \n" + - "
  • Starts a new list item 2.
    • \n" + - "
  • Starts a new list item 3.
    • \n" + - "
Ends an unnumbered item list. \n" + + "
    \n" + + "
  • List item 1.
    • \n" + + "
  • List item 2.
    • \n" + + "
  • List item 3.
    • \n" + + "
\n" + " \n" + - " Starts a piece of text displayed in an italic font. \n" + - " \n" + + " Starts a piece of text displayed in an italic font. \n" + + " \n" + "\n" + "underlined \\b bold text - doxy commands are ignored inside 'htmlonly' section \n" + "\n" + - "<u>underlined text<u>\n" + ""); wantedComments.put("doxygen_translate.doxygen_translate.htmlEntitiesFunction(int, float)", diff --git a/Examples/test-suite/python/doxygen_misc_constructs_runme.py b/Examples/test-suite/python/doxygen_misc_constructs_runme.py index d2f04a874..1c2c55236 100755 --- a/Examples/test-suite/python/doxygen_misc_constructs_runme.py +++ b/Examples/test-suite/python/doxygen_misc_constructs_runme.py @@ -16,6 +16,7 @@ commentVerifier.check(doxygen_misc_constructs.getAddress.__doc__, isGetSize (bool) -- if set, for every object location both address and size are returned Connection::getId() + """) commentVerifier.check(doxygen_misc_constructs.CConnectionConfig.__doc__, @@ -31,7 +32,9 @@ commentVerifier.check(doxygen_misc_constructs.CConnectionConfig.__doc__, used for unspecified parameters. - advancedWinIDEALaunching.py Python example. + + advancedWinIDEALaunching.py Python example. + """) commentVerifier.check(doxygen_misc_constructs.waitTime.__doc__, diff --git a/Examples/test-suite/python/doxygen_translate_all_tags_runme.py b/Examples/test-suite/python/doxygen_translate_all_tags_runme.py index ecccc1fc5..3009caf64 100755 --- a/Examples/test-suite/python/doxygen_translate_all_tags_runme.py +++ b/Examples/test-suite/python/doxygen_translate_all_tags_runme.py @@ -251,7 +251,7 @@ r""" - function + See also: function Same as brief description
Animals
cow dog
Column 1 Column 2
cow dog
cat mouse
horse parrot