From 1dc1c406d3c8899fed47aafe6e30f800ae0ffe9e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 18 Jan 2018 13:50:23 +0100 Subject: [PATCH] doxygen: moved test for \m_footernavigation to a better place. Because I was searching for it everywhere but here. --- doxygen/test/contents_custom/Doxyfile | 3 +-- doxygen/test/contents_custom/input.dox | 16 ---------------- doxygen/test/contents_custom/math.html | 2 +- doxygen/test/page_footernavigation/Doxyfile | 14 ++++++++++++++ doxygen/test/page_footernavigation/input.dox | 16 ++++++++++++++++ .../subpage1.html | 6 +++--- .../subpage2.html | 6 +++--- doxygen/test/test_contents.py | 5 ----- doxygen/test/test_page.py | 9 +++++++++ 9 files changed, 47 insertions(+), 30 deletions(-) create mode 100644 doxygen/test/page_footernavigation/Doxyfile create mode 100644 doxygen/test/page_footernavigation/input.dox rename doxygen/test/{contents_custom => page_footernavigation}/subpage1.html (78%) rename doxygen/test/{contents_custom => page_footernavigation}/subpage2.html (84%) diff --git a/doxygen/test/contents_custom/Doxyfile b/doxygen/test/contents_custom/Doxyfile index dc08fb45..34b659d0 100644 --- a/doxygen/test/contents_custom/Doxyfile +++ b/doxygen/test/contents_custom/Doxyfile @@ -15,5 +15,4 @@ ALIASES = \ "m_enddiv=@xmlonly@endxmlonly" \ "m_span{1}=@xmlonly@endxmlonly" \ "m_endspan=@xmlonly@endxmlonly" \ - "m_class{1}=@xmlonly@endxmlonly" \ - "m_footernavigation=@xmlonly@endxmlonly" + "m_class{1}=@xmlonly@endxmlonly" diff --git a/doxygen/test/contents_custom/input.dox b/doxygen/test/contents_custom/input.dox index 2ef19b7c..538a2958 100644 --- a/doxygen/test/contents_custom/input.dox +++ b/doxygen/test/contents_custom/input.dox @@ -48,8 +48,6 @@ An unstyled list: /** @page math Math -@m_footernavigation - A green formula: @m_class{m-success} @@ -59,18 +57,4 @@ A green formula: @f] A yellow @m_class{m-warning} @f$ \Sigma @f$ inline formula. - -- @subpage subpage1 First subpage -- @subpage subpage2 Second subpage - -*/ - -/** @page subpage1 First subpage - -@m_footernavigation -*/ - -/** @page subpage2 Second subpage - -@m_footernavigation */ diff --git a/doxygen/test/contents_custom/math.html b/doxygen/test/contents_custom/math.html index a874ad73..877ba63a 100644 --- a/doxygen/test/contents_custom/math.html +++ b/doxygen/test/contents_custom/math.html @@ -46,7 +46,7 @@ $ \Sigma $ - inline formula.

+ inline formula.

diff --git a/doxygen/test/page_footernavigation/Doxyfile b/doxygen/test/page_footernavigation/Doxyfile new file mode 100644 index 00000000..8e684bea --- /dev/null +++ b/doxygen/test/page_footernavigation/Doxyfile @@ -0,0 +1,14 @@ +INPUT = input.dox +IMAGE_PATH = . +QUIET = YES +GENERATE_HTML = NO +GENERATE_LATEX = NO +GENERATE_XML = YES + +M_PAGE_FINE_PRINT = +M_THEME_COLOR = +M_LINKS_NAVBAR1 = +M_LINKS_NAVBAR2 = + +ALIASES = \ + "m_footernavigation=@xmlonly@endxmlonly" diff --git a/doxygen/test/page_footernavigation/input.dox b/doxygen/test/page_footernavigation/input.dox new file mode 100644 index 00000000..1ac21bd9 --- /dev/null +++ b/doxygen/test/page_footernavigation/input.dox @@ -0,0 +1,16 @@ +/** @page page A page +- @subpage subpage1 First subpage +- @subpage subpage2 Second subpage + +*/ + +/** @page subpage1 First subpage + +@m_footernavigation +*/ + +/** @page subpage2 Second subpage + +@m_footernavigation +*/ + diff --git a/doxygen/test/contents_custom/subpage1.html b/doxygen/test/page_footernavigation/subpage1.html similarity index 78% rename from doxygen/test/contents_custom/subpage1.html rename to doxygen/test/page_footernavigation/subpage1.html index 8769ef80..5335e80f 100644 --- a/doxygen/test/contents_custom/subpage1.html +++ b/doxygen/test/page_footernavigation/subpage1.html @@ -2,7 +2,7 @@ - Math » First subpage | My Project + A page » First subpage | My Project @@ -21,10 +21,10 @@

- Math » + A page » First subpage

-
Math | Second subpage »
+
A page | Second subpage »
diff --git a/doxygen/test/contents_custom/subpage2.html b/doxygen/test/page_footernavigation/subpage2.html similarity index 84% rename from doxygen/test/contents_custom/subpage2.html rename to doxygen/test/page_footernavigation/subpage2.html index 4e40a924..0d901497 100644 --- a/doxygen/test/contents_custom/subpage2.html +++ b/doxygen/test/page_footernavigation/subpage2.html @@ -2,7 +2,7 @@ - Math » Second subpage | My Project + A page » Second subpage | My Project @@ -21,10 +21,10 @@

- Math » + A page » Second subpage

-
« First subpage | Math
+
« First subpage | A page
diff --git a/doxygen/test/test_contents.py b/doxygen/test/test_contents.py index 00c33936..122122c6 100644 --- a/doxygen/test/test_contents.py +++ b/doxygen/test/test_contents.py @@ -139,8 +139,3 @@ class Custom(IntegrationTestCase): def test_math(self): self.run_dox2html5(wildcard='math.xml') self.assertEqual(*self.actual_expected_contents('math.html')) - - def test_footer_navigation(self): - self.run_dox2html5(wildcard='subpage*.xml') - self.assertEqual(*self.actual_expected_contents('subpage1.html')) - self.assertEqual(*self.actual_expected_contents('subpage2.html')) diff --git a/doxygen/test/test_page.py b/doxygen/test/test_page.py index dd5130da..fbcb4a51 100644 --- a/doxygen/test/test_page.py +++ b/doxygen/test/test_page.py @@ -66,3 +66,12 @@ class InNavbar(IntegrationTestCase): self.run_dox2html5(wildcard='page*.xml') self.assertEqual(*self.actual_expected_contents('page-in-navbar.html')) self.assertEqual(*self.actual_expected_contents('page-b.html')) + +class FooterNavigation(IntegrationTestCase): + def __init__(self, *args, **kwargs): + super().__init__(__file__, 'footernavigation', *args, **kwargs) + + def test(self): + self.run_dox2html5(wildcard='subpage*.xml') + self.assertEqual(*self.actual_expected_contents('subpage1.html')) + self.assertEqual(*self.actual_expected_contents('subpage2.html')) -- 2.30.2