diff options
Diffstat (limited to 'Tools/Scripts/webkitpy/style/checkers/png_unittest.py')
| -rw-r--r-- | Tools/Scripts/webkitpy/style/checkers/png_unittest.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Tools/Scripts/webkitpy/style/checkers/png_unittest.py b/Tools/Scripts/webkitpy/style/checkers/png_unittest.py index 764c28591..92b5ba448 100644 --- a/Tools/Scripts/webkitpy/style/checkers/png_unittest.py +++ b/Tools/Scripts/webkitpy/style/checkers/png_unittest.py @@ -52,8 +52,8 @@ class PNGCheckerTest(unittest.TestCase): pass checker = PNGChecker("test/config", mock_handle_style_error, MockSCMDetector('git'), MockSystemHost()) - self.assertEquals(checker._file_path, "test/config") - self.assertEquals(checker._handle_style_error, mock_handle_style_error) + self.assertEqual(checker._file_path, "test/config") + self.assertEqual(checker._handle_style_error, mock_handle_style_error) def test_check(self): errors = [] @@ -69,8 +69,8 @@ class PNGCheckerTest(unittest.TestCase): scm = MockSCMDetector('svn') checker = PNGChecker(file_path, mock_handle_style_error, scm, MockSystemHost(filesystem=fs)) checker.check() - self.assertEquals(len(errors), 1) - self.assertEquals(errors[0], + self.assertEqual(len(errors), 1) + self.assertEqual(errors[0], (0, 'image/png', 5, 'Set the svn:mime-type property (svn propset svn:mime-type image/png ).')) files = {'/Users/mock/.subversion/config': 'enable-auto-props = yes\n*.png = svn:mime-type=image/png'} @@ -79,7 +79,7 @@ class PNGCheckerTest(unittest.TestCase): errors = [] checker = PNGChecker("config", mock_handle_style_error, scm, MockSystemHost(os_name='linux', filesystem=fs)) checker.check() - self.assertEquals(len(errors), 0) + self.assertEqual(len(errors), 0) files = {'/Users/mock/.subversion/config': '#enable-auto-props = yes'} fs = MockFileSystem(files) @@ -87,7 +87,7 @@ class PNGCheckerTest(unittest.TestCase): errors = [] checker = PNGChecker("config", mock_handle_style_error, scm, MockSystemHost(os_name='linux', filesystem=fs)) checker.check() - self.assertEquals(len(errors), 1) + self.assertEqual(len(errors), 1) files = {'/Users/mock/.subversion/config': 'enable-auto-props = yes\n#enable-auto-props = yes\n*.png = svn:mime-type=image/png'} fs = MockFileSystem(files) @@ -95,7 +95,7 @@ class PNGCheckerTest(unittest.TestCase): errors = [] checker = PNGChecker("config", mock_handle_style_error, scm, MockSystemHost(os_name='linux', filesystem=fs)) checker.check() - self.assertEquals(len(errors), 0) + self.assertEqual(len(errors), 0) files = {'/Users/mock/.subversion/config': '#enable-auto-props = yes\nenable-auto-props = yes\n*.png = svn:mime-type=image/png'} fs = MockFileSystem(files) @@ -103,7 +103,7 @@ class PNGCheckerTest(unittest.TestCase): errors = [] checker = PNGChecker("config", mock_handle_style_error, scm, MockSystemHost(os_name='linux', filesystem=fs)) checker.check() - self.assertEquals(len(errors), 0) + self.assertEqual(len(errors), 0) files = {'/Users/mock/.subversion/config': 'enable-auto-props = no'} fs = MockFileSystem(files) @@ -111,7 +111,7 @@ class PNGCheckerTest(unittest.TestCase): errors = [] checker = PNGChecker("config", mock_handle_style_error, scm, MockSystemHost(os_name='linux', filesystem=fs)) checker.check() - self.assertEquals(len(errors), 1) + self.assertEqual(len(errors), 1) file_path = "foo.png" fs.write_binary_file(file_path, "Dummy binary data") @@ -119,7 +119,7 @@ class PNGCheckerTest(unittest.TestCase): errors = [] checker = PNGChecker(file_path, mock_handle_style_error, scm, MockSystemHost(os_name='linux', filesystem=fs)) checker.check() - self.assertEquals(len(errors), 1) + self.assertEqual(len(errors), 1) file_path = "foo-expected.png" fs.write_binary_file(file_path, "Dummy binary data") @@ -127,8 +127,8 @@ class PNGCheckerTest(unittest.TestCase): errors = [] checker = PNGChecker(file_path, mock_handle_style_error, scm, MockSystemHost(os_name='linux', filesystem=fs)) checker.check() - self.assertEquals(len(errors), 2) - self.assertEquals(errors[0], (0, 'image/png', 5, 'Image lacks a checksum. Generate pngs using run-webkit-tests to ensure they have a checksum.')) + self.assertEqual(len(errors), 2) + self.assertEqual(errors[0], (0, 'image/png', 5, 'Image lacks a checksum. Generate pngs using run-webkit-tests to ensure they have a checksum.')) if __name__ == '__main__': unittest.main() |