Implemented branch coverage and integration bot coverage on the dashboard.

BUG=
TEST=

Review URL: https://webrtc-codereview.appspot.com/434002

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1873 4adac7df-926f-26a2-2b94-8c16560cd09d

tools/quality_tracking/dashboard/add_coverage_data.py

@@ -12,25 +12,29 @@
 
 __author__ = 'phoglund@webrtc.org (Patrik Höglund)'
 
-import datetime
+from datetime import datetime
 import logging
 
 from google.appengine.ext import db
 
 import oauth_post_request_handler
 
+REPORT_CATEGORIES = ('small_medium_tests', 'large_tests')
+
+
 class CoverageData(db.Model):
   """This represents one coverage report from the build bot."""
+
+  # The date the report was made.
   date = db.DateTimeProperty(required=True)
+
+  # Coverage percentages.
   line_coverage = db.FloatProperty(required=True)
   function_coverage = db.FloatProperty(required=True)
+  branch_coverage = db.FloatProperty()
 
-
-def _parse_percentage(string_value):
-  percentage = float(string_value)
-  if percentage < 0.0 or percentage > 100.0:
-    raise ValueError('%s is not a valid percentage.' % string_value)
-  return percentage
+  # The report category must be one of the REPORT_CATEGORIES.
+  report_category = db.CategoryProperty()
 
 
 class AddCoverageData(oauth_post_request_handler.OAuthPostRequestHandler):
@@ -40,19 +44,24 @@ class AddCoverageData(oauth_post_request_handler.OAuthPostRequestHandler):
      the regular oauth_* parameters, these values:
 
      date: The POSIX timestamp for when the coverage observation was made.
-     line_coverage: A float percentage in the interval 0-100.0.
-     function_coverage: A float percentage in the interval 0-100.0.
+     report_category: A value in REPORT_CATEGORIES which characterizes the
+         coverage information (e.g. is the coverage from small / medium tests
+         or large tests?)
+
+     line_coverage: Line coverage percentage.
+     function_coverage: Function coverage percentage.
+     branch_coverage: Branch coverage percentage.
   """
 
   def _parse_and_store_data(self):
     try:
-      posix_time = int(self.request.get('date'))
-      parsed_date = datetime.datetime.fromtimestamp(posix_time)
+      request_posix_timestamp = float(self.request.get('oauth_timestamp'))
+      parsed_date = datetime.fromtimestamp(request_posix_timestamp)
 
-      line_coverage_string = self.request.get('line_coverage')
-      line_coverage = _parse_percentage(line_coverage_string)
-      function_coverage_string = self.request.get('function_coverage')
-      function_coverage = _parse_percentage(function_coverage_string)
+      line_coverage = self._parse_percentage('line_coverage')
+      function_coverage = self._parse_percentage('function_coverage')
+      branch_coverage = self._parse_percentage('branch_coverage')
+      report_category = self._parse_category('report_category')
 
     except ValueError as error:
       logging.warn('Invalid parameter in request: %s.' % error)
@@ -61,6 +70,21 @@ class AddCoverageData(oauth_post_request_handler.OAuthPostRequestHandler):
 
     item = CoverageData(date=parsed_date,
                         line_coverage=line_coverage,
-                        function_coverage=function_coverage)
+                        function_coverage=function_coverage,
+                        branch_coverage=branch_coverage,
+                        report_category=report_category)
     item.put()
 
+  def _parse_percentage(self, key):
+    """Parses out a percentage value from the request."""
+    value = float(self.request.get(key))
+    if percentage < 0.0 or percentage > 100.0:
+      raise ValueError('%s is not a valid percentage.' % string_value)
+    return percentage
+
+  def _parse_category(self, key):
+    value = self.request.get(key)
+    if value in REPORT_CATEGORIES:
+      return value
+    else:
+      raise ValueError("Invalid category %s." % value)