Merge pull request ipython#3914 from jdfreder/trans_tests

nbconvert: Transformer tests

IPython/nbconvert/exporters/tests/test_exporter.py

@@ -53,7 +53,7 @@ def test_extract_outputs(self):
         exporter = self._make_exporter(config=config)
         (output, resources) = exporter.from_filename(self._get_notebook())
         assert resources is not None
-        assert 'outputs' in resources
+        assert isinstance(resources['outputs'], dict)
         assert len(resources['outputs']) > 0
 
 
@@ -65,7 +65,6 @@ def test_transformer_class(self):
         exporter = self._make_exporter(config=config)
         (output, resources) = exporter.from_filename(self._get_notebook())
         assert resources is not None
-        assert 'cheese' in resources
         assert resources['cheese'] == 'real'
 
 
@@ -77,7 +76,6 @@ def test_transformer_instance(self):
         exporter = self._make_exporter(config=config)
         (output, resources) = exporter.from_filename(self._get_notebook())
         assert resources is not None
-        assert 'cheese' in resources
         assert resources['cheese'] == 'real'
 
 
@@ -89,7 +87,6 @@ def test_transformer_dottedobjectname(self):
         exporter = self._make_exporter(config=config)
         (output, resources) = exporter.from_filename(self._get_notebook())
         assert resources is not None
-        assert 'cheese' in resources
         assert resources['cheese'] == 'real'
 
 
@@ -101,7 +98,6 @@ def test_transformer_via_method(self):
         exporter.register_transformer(CheeseTransformer, enabled=True)
         (output, resources) = exporter.from_filename(self._get_notebook())
         assert resources is not None
-        assert 'cheese' in resources
         assert resources['cheese'] == 'real'
 
 

IPython/nbconvert/transformers/extractoutput.py

@@ -57,19 +57,20 @@ def transform_cell(self, cell, resources, cell_index):
         output_files_dir = resources.get('output_files_dir', None)
 
         #Make sure outputs key exists
-        if not 'outputs' in resources:
+        if not isinstance(resources['outputs'], dict):
             resources['outputs'] = {}
 
         #Loop through all of the outputs in the cell
         for index, out in enumerate(cell.get('outputs', [])):
 
             #Get the output in data formats that the template is interested in.
             for out_type in self.display_data_priority:
-                if out.hasattr(out_type):
+                if out.hasattr(out_type): 
                     data = out[out_type]
 
                     #Binary files are base64-encoded, SVG is already XML
                     if out_type in ('png', 'jpg', 'jpeg', 'pdf'):
+
                         # data is b64-encoded as text (str, unicode)
                         # decodestring only accepts bytes
                         data = py3compat.cast_bytes(data)

IPython/nbconvert/transformers/revealhelp.py

@@ -54,7 +54,7 @@ def call(self, nb, resources):
                     worksheet.cells[index - 1].metadata.slide_helper = 'subslide_end'
 
 
-        if 'reveal' not in resources:
+        if not isinstance(resources['reveal'], dict):
             resources['reveal'] = {}
         resources['reveal']['url_prefix'] = self.url_prefix
 

IPython/nbconvert/transformers/sphinx.py

@@ -127,7 +127,7 @@ def call(self, nb, resources):
         # TODO: Add versatile method of additional notebook metadata.  Include
         #       handling of multiple files.  For now use a temporay namespace,
         #       '_draft' to signify that this needs to change.
-        if not "sphinx" in resources:
+        if not isinstance(resources["sphinx"], dict):
             resources["sphinx"] = {}
 
         if self.interactive:

IPython/nbconvert/transformers/tests/base.py

@@ -0,0 +1,53 @@
+"""
+Module with utility functions for transformer tests
+"""
+
+#-----------------------------------------------------------------------------
+# Copyright (c) 2013, the IPython Development Team.
+#
+# Distributed under the terms of the Modified BSD License.
+#
+# The full license is in the file COPYING.txt, distributed with this software.
+#-----------------------------------------------------------------------------
+
+#-----------------------------------------------------------------------------
+# Imports
+#-----------------------------------------------------------------------------
+
+from IPython.nbformat import current as nbformat
+
+from ...tests.base import TestsBase
+from ...exporters.exporter import ResourcesDict
+
+#-----------------------------------------------------------------------------
+# Class
+#-----------------------------------------------------------------------------
+
+class TransformerTestsBase(TestsBase):
+    """Contains test functions transformer tests"""
+
+
+    def build_notebook(self):
+        """Build a notebook in memory for use with transformer tests"""
+
+        outputs = [nbformat.new_output(output_type="stream", stream="stdout", output_text="a"),
+                   nbformat.new_output(output_type="text", output_text="b"),
+                   nbformat.new_output(output_type="stream", stream="stdout", output_text="c"),
+                   nbformat.new_output(output_type="stream", stream="stdout", output_text="d"),
+                   nbformat.new_output(output_type="stream", stream="stderr", output_text="e"),
+                   nbformat.new_output(output_type="stream", stream="stderr", output_text="f"),
+                   nbformat.new_output(output_type="png", output_png=b'Zw==')] #g
+
+        cells=[nbformat.new_code_cell(input="$ e $", prompt_number=1,outputs=outputs),
+               nbformat.new_text_cell('markdown', source="$ e $")]
+        worksheets = [nbformat.new_worksheet(name="worksheet1", cells=cells)]
+
+        return nbformat.new_notebook(name="notebook1", worksheets=worksheets)
+
+
+    def build_resources(self):
+        """Build an empty resources dictionary."""
+
+        res = ResourcesDict()
+        res['metadata'] = ResourcesDict()
+        return res

IPython/nbconvert/transformers/tests/test_coalescestreams.py

@@ -0,0 +1,38 @@
+"""
+Module with tests for the coalescestreams transformer
+"""
+
+#-----------------------------------------------------------------------------
+# Copyright (c) 2013, the IPython Development Team.
+#
+# Distributed under the terms of the Modified BSD License.
+#
+# The full license is in the file COPYING.txt, distributed with this software.
+#-----------------------------------------------------------------------------
+
+#-----------------------------------------------------------------------------
+# Imports
+#-----------------------------------------------------------------------------
+
+from .base import TransformerTestsBase
+from ..coalescestreams import coalesce_streams
+
+
+#-----------------------------------------------------------------------------
+# Class
+#-----------------------------------------------------------------------------
+
+class TestCoalesceStreams(TransformerTestsBase):
+    """Contains test functions for coalescestreams.py"""
+
+    def test_coalesce_streams(self):
+        """coalesce_streams transformer output test"""
+        nb = self.build_notebook()
+        res = self.build_resources()
+        nb, res = coalesce_streams(nb, res)
+        outputs = nb.worksheets[0].cells[0].outputs
+        self.assertEqual(outputs[0].text, "a")
+        self.assertEqual(outputs[1].output_type, "text")
+        self.assertEqual(outputs[2].text, "cd")
+        self.assertEqual(outputs[3].text, "ef")
+

IPython/nbconvert/transformers/tests/test_csshtmlheader.py

@@ -0,0 +1,47 @@
+"""
+Module with tests for the csshtmlheader transformer
+"""
+
+#-----------------------------------------------------------------------------
+# Copyright (c) 2013, the IPython Development Team.
+#
+# Distributed under the terms of the Modified BSD License.
+#
+# The full license is in the file COPYING.txt, distributed with this software.
+#-----------------------------------------------------------------------------
+
+#-----------------------------------------------------------------------------
+# Imports
+#-----------------------------------------------------------------------------
+
+from .base import TransformerTestsBase
+from ..csshtmlheader import CSSHTMLHeaderTransformer
+
+
+#-----------------------------------------------------------------------------
+# Class
+#-----------------------------------------------------------------------------
+
+class TestCSSHTMLHeader(TransformerTestsBase):
+    """Contains test functions for csshtmlheader.py"""
+
+
+    def build_transformer(self):
+        """Make an instance of a transformer"""
+        transformer = CSSHTMLHeaderTransformer()
+        transformer.enabled = True
+        return transformer
+
+
+    def test_constructor(self):
+        """Can a CSSHTMLHeaderTransformer be constructed?"""
+        self.build_transformer()
+
+
+    def test_output(self):
+        """Test the output of the CSSHTMLHeaderTransformer"""
+        nb = self.build_notebook()
+        res = self.build_resources()
+        transformer = self.build_transformer()
+        nb, res = transformer(nb, res)
+        assert 'css' in res['inlining'] 

IPython/nbconvert/transformers/tests/test_extractoutput.py

@@ -0,0 +1,62 @@
+"""
+Module with tests for the extractoutput transformer
+"""
+
+#-----------------------------------------------------------------------------
+# Copyright (c) 2013, the IPython Development Team.
+#
+# Distributed under the terms of the Modified BSD License.
+#
+# The full license is in the file COPYING.txt, distributed with this software.
+#-----------------------------------------------------------------------------
+
+#-----------------------------------------------------------------------------
+# Imports
+#-----------------------------------------------------------------------------
+
+from .base import TransformerTestsBase
+from ..extractoutput import ExtractOutputTransformer
+
+
+#-----------------------------------------------------------------------------
+# Class
+#-----------------------------------------------------------------------------
+
+class TestExtractOutput(TransformerTestsBase):
+    """Contains test functions for extractoutput.py"""
+
+
+    def build_transformer(self):
+        """Make an instance of a transformer"""
+        transformer = ExtractOutputTransformer()
+        transformer.enabled = True
+        return transformer
+
+
+    def test_constructor(self):
+        """Can a ExtractOutputTransformer be constructed?"""
+        self.build_transformer()
+
+
+    def test_output(self):
+        """Test the output of the ExtractOutputTransformer"""
+        nb = self.build_notebook()
+        res = self.build_resources()
+        transformer = self.build_transformer()
+        nb, res = transformer(nb, res)
+
+        # Check if text was extracted.
+        assert 'text_filename' in nb.worksheets[0].cells[0].outputs[1]
+        text_filename = nb.worksheets[0].cells[0].outputs[1]['text_filename']
+
+        # Check if png was extracted.
+        assert 'png_filename' in nb.worksheets[0].cells[0].outputs[6]
+        png_filename = nb.worksheets[0].cells[0].outputs[6]['png_filename']
+
+        # Verify text output
+        assert text_filename in res['outputs']
+        self.assertEqual(res['outputs'][text_filename], b'b')
+
+        # Verify png output
+        assert png_filename in res['outputs']
+        self.assertEqual(res['outputs'][png_filename], b'g')

IPython/nbconvert/transformers/tests/test_latex.py

@@ -0,0 +1,51 @@
+"""
+Module with tests for the latex transformer
+"""
+
+#-----------------------------------------------------------------------------
+# Copyright (c) 2013, the IPython Development Team.
+#
+# Distributed under the terms of the Modified BSD License.
+#
+# The full license is in the file COPYING.txt, distributed with this software.
+#-----------------------------------------------------------------------------
+
+#-----------------------------------------------------------------------------
+# Imports
+#-----------------------------------------------------------------------------
+
+from .base import TransformerTestsBase
+from ..latex import LatexTransformer
+
+
+#-----------------------------------------------------------------------------
+# Class
+#-----------------------------------------------------------------------------
+
+class TestLatex(TransformerTestsBase):
+    """Contains test functions for latex.py"""
+
+
+    def build_transformer(self):
+        """Make an instance of a transformer"""
+        transformer = LatexTransformer()
+        transformer.enabled = True
+        return transformer
+
+    def test_constructor(self):
+        """Can a LatexTransformer be constructed?"""
+        self.build_transformer()
+
+
+    def test_output(self):
+        """Test the output of the LatexTransformer"""
+        nb = self.build_notebook()
+        res = self.build_resources()
+        transformer = self.build_transformer()
+        nb, res = transformer(nb, res)
+
+        # Make sure the code cell wasn't modified.
+        self.assertEqual(nb.worksheets[0].cells[0].input, '$ e $')
+
+        # Verify that the markdown cell was processed.
+        self.assertEqual(nb.worksheets[0].cells[1].source, '$e$')