Move Html and BuildbotPageMeasurementResults to {Html,Buildbot}OutputFormatter.

tools/telemetry/telemetry/results/html_output_formatter_unittest.py

Index: tools/telemetry/telemetry/results/html_output_formatter_unittest.py
diff --git a/tools/telemetry/telemetry/results/html_page_measurement_results_unittest.py b/tools/telemetry/telemetry/results/html_output_formatter_unittest.py
similarity index 89%
rename from tools/telemetry/telemetry/results/html_page_measurement_results_unittest.py
rename to tools/telemetry/telemetry/results/html_output_formatter_unittest.py
index 953ffbad48293e30a2e9b36c680a88b517f2f9e8..6a321eff5b24b371d8a7f8e8d05ea51bad289a8a 100644
--- a/tools/telemetry/telemetry/results/html_page_measurement_results_unittest.py
+++ b/tools/telemetry/telemetry/results/html_output_formatter_unittest.py
@@ -6,7 +6,8 @@ import StringIO
 import unittest
 
 from telemetry.page import page_set
-from telemetry.results import html_page_measurement_results
+from telemetry.results import html_output_formatter
+from telemetry.results import page_test_results
 from telemetry.value import scalar
 
 
@@ -18,8 +19,8 @@ def _MakePageSet():
   return ps
 
 
-class DeterministicHtmlPageMeasurementResults(
-    html_page_measurement_results.HtmlPageMeasurementResults):
+class DeterministicHtmlOutputFormatter(
+    html_output_formatter.HtmlOutputFormatter):
   def _GetBuildTime(self):
     return 'build_time'
 
@@ -32,15 +33,14 @@ class StringIOFile(StringIO.StringIO):
   name = 'fake_output_file'
 
 
-class HtmlPageMeasurementResultsTest(unittest.TestCase):
+class HtmlOutputFormatterTest(unittest.TestCase):
 
   def test_basic_summary(self):
     test_page_set = _MakePageSet()
     output_file = StringIOFile()
 
     # Run the first time and verify the results are written to the HTML file.
-    results = DeterministicHtmlPageMeasurementResults(
-        output_file, 'test_name', False, False, 'browser_type')
+    results = page_test_results.PageTestResults()
     results.StartTest(test_page_set.pages[0])
     results.AddValue(scalar.ScalarValue(
         test_page_set.pages[0], 'a', 'seconds', 3))
@@ -53,8 +53,9 @@ class HtmlPageMeasurementResultsTest(unittest.TestCase):
     results.AddSuccess(test_page_set.pages[1])
     results.StopTest(test_page_set.pages[1])
 
-    results.PrintSummary()
-    results.GetResults()
+    formatter = DeterministicHtmlOutputFormatter(
+        output_file, 'test_name', False, False, 'browser_type')
+    formatter.Format(results)
     expected = {
       "platform": "browser_type",
       "buildTime": "build_time",
@@ -92,12 +93,11 @@ class HtmlPageMeasurementResultsTest(unittest.TestCase):
       },
       "revision": "revision"
     }
-    self.assertEquals(expected, results.GetResults())
+    self.assertEquals(expected, formatter.GetResults())
 
     # Run the second time and verify the results are appended to the HTML file.
     output_file.seek(0)
-    results = DeterministicHtmlPageMeasurementResults(
-        output_file, 'test_name', False, False, 'browser_type')
+    results = page_test_results.PageTestResults()
     results.StartTest(test_page_set.pages[0])
     results.AddValue(scalar.ScalarValue(
         test_page_set.pages[0], 'a', 'seconds', 4))
@@ -110,7 +110,9 @@ class HtmlPageMeasurementResultsTest(unittest.TestCase):
     results.AddSuccess(test_page_set.pages[1])
     results.StopTest(test_page_set.pages[1])
 
-    results.PrintSummary()
+    formatter = DeterministicHtmlOutputFormatter(
+        output_file, 'test_name', False, False, 'browser_type')
+    formatter.Format(results)
     expected = [
       {
         "platform": "browser_type",
@@ -186,13 +188,12 @@ class HtmlPageMeasurementResultsTest(unittest.TestCase):
         },
         "revision": "revision"
       }]
-    self.assertEquals(expected, results.GetCombinedResults())
+    self.assertEquals(expected, formatter.GetCombinedResults())
     last_output_len = len(output_file.getvalue())
 
     # Now reset the results and verify the old ones are gone.
     output_file.seek(0)
-    results = DeterministicHtmlPageMeasurementResults(
-       output_file, 'test_name', True, False, 'browser_type')
+    results = page_test_results.PageTestResults()
     results.StartTest(test_page_set.pages[0])
     results.AddValue(scalar.ScalarValue(
         test_page_set.pages[0], 'a', 'seconds', 5))
@@ -205,7 +206,9 @@ class HtmlPageMeasurementResultsTest(unittest.TestCase):
     results.AddSuccess(test_page_set.pages[1])
     results.StopTest(test_page_set.pages[1])
 
-    results.PrintSummary()
+    formatter = DeterministicHtmlOutputFormatter(
+       output_file, 'test_name', True, False, 'browser_type')
+    formatter.Format(results)
     expected = [{
       "platform": "browser_type",
       "buildTime": "build_time",
@@ -243,5 +246,5 @@ class HtmlPageMeasurementResultsTest(unittest.TestCase):
       },
       "revision": "revision"
     }]
-    self.assertEquals(expected, results.GetCombinedResults())
+    self.assertEquals(expected, formatter.GetCombinedResults())
     self.assertTrue(len(output_file.getvalue()) < last_output_len)