Merge all logic in PageMeasurementResults to PageTestResults.

tools/perf/measurements/page_cycler_unittest.py

 # Copyright 2013 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 unittest
 
 from telemetry.core import browser_options
 from telemetry.page import page_runner
 from telemetry.results import page_measurement_results
 from telemetry.unittest import simple_mock
@@ skipping 122 matching lines @@
     self.assertEquals(cycler._cold_run_start_index, 26)
 
   def testCacheHandled(self):
     cycler = self.SetUpCycler(['--pageset-repeat=5',
                                '--cold-load-percent=50'],
                               True)
 
     url_name = 'http://fakepage.com'
     page = FakePage(url_name)
     tab = FakeTab()
-    results = page_measurement_results.PageMeasurementResults()
 
     for i in range(5):
+      results = page_measurement_results.PageMeasurementResults()
+      results.StartTest(page)
       cycler.WillNavigateToPage(page, tab)
       self.assertEqual(max(0, i - 2), tab.clear_cache_calls,
                        'Iteration %d tab.clear_cache_calls %d' %
                        (i, tab.clear_cache_calls))
-      results.WillMeasurePage(page)
       cycler.MeasurePage(page, tab, results)
+      results.StopTest(page)
 
-      values = results.page_specific_values_for_current_page
-      results.DidMeasurePage()
-
+      values = results.all_page_specific_values
       self.assertGreater(len(values), 2)
 
       self.assertEqual(values[0].page, page)
       chart_name = 'cold_times' if i == 0 or i > 2 else 'warm_times'
       self.assertEqual(values[0].name, '%s.page_load_time' % chart_name)
       self.assertEqual(values[0].units, 'ms')
 
       cycler.DidNavigateToPage(page, tab)
 
   def testColdWarm(self):
     cycler = self.SetUpCycler(['--pageset-repeat=3'], True)
     pages = [FakePage('http://fakepage1.com'), FakePage('http://fakepage2.com')]
     tab = FakeTab()
-    results = page_measurement_results.PageMeasurementResults()
     for i in range(3):
       for page in pages:
+        results = page_measurement_results.PageMeasurementResults()
+        results.StartTest(page)

[nednguyen, 2014/07/25 16:14:45]

I think we use one results throughout the whole telemetry test run, isn't it?
If so, a better test maybe asserting that the results contain all the values
across 3 runs.

[chrishenry, 2014/07/25 16:24:28]

I think that will make the test unnecessarily complicated. Another way to do
this is to check all_page_specific_values after every MeasurePage and check for
the additional values, but then that would be no better than this logic. s:

[nednguyen, 2014/07/25 16:36:57]

Ok. Chatted offline, we probably should fix the page_cylcer WillMeasure method
later.

         cycler.WillNavigateToPage(page, tab)
-        results.WillMeasurePage(page)
         cycler.MeasurePage(page, tab, results)
+        results.StopTest(page)
 
-        values = results.page_specific_values_for_current_page
-        results.DidMeasurePage()
-
+        values = results.all_page_specific_values
         self.assertGreater(len(values), 2)
 
         self.assertEqual(values[0].page, page)
 
         chart_name = 'cold_times' if i == 0 or i > 1 else 'warm_times'
         self.assertEqual(values[0].name, '%s.page_load_time' % chart_name)
         self.assertEqual(values[0].units, 'ms')
 
         cycler.DidNavigateToPage(page, tab)
 
   def testResults(self):
     cycler = self.SetUpCycler([], True)
 
     pages = [FakePage('http://fakepage1.com'), FakePage('http://fakepage2.com')]
     tab = FakeTab()
-    results = page_measurement_results.PageMeasurementResults()
 
     for i in range(2):
       for page in pages:
+        results = page_measurement_results.PageMeasurementResults()
+        results.StartTest(page)
         cycler.WillNavigateToPage(page, tab)
-        results.WillMeasurePage(page)
         cycler.MeasurePage(page, tab, results)
+        results.StopTest(page)
 
-        values = results.page_specific_values_for_current_page
-        results.DidMeasurePage()
-
+        values = results.all_page_specific_values
         self.assertEqual(4, len(values))
 
         self.assertEqual(values[0].page, page)
         chart_name = 'cold_times' if i == 0 else 'warm_times'
         self.assertEqual(values[0].name, '%s.page_load_time' % chart_name)
         self.assertEqual(values[0].units, 'ms')
 
         for value, expected in zip(values[1:], ['gpu', 'renderer', 'browser']):
           self.assertEqual(value.page, page)
           self.assertEqual(value.name,
                            'cpu_utilization.cpu_utilization_%s' % expected)
           self.assertEqual(value.units, '%')
 
-
         cycler.DidNavigateToPage(page, tab)