refactor parsing of change descriptions, fix TBR=

tests/presubmit_unittest.py

 #!/usr/bin/python
 # Copyright (c) 2010 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 is too confused.
 # pylint: disable=E1101,E1103,W0212,W0403
 
 import StringIO
+import unittest
 
 # Fixes include path.
 from super_mox import mox, SuperMoxTestBase
 
 import owners
 import presubmit_support as presubmit
 # Shortcut.
 presubmit_canned_checks = presubmit.presubmit_canned_checks
 
 
@@ skipping 106 matching lines @@
 
 
 class PresubmitUnittest(PresubmitTestsBase):
   """General presubmit_support.py tests (excluding InputApi and OutputApi)."""
 
   _INHERIT_SETTINGS = 'inherit-review-settings-ok'
 
   def testMembersChanged(self):
     self.mox.ReplayAll()
     members = [
-      'AffectedFile', 'Change', 'DoGetTrySlaves', 'DoPresubmitChecks',
-      'GetTrySlavesExecuter', 'GitAffectedFile',
+      'AffectedFile', 'Change', 'ChangeDescription', 'DoGetTrySlaves',
+      'DoPresubmitChecks', 'GetTrySlavesExecuter', 'GitAffectedFile',
       'GitChange', 'InputApi', 'ListRelevantPresubmitFiles', 'Main',
       'NotImplementedException', 'OutputApi', 'ParseFiles',
       'PresubmitExecuter', 'PresubmitOutput', 'ScanSubDirs',
       'SvnAffectedFile', 'SvnChange', 'cPickle', 'cStringIO',
       'exceptions', 'fnmatch', 'gclient_utils', 'glob', 'json', 'load_files',
       'logging', 'marshal', 'normpath', 'optparse', 'os', 'owners', 'pickle',
       'presubmit_canned_checks', 'random', 're', 'scm', 'subprocess',
       'sys', 'tempfile', 'time', 'traceback', 'types', 'unittest', 'urllib2',
       'warn',
     ]
@@ skipping 1813 matching lines @@
   def testCannedCheckOwners_MissingSchemeInHostURL(self):
     self.OwnersTest(is_committing=True,
         approvers=set(['ben@example.com']),
         uncovered_files=set(), host_url='localhost')
 
   def testCannedCheckOwners_HTTPS_HostURL(self):
     self.OwnersTest(is_committing=True,
         approvers=set(['ben@example.com']),
         uncovered_files=set(), host_url='https://localhost')
 
 

[M-A Ruel, 2011/03/22 17:24:16]

only 2 lines.

+
+class ChangeDescriptionTests(unittest.TestCase):
+  def setUp(self):
+    self.editor_input = None
+    self.editor_output = None
+
+  def tearDown(self):
+    self.editor_input = None
+    self.editor_output = None
+
+  def change_desc(self, editor=None, **kwargs):
+    if editor is None:
+      editor = lambda x: x
+    return presubmit.ChangeDescription(editor=editor, **kwargs)
+
+  def editor(self, text):
+    if self.editor_input:
+      self.assertTrue(self.editor_input in text)
+    if self.editor_output is not None:
+      return self.editor_output
+    return text
+
+  def test_empty(self):
+    desc = self.change_desc()
+    self.assertTrue(desc.IsEmpty())
+    desc.UserEdit()
+    self.assertTrue(desc.IsEmpty())
+
+  def test_basic(self):
+    desc = self.change_desc(subject='foo', description='desc',
+                            reviewers=['joe@example.com'])
+    desc.UserEdit()
+    self.assertFalse(desc.IsEmpty())
+    self.assertEqual(desc.subject, 'foo')
+    self.assertEquals(desc.description,
+       'foo\n'
+       '\n'
+       'desc\n'
+       '\n'
+       'R=joe@example.com')
+    self.assertEquals(desc.reviewers, ['joe@example.com'])
+    self.assertFalse(desc.tbr)
+
+  def test_subject_only(self):
+    self.editor_input = 'foo\n\nR=\nBUG=\nTEST=\n'
+    desc = self.change_desc(subject='foo', editor=self.editor)
+    desc.UserEdit()
+    self.assertEquals(desc.description, 'foo')
+
+  def test_tbr_with_reviewer(self):
+    self.editor_input = 'TBR=\nBUG=\nTEST=\n'
+    self.editor_output = 'foo\n\nTBR=joe@example.com'
+    desc = self.change_desc(tbr=True, editor=self.editor)
+    self.assertFalse(desc.tbr)
+    self.assertEquals(desc.reviewers, [])
+    desc.UserEdit()
+    self.assertTrue(desc.tbr)
+    self.assertEquals(desc.reviewers, ['joe@example.com'])
+    self.assertEquals(desc.description,
+        'foo\n'
+        '\n'
+        'TBR=joe@example.com')
+
+  def test_tbr_without_reviewer(self):
+    desc = self.change_desc(subject='foo', tbr=True)
+    desc.UserEdit()
+    self.assertEquals(desc.description, 'foo\n\nTBR=')
+
+  def test_really_long_subject(self):
+    subject = 'foo' * 40
+    desc = self.change_desc(subject=subject)
+    self.assertEquals(desc.description, subject)
+    self.assertEquals(desc.subject, subject[:97] + '...')
+
+
 if __name__ == '__main__':
   import unittest
   unittest.main()