Source

rope_py3k / ropetest / refactor / movetest.py

Diff from to

ropetest/refactor/movetest.py

         self.mod1.write('class AClass(object):\n    pass\n')
         self._move(self.mod1, self.mod1.read().index('AClass') + 1,
                               self.mod2)
-        self.assertEquals('', self.mod1.read())
-        self.assertEquals('class AClass(object):\n    pass\n',
+        self.assertEqual('', self.mod1.read())
+        self.assertEqual('class AClass(object):\n    pass\n',
                           self.mod2.read())
 
     def test_changing_other_modules_adding_normal_imports(self):
         self.mod3.write('import mod1\na_var = mod1.AClass()\n')
         self._move(self.mod1, self.mod1.read().index('AClass') + 1,
                    self.mod2)
-        self.assertEquals('import mod1\nimport mod2\na_var = mod2.AClass()\n',
+        self.assertEqual('import mod1\nimport mod2\na_var = mod2.AClass()\n',
                           self.mod3.read())
 
     def test_changing_other_modules_removing_from_imports(self):
         self.mod3.write('from mod1 import AClass\na_var = AClass()\n')
         self._move(self.mod1, self.mod1.read().index('AClass') + 1,
                    self.mod2)
-        self.assertEquals('import mod2\na_var = mod2.AClass()\n',
+        self.assertEqual('import mod2\na_var = mod2.AClass()\n',
                           self.mod3.read())
 
     def test_changing_source_module(self):
         self.mod1.write('class AClass(object):\n    pass\na_var = AClass()\n')
         self._move(self.mod1, self.mod1.read().index('AClass') + 1,
                    self.mod2)
-        self.assertEquals('import mod2\na_var = mod2.AClass()\n',
+        self.assertEqual('import mod2\na_var = mod2.AClass()\n',
                           self.mod1.read())
 
     def test_changing_destination_module(self):
         self.mod2.write('from mod1 import AClass\na_var = AClass()\n')
         self._move(self.mod1, self.mod1.read().index('AClass') + 1,
                    self.mod2)
-        self.assertEquals('class AClass(object):\n    pass\na_var = AClass()\n',
+        self.assertEqual('class AClass(object):\n    pass\na_var = AClass()\n',
                           self.mod2.read())
 
     @testutils.assert_raises(exceptions.RefactoringError)
         expected = 'import mod3\n' \
                    'from mod3 import a_var\n\n\n' \
                    'def a_func():\n    print(mod3, a_var)\n'
-        self.assertEquals(expected, self.mod2.read())
+        self.assertEqual(expected, self.mod2.read())
 
     def test_moving_used_names_to_destination_module2(self):
         code = 'a_var = 10\n' \
                '    print(a_var)\n'
         self.mod1.write(code)
         self._move(self.mod1, code.index('a_func') + 1, self.mod2)
-        self.assertEquals('a_var = 10\n', self.mod1.read())
+        self.assertEqual('a_var = 10\n', self.mod1.read())
         expected = 'from mod1 import a_var\n\n\n' \
                    'def a_func():\n' \
                    '    print(a_var)\n'
-        self.assertEquals(expected, self.mod2.read())
+        self.assertEqual(expected, self.mod2.read())
 
     def test_moving_used_underlined_names_to_destination_module(self):
         code = '_var = 10\n' \
         expected = 'from mod1 import _var\n\n\n' \
                    'def a_func():\n' \
                    '    print(_var)\n'
-        self.assertEquals(expected, self.mod2.read())
+        self.assertEqual(expected, self.mod2.read())
 
     def test_moving_and_used_relative_imports(self):
         code = 'import mod5\n' \
         expected = 'import pkg.mod5\n\n\n' \
                    'def a_func():\n' \
                    '    print(pkg.mod5)\n'
-        self.assertEquals(expected, self.mod1.read())
+        self.assertEqual(expected, self.mod1.read())
 
     def test_moving_modules(self):
         code = 'import mod1\nprint(mod1)'
         self.mod2.write(code)
         self._move(self.mod2, code.index('mod1') + 1, self.pkg)
         expected = 'import pkg.mod1\nprint(pkg.mod1)'
-        self.assertEquals(expected, self.mod2.read())
+        self.assertEqual(expected, self.mod2.read())
         self.assertTrue(not self.mod1.exists() and
                         self.pycore.find_module('pkg.mod1') is not None)
 
         self.mod2.write(code)
         self._move(self.mod2, code.index('mod4') + 1, self.project.root)
         expected = 'import mod4\nprint(mod4)'
-        self.assertEquals(expected, self.mod2.read())
+        self.assertEqual(expected, self.mod2.read())
         self.assertTrue(self.pycore.find_module('mod4') is not None)
 
     def test_moving_modules_and_removing_out_of_date_froms(self):
         code = 'from pkg import mod4\nprint(mod4)'
         self.mod2.write(code)
         self._move(self.mod2, code.index('mod4') + 1, self.project.root)
-        self.assertEquals('import mod4\nprint(mod4)', self.mod2.read())
+        self.assertEqual('import mod4\nprint(mod4)', self.mod2.read())
 
     def test_moving_modules_and_removing_out_of_date_froms2(self):
         self.mod4.write('a_var = 10')
         self.mod2.write(code)
         self._move(self.mod2, code.index('mod4') + 1, self.project.root)
         expected = 'from mod4 import a_var\nprint(a_var)\n'
-        self.assertEquals(expected, self.mod2.read())
+        self.assertEqual(expected, self.mod2.read())
 
     def test_moving_modules_and_relative_import(self):
         self.mod4.write('import mod5\nprint(mod5)\n')
         self._move(self.mod2, code.index('mod4') + 1, self.project.root)
         moved = self.pycore.find_module('mod4')
         expected = 'import pkg.mod5\nprint(pkg.mod5)\n'
-        self.assertEquals(expected, moved.read())
+        self.assertEqual(expected, moved.read())
 
     def test_moving_packages(self):
         pkg2 = testutils.create_package(self.project, 'pkg2')
         self.assertTrue(self.pycore.find_module('pkg2.pkg.mod4') is not None)
         self.assertTrue(self.pycore.find_module('pkg2.pkg.mod5') is not None)
         expected = 'import pkg2.pkg.mod4\nprint(pkg2.pkg.mod4)'
-        self.assertEquals(expected, self.mod1.read())
+        self.assertEqual(expected, self.mod1.read())
 
     def test_moving_modules_with_self_imports(self):
         self.mod1.write('import mod1\nprint(mod1)\n')
         self.mod2.write('import mod1\n')
         self._move(self.mod2, self.mod2.read().index('mod1') + 1, self.pkg)
         moved = self.pycore.find_module('pkg.mod1')
-        self.assertEquals('import pkg.mod1\nprint(pkg.mod1)\n', moved.read())
+        self.assertEqual('import pkg.mod1\nprint(pkg.mod1)\n', moved.read())
 
     def test_moving_funtions_to_imported_module(self):
         code = 'import mod1\n' \
         expected = 'def a_func():\n' \
                    '    var = a_var\n' \
                    'a_var = 1\n'
-        self.assertEquals(expected, self.mod1.read())
+        self.assertEqual(expected, self.mod1.read())
 
     def test_moving_resources_using_move_module_refactoring(self):
         self.mod1.write('a_var = 1')
         mover = move.create_move(self.project, self.mod1)
         mover.get_changes(self.pkg).do()
         expected = 'import pkg.mod1\nmy_var = pkg.mod1.a_var\n'
-        self.assertEquals(expected, self.mod2.read())
+        self.assertEqual(expected, self.mod2.read())
         self.assertTrue(self.pkg.get_child('mod1.py') is not None)
 
     def test_moving_resources_using_move_module_for_packages(self):
         mover = move.create_move(self.project, self.pkg)
         mover.get_changes(pkg2).do()
         expected = 'import pkg2.pkg\nmy_pkg = pkg2.pkg'
-        self.assertEquals(expected, self.mod1.read())
+        self.assertEqual(expected, self.mod1.read())
         self.assertTrue(pkg2.get_child('pkg') is not None)
 
     def test_moving_resources_using_move_module_for_init_dot_py(self):
         init = self.pkg.get_child('__init__.py')
         mover = move.create_move(self.project, init)
         mover.get_changes(pkg2).do()
-        self.assertEquals('import pkg2.pkg\nmy_pkg = pkg2.pkg',
+        self.assertEqual('import pkg2.pkg\nmy_pkg = pkg2.pkg',
                           self.mod1.read())
         self.assertTrue(pkg2.get_child('pkg') is not None)
 
         self.mod2.write('from mod1 import *\na = a_var\n')
         mover = move.create_move(self.project, self.mod1)
         mover.get_changes(self.pkg).do()
-        self.assertEquals('from pkg.mod1 import *\na = a_var\n',
+        self.assertEqual('from pkg.mod1 import *\na = a_var\n',
                           self.mod2.read())
 
     def test_moving_module_and_not_removing_blanks_after_imports(self):
                         'import os\n\n\nprint(mod4.a_var)\n')
         mover = move.create_move(self.project, self.mod4)
         mover.get_changes(self.project.root).do()
-        self.assertEquals('import os\nimport mod4\n\n\n'
+        self.assertEqual('import os\nimport mod4\n\n\n'
                           'print(mod4.a_var)\n', self.mod2.read())
 
     @testutils.assert_raises(exceptions.RefactoringError)
         self.mod1.write(code)
         mover = move.create_move(self.project, self.mod1,
                                  code.index('a_method'))
-        self.assertEquals('def new_method(self):\n    pass\n',
+        self.assertEqual('def new_method(self):\n    pass\n',
                           mover.get_new_method('new_method'))
 
     def test_moving_methods_getting_new_method_for_constant_methods(self):
         self.mod1.write(code)
         mover = move.create_move(self.project, self.mod1,
                                  code.index('a_method'))
-        self.assertEquals('def new_method(self):\n    return 1\n',
+        self.assertEqual('def new_method(self):\n    return 1\n',
                           mover.get_new_method('new_method'))
 
     def test_moving_methods_getting_new_method_passing_simple_paremters(self):
         self.mod1.write(code)
         mover = move.create_move(self.project, self.mod1,
                                  code.index('a_method'))
-        self.assertEquals('def new_method(self, p):\n    return p\n',
+        self.assertEqual('def new_method(self, p):\n    return p\n',
                           mover.get_new_method('new_method'))
 
     def test_moving_methods_getting_new_method_using_main_object(self):
         self.mod1.write(code)
         mover = move.create_move(self.project, self.mod1,
                                  code.index('a_method'))
-        self.assertEquals('def new_method(self, host):\n    return host.attr\n',
+        self.assertEqual('def new_method(self, host):\n    return host.attr\n',
                           mover.get_new_method('new_method'))
 
     def test_moving_methods_getting_new_method_renaming_main_object(self):
         self.mod1.write(code)
         mover = move.create_move(self.project, self.mod1,
                                  code.index('a_method'))
-        self.assertEquals('def new_method(self, host):\n    return host.attr\n',
+        self.assertEqual('def new_method(self, host):\n    return host.attr\n',
                           mover.get_new_method('new_method'))
 
     def test_moving_methods_gettin_new_method_with_keyword_arguments(self):
         self.mod1.write(code)
         mover = move.create_move(self.project, self.mod1,
                                  code.index('a_method'))
-        self.assertEquals('def new_method(self, p=None):\n    return p\n',
+        self.assertEqual('def new_method(self, p=None):\n    return p\n',
                           mover.get_new_method('new_method'))
 
     def test_moving_methods_gettin_new_method_with_many_kinds_arguments(self):
                                  code.index('a_method'))
         expected = 'def new_method(self, host, p1, *args, **kwds):\n' \
                    '    return host.attr\n'
-        self.assertEquals(expected, mover.get_new_method('new_method'))
+        self.assertEqual(expected, mover.get_new_method('new_method'))
 
     def test_moving_methods_getting_new_method_for_multi_line_methods(self):
         code = 'class A(object):\n' \
         self.mod1.write(code)
         mover = move.create_move(self.project, self.mod1,
                                  code.index('a_method'))
-        self.assertEquals(
+        self.assertEqual(
             'def new_method(self):\n    a = 2\n    return a\n',
             mover.get_new_method('new_method'))
 
                    '    attr = mod2.B()\n' \
                    '    def a_method(self):\n' \
                    '        return self.attr.new_method()\n'
-        self.assertEquals(expected, self.mod1.read())
+        self.assertEqual(expected, self.mod1.read())
 
     def test_moving_methods_getting_getting_changes_for_goal_class(self):
         self.mod2.write('class B(object):\n    var = 1\n')
                    '    var = 1\n\n\n' \
                    '    def new_method(self):\n' \
                    '        return 1\n'
-        self.assertEquals(expected, self.mod2.read())
+        self.assertEqual(expected, self.mod2.read())
 
     def test_moving_methods_getting_getting_changes_for_goal_class2(self):
         code = 'class B(object):\n    var = 1\n\n' \
         mover = move.create_move(self.project, self.mod1,
                                  code.index('a_method'))
         mover.get_changes('attr', 'new_method').do()
-        self.assertEquals(
+        self.assertEqual(
             'class B(object):\n    var = 1\n\n\n'
             '    def new_method(self):\n'
             '        return 1\n\n'
                '    var = 1\n\n\n' \
                '    def new_method(self):\n' \
                '        return sys.version\n'
-        self.assertEquals(code, self.mod2.read())
+        self.assertEqual(code, self.mod2.read())
 
     def test_moving_methods_getting_getting_changes_for_goal_class3(self):
         self.mod2.write('class B(object):\n    pass\n')
         expected = 'class B(object):\n\n' \
                    '    def new_method(self):\n' \
                    '        return 1\n'
-        self.assertEquals(expected, self.mod2.read())
+        self.assertEqual(expected, self.mod2.read())
 
     def test_moving_methods_and_source_class_with_parameters(self):
         self.mod2.write('class B(object):\n    pass\n')
                     '    attr = mod2.B()\n' \
                     '    def a_method(self, p):\n' \
                     '        return self.attr.new_method(p)\n'
-        self.assertEquals(expected1, self.mod1.read())
+        self.assertEqual(expected1, self.mod1.read())
         expected2 = 'class B(object):\n\n' \
                     '    def new_method(self, p):\n' \
                     '        return p\n'
-        self.assertEquals(expected2, self.mod2.read())
+        self.assertEqual(expected2, self.mod2.read())
 
     def test_moving_globals_to_a_module_with_only_docstrings(self):
         self.mod1.write('import sys\n\n\ndef f():\n    print(sys.version)\n')
         mover = move.create_move(self.project, self.mod1,
                                  self.mod1.read().index('f()') + 1)
         self.project.do(mover.get_changes(self.mod2))
-        self.assertEquals(
+        self.assertEqual(
             '"""doc\n\nMore docs ...\n\n"""\n'
             'import sys\n\n\ndef f():\n    print(sys.version)\n',
             self.mod2.read())
                    'import sys\n\n\n' \
                    'def f():\n' \
                    '    print(sys.version, os.path)\n'
-        self.assertEquals(expected, self.mod2.read())
+        self.assertEqual(expected, self.mod2.read())
 
     def test_moving_a_global_when_it_is_used_after_a_multiline_str(self):
         code = 'def f():\n    pass\ns = """\\\n"""\nr = f()\n'
                                  code.index('f()') + 1)
         self.project.do(mover.get_changes(self.mod2))
         expected = 'import mod2\ns = """\\\n"""\nr = mod2.f()\n'
-        self.assertEquals(expected, self.mod1.read())
+        self.assertEqual(expected, self.mod1.read())
 
     @testutils.assert_raises(exceptions.RefactoringError)
     def test_raising_an_exception_when_moving_non_package_folders(self):
                                  code2.index('f()') + 1)
         self.project.do(mover.get_changes(self.mod1))
         expected = '%s\n%s' % (code1, code2)
-        self.assertEquals(expected, self.mod1.read())
+        self.assertEqual(expected, self.mod1.read())
 
 
 if __name__ == '__main__':
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.