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

Unified Diff: tools/telemetry/telemetry/results/html_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/csv_page_measurement_results_unittest.py ('k') | tools/telemetry/telemetry/results/page_measurement_results.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/html_page_measurement_results_unittest.py

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

index a378fe1f5e0dc228e55832ea04b05299b130b857..953ffbad48293e30a2e9b36c680a88b517f2f9e8 100644

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

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

@@ -41,17 +41,17 @@ class HtmlPageMeasurementResultsTest(unittest.TestCase):

# 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.WillMeasurePage(test_page_set.pages[0])

+ results.StartTest(test_page_set.pages[0])

results.AddValue(scalar.ScalarValue(

test_page_set.pages[0], 'a', 'seconds', 3))

- results.DidMeasurePage()

results.AddSuccess(test_page_set.pages[0])

+ results.StopTest(test_page_set.pages[0])

- results.WillMeasurePage(test_page_set.pages[1])

+ results.StartTest(test_page_set.pages[1])

results.AddValue(scalar.ScalarValue(

test_page_set.pages[1], 'a', 'seconds', 7))

- results.DidMeasurePage()

results.AddSuccess(test_page_set.pages[1])

+ results.StopTest(test_page_set.pages[1])

results.PrintSummary()

results.GetResults()

@@ -98,17 +98,17 @@ class HtmlPageMeasurementResultsTest(unittest.TestCase):

output_file.seek(0)

results = DeterministicHtmlPageMeasurementResults(

output_file, 'test_name', False, False, 'browser_type')

- results.WillMeasurePage(test_page_set.pages[0])

+ results.StartTest(test_page_set.pages[0])

results.AddValue(scalar.ScalarValue(

test_page_set.pages[0], 'a', 'seconds', 4))

- results.DidMeasurePage()

results.AddSuccess(test_page_set.pages[0])

+ results.StopTest(test_page_set.pages[0])

- results.WillMeasurePage(test_page_set.pages[1])

+ results.StartTest(test_page_set.pages[1])

results.AddValue(scalar.ScalarValue(

test_page_set.pages[1], 'a', 'seconds', 8))

- results.DidMeasurePage()

results.AddSuccess(test_page_set.pages[1])

+ results.StopTest(test_page_set.pages[1])

results.PrintSummary()

expected = [

@@ -193,17 +193,17 @@ class HtmlPageMeasurementResultsTest(unittest.TestCase):

output_file.seek(0)

results = DeterministicHtmlPageMeasurementResults(

output_file, 'test_name', True, False, 'browser_type')

- results.WillMeasurePage(test_page_set.pages[0])

+ results.StartTest(test_page_set.pages[0])

results.AddValue(scalar.ScalarValue(

test_page_set.pages[0], 'a', 'seconds', 5))

- results.DidMeasurePage()

results.AddSuccess(test_page_set.pages[0])

+ results.StopTest(test_page_set.pages[0])

- results.WillMeasurePage(test_page_set.pages[1])

+ results.StartTest(test_page_set.pages[1])

results.AddValue(scalar.ScalarValue(

test_page_set.pages[1], 'a', 'seconds', 9))

- results.DidMeasurePage()

results.AddSuccess(test_page_set.pages[1])

+ results.StopTest(test_page_set.pages[1])

results.PrintSummary()

expected = [{