Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(146)

Side by Side Diff: third_party/WebKit/Tools/Scripts/webkitpy/style/main_unittest.py

Issue 2370923004: Change webkitpy.style.main_unittest to use LoggingTestCase. (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (C) 2010 Chris Jerdonek (cjerdonek@webkit.org) 1 # Copyright (C) 2010 Chris Jerdonek (cjerdonek@webkit.org)
2 # 2 #
3 # Redistribution and use in source and binary forms, with or without 3 # Redistribution and use in source and binary forms, with or without
4 # modification, are permitted provided that the following conditions 4 # modification, are permitted provided that the following conditions
5 # are met: 5 # are met:
6 # 1. Redistributions of source code must retain the above copyright 6 # 1. Redistributions of source code must retain the above copyright
7 # notice, this list of conditions and the following disclaimer. 7 # notice, this list of conditions and the following disclaimer.
8 # 2. Redistributions in binary form must reproduce the above copyright 8 # 2. Redistributions in binary form must reproduce the above copyright
9 # notice, this list of conditions and the following disclaimer in the 9 # notice, this list of conditions and the following disclaimer in the
10 # documentation and/or other materials provided with the distribution. 10 # documentation and/or other materials provided with the distribution.
11 # 11 #
12 # THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND 12 # THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
13 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 13 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
14 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 14 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
15 # DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR 15 # DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
16 # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 16 # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
17 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 17 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
18 # SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 18 # SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
19 # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 19 # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
20 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 20 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
21 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 21 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
22 22
23 import unittest 23 import unittest
24 24
25 from main import change_directory 25 from main import change_directory
26 from webkitpy.common.system.filesystem_mock import MockFileSystem 26 from webkitpy.common.system.filesystem_mock import MockFileSystem
27 from webkitpy.common.system.logtesting import LogTesting 27 from webkitpy.common.system.logtesting import LoggingTestCase
28 28
29 29
30 class ChangeDirectoryTest(unittest.TestCase): 30 class ChangeDirectoryTest(LoggingTestCase):
31 _original_directory = "/original" 31 _original_directory = "/original"
32 _checkout_root = "/WebKit" 32 _checkout_root = "/WebKit"
33 33
34 def setUp(self): 34 def setUp(self):
35 self._log = LogTesting.setUp(self) 35 super(ChangeDirectoryTest, self).setUp()
36 self.filesystem = MockFileSystem(dirs=[self._original_directory, self._c heckout_root], cwd=self._original_directory) 36 self.filesystem = MockFileSystem(dirs=[self._original_directory, self._c heckout_root], cwd=self._original_directory)
37 37
38 def tearDown(self):
39 self._log.tearDown()
40
41 def _change_directory(self, paths, checkout_root): 38 def _change_directory(self, paths, checkout_root):
42 return change_directory(self.filesystem, paths=paths, checkout_root=chec kout_root) 39 return change_directory(self.filesystem, paths=paths, checkout_root=chec kout_root)
43 40
44 def _assert_result(self, actual_return_value, expected_return_value, 41 def _assert_result(self, actual_return_value, expected_return_value,
45 expected_log_messages, expected_current_directory): 42 expected_log_messages, expected_current_directory):
46 self.assertEqual(actual_return_value, expected_return_value) 43 self.assertEqual(actual_return_value, expected_return_value)
47 self._log.assertMessages(expected_log_messages) 44 self.assertLog(expected_log_messages)
48 self.assertEqual(self.filesystem.getcwd(), expected_current_directory) 45 self.assertEqual(self.filesystem.getcwd(), expected_current_directory)
49 46
50 def test_paths_none(self): 47 def test_paths_none(self):
51 paths = self._change_directory(checkout_root=self._checkout_root, paths= None) 48 paths = self._change_directory(checkout_root=self._checkout_root, paths= None)
52 self._assert_result(paths, None, [], self._checkout_root) 49 self._assert_result(paths, None, [], self._checkout_root)
53 50
54 def test_paths_convertible(self): 51 def test_paths_convertible(self):
55 paths = ["/WebKit/foo1.txt", "/WebKit/foo2.txt"] 52 paths = ["/WebKit/foo1.txt", "/WebKit/foo2.txt"]
56 paths = self._change_directory(checkout_root=self._checkout_root, paths= paths) 53 paths = self._change_directory(checkout_root=self._checkout_root, paths= paths)
57 self._assert_result(paths, ["foo1.txt", "foo2.txt"], [], self._checkout_ root) 54 self._assert_result(paths, ["foo1.txt", "foo2.txt"], [], self._checkout_ root)
58 55
59 def test_with_scm_paths_unconvertible(self): 56 def test_with_scm_paths_unconvertible(self):
60 paths = ["/WebKit/foo1.txt", "/outside/foo2.txt"] 57 paths = ["/WebKit/foo1.txt", "/outside/foo2.txt"]
61 paths = self._change_directory(checkout_root=self._checkout_root, paths= paths) 58 paths = self._change_directory(checkout_root=self._checkout_root, paths= paths)
62 log_messages = [ 59 log_messages = [
63 """WARNING: Path-dependent style checks may not work correctly: 60 """WARNING: Path-dependent style checks may not work correctly:
64 61
65 One of the given paths is outside the WebKit checkout of the current 62 One of the given paths is outside the WebKit checkout of the current
66 working directory: 63 working directory:
67 64
68 Path: /outside/foo2.txt 65 Path: /outside/foo2.txt
69 Checkout root: /WebKit 66 Checkout root: /WebKit
70 67
71 Pass only files below the checkout root to ensure correct results. 68 Pass only files below the checkout root to ensure correct results.
72 See the help documentation for more info. 69 See the help documentation for more info.
73 70
74 """] 71 """]
75 self._assert_result(paths, paths, log_messages, self._original_directory ) 72 self._assert_result(paths, paths, log_messages, self._original_directory )
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698