Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(18)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tools/telemetry/telemetry/results/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/page_measurement_results.py ('k') | tools/telemetry/telemetry/results/page_test_results.py » ('j') | tools/telemetry/telemetry/results/page_test_results.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/results/page_measurement_results_unittest.py
diff --git a/tools/telemetry/telemetry/results/page_measurement_results_unittest.py b/tools/telemetry/telemetry/results/page_measurement_results_unittest.py
index 9632f40b4ea5e22ab15f1b9208eda1bcf5f2fd0b..f4b7662b47c790321fd5f4805de4cc4c582940cf 100644
--- a/tools/telemetry/telemetry/results/page_measurement_results_unittest.py
+++ b/tools/telemetry/telemetry/results/page_measurement_results_unittest.py
@@ -47,13 +47,13 @@ class PageMeasurementResultsTest(unittest.TestCase):
def test_basic(self):
results = NonPrintingPageMeasurementResults()
- results.WillMeasurePage(self.pages[0])
+ results.StartTest(self.pages[0])
results.AddValue(scalar.ScalarValue(self.pages[0], 'a', 'seconds', 3))
- results.DidMeasurePage()
+ results.StopTest(self.pages[0])
- results.WillMeasurePage(self.pages[1])
+ results.StartTest(self.pages[1])
results.AddValue(scalar.ScalarValue(self.pages[1], 'a', 'seconds', 3))
- results.DidMeasurePage()
+ results.StopTest(self.pages[1])
results.PrintSummary()
@@ -68,7 +68,7 @@ class PageMeasurementResultsTest(unittest.TestCase):
def test_url_is_invalid_value(self):
results = NonPrintingPageMeasurementResults()
- results.WillMeasurePage(self.pages[0])
+ results.StartTest(self.pages[0])
self.assertRaises(
AssertionError,
lambda: results.AddValue(scalar.ScalarValue(
@@ -76,7 +76,7 @@ class PageMeasurementResultsTest(unittest.TestCase):
def test_add_summary_value_with_page_specified(self):
results = NonPrintingPageMeasurementResults()
- results.WillMeasurePage(self.pages[0])
+ results.StartTest(self.pages[0])
self.assertRaises(
AssertionError,
lambda: results.AddSummaryValue(scalar.ScalarValue(self.pages[0],
@@ -84,11 +84,11 @@ class PageMeasurementResultsTest(unittest.TestCase):
def test_unit_change(self):
results = NonPrintingPageMeasurementResults()
- results.WillMeasurePage(self.pages[0])
+ results.StartTest(self.pages[0])
results.AddValue(scalar.ScalarValue(self.pages[0], 'a', 'seconds', 3))
- results.DidMeasurePage()
+ results.StopTest(self.pages[0])
- results.WillMeasurePage(self.pages[1])
+ results.StartTest(self.pages[1])
self.assertRaises(
AssertionError,
lambda: results.AddValue(scalar.ScalarValue(
@@ -96,11 +96,11 @@ class PageMeasurementResultsTest(unittest.TestCase):
def test_type_change(self):
results = NonPrintingPageMeasurementResults()
- results.WillMeasurePage(self.pages[0])
+ results.StartTest(self.pages[0])
results.AddValue(scalar.ScalarValue(self.pages[0], 'a', 'seconds', 3))
- results.DidMeasurePage()
+ results.StopTest(self.pages[0])
- results.WillMeasurePage(self.pages[1])
+ results.StartTest(self.pages[1])
self.assertRaises(
AssertionError,
lambda: results.AddValue(histogram.HistogramValue(
@@ -110,14 +110,14 @@ class PageMeasurementResultsTest(unittest.TestCase):
def test_basic_summary_all_pages_fail(self):
"""If all pages fail, no summary is printed."""
results = SummarySavingPageMeasurementResults()
- results.WillMeasurePage(self.pages[0])
+ results.StartTest(self.pages[0])
results.AddValue(scalar.ScalarValue(self.pages[0], 'a', 'seconds', 3))
- results.DidMeasurePage()
+ results.StopTest(self.pages[0])
results.AddValue(failure.FailureValue.FromMessage(self.pages[0], 'message'))
- results.WillMeasurePage(self.pages[1])
+ results.StartTest(self.pages[1])
results.AddValue(scalar.ScalarValue(self.pages[1], 'a', 'seconds', 7))
- results.DidMeasurePage()
+ results.StopTest(self.pages[1])
results.AddValue(failure.FailureValue.FromMessage(self.pages[1], 'message'))
results.PrintSummary()
@@ -125,50 +125,47 @@ class PageMeasurementResultsTest(unittest.TestCase):
def test_get_successful_page_values_merged_no_failures(self):
results = SummarySavingPageMeasurementResults()
- results.WillMeasurePage(self.pages[0])
+ results.StartTest(self.pages[0])
results.AddValue(scalar.ScalarValue(self.pages[0], 'a', 'seconds', 3))
- self.assertEquals(1, len(results.page_specific_values_for_current_page))
- results.DidMeasurePage()
- self.assertRaises(
- AssertionError,
- lambda: results.page_specific_values_for_current_page)
+ self.assertEquals(1, len(results.all_page_specific_values))
+ results.StopTest(self.pages[0])
def test_get_all_values_for_successful_pages(self):
results = SummarySavingPageMeasurementResults()
- results.WillMeasurePage(self.pages[0])
+ results.StartTest(self.pages[0])
value1 = scalar.ScalarValue(self.pages[0], 'a', 'seconds', 3)
results.AddValue(value1)
- results.DidMeasurePage()
+ results.StopTest(self.pages[0])
- results.WillMeasurePage(self.pages[1])
+ results.StartTest(self.pages[1])
value2 = scalar.ScalarValue(self.pages[1], 'a', 'seconds', 3)
results.AddValue(value2)
- results.DidMeasurePage()
+ results.StopTest(self.pages[1])
- results.WillMeasurePage(self.pages[2])
+ results.StartTest(self.pages[2])
value3 = scalar.ScalarValue(self.pages[2], 'a', 'seconds', 3)
results.AddValue(value3)
- results.DidMeasurePage()
+ results.StopTest(self.pages[2])
self.assertEquals(
[value1, value2, value3], results.all_page_specific_values)
def test_get_all_values_for_successful_pages_one_page_fails(self):
results = SummarySavingPageMeasurementResults()
- results.WillMeasurePage(self.pages[0])
+ results.StartTest(self.pages[0])
value1 = scalar.ScalarValue(self.pages[0], 'a', 'seconds', 3)
results.AddValue(value1)
- results.DidMeasurePage()
+ results.StopTest(self.pages[0])
- results.WillMeasurePage(self.pages[1])
+ results.StartTest(self.pages[1])
value2 = failure.FailureValue.FromMessage(self.pages[1], 'Failure')
results.AddValue(value2)
- results.DidMeasurePage()
+ results.StopTest(self.pages[1])
- results.WillMeasurePage(self.pages[2])
+ results.StartTest(self.pages[2])
value3 = scalar.ScalarValue(self.pages[2], 'a', 'seconds', 3)
results.AddValue(value3)
- results.DidMeasurePage()
+ results.StopTest(self.pages[2])
self.assertEquals(
[value1, value2, value3], results.all_page_specific_values)
« tools/perf/measurements/page_cycler_unittest.py ('K') | « tools/telemetry/telemetry/results/page_measurement_results.py ('k') | tools/telemetry/telemetry/results/page_test_results.py » ('j') | tools/telemetry/telemetry/results/page_test_results.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698