Skip to content

Commit

Permalink
remove obsolete OVERRIDE/FINAL presubmit checks
Browse files Browse the repository at this point in the history
BUG=417463

Review URL: https://codereview.chromium.org/655693003

Cr-Commit-Position: refs/heads/master@{#300675}
  • Loading branch information
mostynb authored and Commit bot committed Oct 22, 2014
1 parent fd4440e commit 5a73a5d
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 77 deletions.
17 changes: 0 additions & 17 deletions PRESUBMIT.py
Original file line number Diff line number Diff line change
Expand Up @@ -1282,22 +1282,6 @@ def _CheckNoDeprecatedJS(input_api, output_api):
return results


def _CheckForOverrideAndFinalRules(input_api, output_api):
"""Checks for final and override used as per C++11"""
problems = []
for f in input_api.AffectedFiles():
if (f.LocalPath().endswith(('.cc', '.cpp', '.h', '.mm'))):
for line_num, line in f.ChangedContents():
if (input_api.re.search(r'\b(FINAL|OVERRIDE)\b', line)):
problems.append(' %s:%d' % (f.LocalPath(), line_num))

if not problems:
return []
return [output_api.PresubmitError('Use C++11\'s |final| and |override| '
'rather than FINAL and OVERRIDE.',
problems)]


def _CommonChecks(input_api, output_api):
"""Checks common to both upload and commit."""
results = []
Expand Down Expand Up @@ -1340,7 +1324,6 @@ def _CommonChecks(input_api, output_api):
results.extend(_CheckNoDeprecatedJS(input_api, output_api))
results.extend(_CheckParseErrors(input_api, output_api))
results.extend(_CheckForIPCRules(input_api, output_api))
results.extend(_CheckForOverrideAndFinalRules(input_api, output_api))

if any('PRESUBMIT.py' == f.LocalPath() for f in input_api.AffectedFiles()):
results.extend(input_api.canned_checks.RunUnitTestsInDirectory(
Expand Down
60 changes: 0 additions & 60 deletions PRESUBMIT_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -413,66 +413,6 @@ def testValidOSMacroNames(self):
self.assertEqual(0, len(errors))


class InvalidOverideAndFinalTest(unittest.TestCase):
def testValidOverrideConstructs(self):
mock_input_api = MockInputApi()
lines = ['foo1() override;',
'foo2() final;',
'#DEFINE OVERRIDE_METHOD_OVERLOAD',
'#DEFINE FINAL_METHOD',
'#DEFINE OVERRIDE_OVERRIDE_SOMETHING',
'#DEFINE SOMETHING_OVERRIDE_SOMETHING',
'#DEFINE SOMETHING_SOMETHING_OVERRIDE',
'#DEFINE FINAL_OVERRIDE_FINAL',
'#DEFINE SOMETHING_OVERRIDE_FINAL',
'#DEFINE OVERRIDE_OVERRIDE_OVERRIDE',
'#endif // FINAL_METHOD',
'#endif // OVERRIDE_METHOD_OVERLOAD']
mock_file_h = MockFile('something.h', lines)
mock_input_api.files = [mock_file_h]
errors = PRESUBMIT._CheckForOverrideAndFinalRules(mock_input_api,
MockOutputApi())
self.assertEqual(0, len(errors))

def testInvalidOverrideConstructsInHeaders(self):
mock_input_api = MockInputApi()
lines_cpp = ['foo2() FINAL;']
lines_h = ['foo1() OVERRIDE;']
mock_file_cpp = MockFile('something.cpp', lines_cpp)
mock_file_h = MockFile('something.h', lines_h)
mock_input_api.files = [mock_file_cpp, mock_file_h]
errors = PRESUBMIT._CheckForOverrideAndFinalRules(mock_input_api,
MockOutputApi())
self.assertEqual(1, len(errors))

def testInvalidOverrideConstructsInCpp(self):
mock_input_api = MockInputApi()
lines_cpp = ['foo2() FINAL;']
mock_file_cpp = MockFile('something.cpp', lines_cpp)
mock_input_api.files = [mock_file_cpp]
errors = PRESUBMIT._CheckForOverrideAndFinalRules(mock_input_api,
MockOutputApi())
self.assertEqual(1, len(errors))

def testInvalidOverrideConstructsInCc(self):
mock_input_api = MockInputApi()
lines_cc = ['foo3() override FINAL;']
mock_file_cc = MockFile('something.cc', lines_cc)
mock_input_api.files = [mock_file_cc]
errors = PRESUBMIT._CheckForOverrideAndFinalRules(mock_input_api,
MockOutputApi())
self.assertEqual(1, len(errors))

def testInvalidOverrideConstructsInMm(self):
mock_input_api = MockInputApi()
lines_mm = ['foo4() OVERRIDE final;']
mock_file_mm = MockFile('something.mm', lines_mm)
mock_input_api.files = [mock_file_mm]
errors = PRESUBMIT._CheckForOverrideAndFinalRules(mock_input_api,
MockOutputApi())
self.assertEqual(1, len(errors))


class InvalidIfDefinedMacroNamesTest(unittest.TestCase):
def testInvalidIfDefinedMacroNames(self):
lines = ['#if defined(TARGET_IPHONE_SIMULATOR)',
Expand Down

0 comments on commit 5a73a5d

Please sign in to comment.