Allow 'class Singleton<T>' in header files.

tests/presubmit_unittest.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.
 
 """Unit tests for presubmit_support.py and presubmit_canned_checks.py."""
 
 # pylint: disable=E1101,E1103
 
 import logging
@@ skipping 1475 matching lines @@
       'CheckChangeHasTestField',
       'CheckChangeLintsClean',
       'CheckChangeSvnEolStyle',
       'CheckChangeWasUploaded',
       'CheckDoNotSubmit',
       'CheckDoNotSubmitInDescription', 'CheckDoNotSubmitInFiles',
       'CheckLongLines', 'CheckTreeIsOpen', 'PanProjectChecks',
       'CheckLicense',
       'CheckOwners',
       'CheckRietveldTryJobExecution',
+      'CheckSingletonInHeaders',
       'CheckSvnModifiedDirectories',
       'CheckSvnForCommonMimeTypes', 'CheckSvnProperty',
       'RunPythonUnitTests', 'RunPylint',
       'RunUnitTests', 'RunUnitTestsInDirectory',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(presubmit_canned_checks, members)
 
   def DescriptionTest(self, check, description1, description2, error_type,
                       committing):
@@ skipping 184 matching lines @@
         'DO NOTSUBMIT', None, 'DO NOT ' + 'SUBMIT', None,
         presubmit.OutputApi.PresubmitError)
 
   def testCheckChangeHasNoStrayWhitespace(self):
     self.ContentTest(
         lambda x,y,z:
             presubmit_canned_checks.CheckChangeHasNoStrayWhitespace(x, y),
         'Foo', None, 'Foo ', None,
         presubmit.OutputApi.PresubmitPromptWarning)
 
+  def testCheckSingletonInHeaders(self):
+    change1 = presubmit.Change(
+        'foo1', 'foo1\n', self.fake_root_dir, None, 0, 0, None)
+    input_api1 = self.MockInputApi(change1, False)
+    affected_file1 = self.mox.CreateMock(presubmit.SvnAffectedFile)
+    affected_file2 = self.mox.CreateMock(presubmit.SvnAffectedFile)
+    input_api1.AffectedSourceFiles(None).AndReturn(
+        [affected_file1, affected_file2])
+    affected_file1.LocalPath().AndReturn('foo.h')
+    input_api1.ReadFile(affected_file1).AndReturn(
+        '// Comment mentioning Singleton<Foo>.\n' +
+        'friend class Singleton<Foo>;')
+    for _ in range(4):
+      affected_file2.LocalPath().AndReturn('foo.cc')
+
+    change2 = presubmit.Change(
+        'foo2', 'foo2\n', self.fake_root_dir, None, 0, 0, None)
+    input_api2 = self.MockInputApi(change2, False)
+
+    affected_file3 = self.mox.CreateMock(presubmit.SvnAffectedFile)
+    input_api2.AffectedSourceFiles(None).AndReturn([affected_file3])
+    affected_file3.LocalPath().AndReturn('foo.h')
+    input_api2.ReadFile(affected_file3).AndReturn(
+        'Foo* foo = Singleton<Foo>::get();')
+
+    self.mox.ReplayAll()
+
+    results1 = presubmit_canned_checks.CheckSingletonInHeaders(
+        input_api1, presubmit.OutputApi)
+    self.assertEquals(results1, [])
+    results2 = presubmit_canned_checks.CheckSingletonInHeaders(
+        input_api2, presubmit.OutputApi)
+    self.assertEquals(len(results2), 1)
+    self.assertEquals(results2[0].__class__, presubmit.OutputApi.PresubmitError)
+
   def testCheckChangeHasOnlyOneEol(self):
     self.ReadFileTest(presubmit_canned_checks.CheckChangeHasOnlyOneEol,
                       "Hey!\nHo!\n", "Hey!\nHo!\n\n",
                       presubmit.OutputApi.PresubmitPromptWarning)
 
   def testCheckChangeHasNoCR(self):
     self.ReadFileTest(presubmit_canned_checks.CheckChangeHasNoCR,
                       "Hey!\nHo!\n", "Hey!\r\nHo!\r\n",
                       presubmit.OutputApi.PresubmitPromptWarning)
 
@@ skipping 688 matching lines @@
         owners_check=False)
     self.assertEqual(1, len(results))
     self.assertEqual(
         'Found line ending with white spaces in:', results[0]._message)
     self.checkstdout('')
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()