Add CheckChangeHasDescription.

tests/presubmit_unittest.py

 #!/usr/bin/python
 # Copyright (c) 2006-2009 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."""
 
 import exceptions
 import random
 import string
@@ skipping 919 matching lines @@
     input_api.cStringIO = presubmit.cStringIO
     input_api.re = presubmit.re
     input_api.traceback = presubmit.traceback
     input_api.urllib2 = self.mox.CreateMock(presubmit.urllib2)
     input_api.unittest = unittest
     return input_api
 
   def testMembersChanged(self):
     self.mox.ReplayAll()
     members = [
-      'CheckChangeHasBugField', 'CheckChangeHasNoCR', 'CheckChangeHasNoTabs',
+      'CheckChangeHasBugField', 'CheckChangeHasDescription',
+      'CheckChangeHasNoCR', 'CheckChangeHasNoTabs',
       'CheckChangeHasQaField', 'CheckChangeHasTestedField',
       'CheckChangeHasTestField', 'CheckChangeSvnEolStyle',
       'CheckDoNotSubmit',
       'CheckDoNotSubmitInDescription', 'CheckDoNotSubmitInFiles',
       'CheckLongLines', 'CheckTreeIsOpen', 'RunPythonUnitTests',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(presubmit_canned_checks, members)
 
-  def DescriptionTest(self, check, description1, description2, error_type):
+  def DescriptionTest(self, check, description1, description2, error_type,
+                      committing):
     input_api1 = self.MockInputApi()
-    input_api1.change = self.MakeBasicChange('foo', 'Foo\n' + description1)
+    input_api1.is_committing = committing
+    input_api1.change = self.MakeBasicChange('foo', description1)
     input_api2 = self.MockInputApi()
-    input_api2.change = self.MakeBasicChange('foo', 'Foo\n' + description2)
+    input_api2.is_committing = committing
+    input_api2.change = self.MakeBasicChange('foo', description2)
     self.mox.ReplayAll()
 
     results1 = check(input_api1, presubmit.OutputApi)
     self.assertEquals(results1, [])
     results2 = check(input_api2, presubmit.OutputApi)
     self.assertEquals(len(results2), 1)
     self.assertEquals(results2[0].__class__, error_type)
 
   def ContentTest(self, check, content1, content2, error_type):
     input_api1 = self.MockInputApi()
@@ skipping 17 matching lines @@
     self.mox.ReplayAll()
 
     results1 = check(input_api1, presubmit.OutputApi, None)
     self.assertEquals(results1, [])
     results2 = check(input_api2, presubmit.OutputApi, None)
     self.assertEquals(len(results2), 1)
     self.assertEquals(results2[0].__class__, error_type)
 
   def testCannedCheckChangeHasBugField(self):
     self.DescriptionTest(presubmit_canned_checks.CheckChangeHasBugField,
-                         'BUG=1234', '',
-                         presubmit.OutputApi.PresubmitNotifyResult)
+                         'Foo\nBUG=1234', 'Foo\n',
+                         presubmit.OutputApi.PresubmitNotifyResult,
+                         False)
 
+  def testCheckChangeHasDescription(self):
+    self.DescriptionTest(presubmit_canned_checks.CheckChangeHasDescription,
+                         'Bleh', '',
+                         presubmit.OutputApi.PresubmitNotifyResult,
+                         False)
+    self.mox.VerifyAll()
+    self.DescriptionTest(presubmit_canned_checks.CheckChangeHasDescription,
+                         'Bleh', '',
+                         presubmit.OutputApi.PresubmitError,
+                         True)
+  
   def testCannedCheckChangeHasTestField(self):
     self.DescriptionTest(presubmit_canned_checks.CheckChangeHasTestField,
-                         'TEST=did some stuff', '',
-                         presubmit.OutputApi.PresubmitNotifyResult)
+                         'Foo\nTEST=did some stuff', 'Foo\n',
+                         presubmit.OutputApi.PresubmitNotifyResult,
+                         False)
 
   def testCannedCheckChangeHasTestedField(self):
     self.DescriptionTest(presubmit_canned_checks.CheckChangeHasTestedField,
-                         'TESTED=did some stuff', '',
-                         presubmit.OutputApi.PresubmitError)
+                         'Foo\nTESTED=did some stuff', 'Foo\n',
+                         presubmit.OutputApi.PresubmitError,
+                         False)
 
   def testCannedCheckChangeHasQAField(self):
     self.DescriptionTest(presubmit_canned_checks.CheckChangeHasQaField,
-                         'QA=BSOD your machine', '',
-                         presubmit.OutputApi.PresubmitError)
+                         'Foo\nQA=BSOD your machine', 'Foo\n',
+                         presubmit.OutputApi.PresubmitError,
+                         False)
 
   def testCannedCheckDoNotSubmitInDescription(self):
     self.DescriptionTest(presubmit_canned_checks.CheckDoNotSubmitInDescription,
-                         'DO NOTSUBMIT', 'DO NOT ' + 'SUBMIT',
-                         presubmit.OutputApi.PresubmitError)
+                         'Foo\nDO NOTSUBMIT', 'Foo\nDO NOT ' + 'SUBMIT',
+                         presubmit.OutputApi.PresubmitError,
+                         False)
 
   def testCannedCheckDoNotSubmitInFiles(self):
     self.ContentTest(
         lambda x,y,z: presubmit_canned_checks.CheckDoNotSubmitInFiles(x, y),
         'DO NOTSUBMIT', 'DO NOT ' + 'SUBMIT',
         presubmit.OutputApi.PresubmitError)
 
   def testCheckChangeHasNoCR(self):
     input_api1 = self.MockInputApi()
     self.mox.StubOutWithMock(input_api1, 'ReadFile')
@@ skipping 225 matching lines @@
     test_result.errors = 0
     self.mox.ReplayAll()
 
     results = presubmit_canned_checks.RunPythonUnitTests(
         input_api, presubmit.OutputApi, ['test_module'])
     self.assertEquals(len(results), 0)
 
 
 if __name__ == '__main__':
   unittest.main()