Cleanup of page_measurement_results object

tools/telemetry/telemetry/page/html_page_measurement_results_unittest.py

Index: tools/telemetry/telemetry/page/html_page_measurement_results_unittest.py
diff --git a/tools/telemetry/telemetry/page/html_page_measurement_results_unittest.py b/tools/telemetry/telemetry/page/html_page_measurement_results_unittest.py
index 043bf7a92209319c3978532a29b5d630770d74c5..60973c5e1297b3cad656eca8b3bc6d686b8c3684 100644
--- a/tools/telemetry/telemetry/page/html_page_measurement_results_unittest.py
+++ b/tools/telemetry/telemetry/page/html_page_measurement_results_unittest.py
@@ -52,52 +52,53 @@ class HtmlPageMeasurementResultsTest(unittest.TestCase):
     results.WillMeasurePage(test_page_set.pages[0])
     results.Add('a', 'seconds', 3)
     results.DidMeasurePage()
+    results.AddSuccess(test_page_set.pages[0])
+
     results.WillMeasurePage(test_page_set.pages[1])
     results.Add('a', 'seconds', 7)
     results.DidMeasurePage()
+    results.AddSuccess(test_page_set.pages[1])
 
     results.PrintSummary()
-    expected = (
-        '<script id="results-json" type="application/json">'
-          '[{'
-            '"platform": "browser_type", '
-            '"buildTime": "build_time", '
-            '"label": null, '
-            '"tests": {'
-              '"test_name": {'
-                '"metrics": {'
-                  '"a": {'
-                    '"current": [3, 7], '
-                    '"units": "seconds", '
-                    '"important": true'
-                  '}, '
-                  '"telemetry_page_measurement_results.num_failed": {'
-                    '"current": [0], '
-                    '"units": "count", '
-                    '"important": false'
-                  '}, '
-                  '"a_by_url.http://www.bar.com/": {'
-                    '"current": [7], '
-                    '"units": "seconds", '
-                    '"important": false'
-                  '}, '
-                  '"telemetry_page_measurement_results.num_errored": {'
-                    '"current": [0], '
-                    '"units": "count", '
-                    '"important": false'
-                  '}, '
-                  '"a_by_url.http://www.foo.com/": {'
-                    '"current": [3], '
-                    '"units": "seconds", '
-                    '"important": false'
-                  '}'
-                '}'
-              '}'
-            '}, '
-            '"revision": "revision"'
-          '}]'
-        '</script>')
-    self.assertIn(expected, output_file.getvalue())
+    results.GetResults()
+    expected = {
+      "platform": "browser_type",
+      "buildTime": "build_time",
+      "label": None,
+      "tests": {
+        "test_name": {
+          "metrics": {
+            "a": {
+              "current": [3, 7],
+              "units": "seconds",
+              "important": True
+            },
+            "telemetry_page_measurement_results.num_failed": {
+              "current": [0],
+              "units": "count",
+              "important": False
+            },
+            "a_by_url.http://www.bar.com/": {
+              "current": [7],
+              "units": "seconds",
+              "important": False
+            },
+            "telemetry_page_measurement_results.num_errored": {
+              "current": [0],
+              "units": "count",
+              "important": False
+            },
+            "a_by_url.http://www.foo.com/": {
+              "current": [3],
+              "units": "seconds",
+              "important": False
+            }
+          }
+        }
+      },
+      "revision": "revision"
+    }
+    self.assertEquals(expected, results.GetResults())
 
     # Run the second time and verify the results are appended to the HTML file.
     output_file.seek(0)
@@ -106,89 +107,90 @@ class HtmlPageMeasurementResultsTest(unittest.TestCase):
     results.WillMeasurePage(test_page_set.pages[0])
     results.Add('a', 'seconds', 4)
     results.DidMeasurePage()
+    results.AddSuccess(test_page_set.pages[0])
+
     results.WillMeasurePage(test_page_set.pages[1])
     results.Add('a', 'seconds', 8)
     results.DidMeasurePage()
+    results.AddSuccess(test_page_set.pages[1])
 
     results.PrintSummary()
-    expected = (
-        '<script id="results-json" type="application/json">'
-          '[{'
-            '"platform": "browser_type", '
-            '"buildTime": "build_time", '
-            '"revision": "revision", '
-            '"tests": {'
-              '"test_name": {'
-                '"metrics": {'
-                  '"a": {'
-                    '"current": [3, 7], '
-                    '"units": "seconds", '
-                    '"important": true'
-                  '}, '
-                  '"telemetry_page_measurement_results.num_failed": {'
-                    '"current": [0], '
-                    '"units": "count", '
-                    '"important": false'
-                  '}, '
-                  '"a_by_url.http://www.bar.com/": {'
-                    '"current": [7], '
-                    '"units": "seconds", '
-                    '"important": false'
-                  '}, '
-                  '"telemetry_page_measurement_results.num_errored": {'
-                    '"current": [0], '
-                    '"units": "count", '
-                    '"important": false'
-                  '}, '
-                  '"a_by_url.http://www.foo.com/": {'
-                    '"current": [3], '
-                    '"units": "seconds", '
-                    '"important": false'
-                  '}'
-                '}'
-              '}'
-            '}, '
-            '"label": null'
-          '}, '
-          '{'
-            '"platform": "browser_type", '
-            '"buildTime": "build_time", '
-            '"label": null, '
-            '"tests": {'
-              '"test_name": {'
-                '"metrics": {'
-                  '"a": {'
-                    '"current": [4, 8], '
-                    '"units": "seconds", '
-                    '"important": true'
-                  '}, '
-                  '"telemetry_page_measurement_results.num_failed": {'
-                    '"current": [0], '
-                    '"units": "count", '
-                    '"important": false'
-                  '}, '
-                  '"a_by_url.http://www.bar.com/": {'
-                    '"current": [8], '
-                    '"units": "seconds", '
-                    '"important": false'
-                  '}, '
-                  '"telemetry_page_measurement_results.num_errored": {'
-                    '"current": [0], '
-                    '"units": "count", '
-                    '"important": false'
-                  '}, '
-                  '"a_by_url.http://www.foo.com/": {'
-                    '"current": [4], '
-                    '"units": "seconds", '
-                    '"important": false'
-                  '}'
-                '}'
-              '}'
-            '}, '
-            '"revision": "revision"'
-          '}]'
-        '</script>')
-    self.assertIn(expected, output_file.getvalue())
+    expected = [
+      {
+        "platform": "browser_type",
+        "buildTime": "build_time",
+        "label": None,
+        "tests": {
+          "test_name": {
+            "metrics": {
+              "a": {
+                "current": [3, 7],
+                "units": "seconds",
+                "important": True
+              },
+              "telemetry_page_measurement_results.num_failed": {
+                "current": [0],
+                "units": "count",
+                "important": False
+              },
+              "a_by_url.http://www.bar.com/": {
+                "current": [7],
+                "units": "seconds",
+                "important": False
+              },
+              "telemetry_page_measurement_results.num_errored": {
+                "current": [0],
+                "units": "count",
+                "important": False
+              },
+              "a_by_url.http://www.foo.com/": {
+                "current": [3],
+                "units": "seconds",
+                "important": False
+              }
+            }
+          }
+        },
+        "revision": "revision"
+      },
+      {
+        "platform": "browser_type",
+        "buildTime": "build_time",
+        "label": None,
+        "tests": {
+          "test_name": {
+            "metrics": {
+              "a": {
+                "current": [4, 8],
+                "units": "seconds",
+                "important": True
+              },
+              "telemetry_page_measurement_results.num_failed": {
+                "current": [0],
+                "units": "count",
+                "important": False,
+              },
+              "a_by_url.http://www.bar.com/": {
+                "current": [8],
+                "units": "seconds",
+                "important": False
+              },
+              "telemetry_page_measurement_results.num_errored": {
+                "current": [0],
+                "units": "count",
+                "important": False
+              },
+              "a_by_url.http://www.foo.com/": {
+                "current": [4],
+                "units": "seconds",
+                "important": False
+              }
+            }
+          }
+        },
+        "revision": "revision"
+      }]
+    self.assertEquals(expected, results.GetCombinedResults())
     last_output_len = len(output_file.getvalue())
 
     # Now reset the results and verify the old ones are gone.
@@ -198,50 +200,50 @@ class HtmlPageMeasurementResultsTest(unittest.TestCase):
     results.WillMeasurePage(test_page_set.pages[0])
     results.Add('a', 'seconds', 5)
     results.DidMeasurePage()
+    results.AddSuccess(test_page_set.pages[0])
+
     results.WillMeasurePage(test_page_set.pages[1])
     results.Add('a', 'seconds', 9)
     results.DidMeasurePage()
+    results.AddSuccess(test_page_set.pages[1])
 
     results.PrintSummary()
-    expected = (
-        '<script id="results-json" type="application/json">'
-          '[{'
-            '"platform": "browser_type", '
-            '"buildTime": "build_time", '
-            '"label": null, '
-            '"tests": {'
-              '"test_name": {'
-                '"metrics": {'
-                  '"a": {'
-                    '"current": [5, 9], '
-                    '"units": "seconds", '
-                    '"important": true'
-                  '}, '
-                  '"telemetry_page_measurement_results.num_failed": {'
-                    '"current": [0], '
-                    '"units": "count", '
-                    '"important": false'
-                  '}, '
-                  '"a_by_url.http://www.bar.com/": {'
-                    '"current": [9], '
-                    '"units": "seconds", '
-                    '"important": false'
-                  '}, '
-                  '"telemetry_page_measurement_results.num_errored": {'
-                    '"current": [0], '
-                    '"units": "count", '
-                    '"important": false'
-                  '}, '
-                  '"a_by_url.http://www.foo.com/": {'
-                    '"current": [5], '
-                    '"units": "seconds", '
-                    '"important": false'
-                  '}'
-                '}'
-              '}'
-            '}, '
-            '"revision": "revision"'
-          '}]'
-        '</script>')
-    self.assertIn(expected, output_file.getvalue())
+    expected = [{
+      "platform": "browser_type",
+      "buildTime": "build_time",
+      "label": None,
+      "tests": {
+        "test_name": {
+          "metrics": {
+            "a": {
+              "current": [5, 9],
+              "units": "seconds",
+              "important": True
+            },
+            "telemetry_page_measurement_results.num_failed": {
+              "current": [0],
+              "units": "count",
+              "important": False
+            },
+            "a_by_url.http://www.bar.com/": {
+              "current": [9],
+              "units": "seconds",
+              "important": False
+            },
+            "telemetry_page_measurement_results.num_errored": {
+              "current": [0],
+              "units": "count",
+              "important": False
+            },
+            "a_by_url.http://www.foo.com/": {
+              "current": [5],
+              "units": "seconds",
+              "important": False
+            }
+          }
+        }
+      },
+      "revision": "revision"
+    }]
+    self.assertEquals(expected, results.GetCombinedResults())
     self.assertTrue(len(output_file.getvalue()) < last_output_len)