tools/telemetry/telemetry/results/csv_page_measurement_results_unittest.py - Issue 403093002: Merge all logic in PageMeasurementResults to PageTestResults.

Unified Diff: tools/telemetry/telemetry/results/csv_page_measurement_results_unittest.py

Issue 403093002: Merge all logic in PageMeasurementResults to PageTestResults. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Created 6 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« tools/perf/measurements/page_cycler_unittest.py ('K') | « tools/telemetry/telemetry/results/buildbot_page_measurement_results_unittest.py ('k') | tools/telemetry/telemetry/results/html_page_measurement_results_unittest.py » ('j') | tools/telemetry/telemetry/results/page_test_results.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tools/telemetry/telemetry/results/csv_page_measurement_results_unittest.py

diff --git a/tools/telemetry/telemetry/results/csv_page_measurement_results_unittest.py b/tools/telemetry/telemetry/results/csv_page_measurement_results_unittest.py

index 44cf6c7cf0ff6e3a8b6df7268e32a598d0424925..f49b8668ad702a0a632eec9db6a70497343f0db3 100644

--- a/tools/telemetry/telemetry/results/csv_page_measurement_results_unittest.py

+++ b/tools/telemetry/telemetry/results/csv_page_measurement_results_unittest.py

@@ -48,12 +48,12 @@ class CsvPageMeasurementResultsTest(unittest.TestCase):

def test_with_no_results_on_second_run(self):

results = NonPrintingCsvPageMeasurementResults(self._output)

- results.WillMeasurePage(self._page_set[0])

+ results.StartTest(self._page_set[0])

results.AddValue(scalar.ScalarValue(self._page_set[0], 'foo', 'seconds', 3))

- results.DidMeasurePage()

+ results.StopTest(self._page_set[0])

- results.WillMeasurePage(self._page_set[1])

- results.DidMeasurePage()

+ results.StartTest(self._page_set[1])

+ results.StopTest(self._page_set[1])

results.PrintSummary()

self.assertEqual(['page_name', 'foo (seconds)'], self.output_header_row)

@@ -64,14 +64,14 @@ class CsvPageMeasurementResultsTest(unittest.TestCase):

def test_fewer_results_on_second_run(self):

results = NonPrintingCsvPageMeasurementResults(self._output)

- results.WillMeasurePage(self._page_set[0])

+ results.StartTest(self._page_set[0])

results.AddValue(scalar.ScalarValue(self._page_set[0], 'foo', 'seconds', 3))

results.AddValue(scalar.ScalarValue(self._page_set[0], 'bar', 'seconds', 4))

- results.DidMeasurePage()

+ results.StopTest(self._page_set[0])

- results.WillMeasurePage(self._page_set[1])

+ results.StartTest(self._page_set[1])

results.AddValue(scalar.ScalarValue(self._page_set[1], 'bar', 'seconds', 5))

- results.DidMeasurePage()

+ results.StopTest(self._page_set[1])

results.PrintSummary()

self.assertEqual(['page_name', 'bar (seconds)', 'foo (seconds)'],

@@ -82,13 +82,13 @@ class CsvPageMeasurementResultsTest(unittest.TestCase):

def test_with_output_at_print_summary_time(self):

results = NonPrintingCsvPageMeasurementResults(self._output)

- results.WillMeasurePage(self._page_set[0])

+ results.StartTest(self._page_set[0])

results.AddValue(scalar.ScalarValue(self._page_set[0], 'foo', 'seconds', 3))

- results.DidMeasurePage()

+ results.StopTest(self._page_set[0])

- results.WillMeasurePage(self._page_set[1])

+ results.StartTest(self._page_set[1])

results.AddValue(scalar.ScalarValue(self._page_set[1], 'bar', 'seconds', 4))

- results.DidMeasurePage()

+ results.StopTest(self._page_set[1])

results.PrintSummary()

@@ -102,17 +102,17 @@ class CsvPageMeasurementResultsTest(unittest.TestCase):

def test_histogram(self):

results = NonPrintingCsvPageMeasurementResults(self._output)

- results.WillMeasurePage(self._page_set[0])

+ results.StartTest(self._page_set[0])

results.AddValue(histogram.HistogramValue(

self._page_set[0], 'a', '',

raw_value_json='{"buckets": [{"low": 1, "high": 2, "count": 1}]}'))

- results.DidMeasurePage()

+ results.StopTest(self._page_set[0])

- results.WillMeasurePage(self._page_set[1])

+ results.StartTest(self._page_set[1])

results.AddValue(histogram.HistogramValue(

self._page_set[1], 'a', '',

raw_value_json='{"buckets": [{"low": 2, "high": 3, "count": 1}]}'))

- results.DidMeasurePage()

+ results.StopTest(self._page_set[1])

results.PrintSummary()