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 81 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))
 
 
 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))
     self.assertEqual(3, len(errors))
     self.assertTrue('1' in errors[0])
     self.assertTrue('3' in errors[1])
     self.assertTrue('5' in errors[2])
 
 
 if __name__ == '__main__':
   unittest.main()