test-webkitpy: more class renaming cleanup
authordpranke@chromium.org <dpranke@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 13 Jul 2012 07:39:36 +0000 (07:39 +0000)
committerdpranke@chromium.org <dpranke@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 13 Jul 2012 07:39:36 +0000 (07:39 +0000)
https://bugs.webkit.org/show_bug.cgi?id=91182

Reviewed by Adam Barth.

More removing of the unnecessary "Test" prefix.

* Scripts/webkitpy/test/finder.py:
(_DirectoryTree):
(Finder.add_tree):
* Scripts/webkitpy/test/main.py:
(Tester._run_tests):
* Scripts/webkitpy/test/runner.py:
(Runner):
* Scripts/webkitpy/test/runner_unittest.py:
(RunnerTest.test_regular):
(RunnerTest.test_verbose):
(RunnerTest.test_timing):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@122548 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/webkitpy/test/finder.py
Tools/Scripts/webkitpy/test/main.py
Tools/Scripts/webkitpy/test/runner.py
Tools/Scripts/webkitpy/test/runner_unittest.py

index 32bab4f..b4d89dc 100644 (file)
@@ -1,3 +1,24 @@
+2012-07-13  Dirk Pranke  <dpranke@chromium.org>
+
+        test-webkitpy: more class renaming cleanup
+        https://bugs.webkit.org/show_bug.cgi?id=91182
+
+        Reviewed by Adam Barth.
+
+        More removing of the unnecessary "Test" prefix.
+
+        * Scripts/webkitpy/test/finder.py:
+        (_DirectoryTree):
+        (Finder.add_tree):
+        * Scripts/webkitpy/test/main.py:
+        (Tester._run_tests):
+        * Scripts/webkitpy/test/runner.py:
+        (Runner):
+        * Scripts/webkitpy/test/runner_unittest.py:
+        (RunnerTest.test_regular):
+        (RunnerTest.test_verbose):
+        (RunnerTest.test_timing):
+
 2012-07-12  Christophe Dumez  <christophe.dumez@intel.com>
 
         [WK2][EFL] Facilitate debugging of the Web Process
index f0781c4..132072d 100644 (file)
@@ -31,7 +31,7 @@ import sys
 _log = logging.getLogger(__name__)
 
 
-class TestDirectoryTree(object):
+class _DirectoryTree(object):
     def __init__(self, filesystem, top_directory, starting_subdirectory):
         self.filesystem = filesystem
         self.top_directory = filesystem.realpath(top_directory)
@@ -79,7 +79,7 @@ class Finder(object):
         self.trees = []
 
     def add_tree(self, top_directory, starting_subdirectory=None):
-        self.trees.append(TestDirectoryTree(self.filesystem, top_directory, starting_subdirectory))
+        self.trees.append(_DirectoryTree(self.filesystem, top_directory, starting_subdirectory))
 
     def additional_paths(self, paths):
         return [tree.top_directory for tree in self.trees if tree.top_directory not in paths]
index 5f9114b..2d34b80 100644 (file)
@@ -34,7 +34,7 @@ import unittest
 from webkitpy.common.system.filesystem import FileSystem
 from webkitpy.common.system import outputcapture
 from webkitpy.test.finder import Finder
-from webkitpy.test.runner import TestRunner
+from webkitpy.test.runner import Runner
 
 _log = logging.getLogger(__name__)
 
@@ -177,7 +177,7 @@ class Tester(object):
             suites.append(loader.loadTestsFromName(name, None))
 
         test_suite = unittest.TestSuite(suites)
-        test_runner = TestRunner(self.stream, self._options, loader)
+        test_runner = Runner(self.stream, self._options, loader)
 
         _log.debug("Running the tests.")
         if self._options.pass_through:
index e190f2c..39414d8 100644 (file)
@@ -31,7 +31,7 @@ import unittest
 _log = logging.getLogger(__name__)
 
 
-class TestRunner(object):
+class Runner(object):
     def __init__(self, stream, options, loader):
         self.options = options
         self.stream = stream
index e2ea31a..22cef88 100644 (file)
@@ -25,7 +25,7 @@ import StringIO
 import unittest
 
 from webkitpy.tool.mocktool import MockOptions
-from webkitpy.test.runner import TestRunner
+from webkitpy.test.runner import Runner
 
 
 class FakeModuleSuite(object):
@@ -74,7 +74,7 @@ class RunnerTest(unittest.TestCase):
         loader = FakeLoader(('test1 (Foo)', '.', ''),
                             ('test2 (Foo)', 'F', 'test2\nfailed'),
                             ('test3 (Foo)', 'E', 'test3\nerred'))
-        result = TestRunner(stream, options, loader).run(loader.top_suite())
+        result = Runner(stream, options, loader).run(loader.top_suite())
         self.assertFalse(result.wasSuccessful())
         self.assertEquals(result.testsRun, 3)
         self.assertEquals(len(result.failures), 1)
@@ -87,7 +87,7 @@ class RunnerTest(unittest.TestCase):
         loader = FakeLoader(('test1 (Foo)', '.', ''),
                             ('test2 (Foo)', 'F', 'test2\nfailed'),
                             ('test3 (Foo)', 'E', 'test3\nerred'))
-        result = TestRunner(stream, options, loader).run(loader.top_suite())
+        result = Runner(stream, options, loader).run(loader.top_suite())
         self.assertFalse(result.wasSuccessful())
         self.assertEquals(result.testsRun, 3)
         self.assertEquals(len(result.failures), 1)
@@ -100,7 +100,7 @@ class RunnerTest(unittest.TestCase):
         loader = FakeLoader(('test1 (Foo)', '.', ''),
                             ('test2 (Foo)', 'F', 'test2\nfailed'),
                             ('test3 (Foo)', 'E', 'test3\nerred'))
-        result = TestRunner(stream, options, loader).run(loader.top_suite())
+        result = Runner(stream, options, loader).run(loader.top_suite())
         self.assertFalse(result.wasSuccessful())
         self.assertEquals(result.testsRun, 3)
         self.assertEquals(len(result.failures), 1)