| Index: PRESUBMIT_test.py
|
| diff --git a/PRESUBMIT_test.py b/PRESUBMIT_test.py
|
| index 2f377084548507fa30d8de02ced24d803ef2e94d..8dc2115ad29b3cef96391ce44f47b5c50c766c2d 100755
|
| --- a/PRESUBMIT_test.py
|
| +++ b/PRESUBMIT_test.py
|
| @@ -12,87 +12,11 @@ import sys
|
| import unittest
|
|
|
| import PRESUBMIT
|
| -
|
| +from PRESUBMIT_test_mocks import MockChange, MockFile
|
| +from PRESUBMIT_test_mocks import MockInputApi, MockOutputApi
|
|
|
| _TEST_DATA_DIR = 'base/test/data/presubmit'
|
|
|
| -
|
| -class MockInputApi(object):
|
| - def __init__(self):
|
| - self.json = json
|
| - self.re = re
|
| - self.os_path = os.path
|
| - self.python_executable = sys.executable
|
| - self.subprocess = subprocess
|
| - self.files = []
|
| - self.is_committing = False
|
| -
|
| - def AffectedFiles(self, file_filter=None):
|
| - return self.files
|
| -
|
| - def PresubmitLocalPath(self):
|
| - return os.path.dirname(__file__)
|
| -
|
| - def ReadFile(self, filename, mode='rU'):
|
| - for file_ in self.files:
|
| - if file_.LocalPath() == filename:
|
| - return '\n'.join(file_.NewContents())
|
| - # Otherwise, file is not in our mock API.
|
| - raise IOError, "No such file or directory: '%s'" % filename
|
| -
|
| -
|
| -class MockOutputApi(object):
|
| - class PresubmitResult(object):
|
| - def __init__(self, message, items=None, long_text=''):
|
| - self.message = message
|
| - self.items = items
|
| - self.long_text = long_text
|
| -
|
| - class PresubmitError(PresubmitResult):
|
| - def __init__(self, message, items, long_text=''):
|
| - MockOutputApi.PresubmitResult.__init__(self, message, items, long_text)
|
| - self.type = 'error'
|
| -
|
| - class PresubmitPromptWarning(PresubmitResult):
|
| - def __init__(self, message, items, long_text=''):
|
| - MockOutputApi.PresubmitResult.__init__(self, message, items, long_text)
|
| - self.type = 'warning'
|
| -
|
| - class PresubmitNotifyResult(PresubmitResult):
|
| - def __init__(self, message, items, long_text=''):
|
| - MockOutputApi.PresubmitResult.__init__(self, message, items, long_text)
|
| - self.type = 'notify'
|
| -
|
| - class PresubmitPromptOrNotify(PresubmitResult):
|
| - def __init__(self, message, items, long_text=''):
|
| - MockOutputApi.PresubmitResult.__init__(self, message, items, long_text)
|
| - self.type = 'promptOrNotify'
|
| -
|
| -
|
| -class MockFile(object):
|
| - def __init__(self, local_path, new_contents):
|
| - self._local_path = local_path
|
| - self._new_contents = new_contents
|
| - self._changed_contents = [(i + 1, l) for i, l in enumerate(new_contents)]
|
| -
|
| - def ChangedContents(self):
|
| - return self._changed_contents
|
| -
|
| - def NewContents(self):
|
| - return self._new_contents
|
| -
|
| - def LocalPath(self):
|
| - return self._local_path
|
| -
|
| -
|
| -class MockChange(object):
|
| - def __init__(self, changed_files):
|
| - self._changed_files = changed_files
|
| -
|
| - def LocalPaths(self):
|
| - return self._changed_files
|
| -
|
| -
|
| class IncludeOrderTest(unittest.TestCase):
|
| def testSystemHeaderOrder(self):
|
| scope = [(1, '#include <csystem.h>'),
|
|
|