PRESUBMIT #include check enhancements.

PRESUBMIT_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 import re
 import unittest
 
 import PRESUBMIT
@@ skipping 10 matching lines @@
 
 
 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):
-    pass
+    def __init__(self, message, items, long_text=''):
+      MockOutputApi.PresubmitResult.__init__(self, message, items, long_text)
 
   class PresubmitPromptWarning(PresubmitResult):
-    pass
+    def __init__(self, message, items, long_text=''):
+      MockOutputApi.PresubmitResult.__init__(self, message, items, long_text)
 
   class PresubmitNotifyResult(PresubmitResult):
-    pass
+    def __init__(self, message, items, long_text=''):
+      MockOutputApi.PresubmitResult.__init__(self, message, items, long_text)
 
 
 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
@@ skipping 65 matching lines @@
     self.assertTrue('15' in warnings[0])
     self.assertTrue('25' in warnings[1])
     self.assertTrue('35' in warnings[2])
 
   def testSpecialFirstInclude1(self):
     mock_input_api = MockInputApi()
     contents = ['#include "some/path/foo.h"',
                 '#include "a/header.h"']
     mock_file = MockFile('some/path/foo.cc', contents)
     warnings = PRESUBMIT._CheckIncludeOrderInFile(
-        mock_input_api, mock_file, True, range(1, len(contents) + 1))
+        mock_input_api, mock_file, range(1, len(contents) + 1))
     self.assertEqual(0, len(warnings))
 
   def testSpecialFirstInclude2(self):
     mock_input_api = MockInputApi()
     contents = ['#include "some/other/path/foo.h"',
                 '#include "a/header.h"']
     mock_file = MockFile('some/path/foo.cc', contents)
     warnings = PRESUBMIT._CheckIncludeOrderInFile(
-        mock_input_api, mock_file, True, range(1, len(contents) + 1))
+        mock_input_api, mock_file, range(1, len(contents) + 1))
     self.assertEqual(0, len(warnings))
 
   def testSpecialFirstInclude3(self):
     mock_input_api = MockInputApi()
     contents = ['#include "some/path/foo.h"',
                 '#include "a/header.h"']
     mock_file = MockFile('some/path/foo_platform.cc', contents)
     warnings = PRESUBMIT._CheckIncludeOrderInFile(
-        mock_input_api, mock_file, True, range(1, len(contents) + 1))
+        mock_input_api, mock_file, range(1, len(contents) + 1))
     self.assertEqual(0, len(warnings))
 
   def testSpecialFirstInclude4(self):
     mock_input_api = MockInputApi()
     contents = ['#include "some/path/bar.h"',
                 '#include "a/header.h"']
     mock_file = MockFile('some/path/foo_platform.cc', contents)
     warnings = PRESUBMIT._CheckIncludeOrderInFile(
-        mock_input_api, mock_file, True, range(1, len(contents) + 1))
+        mock_input_api, mock_file, range(1, len(contents) + 1))
     self.assertEqual(1, len(warnings))
     self.assertTrue('2' in warnings[0])
 
+  def testSpecialFirstInclude5(self):
+    mock_input_api = MockInputApi()
+    contents = ['#include "some/other/path/foo.h"',
+                '#include "a/header.h"']
+    mock_file = MockFile('some/path/foo-suffix.h', contents)
+    warnings = PRESUBMIT._CheckIncludeOrderInFile(
+        mock_input_api, mock_file, range(1, len(contents) + 1))
+    self.assertEqual(0, len(warnings))
+
   def testOrderAlreadyWrong(self):
     scope = [(1, '#include "b.h"'),
              (2, '#include "a.h"'),
              (3, '#include "c.h"')]
     mock_input_api = MockInputApi()
     warnings = PRESUBMIT._CheckIncludeOrderForScope(scope, mock_input_api,
                                                     '', [3])
     self.assertEqual(0, len(warnings))
 
   def testConflictAdded1(self):
@@ skipping 12 matching lines @@
              (3, '#include "d.h"')]
     mock_input_api = MockInputApi()
     warnings = PRESUBMIT._CheckIncludeOrderForScope(scope, mock_input_api,
                                                     '', [2])
     self.assertEqual(1, len(warnings))
     self.assertTrue('2' in warnings[0])
 
   def testIfElifElseEndif(self):
     mock_input_api = MockInputApi()
     contents = ['#include "e.h"',
+                '#define foo',
+                '#include "f.h"',
+                '#undef foo',
+                '#include "e.h"',
                 '#if foo',
                 '#include "d.h"',
                 '#elif bar',
                 '#include "c.h"',
                 '#else',
                 '#include "b.h"',
                 '#endif',
                 '#include "a.h"']
     mock_file = MockFile('', contents)
     warnings = PRESUBMIT._CheckIncludeOrderInFile(
-        mock_input_api, mock_file, True, range(1, len(contents) + 1))
+        mock_input_api, mock_file, range(1, len(contents) + 1))
     self.assertEqual(0, len(warnings))
 
   def testSysIncludes(self):
     # #include <sys/...>'s can appear in any order.
     mock_input_api = MockInputApi()
     contents = ['#include <sys/b.h>',
                 '#include <sys/a.h>']
     mock_file = MockFile('', contents)
     warnings = PRESUBMIT._CheckIncludeOrderInFile(
-        mock_input_api, mock_file, True, range(1, len(contents) + 1))
+        mock_input_api, mock_file, range(1, len(contents) + 1))
     self.assertEqual(0, len(warnings))
 
+  def testCheckOnlyCFiles(self):
+    mock_input_api = MockInputApi()
+    mock_output_api = MockOutputApi()
+    contents = ['#include <b.h>',
+                '#include <a.h>']
+    mock_file_cc = MockFile('something.cc', contents)
+    mock_file_h = MockFile('something.h', contents)
+    mock_file_other = MockFile('something.py', contents)
+    mock_input_api.files = [mock_file_cc, mock_file_h, mock_file_other]
+    warnings = PRESUBMIT._CheckIncludeOrder(mock_input_api, mock_output_api)
+    self.assertEqual(1, len(warnings))
+    self.assertEqual(2, len(warnings[0].items))
+
 
 class VersionControlerConflictsTest(unittest.TestCase):
   def testTypicalConflict(self):
     lines = ['<<<<<<< HEAD',
              '  base::ScopedTempDir temp_dir_;',
              '=======',
              '  ScopedTempDir temp_dir_;',
              '>>>>>>> master']
     errors = PRESUBMIT._CheckForVersionControlConflictsInFile(
         MockInputApi(), MockFile('some/path/foo_platform.cc', lines))
@@ skipping 36 matching lines @@
     mock_input_api.files = [
       MockFile('other/path/qux.h', ''),
       MockFile('other/path/qux.cc', ''),
     ]
     results = PRESUBMIT._CheckPatchFiles(mock_input_api, MockOutputApi())
     self.assertEqual(0, len(results))
 
 
 if __name__ == '__main__':
   unittest.main()