Index: tools/telemetry/telemetry/page/page_benchmark_results_unittest.py |
diff --git a/tools/telemetry/telemetry/page_benchmark_results_unittest.py b/tools/telemetry/telemetry/page/page_benchmark_results_unittest.py |
similarity index 72% |
rename from tools/telemetry/telemetry/page_benchmark_results_unittest.py |
rename to tools/telemetry/telemetry/page/page_benchmark_results_unittest.py |
index f2e5ab2f0b9596e6b36c237a644d6e2acc3ab10c..24258beb29b5ad1dca0e5bf0f9a3de8153f6feab 100644 |
--- a/tools/telemetry/telemetry/page_benchmark_results_unittest.py |
+++ b/tools/telemetry/telemetry/page/page_benchmark_results_unittest.py |
@@ -4,13 +4,12 @@ |
import os |
import unittest |
-from telemetry.page_benchmark_results import PageBenchmarkResults |
-from telemetry.page_set import PageSet |
-from telemetry.perf_tests_helper import PrintPerfResult |
- |
+from telemetry.page import page_benchmark_results |
+from telemetry.page import page_set |
+from telemetry.page import perf_tests_helper |
def _MakePageSet(): |
- return PageSet.FromDict({ |
+ return page_set.PageSet.FromDict({ |
"description": "hello", |
"archive_path": "foo.wpr", |
"pages": [ |
@@ -19,81 +18,83 @@ def _MakePageSet(): |
] |
}, os.path.dirname(__file__)) |
-class NonPrintingPageBenchmarkResults(PageBenchmarkResults): |
+class NonPrintingPageBenchmarkResults( |
+ page_benchmark_results.PageBenchmarkResults): |
def __init__(self): |
super(NonPrintingPageBenchmarkResults, self).__init__() |
def _PrintPerfResult(self, *args): |
pass |
-class SummarySavingPageBenchmarkResults(PageBenchmarkResults): |
+class SummarySavingPageBenchmarkResults( |
+ page_benchmark_results.PageBenchmarkResults): |
def __init__(self): |
super(SummarySavingPageBenchmarkResults, self).__init__() |
self.results = [] |
def _PrintPerfResult(self, *args): |
- res = PrintPerfResult(*args, print_to_stdout=False) |
+ res = perf_tests_helper.PrintPerfResult(*args, print_to_stdout=False) |
self.results.append(res) |
class PageBenchmarkResultsTest(unittest.TestCase): |
def test_basic(self): |
- page_set = _MakePageSet() |
+ test_page_set = _MakePageSet() |
benchmark_results = NonPrintingPageBenchmarkResults() |
- benchmark_results.WillMeasurePage(page_set.pages[0]) |
+ benchmark_results.WillMeasurePage(test_page_set.pages[0]) |
benchmark_results.Add('a', 'seconds', 3) |
benchmark_results.DidMeasurePage() |
- benchmark_results.WillMeasurePage(page_set.pages[1]) |
+ benchmark_results.WillMeasurePage(test_page_set.pages[1]) |
benchmark_results.Add('a', 'seconds', 3) |
benchmark_results.DidMeasurePage() |
benchmark_results.PrintSummary('trace_tag') |
def test_url_is_invalid_value(self): |
- page_set = _MakePageSet() |
+ test_page_set = _MakePageSet() |
benchmark_results = NonPrintingPageBenchmarkResults() |
- benchmark_results.WillMeasurePage(page_set.pages[0]) |
+ benchmark_results.WillMeasurePage(test_page_set.pages[0]) |
self.assertRaises( |
AssertionError, |
lambda: benchmark_results.Add('url', 'string', 'foo')) |
def test_unit_change(self): |
- page_set = _MakePageSet() |
+ test_page_set = _MakePageSet() |
benchmark_results = NonPrintingPageBenchmarkResults() |
- benchmark_results.WillMeasurePage(page_set.pages[0]) |
+ benchmark_results.WillMeasurePage(test_page_set.pages[0]) |
benchmark_results.Add('a', 'seconds', 3) |
benchmark_results.DidMeasurePage() |
- benchmark_results.WillMeasurePage(page_set.pages[1]) |
+ benchmark_results.WillMeasurePage(test_page_set.pages[1]) |
self.assertRaises( |
AssertionError, |
lambda: benchmark_results.Add('a', 'foobgrobbers', 3)) |
def test_type_change(self): |
- page_set = _MakePageSet() |
+ test_page_set = _MakePageSet() |
benchmark_results = NonPrintingPageBenchmarkResults() |
- benchmark_results.WillMeasurePage(page_set.pages[0]) |
+ benchmark_results.WillMeasurePage(test_page_set.pages[0]) |
benchmark_results.Add('a', 'seconds', 3) |
benchmark_results.DidMeasurePage() |
- benchmark_results.WillMeasurePage(page_set.pages[1]) |
+ benchmark_results.WillMeasurePage(test_page_set.pages[1]) |
self.assertRaises( |
AssertionError, |
lambda: benchmark_results.Add('a', 'seconds', 3, data_type='histogram')) |
def test_basic_summary(self): |
- page_set = _MakePageSet() |
+ test_page_set = _MakePageSet() |
benchmark_results = SummarySavingPageBenchmarkResults() |
- benchmark_results.WillMeasurePage(page_set.pages[0]) |
+ benchmark_results.WillMeasurePage(test_page_set.pages[0]) |
benchmark_results.Add('a', 'seconds', 3) |
benchmark_results.DidMeasurePage() |
- benchmark_results.WillMeasurePage(page_set.pages[1]) |
+ benchmark_results.WillMeasurePage(test_page_set.pages[1]) |
benchmark_results.Add('a', 'seconds', 7) |
benchmark_results.DidMeasurePage() |
@@ -107,16 +108,16 @@ class PageBenchmarkResultsTest(unittest.TestCase): |
expected) |
def test_histogram(self): |
- page_set = _MakePageSet() |
+ test_page_set = _MakePageSet() |
benchmark_results = SummarySavingPageBenchmarkResults() |
- benchmark_results.WillMeasurePage(page_set.pages[0]) |
+ benchmark_results.WillMeasurePage(test_page_set.pages[0]) |
benchmark_results.Add('a', '', |
'{"buckets": [{"low": 1, "high": 2, "count": 1}]}', |
data_type='histogram') |
benchmark_results.DidMeasurePage() |
- benchmark_results.WillMeasurePage(page_set.pages[1]) |
+ benchmark_results.WillMeasurePage(test_page_set.pages[1]) |
benchmark_results.Add('a', '', |
'{"buckets": [{"low": 2, "high": 3, "count": 1}]}', |
data_type='histogram') |