assert_equals -> assert_equal

IPython/nbconvert/filters/tests/test_ansi.py

@@ -1,91 +1,91
 """
 Module with tests for ansi filters
 """
 
 #-----------------------------------------------------------------------------
 # 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.utils.coloransi import TermColors
 
 from ...tests.base import TestsBase
 from ..ansi import strip_ansi, ansi2html, ansi2latex
 
 
 #-----------------------------------------------------------------------------
 # Class
 #-----------------------------------------------------------------------------
 
 class TestAnsi(TestsBase):
     """Contains test functions for ansi.py"""
 
 
     def test_strip_ansi(self):
         """
         strip_ansi test
         """
         correct_outputs = {
             '%s%s%s' % (TermColors.Green, TermColors.White, TermColors.Red)  : '',
             'hello%s' % TermColors.Blue: 'hello',
             'he%s%sllo' % (TermColors.Yellow, TermColors.Cyan) : 'hello',
             '%shello' % TermColors.Blue : 'hello',
             '{0}h{0}e{0}l{0}l{0}o{0}'.format(TermColors.Red) : 'hello',
             'hel%slo' % TermColors.Green : 'hello',
             'hello' : 'hello'}
 
         for inval, outval in correct_outputs.items():
             yield self._try_strip_ansi, inval, outval
 
 
     def _try_strip_ansi(self, inval, outval):
-        self.assert_equals(outval, strip_ansi(inval))
+        self.assert_equal(outval, strip_ansi(inval))
 
 
     def test_ansi2html(self):
         """
         ansi2html test
         """
         correct_outputs = {
             '%s' % (TermColors.Red)  : '<span class="ansired"></span>',
             'hello%s' % TermColors.Blue: 'hello<span class="ansiblue"></span>',
             'he%s%sllo' % (TermColors.Green, TermColors.Cyan) : 'he<span class="ansigreen"></span><span class="ansicyan">llo</span>',
             '%shello' % TermColors.Yellow : '<span class="ansiyellow">hello</span>',
             '{0}h{0}e{0}l{0}l{0}o{0}'.format(TermColors.White) : '<span class="ansigrey">h</span><span class="ansigrey">e</span><span class="ansigrey">l</span><span class="ansigrey">l</span><span class="ansigrey">o</span><span class="ansigrey"></span>',
             'hel%slo' % TermColors.Green : 'hel<span class="ansigreen">lo</span>',
             'hello' : 'hello'}
 
         for inval, outval in correct_outputs.items():
             yield self._try_ansi2html, inval, outval
 
 
     def _try_ansi2html(self, inval, outval):
         self.fuzzy_compare(outval, ansi2html(inval))
 
 
     def test_ansi2latex(self):
         """
         ansi2latex test
         """
         correct_outputs = {
             '%s' % (TermColors.Red)  : r'\red{}',
             'hello%s' % TermColors.Blue: r'hello\blue{}',
             'he%s%sllo' % (TermColors.Green, TermColors.Cyan) : r'he\green{}\cyan{llo}',
             '%shello' % TermColors.Yellow : r'\yellow{hello}',
             '{0}h{0}e{0}l{0}l{0}o{0}'.format(TermColors.White) : r'\white{h}\white{e}\white{l}\white{l}\white{o}\white{}',
             'hel%slo' % TermColors.Green : r'hel\green{lo}',
             'hello' : 'hello'}
 
         for inval, outval in correct_outputs.items():
             yield self._try_ansi2latex, inval, outval
 
 
     def _try_ansi2latex(self, inval, outval):
         self.fuzzy_compare(outval, ansi2latex(inval), case_sensitive=True)

IPython/nbconvert/filters/tests/test_latex.py

@@ -1,72 +1,72
 """
 Module with tests for Latex
 """
 
 #-----------------------------------------------------------------------------
 # 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 ...tests.base import TestsBase
 from ..latex import escape_latex, strip_math_space
 
 
 #-----------------------------------------------------------------------------
 # Class
 #-----------------------------------------------------------------------------
 
 class TestLatex(TestsBase):
 
 
     def test_escape_latex(self):
         """
         escape_latex test
         """
         tests = [
             (r'How are \you doing today?', r'How are \textbackslashyou doing today?'),
             (r'\escapechar=`\A\catcode`\|=0 |string|foo', r'\textbackslashescapechar=`\textbackslashA\textbackslashcatcode`\textbackslash|=0 |string|foo'),
             (r'# $ % & ~ _ ^ \ { }',r'\# \$ \% \& \~{} \_ \^{} \textbackslash \{ \}'),
             ('','')]
 
         for test in tests:
             yield self._try_escape_latex, test[0], test[1]
 
 
     def _try_escape_latex(self, test, result):
         """
         Try to remove latex from string
         """
-        self.assert_equals(escape_latex(test), result)
+        self.assert_equal(escape_latex(test), result)
 
 
     def test_strip_math_space(self):
         """
         strip_math_space test
         """
         tests = [
             ('$e$','$e$'),
             ('$ e $','$e$'),
             ('xxx$e^i$yyy','xxx$e^i$yyy'),
             ('xxx$ e^i $yyy','xxx$e^i$yyy'),
             ('xxx$e^i $yyy','xxx$e^i$yyy'),
             ('xxx$ e^i$yyy','xxx$e^i$yyy'),
             ('\$ e $ e $','\$ e $e$'),
             ('','')]
 
         for test in tests:
             yield self._try_strip_math_space, test[0], test[1]
 
 
     def _try_strip_math_space(self, test, result):
         """
         Try to remove spaces between dollar symbols and contents correctly
         """
-        self.assert_equals(strip_math_space(test), result)
+        self.assert_equal(strip_math_space(test), result)

IPython/nbconvert/filters/tests/test_strings.py

@@ -1,132 +1,132
 """
 Module with tests for Strings
 """
 
 #-----------------------------------------------------------------------------
 # 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 ...tests.base import TestsBase
 from ..strings import (wrap_text, html2text, add_anchor, strip_dollars, 
     strip_files_prefix, get_lines, comment_lines, ipython2python)
 
 
 #-----------------------------------------------------------------------------
 # Class
 #-----------------------------------------------------------------------------
 
 class TestStrings(TestsBase):
 
     def test_wrap_text(self):
         """
         wrap_text test
         """
         test_text = """
         Tush! never tell me; I take it much unkindly
         That thou, Iago, who hast had my purse
         As if the strings were thine, shouldst know of this.
         """
         for length in [30,5,1]:
             yield self._confirm_wrap_text, test_text, length
     
     def _confirm_wrap_text(self, text, length):
         for line in wrap_text(text, length).split('\n'):
             assert len(line) <= length
 
     def test_html2text(self):
         """
         html2text test
         """
         #TODO: More tests
-        self.assert_equals(html2text('<name>joe</name>'), 'joe')
+        self.assert_equal(html2text('<name>joe</name>'), 'joe')
         
 
     def test_add_anchor(self):
         """
         add_anchor test
         """
         #TODO: More tests
         results = add_anchor('<b>Hello World!</b>')
         assert 'Hello World!' in results
         assert 'id="' in results
         assert 'class="anchor-link"' in results
         assert '<b' in results
         assert '</b>' in results
 
         
     def test_strip_dollars(self):
         """
         strip_dollars test
         """
         tests = [
             ('', ''), 
             ('$$', ''), 
             ('$H$', 'H'), 
             ('$He', 'He'), 
             ('H$el', 'H$el'), 
             ('Hell$', 'Hell'),
             ('Hello', 'Hello'),
             ('W$o$rld', 'W$o$rld')]
         for test in tests:
             yield self._try_strip_dollars, test[0], test[1]
 
 
     def _try_strip_dollars(self, test, result):
-        self.assert_equals(strip_dollars(test), result)
+        self.assert_equal(strip_dollars(test), result)
 
 
     def test_strip_files_prefix(self):
         """
         strip_files_prefix test
         """
         tests = [
             ('', ''), 
             ('/files', '/files'), 
             ('test="/files"', 'test="/files"'), 
             ('My files are in `files/`', 'My files are in `files/`'),
             ('<a href="files/test.html">files/test.html</a>', '<a href="test.html">files/test.html</a>')]
         for test in tests:
             yield self._try_files_prefix, test[0], test[1]
 
 
     def _try_files_prefix(self, test, result):
-        self.assert_equals(strip_files_prefix(test), result)
+        self.assert_equal(strip_files_prefix(test), result)
         
 
     def test_comment_lines(self):
         """
         comment_lines test
         """
         for line in comment_lines('hello\nworld\n!').split('\n'):
             assert line.startswith('# ')
         for line in comment_lines('hello\nworld\n!', 'beep').split('\n'):
             assert line.startswith('beep')
         
 
     def test_get_lines(self):
         """
         get_lines test
         """
         text = "hello\nworld\n!"
-        self.assert_equals(get_lines(text, start=1), "world\n!")
-        self.assert_equals(get_lines(text, end=2), "hello\nworld")
-        self.assert_equals(get_lines(text, start=2, end=5), "!")
-        self.assert_equals(get_lines(text, start=-2), "world\n!")
+        self.assert_equal(get_lines(text, start=1), "world\n!")
+        self.assert_equal(get_lines(text, end=2), "hello\nworld")
+        self.assert_equal(get_lines(text, start=2, end=5), "!")
+        self.assert_equal(get_lines(text, start=-2), "world\n!")
         
 
     def test_ipython2python(self):
         """
         ipython2python test
         """
         #TODO: More tests
         results = ipython2python(u'%%pylab\nprint("Hello-World")').replace("u'", "'")
         self.fuzzy_compare(results, u"get_ipython().run_cell_magic('pylab', '', 'print(\"Hello-World\")')", 
             ignore_spaces=True, ignore_newlines=True)