Fractional line coverage + logging change.

build/android/emma_coverage_stats.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.
 
 """Generates incremental code coverage reports for Java code in Chromium.
 
 Usage:
 
   build/android/emma_coverage_stats.py -v --out <output file path> --emma-dir
@@ skipping 282 matching lines @@
       return None
     emma_file = self._source_to_emma[file_path]
     total_line_coverage = self._emma_parser.GetLineCoverage(emma_file)
     incremental_line_coverage = [line for line in total_line_coverage
                                  if line.lineno in line_numbers]
     line_by_line_coverage = [
       {
         'line': line.source,
         'coverage': line.covered_status,
         'changed': line.lineno in line_numbers,
+        'fractional_coverage': line.fractional_line_coverage,
       }
       for line in total_line_coverage
     ]
     total_covered_lines, total_lines = (
         self.GetSummaryStatsForLines(total_line_coverage))
     incremental_covered_lines, incremental_total_lines = (
         self.GetSummaryStatsForLines(incremental_line_coverage))
 
     file_coverage_stats = {
       'absolute': {
@@ skipping 75 matching lines @@
 
     Args:
       file_path: A string representing path to the file.
 
     Returns:
       True for Java files that exist, False for all others.
     """
     if os.path.splitext(file_path)[1] == '.java' and os.path.exists(file_path):
       return True
     else:
-      logging.debug(
-          'Skipping file %s, cannot compute code coverage.', file_path)
+      logging.info('Skipping file %s, cannot compute code coverage.', file_path)
       return False
 
   @staticmethod
   def GetPackageNameFromFile(file_path):
     """Gets the full package name including the file name for a given file path.
 
     Args:
       file_path: String representing the path to the Java source file.
 
     Returns:
@@ skipping 28 matching lines @@
   with open(line_coverage_file) as f:
     potential_files_for_coverage = json.load(f)
 
   files_for_coverage = {f: lines
                         for f, lines in potential_files_for_coverage.iteritems()
                         if _EmmaCoverageStats.NeedsCoverage(f)}
 
   coverage_results = {}
   if files_for_coverage:
     code_coverage = _EmmaCoverageStats(coverage_dir, files_for_coverage.keys())
-    coverage_results = code_coverage.GetCoverageDict(
-        files_for_coverage)
+    coverage_results = code_coverage.GetCoverageDict(files_for_coverage)
   else:
     logging.info('No Java files requiring coverage were included in %s.',
                  line_coverage_file)
 
   with open(out_file_path, 'w+') as out_status_file:
     json.dump(coverage_results, out_status_file)
 
 
 def main():
   argparser = argparse.ArgumentParser()
   argparser.add_argument('--out', required=True, type=str,
                          help='Report output file path.')
   argparser.add_argument('--emma-dir', required=True, type=str,
                          help='EMMA HTML report directory.')
   argparser.add_argument('--lines-for-coverage-file', required=True, type=str,
                          help='File containing a JSON object. Should contain a '
                          'dict mapping file names to lists of line numbers of '
                          'code for which coverage information is desired.')
   argparser.add_argument('-v', '--verbose', action='count',
                          help='Print verbose log information.')
   args = argparser.parse_args()
   run_tests_helper.SetLogLevel(args.verbose)
   GenerateCoverageReport(args.lines_for_coverage_file, args.out, args.emma_dir)
 
 
 if __name__ == '__main__':
   sys.exit(main())