Fractional line coverage + logging change.

build/android/emma_coverage_stats_test.py

 #!/usr/bin/python
 # Copyright 2015 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.
 
 import os
 import sys
 import unittest
 from xml.etree import ElementTree
 
@@ skipping 383 matching lines @@
         'total': 5
       },
       'incremental': {
         'covered': 2.05,
         'total': 3
       },
       'source': [
         {
           'line': line_coverage[0].source,
           'coverage': line_coverage[0].covered_status,
-          'changed': True
+          'changed': True,
+          'fractional_coverage': line_coverage[0].fractional_line_coverage,
         },
         {
           'line': line_coverage[1].source,
           'coverage': line_coverage[1].covered_status,
-          'changed': False
+          'changed': False,
+          'fractional_coverage': line_coverage[1].fractional_line_coverage,
         },
         {
           'line': line_coverage[2].source,
           'coverage': line_coverage[2].covered_status,
-          'changed': True
+          'changed': True,
+          'fractional_coverage': line_coverage[2].fractional_line_coverage,
         },
         {
           'line': line_coverage[3].source,
           'coverage': line_coverage[3].covered_status,
-          'changed': False
+          'changed': False,
+          'fractional_coverage': line_coverage[3].fractional_line_coverage,
         },
         {
           'line': line_coverage[4].source,
           'coverage': line_coverage[4].covered_status,
-          'changed': True
+          'changed': True,
+          'fractional_coverage': line_coverage[4].fractional_line_coverage,
         },
         {
           'line': line_coverage[5].source,
           'coverage': line_coverage[5].covered_status,
-          'changed': True
+          'changed': True,
+          'fractional_coverage': line_coverage[5].fractional_line_coverage,
         }
       ]
     }
     result_dict = self.simple_coverage.GetCoverageDictForFile(
         '/fake/src', lines)
     self.assertDictEqual(result_dict, expected_dict)
 
   def testGetCoverageDictForFile_emptyCoverage(self):
     expected_dict = {
       'absolute': {'covered': 0, 'total': 0},
@@ skipping 35 matching lines @@
             1, '', emma_coverage_stats.NOT_COVERED, 1.0),
         emma_coverage_stats.LineCoverage(
             2, '', emma_coverage_stats.COVERED, 1.0)
       ]
     }
     expected_dict = {
       'files': {
         '/path/2/File2.java': {
           'absolute': {'covered': 1, 'total': 2},
           'incremental': {'covered': 1, 'total': 2},
-          'source': [{'changed': True, 'coverage': 0, 'line': ''},
-                     {'changed': True, 'coverage': 1, 'line': ''}]
+          'source': [{'changed': True, 'coverage': 0,
+                      'line': '', 'fractional_coverage': 1.0},
+                     {'changed': True, 'coverage': 1,
+                      'line': '', 'fractional_coverage': 1.0}]
         },
         '/path/to/1/File1.java': {
           'absolute': {'covered': 2.5, 'total': 3},
           'incremental': {'covered': 2, 'total': 2},
-          'source': [{'changed': True, 'coverage': 1, 'line': ''},
-                     {'changed': False, 'coverage': 2, 'line': ''},
-                     {'changed': True, 'coverage': -1, 'line': ''},
-                     {'changed': True, 'coverage': 1, 'line': ''}]
+          'source': [{'changed': True, 'coverage': 1,
+                      'line': '', 'fractional_coverage': 1.0},
+                     {'changed': False, 'coverage': 2,
+                      'line': '', 'fractional_coverage': 0.5},
+                     {'changed': True, 'coverage': -1,
+                      'line': '', 'fractional_coverage': 1.0},
+                     {'changed': True, 'coverage': 1,
+                      'line': '', 'fractional_coverage': 1.0}]
         }
       },
       'patch': {'incremental': {'covered': 3, 'total': 4}}
     }
-    # Return the relevant coverage info for each file. We aren't testing
-    # _GetCoverageStatusForFile here.
+    # Return the relevant coverage info for each file.
     self.simple_coverage._emma_parser.GetLineCoverage = (
         lambda x: coverage_info[x])
     result_dict = self.simple_coverage.GetCoverageDict(files_for_coverage)
     self.assertDictEqual(result_dict, expected_dict)
 
   def testGetCoverageDict_noCoverage(self):
     result_dict = self.simple_coverage.GetCoverageDict({})
     self.assertDictEqual(result_dict, EMPTY_COVERAGE_STATS_DICT)
 
 
@@ skipping 33 matching lines @@
   mock_open = mock.mock_open()
   mock_open.side_effect = [mock.mock_open(read_data=side_effect).return_value
                            for side_effect in side_effects]
   with mock.patch('__builtin__.open', mock_open):
     return func(**kwargs), mock_open
 
 
 if __name__ == '__main__':
   # Suppress logging messages.
   unittest.main(buffer=True)