Fixes small things pointed out by @minrk

IPython/nbconvert/transformers/tests/test_coalescestreams.py

@@ -1,35 +1,36 b''
 """
 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, res = coalesce_streams(self.build_notebook(), self.build_resources())
-        self.assertEqual(nb.worksheets[0].cells[0].outputs[0].text, "a")
-        self.assertEqual(nb.worksheets[0].cells[0].outputs[1].output_type, "text")
-        self.assertEqual(nb.worksheets[0].cells[0].outputs[2].text, "cd")
-        self.assertEqual(nb.worksheets[0].cells[0].outputs[3].text, "ef")
+        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")
     
  No newline at end of file

IPython/nbconvert/transformers/tests/test_csshtmlheader.py

@@ -1,39 +1,45 b''
 """
 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 test_constructor(self):
-        """Can a CSSHTMLHeaderTransformer be constructed?"""
+
+    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, res = self.test_constructor()(self.build_notebook(), self.build_resources())
+        nb, res = self.build_transformer()(self.build_notebook(), self.build_resources())
         assert 'inlining' in res
         assert 'css' in res['inlining'] 
  No newline at end of file

IPython/nbconvert/transformers/tests/test_extractoutput.py

@@ -1,56 +1,62 b''
 """
 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 test_constructor(self):
-        """Can a ExtractOutputTransformer be constructed?"""
+
+    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, res = self.test_constructor()(self.build_notebook(), self.build_resources())
+        nb, res = self.build_transformer()(self.build_notebook(), self.build_resources())
 
         # 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']
 
         # Make sure an entry to the resources was added.
         assert 'outputs' in res
 
         # Verify text output
         assert text_filename in res['outputs']
         self.assertEqual(res['outputs'][text_filename], 'b')
 
         # Verify png output
         assert png_filename in res['outputs']
         self.assertEqual(res['outputs'][png_filename], 'g')

IPython/nbconvert/transformers/tests/test_latex.py

@@ -1,43 +1,48 b''
 """
 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 test_constructor(self):
-        """Can a LatexTransformer be constructed?"""
+
+    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, res = self.test_constructor()(self.build_notebook(), self.build_resources())
+        nb, res = self.build_transformer()(self.build_notebook(), self.build_resources())
 
         # 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$')

IPython/nbconvert/transformers/tests/test_revealhelp.py

@@ -1,93 +1,88 b''
 """
 Module with tests for the revealhelp 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 IPython.nbformat import current as nbformat
 
 from .base import TransformerTestsBase
 from ..revealhelp import RevealHelpTransformer
 
 
 #-----------------------------------------------------------------------------
 # Class
 #-----------------------------------------------------------------------------
 
 class Testrevealhelp(TransformerTestsBase):
     """Contains test functions for revealhelp.py"""
 
     def build_notebook(self):
         """Build a reveal slides notebook in memory for use with tests.  
         Overrides base in TransformerTestsBase"""
 
         outputs = [nbformat.new_output(output_type="stream", stream="stdout", output_text="a")]
         
         slide_metadata = {'slideshow' : {'slide_type': 'slide'}}
         subslide_metadata = {'slideshow' : {'slide_type': 'subslide'}}
 
         cells=[nbformat.new_code_cell(input="", prompt_number=1, outputs=outputs),
                nbformat.new_text_cell('markdown', source="", metadata=slide_metadata),
                nbformat.new_code_cell(input="", prompt_number=2, outputs=outputs),
                nbformat.new_text_cell('markdown', source="", metadata=slide_metadata),
                nbformat.new_text_cell('markdown', source="", metadata=subslide_metadata)]
         worksheets = [nbformat.new_worksheet(name="worksheet1", cells=cells)]
 
         return nbformat.new_notebook(name="notebook1", worksheets=worksheets)
 
-    def test_constructor(self):
-        """Can a RevealHelpTransformer be constructed?"""
+
+    def build_transformer(self):
+        """Make an instance of a transformer"""
         transformer = RevealHelpTransformer()
         transformer.enabled = True
         return transformer
     
 
+    def test_constructor(self):
+        """Can a RevealHelpTransformer be constructed?"""
+        self.build_transformer()
+    
+
     def test_reveal_attribute(self):
         """Make sure the reveal url_prefix resources is set"""
-        nb, res = self.test_constructor()(self.build_notebook(), self.build_resources())
+        nb, res = self.build_transformer()(self.build_notebook(), self.build_resources())
         assert 'reveal' in res
         assert  'url_prefix' in res['reveal']
 
 
     def test_reveal_output(self):
         """Make sure that the reveal transformer """
-        nb, res = self.test_constructor()(self.build_notebook(), self.build_resources())
+        nb, res = self.build_transformer()(self.build_notebook(), self.build_resources())
         cells = nb.worksheets[0].cells
         
         # Make sure correct metadata tags are available on every cell.
-        assert 'slide_type' in cells[0].metadata
-        assert 'align_type' in cells[0].metadata
-
-        assert 'slide_type' in cells[1].metadata
-        assert 'align_type' in cells[1].metadata
-
-        assert 'slide_type' in cells[2].metadata
-        assert 'align_type' in cells[2].metadata
-
-        assert 'slide_type' in cells[3].metadata
-        assert 'align_type' in cells[3].metadata
-
-        assert 'slide_type' in cells[4].metadata
-        assert 'align_type' in cells[4].metadata
+        for cell in cells:
+            assert 'slide_type' in cell.metadata
+            assert 'align_type' in cell.metadata
 
         # Make sure slide end is only applied to the cells preceeding slide 
         # cells.
         assert 'slide_helper' not in cells[1].metadata
 
         # Verify 'slide-end'
         assert 'slide_helper' in cells[0].metadata
         self.assertEqual(cells[0].metadata['slide_helper'], 'slide_end')
         assert 'slide_helper' in cells[2].metadata
         self.assertEqual(cells[2].metadata['slide_helper'], 'slide_end')
         assert 'slide_helper' in cells[3].metadata
         self.assertEqual(cells[3].metadata['slide_helper'], 'subslide_end')

IPython/nbconvert/transformers/tests/test_sphinx.py

@@ -1,49 +1,55 b''
 """
 Module with tests for the sphinx 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 ..sphinx import SphinxTransformer
 
 
 #-----------------------------------------------------------------------------
 # Class
 #-----------------------------------------------------------------------------
 
 class TestSphinx(TransformerTestsBase):
     """Contains test functions for sphinx.py"""
 
-    def test_constructor(self):
-        """Can a SphinxTransformer be constructed?"""
+
+    def build_transformer(self):
+        """Make an instance of a transformer"""
         transformer = SphinxTransformer()
         transformer.enabled = True
         return transformer
     
 
+    def test_constructor(self):
+        """Can a SphinxTransformer be constructed?"""
+        self.build_transformer()
+    
+
     def test_resources(self):
         """Make sure the SphinxTransformer adds the appropriate resources to the
         resources dict."""
-        nb, res = self.test_constructor()(self.build_notebook(), self.build_resources())
+        nb, res = self.build_transformer()(self.build_notebook(), self.build_resources())
         assert 'sphinx' in res
         assert "author" in res['sphinx']
         assert "version" in res['sphinx']
         assert "release" in res['sphinx']
         assert "date" in res['sphinx']
         assert "chapterstyle" in res['sphinx']
         assert "outputstyle" in res['sphinx']
         assert "centeroutput" in res['sphinx']
         assert "header" in res['sphinx']
         assert "texinputs" in res['sphinx']
         assert "pygment_definitions" in res['sphinx']

IPython/nbconvert/transformers/tests/test_svg2pdf.py

@@ -1,82 +1,87 b''
 """
 Module with tests for the svg2pdf 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 IPython.testing import decorators as dec
 from IPython.nbformat import current as nbformat
 
 from .base import TransformerTestsBase
 from ..svg2pdf import SVG2PDFTransformer
 
 
 #-----------------------------------------------------------------------------
 # Class
 #-----------------------------------------------------------------------------
 
 class Testsvg2pdf(TransformerTestsBase):
     """Contains test functions for svg2pdf.py"""
 
     simple_svg = """<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.0"
    x="0.00000000"
    y="0.00000000"
    width="500.00000"
    height="500.00000"
    id="svg2">
   <defs
      id="defs4" />
   <g
      id="layer1">
     <rect
        width="300.00000"
        height="300.00000"
        x="100.00000"
        y="100.00000"
        style="opacity:1.0000000;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:8.0000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.00000000;stroke-opacity:1.0000000"
        id="rect5719" />
   </g>
 </svg>"""
 
     def build_notebook(self):
         """Build a reveal slides notebook in memory for use with tests.  
         Overrides base in TransformerTestsBase"""
 
         outputs = [nbformat.new_output(output_type="svg", output_svg=self.simple_svg)]
         
         slide_metadata = {'slideshow' : {'slide_type': 'slide'}}
         subslide_metadata = {'slideshow' : {'slide_type': 'subslide'}}
 
         cells=[nbformat.new_code_cell(input="", prompt_number=1, outputs=outputs)]
         worksheets = [nbformat.new_worksheet(name="worksheet1", cells=cells)]
 
         return nbformat.new_notebook(name="notebook1", worksheets=worksheets)
 
 
-    def test_constructor(self):
-        """Can a SVG2PDFTransformer be constructed?"""
+    def build_transformer(self):
+        """Make an instance of a transformer"""
         transformer = SVG2PDFTransformer()
         transformer.enabled = True
         return transformer
     
 
+    def test_constructor(self):
+        """Can a SVG2PDFTransformer be constructed?"""
+        self.build_transformer()
+        
+
     @dec.onlyif_cmds_exist('inkscape')
     def test_output(self):
         """Test the output of the SVG2PDFTransformer"""
-        nb, res = self.test_constructor()(self.build_notebook(), self.build_resources())
+        nb, res = self.build_transformer()(self.build_notebook(), self.build_resources())
         assert 'svg' in nb.worksheets[0].cells[0].outputs[0]