Add CheckChangeHasOnlyOneEol and CheckChangeHasNoCrAndHasOnlyOneEol.

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', 'CheckChangeHasOnlyOneEol',
+      'CheckChangeHasNoCR', 'CheckChangeHasNoCrAndHasOnlyOneEol',
+      '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):
@@ skipping 29 matching lines @@
     ]
     input_api2.RightHandSideLines(mox.IgnoreArg()).AndReturn(output2)
     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 ReadFileTest(self, check, content1, content2, error_type):
+    input_api1 = self.MockInputApi()
+    self.mox.StubOutWithMock(input_api1, 'ReadFile')
+    input_api1.change = self.MakeBasicChange('foo', 'Foo\n')
+    affected_file1 = self.mox.CreateMock(presubmit.SvnAffectedFile)
+    input_api1.AffectedSourceFiles(None).AndReturn([affected_file1])
+    input_api1.ReadFile(affected_file1, 'rb').AndReturn(content1)
+    input_api2 = self.MockInputApi()
+    self.mox.StubOutWithMock(input_api2, 'ReadFile')
+    input_api2.change = self.MakeBasicChange('foo', 'Foo\n')
+    affected_file2 = self.mox.CreateMock(presubmit.SvnAffectedFile)
+    input_api2.AffectedSourceFiles(None).AndReturn([affected_file2])
+    input_api2.ReadFile(affected_file2, 'rb').AndReturn(content2)
+    affected_file2.LocalPath().AndReturn('bar.cc')
+    self.mox.ReplayAll()
+
+    results = check(input_api1, presubmit.OutputApi)
+    self.assertEquals(results, [])
+    results2 = check(input_api2, presubmit.OutputApi)
+    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)
 
   def testCannedCheckChangeHasTestField(self):
     self.DescriptionTest(presubmit_canned_checks.CheckChangeHasTestField,
                          'TEST=did some stuff', '',
                          presubmit.OutputApi.PresubmitNotifyResult)
 
@@ skipping 11 matching lines @@
     self.DescriptionTest(presubmit_canned_checks.CheckDoNotSubmitInDescription,
                          'DO NOTSUBMIT', 'DO NOT ' + 'SUBMIT',
                          presubmit.OutputApi.PresubmitError)
 
   def testCannedCheckDoNotSubmitInFiles(self):
     self.ContentTest(
         lambda x,y,z: presubmit_canned_checks.CheckDoNotSubmitInFiles(x, y),
         'DO NOTSUBMIT', 'DO NOT ' + 'SUBMIT',
         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):
-    input_api1 = self.MockInputApi()
-    self.mox.StubOutWithMock(input_api1, 'ReadFile')
-    input_api1.change = self.MakeBasicChange('foo', 'Foo\n')
-    affected_file1 = self.mox.CreateMock(presubmit.SvnAffectedFile)
-    input_api1.AffectedSourceFiles(None).AndReturn([affected_file1])
-    input_api1.ReadFile(affected_file1, 'rb').AndReturn("Hey!\nHo!\n")
-    input_api2 = self.MockInputApi()
-    self.mox.StubOutWithMock(input_api2, 'ReadFile')
-    input_api2.change = self.MakeBasicChange('foo', 'Foo\n')
-    affected_file2 = self.mox.CreateMock(presubmit.SvnAffectedFile)
-    input_api2.AffectedSourceFiles(None).AndReturn([affected_file2])
-    input_api2.ReadFile(affected_file2, 'rb').AndReturn("Hey!\r\nHo!\r\n")
-    affected_file2.LocalPath().AndReturn('bar.cc')
-    self.mox.ReplayAll()
+    self.ReadFileTest(presubmit_canned_checks.CheckChangeHasNoCR,
+                      "Hey!\nHo!\n", "Hey!\r\nHo!\r\n",
+                      presubmit.OutputApi.PresubmitPromptWarning)
+ 
+  def testCheckChangeHasNoCrAndHasOnlyOneEol(self):
+    self.ReadFileTest(
+        presubmit_canned_checks.CheckChangeHasNoCrAndHasOnlyOneEol,
+        "Hey!\nHo!\n", "Hey!\nHo!\n\n",
+        presubmit.OutputApi.PresubmitPromptWarning)
+    self.mox.VerifyAll()
+    self.ReadFileTest(
+        presubmit_canned_checks.CheckChangeHasNoCrAndHasOnlyOneEol,
+        "Hey!\nHo!\n", "Hey!\r\nHo!\r\n",
+        presubmit.OutputApi.PresubmitPromptWarning)
 
-    results = presubmit_canned_checks.CheckChangeHasNoCR(
-        input_api1, presubmit.OutputApi, None)
-    self.assertEquals(results, [])
-    results2 = presubmit_canned_checks.CheckChangeHasNoCR(
-        input_api2, presubmit.OutputApi, None)
-    self.assertEquals(len(results2), 1)
-    self.assertEquals(results2[0].__class__,
-                      presubmit.OutputApi.PresubmitPromptWarning)
-  
   def testCannedCheckChangeHasNoTabs(self):
     self.ContentTest(presubmit_canned_checks.CheckChangeHasNoTabs,
                      'blah blah', 'blah\tblah',
                      presubmit.OutputApi.PresubmitPromptWarning)
 
   def testCannedCheckLongLines(self):
     check = lambda x,y,z: presubmit_canned_checks.CheckLongLines(x, y, 10, z)
     self.ContentTest(check, '', 'blah blah blah',
                      presubmit.OutputApi.PresubmitPromptWarning)
 
@@ skipping 193 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()