AsciiDoc to DITA conversion was missing note admonitions - fixes #3

jmourelos · Oct 17, 2016 · 116ee10 · 116ee10
1 parent 4a0d5c9
commit 116ee10
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -11,7 +11,7 @@ help:
 	@echo "release - package and upload a release"
 	@echo "sdist - package"
 
-clean: clean-build clean-pyc
+clean: clean-build clean-pyc clean-test
 
 clean-build:
 	rm -fr build/
@@ -23,6 +23,9 @@ clean-pyc:
 	find . -name '*.pyo' -exec rm -f {} +
 	find . -name '*~' -exec rm -f {} +
 
+clean-test:
+	rm -fr .tox/
+
 lint:
 	flake8 doconv tests
 

diff --git a/doconv/plugin/docbooktodita/db2dita/dbReader.xsl b/doconv/plugin/docbooktodita/db2dita/dbReader.xsl
@@ -309,7 +309,7 @@
             epigraph|equation|example|fieldsynopsis|figure|formalpara|
             funcsynopsis|glosslist|important|indexterm|informalequation|
             informalexample|informalfigure|informaltable|itemizedlist|
-            literallayout|mediaobject|methodsynopsis|orderedlist|
+            literallayout|mediaobject|methodsynopsis|note|orderedlist|
             para|procedure|productionset|programlisting|
             programlistingco|remark|revhistory|screen|screenco|
             screenshot|segmentedlist|sidebar|simpara|simplelist|synopsis|

diff --git a/test-requirements.txt b/test-requirements.txt
@@ -1,6 +1,6 @@
 # Top-level dependencies: tox, pytest, mock
 mock==1.0.1
 tox==1.6.1
-py==1.4.17
+py==1.4.31
 virtualenv==1.10.1
-pytest==2.4.2
+pytest==2.7.3
diff --git a/tests/samples/Admonitions.adoc b/tests/samples/Admonitions.adoc
@@ -0,0 +1,36 @@
+
+== Admonition Blocks
+
+Admonition tests.
+
+
+[NOTE]
+====
+A NOTE admonition block
+====
+
+
+[CAUTION]
+====
+A CAUTION admonition block
+====
+
+
+[TIP]
+====
+A TIP admonition block
+====
+
+
+[WARNING]
+====
+A WARNING admonition block
+====
+
+
+[IMPORTANT]
+====
+An IMPORTANT admonition block
+====
+
+
diff --git a/tests/test_doconv.py b/tests/test_doconv.py
@@ -86,6 +86,21 @@ def test_convert_asciidoc_dita(self):
                                            self.generate_output_filename())
         assert_xml(converted_file)
 
+    def test_convert_admonitions_asciidoc_dita(self):
+        converter = Converter("asciidoc", "dita")
+        converted_file = converter.convert(self.get_sample("Admonitions.adoc"),
+                                           self.generate_output_filename())
+        assert_xml(converted_file)
+        with open(converted_file, 'r') as converted_fd:
+            converted_content = converted_fd.read()
+
+        assert 'A NOTE admonition block' in converted_content
+        assert 'A CAUTION admonition block' in converted_content
+        assert 'A TIP admonition block' in converted_content
+        assert 'A WARNING admonition block' in converted_content
+        assert 'An IMPORTANT admonition block' in converted_content
+
+
     def teardown(self):
         chdir(self.initial_dir)
         rmtree(self.tmp)