chiark / gitweb /
~cjwatson / blog.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b8bf073)
doxygen: moved test for \m_footernavigation to a better place.
authorVladimír Vondruš <mosra@centrum.cz>
Thu, 18 Jan 2018 12:50:23 +0000 (13:50 +0100)
committerVladimír Vondruš <mosra@centrum.cz>
Thu, 18 Jan 2018 14:02:25 +0000 (15:02 +0100)
Because I was searching for it everywhere but here.

doxygen/test/contents_custom/Doxyfile patch | blob | history
doxygen/test/contents_custom/input.dox patch | blob | history
doxygen/test/contents_custom/math.html patch | blob | history
doxygen/test/page_footernavigation/Doxyfile [new file with mode: 0644] patch | blob
doxygen/test/page_footernavigation/input.dox [new file with mode: 0644] patch | blob
doxygen/test/page_footernavigation/subpage1.html [moved from doxygen/test/contents_custom/subpage1.html with 78% similarity] patch | blob | history
doxygen/test/page_footernavigation/subpage2.html [moved from doxygen/test/contents_custom/subpage2.html with 84% similarity] patch | blob | history
doxygen/test/test_contents.py patch | blob | history
doxygen/test/test_page.py patch | blob | history

diff --git a/doxygen/test/contents_custom/Doxyfile b/doxygen/test/contents_custom/Doxyfile
index dc08fb456fff3cbcf40d36820be22bff0c70f896..34b659d0d8875eed12c7eb66e2576854a7016afa 100644 (file)
--- a/doxygen/test/contents_custom/Doxyfile
+++ b/doxygen/test/contents_custom/Doxyfile
@@ -15,5 +15,4 @@ ALIASES = \
     "m_enddiv=@xmlonly</mcss:div>@endxmlonly" \
     "m_span{1}=@xmlonly<mcss:span xmlns:mcss=\"http://mcss.mosra.cz/doxygen/\" mcss:class=\"\1\">@endxmlonly" \
     "m_endspan=@xmlonly</mcss:span>@endxmlonly" \
-    "m_class{1}=@xmlonly<mcss:class xmlns:mcss=\"http://mcss.mosra.cz/doxygen/\" mcss:class=\"\1\" />@endxmlonly" \
-    "m_footernavigation=@xmlonly<mcss:footernavigation xmlns:mcss=\"http://mcss.mosra.cz/doxygen/\" />@endxmlonly"
+    "m_class{1}=@xmlonly<mcss:class xmlns:mcss=\"http://mcss.mosra.cz/doxygen/\" mcss:class=\"\1\" />@endxmlonly"
diff --git a/doxygen/test/contents_custom/input.dox b/doxygen/test/contents_custom/input.dox
index 2ef19b7c695b5b05c415d89410f7f86e201325a3..538a295887cdecba28029b5651283d82f25552b5 100644 (file)
--- 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 a874ad736af4cbf48821225fc54f96c45a4a61c0..877ba63aedb1bdb1af55b6b4470dbd891cee5dc8 100644 (file)
--- a/doxygen/test/contents_custom/math.html
+++ b/doxygen/test/contents_custom/math.html
@@ -46,7 +46,7 @@ $ \Sigma $
 <g id='eq2-page1'>
 <use x='0' xlink:href='#eq2-g0-6' y='0'/>
 </g>
-</svg> inline formula.</p><ul><li><a href="subpage1.html" class="m-dox">First subpage</a> First subpage</li><li><a href="subpage2.html" class="m-dox">Second subpage</a> Second subpage</li></ul>
+</svg> inline formula.</p>
       </div>
     </div>
   </div>
diff --git a/doxygen/test/page_footernavigation/Doxyfile b/doxygen/test/page_footernavigation/Doxyfile
new file mode 100644 (file)
index 0000000..8e684be
--- /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<mcss:footernavigation xmlns:mcss=\"http://mcss.mosra.cz/doxygen/\" />@endxmlonly"
diff --git a/doxygen/test/page_footernavigation/input.dox b/doxygen/test/page_footernavigation/input.dox
new file mode 100644 (file)
index 0000000..1ac21bd
--- /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 8769ef806592164f0dbdffa1b0bef5484add8ebc..5335e80fb38ae31ab324f38da8eb0b17197bcbd9 100644 (file)
--- a/doxygen/test/contents_custom/subpage1.html
+++ b/doxygen/test/page_footernavigation/subpage1.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <meta charset="UTF-8" />
-  <title>Math &raquo; First subpage | My Project</title>
+  <title>A page &raquo; First subpage | My Project</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,600i%7CSource+Code+Pro:400,400i,600" />
   <link rel="stylesheet" href="m-dark+doxygen.compiled.css" />
   <link rel="next" href="subpage2.html" />
@@ -21,10 +21,10 @@
     <div class="m-row">
       <div class="m-col-l-10 m-push-l-1">
         <h1>
-          <span class="m-breadcrumb"><a href="math.html">Math</a> &raquo;</span>
+          <span class="m-breadcrumb"><a href="page.html">A page</a> &raquo;</span>
           First subpage
         </h1>
-        <div class="m-note m-dim m-thin m-text-center"><a href="math.html" class="m-dox">Math</a> | <a href="subpage2.html" class="m-dox">Second subpage &raquo;</a></div>
+        <div class="m-note m-dim m-thin m-text-center"><a href="page.html" class="m-dox">A page</a> | <a href="subpage2.html" class="m-dox">Second subpage &raquo;</a></div>
       </div>
     </div>
   </div>
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 4e40a924e331dddc4b6c80d4c81646e26cff8ab2..0d90149759743193262746b8d2f6d09e06f1f687 100644 (file)
--- a/doxygen/test/contents_custom/subpage2.html
+++ b/doxygen/test/page_footernavigation/subpage2.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <meta charset="UTF-8" />
-  <title>Math &raquo; Second subpage | My Project</title>
+  <title>A page &raquo; Second subpage | My Project</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,600i%7CSource+Code+Pro:400,400i,600" />
   <link rel="stylesheet" href="m-dark+doxygen.compiled.css" />
   <link rel="prev" href="subpage1.html" />
@@ -21,10 +21,10 @@
     <div class="m-row">
       <div class="m-col-l-10 m-push-l-1">
         <h1>
-          <span class="m-breadcrumb"><a href="math.html">Math</a> &raquo;</span>
+          <span class="m-breadcrumb"><a href="page.html">A page</a> &raquo;</span>
           Second subpage
         </h1>
-        <div class="m-note m-dim m-thin m-text-center"><a href="subpage1.html" class="m-dox">&laquo; First subpage</a> | <a href="math.html" class="m-dox">Math</a></div>
+        <div class="m-note m-dim m-thin m-text-center"><a href="subpage1.html" class="m-dox">&laquo; First subpage</a> | <a href="page.html" class="m-dox">A page</a></div>
       </div>
     </div>
   </div>
diff --git a/doxygen/test/test_contents.py b/doxygen/test/test_contents.py
index 00c339366f98dcb21ae550dd4f4214fad72dde8d..122122c62c8442c35def7e5d77d8a04c898d728f 100644 (file)
--- 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 dd5130da37682a5f71e0a97023f5a3c4863a16b4..fbcb4a51811e0174b8a0681f3ceb1692e897f093 100644 (file)
--- 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'))
Colin Watson's blog