+ + + + + The htmlonly command + +Works only since Doxygen 1.8.18, before it was not included in the XML output. + </div> + </div> + </div> +</article></main> +</body> +</html> diff --git a/documentation/test_doxygen/contents_htmlinclude/index.html b/documentation/test_doxygen/contents_htmlonly_htmlinclude/index.html similarity index 100% rename from documentation/test_doxygen/contents_htmlinclude/index.html rename to documentation/test_doxygen/contents_htmlonly_htmlinclude/index.html diff --git a/documentation/test_doxygen/contents_htmlonly_htmlinclude/input.dox b/documentation/test_doxygen/contents_htmlonly_htmlinclude/input.dox new file mode 100644 index 00000000..e6636970 --- /dev/null +++ b/documentation/test_doxygen/contents_htmlonly_htmlinclude/input.dox @@ -0,0 +1,18 @@ +/** @mainpage + +@htmlinclude file.html +*/ + +/** @page html-only The htmlonly command + +Works only since Doxygen 1.8.18, before it was not included in the XML output. + +@htmlonly +<iframe style="width: 500px; height: 500px;" src="https://mcss.mosra.cz"> +@endhtmlonly +*/ + +/** @page warnings This will produce a warning + +@htmlinclude nonexistent.html +*/ diff --git a/documentation/test_doxygen/contents_htmlinclude/warnings.html b/documentation/test_doxygen/contents_htmlonly_htmlinclude/warnings.html similarity index 100% rename from documentation/test_doxygen/contents_htmlinclude/warnings.html rename to documentation/test_doxygen/contents_htmlonly_htmlinclude/warnings.html diff --git a/documentation/test_doxygen/test_contents.py b/documentation/test_doxygen/test_contents.py index 06f527c3..0913134e 100644 --- a/documentation/test_doxygen/test_contents.py +++ b/documentation/test_doxygen/test_contents.py @@ -347,11 +347,17 @@ def test_warnings(self): self.run_doxygen(wildcard='warnings.xml') self.assertEqual(*self.actual_expected_contents('warnings.html')) -class Htmlinclude(IntegrationTestCase): - def test(self): +class HtmlonlyHtmlinclude(IntegrationTestCase): + def test_htmlinclude(self): self.run_doxygen(wildcard='indexpage.xml') self.assertEqual(*self.actual_expected_contents('index.html')) + @unittest.skipUnless(LooseVersion(doxygen_version()) >= LooseVersion("1.8.18"), + "1.8.17 and older doesn't include @htmlonly in XML output") + def test_htmlonly(self): + self.run_doxygen(wildcard='html-only.xml') + self.assertEqual(*self.actual_expected_contents('html-only.html')) + def test_warnings(self): self.run_doxygen(wildcard='warnings.xml') self.assertEqual(*self.actual_expected_contents('warnings.html'))