Changeset 160167 in webkit

Timestamp:

Dec 5, 2013 4:00:50 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Remove duplicated/dead code from cpp style checker unit tests.
​https://bugs.webkit.org/show_bug.cgi?id=125226

Patch by Tamas Gergely <​tgergely.u-szeged@partner.samsung.com> on 2013-12-05
Reviewed by Ryosuke Niwa.

Remove the first definition of OrderOfIncludesTest class as it is
overwritten by the second. Remove a duplicated assert statement
from the second class.

• Scripts/webkitpy/style/checkers/cpp_unittest.py:

(OrderOfIncludesTest.setUp):
(OrderOfIncludesTest.test_try_drop_common_suffixes):

The last assert was duplicated.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/style/checkers/cpp_unittest.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-12-05  Tamas Gergely  <tgergely.u-szeged@partner.samsung.com>
+
+        Remove duplicated/dead code from cpp style checker unit tests.
+        https://bugs.webkit.org/show_bug.cgi?id=125226
+
+        Reviewed by Ryosuke Niwa.
+
+        Remove the first definition of OrderOfIncludesTest class as it is
+        overwritten by the second. Remove a duplicated assert statement
+        from the second class.
+
+        * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+        (OrderOfIncludesTest.setUp):
+        (OrderOfIncludesTest.test_try_drop_common_suffixes):
+          The last assert was duplicated.
+
 2013-12-05  László Langó  <lango@inf.u-szeged.hu>
 

trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py

@@ -2534 +2534 @@
         # Cheat os.path.abspath called in FileInfo class.
         self.os_path_abspath_orig = os.path.abspath
-        os.path.abspath = lambda value: value
-
-    def tearDown(self):
-        os.path.abspath = self.os_path_abspath_orig
-
-    def test_try_drop_common_suffixes(self):
-        self.assertEqual('foo/foo', cpp_style._drop_common_suffixes('foo/foo-inl.h'))
-        self.assertEqual('foo/bar/foo',
-                         cpp_style._drop_common_suffixes('foo/bar/foo_inl.h'))
-        self.assertEqual('foo/foo', cpp_style._drop_common_suffixes('foo/foo.cpp'))
-        self.assertEqual('foo/foo_unusualinternal',
-                         cpp_style._drop_common_suffixes('foo/foo_unusualinternal.h'))
-        self.assertEqual('',
-                         cpp_style._drop_common_suffixes('_test.cpp'))
-        self.assertEqual('test',
-                         cpp_style._drop_common_suffixes('test.cpp'))
-
-
-class OrderOfIncludesTest(CppStyleTestBase):
-    def setUp(self):
-        self.include_state = cpp_style._IncludeState()
-
-        # Cheat os.path.abspath called in FileInfo class.
-        self.os_path_abspath_orig = os.path.abspath
         self.os_path_isfile_orig = os.path.isfile
         os.path.abspath = lambda value: value
@@ -2878 +2854 @@
         self.assertEqual('test',
                          cpp_style._drop_common_suffixes('test.cpp'))
-        self.assertEqual('test',
-                         cpp_style._drop_common_suffixes('test.cpp'))
+
 
 class CheckForFunctionLengthsTest(CppStyleTestBase):