Allow special java statements (for example imports) to be as long as neccessary.

tests/git_cl_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.
 
 """Unit tests for git_cl.py."""
 
 import os
 import StringIO
 import stat
@@ skipping 403 matching lines @@
       description,
       reviewers):
     """Generic gerrit reviewer test framework."""
     self.calls = self._gerrit_base_calls()
     self.calls += self._gerrit_upload_calls(description, reviewers)
     git_cl.main(['upload'] + upload_args)
 
   def test_gerrit_no_reviewer(self):
     self._run_gerrit_reviewer_test(
         [],
-        'desc\n\nBUG=\n',
+        'desc\n\nBUG=\nChange-Id:123456789\n',
         [])
 
   def test_gerrit_reviewers_cmd_line(self):
     self._run_gerrit_reviewer_test(
         ['-r', 'foo@example.com'],
-        'desc\n\nBUG=\n',
+        'desc\n\nBUG=\nChange-Id:123456789',
         ['foo@example.com'])
 
   def test_gerrit_reviewer_multiple(self):
     self._run_gerrit_reviewer_test(
         [],
-        'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n',
+        'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
+        'Change-Id:123456789\n',
         ['reviewer@example.com', 'another@example.com'])
 
 
   def test_config_gerrit_download_hook(self):
     self.mock(git_cl, 'FindCodereviewSettingsFile', CodereviewSettingsFileMock)
     def ParseCodereviewSettingsContent(content):
       keyvals = {}
       keyvals['CODE_REVIEW_SERVER'] = 'gerrit.chromium.org'
       keyvals['GERRIT_HOST'] = 'gerrit.chromium.org'
       keyvals['GERRIT_PORT'] = '29418'
@@ skipping 42 matching lines @@
         ((['git', 'config', 'rietveld.viewvc-url'],), ''),
         (('ViewVC URL:',), ''),
         # DownloadHooks(True)
         ((commit_msg_path, os.X_OK,), True),
         ]
     git_cl.main(['config'])
 
 
 if __name__ == '__main__':
   unittest.main()