Fixed tests

IPython/nbconvert/exporters/tests/test_html.py

@@ -1,64 +1,64 b''
 """
 Module with tests for basichtml.py
 """
 
 #-----------------------------------------------------------------------------
 # 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 ExportersTestsBase
-from ..basichtml import BasicHTMLExporter
+from ..html import HTMLExporter
 from IPython.testing.decorators import onlyif_cmds_exist
 
 #-----------------------------------------------------------------------------
 # Class
 #-----------------------------------------------------------------------------
 
-class TestBasicHTMLExporter(ExportersTestsBase):
+class TestHTMLExporter(ExportersTestsBase):
     """Contains test functions for basichtml.py"""
 
     def test_constructor(self):
         """
-        Can a BasicHTMLExporter be constructed?
+        Can a HTMLExporter be constructed?
         """
-        BasicHTMLExporter()
+        HTMLExporter()
 
     @onlyif_cmds_exist('pandoc')
     def test_export(self):
         """
-        Can a BasicHTMLExporter export something?
+        Can a HTMLExporter export something?
         """
-        (output, resources) = BasicHTMLExporter().from_filename(self._get_notebook())
+        (output, resources) = HTMLExporter().from_filename(self._get_notebook())
         assert len(output) > 0
 
 
     def test_export_basic(self):
         """
-        Can a BasicHTMLExporter export using the 'basic' flavor?
+        Can a HTMLExporter export using the 'basic' flavor?
         """
-        (output, resources) = BasicHTMLExporter(flavor='basic').from_filename(self._get_notebook())
+        (output, resources) = HTMLExporter(flavor='basic').from_filename(self._get_notebook())
         assert len(output) > 0
 
 
     def test_export_full(self):
         """
-        Can a BasicHTMLExporter export using the 'full' flavor?
+        Can a HTMLExporter export using the 'full' flavor?
         """
-        (output, resources) = BasicHTMLExporter(flavor='full').from_filename(self._get_notebook())
+        (output, resources) = HTMLExporter(flavor='full').from_filename(self._get_notebook())
         assert len(output) > 0
 
 
     def test_export_reveal(self):
         """
-        Can a BasicHTMLExporter export using the 'reveal' flavor?
+        Can a HTMLExporter export using the 'reveal' flavor?
         """
-        (output, resources) = BasicHTMLExporter(flavor='reveal').from_filename(self._get_notebook())
+        (output, resources) = HTMLExporter(flavor='reveal').from_filename(self._get_notebook())
         assert len(output) > 0
  No newline at end of file

IPython/nbconvert/exporters/tests/test_latex.py

@@ -1,65 +1,65 b''
 """
 Module with tests for latex.py
 """
 
 #-----------------------------------------------------------------------------
 # 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 ExportersTestsBase
 from ..latex import LatexExporter
 from IPython.testing.decorators import onlyif_cmds_exist
 
 #-----------------------------------------------------------------------------
 # Class
 #-----------------------------------------------------------------------------
 
 class TestLatexExporter(ExportersTestsBase):
     """Contains test functions for latex.py"""
 
     def test_constructor(self):
         """
         Can a LatexExporter be constructed?
         """
         LatexExporter()
 
 
     @onlyif_cmds_exist('pandoc')
     def test_export(self):
         """
         Can a LatexExporter export something?
         """
         (output, resources) = LatexExporter().from_filename(self._get_notebook())
         assert len(output) > 0
 
 
-    def test_export_full(self):
+    def test_export_book(self):
         """
-        Can a LatexExporter export using 'full' flavor?
+        Can a LatexExporter export using 'book' flavor?
         """
-        (output, resources) = LatexExporter(flavor='full').from_filename(self._get_notebook())
+        (output, resources) = LatexExporter(flavor='book').from_filename(self._get_notebook())
         assert len(output) > 0
 
 
     def test_export_basic(self):
         """
         Can a LatexExporter export using 'basic' flavor?
         """
         (output, resources) = LatexExporter(flavor='basic').from_filename(self._get_notebook())
         assert len(output) > 0
 
 
-    def test_export_reveal(self):
+    def test_export_article(self):
         """
-        Can a LatexExporter export using 'reveal' flavor?
+        Can a LatexExporter export using 'article' flavor?
         """
-        (output, resources) = LatexExporter(flavor='reveal').from_filename(self._get_notebook())
+        (output, resources) = LatexExporter(flavor='article').from_filename(self._get_notebook())
         assert len(output) > 0
  No newline at end of file

IPython/nbconvert/tests/test_nbconvertapp.py

@@ -1,123 +1,135 b''
 """
 Contains tests for the nbconvertapp
 """
 #-----------------------------------------------------------------------------
 #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
 #-----------------------------------------------------------------------------
 
 import os
 from .base import TestsBase
 
 from IPython.utils import py3compat
 
     
 #-----------------------------------------------------------------------------
 # Constants
 #-----------------------------------------------------------------------------
 
 # Define ipython commandline name
 if py3compat.PY3:
     IPYTHON = 'ipython3'
 else:
     IPYTHON = 'ipython'
 
 
 #-----------------------------------------------------------------------------
 # Classes and functions
 #-----------------------------------------------------------------------------
 
 class TestNbConvertApp(TestsBase):
     """Collection of NbConvertApp tests"""
 
 
     def test_notebook_help(self):
         """
         Will help show if no notebooks are specified?
         """
         with self.create_temp_cwd():
             assert "see '--help-all'" in self.call([IPYTHON, 'nbconvert'])
 
 
     def test_glob(self):
         """
         Do search patterns work for notebook names?
         """
         with self.create_temp_cwd(['notebook*.ipynb']):
             assert not 'error' in self.call([IPYTHON, 'nbconvert', 
-                '--format="python"', '--notebooks=["*.ipynb"]']).lower()
+                '--to="python"', '--notebooks=["*.ipynb"]']).lower()
             assert os.path.isfile('notebook1.py')
             assert os.path.isfile('notebook2.py')
 
 
     def test_glob_subdir(self):
         """
         Do search patterns work for subdirectory notebook names?
         """
         with self.create_temp_cwd() as cwd:
             self.copy_files_to(['notebook*.ipynb'], 'subdir/')
-            assert not 'error' in self.call([IPYTHON, 'nbconvert', '--format="python"', 
+            assert not 'error' in self.call([IPYTHON, 'nbconvert', '--to="python"', 
                 '--notebooks=["%s"]' % os.path.join('subdir', '*.ipynb')]).lower()
             assert os.path.isfile('notebook1.py')
             assert os.path.isfile('notebook2.py')
 
 
     def test_explicit(self):
         """
         Do explicit notebook names work?
         """
         with self.create_temp_cwd(['notebook*.ipynb']):
-            assert not 'error' in self.call([IPYTHON, 'nbconvert', '--format="python"', 
+            assert not 'error' in self.call([IPYTHON, 'nbconvert', '--to="python"', 
                 '--notebooks=["notebook2.ipynb"]']).lower()
             assert not os.path.isfile('notebook1.py')
             assert os.path.isfile('notebook2.py')
 
 
+    def test_flavor(self):
+        """
+        Do explicit notebook names work?
+        """
+        with self.create_temp_cwd(['notebook*.ipynb']):
+            assert not 'error' in self.call([IPYTHON, 'nbconvert', '--to="html"', 
+                '--notebooks=["notebook2.ipynb"]', '--flavor="reveal"']).lower()
+            assert os.path.isfile('notebook2.html')
+            with open('notebook2.html') as f:
+                assert '/reveal.css' in f.read()
+
+
     def test_glob_explicit(self):
         """
         Can a search pattern be used along with matching explicit notebook names?
         """
         with self.create_temp_cwd(['notebook*.ipynb']):
-            assert not 'error' in self.call([IPYTHON, 'nbconvert', '--format="python"', 
+            assert not 'error' in self.call([IPYTHON, 'nbconvert', '--to="python"', 
                 '--notebooks=["*.ipynb", "notebook1.ipynb", "notebook2.ipynb"]']).lower()
             assert os.path.isfile('notebook1.py')
             assert os.path.isfile('notebook2.py')
 
 
     def test_explicit_glob(self):
         """
         Can explicit notebook names be used and then a matching search pattern?
         """
         with self.create_temp_cwd(['notebook*.ipynb']):
-            assert not 'error' in self.call([IPYTHON, 'nbconvert', '--format="python"', 
+            assert not 'error' in self.call([IPYTHON, 'nbconvert', '--to="python"', 
                 '--notebooks=["notebook1.ipynb", "notebook2.ipynb", "*.ipynb"]']).lower()
             assert os.path.isfile('notebook1.py')
             assert os.path.isfile('notebook2.py')
 
 
     def test_default_config(self):
         """
         Does the default config work?
         """
         with self.create_temp_cwd(['notebook*.ipynb', 'ipython_nbconvert_config.py']):
             assert not 'error' in self.call([IPYTHON, 'nbconvert']).lower()
             assert os.path.isfile('notebook1.py')
             assert not os.path.isfile('notebook2.py')
 
 
     def test_override_config(self):
         """
         Can the default config be overriden?
         """
         with self.create_temp_cwd(['notebook*.ipynb', 'ipython_nbconvert_config.py', 
                                    'override.py']):
             assert not 'error' in self.call([IPYTHON, 'nbconvert', '--config="override.py"']).lower()
             assert not os.path.isfile('notebook1.py')
             assert os.path.isfile('notebook2.py')