Move t.p.PageMeasurementUnitTestBase to t.testing.PageTestTestCase.

(PageTestTestCase should also be the place to merge the unit test helper
defined in TestPageTestResults.)

BUG=383635

Review URL: https://codereview.chromium.org/449943002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288182 0039d316-1c4b-4281-b951-d872f2087c98

tools/perf/measurements/loading_trace_unittest.py

@@ -1,13 +1,13 @@
 # Copyright 2014 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.
+
 from measurements import loading_trace
 from telemetry.core import wpr_modes
-from telemetry.page import page_measurement_unittest_base
+from telemetry.testing import page_test_test_case
 from telemetry.unittest import options_for_unittests
 
-class LoadingTraceUnitTest(
-      page_measurement_unittest_base.PageMeasurementUnitTestBase):
+class LoadingTraceUnitTest(page_test_test_case.PageTestTestCase):
   def setUp(self):
     self._options = options_for_unittests.GetCopy()
     self._options.browser_options.wpr_mode = wpr_modes.WPR_OFF

tools/perf/measurements/rasterize_and_record_micro_unittest.py

@@ -6,14 +6,13 @@
 
 from measurements import rasterize_and_record_micro
 from telemetry.core import wpr_modes
-from telemetry.page import page_measurement_unittest_base
 from telemetry.page import page_test
+from telemetry.testing import page_test_test_case
 from telemetry.unittest import test
 from telemetry.unittest import options_for_unittests
 
 
-class RasterizeAndRecordMicroUnitTest(
-      page_measurement_unittest_base.PageMeasurementUnitTestBase):
+class RasterizeAndRecordMicroUnitTest(page_test_test_case.PageTestTestCase):
   """Smoke test for rasterize_and_record_micro measurement
 
      Runs rasterize_and_record_micro measurement on a simple page and verifies

tools/perf/measurements/record_per_area_unittest.py

@@ -4,13 +4,12 @@
 
 from measurements import record_per_area
 from telemetry.core import wpr_modes
-from telemetry.page import page_measurement_unittest_base
+from telemetry.testing import page_test_test_case
 from telemetry.unittest import test
 from telemetry.unittest import options_for_unittests
 
 
-class RecordPerAreaUnitTest(
-      page_measurement_unittest_base.PageMeasurementUnitTestBase):
+class RecordPerAreaUnitTest(page_test_test_case.PageTestTestCase):
   """Smoke test for record_per_area measurement
 
      Runs record_per_area measurement on a simple page and verifies

tools/perf/measurements/repaint_unittest.py

@@ -4,8 +4,8 @@
 
 from measurements import repaint
 from telemetry.core import wpr_modes
-from telemetry.page import page_measurement_unittest_base
 from telemetry.page import page as page_module
+from telemetry.testing import page_test_test_case
 from telemetry.unittest import options_for_unittests
 from telemetry.unittest import test
 
@@ -19,8 +19,7 @@ def RunRepaint(self, action_runner):
     action_runner.RepaintContinuously(seconds=2)
 
 
-class RepaintUnitTest(
-      page_measurement_unittest_base.PageMeasurementUnitTestBase):
+class RepaintUnitTest(page_test_test_case.PageTestTestCase):
   """Smoke test for repaint measurement
 
      Runs repaint measurement on a simple page and verifies

tools/perf/measurements/screenshot_unittest.py

@@ -8,13 +8,12 @@
 
 from measurements import screenshot
 from telemetry import benchmark
-from telemetry.page import page_measurement_unittest_base
 from telemetry.page import page_test
+from telemetry.testing import page_test_test_case
 from telemetry.unittest import options_for_unittests
 
 
-class ScreenshotUnitTest(
-      page_measurement_unittest_base.PageMeasurementUnitTestBase):
+class ScreenshotUnitTest(page_test_test_case.PageTestTestCase):
   def setUp(self):
     self._options = options_for_unittests.GetCopy()
     self._options.png_outdir = tempfile.mkdtemp('_png_test')

tools/perf/measurements/skpicture_printer_unittest.py

@@ -6,13 +6,12 @@
 import tempfile
 
 from measurements import skpicture_printer
-from telemetry.page import page_measurement_unittest_base
+from telemetry.testing import page_test_test_case
 from telemetry.unittest import options_for_unittests
 from telemetry.unittest import test
 
 
-class SkpicturePrinterUnitTest(
-      page_measurement_unittest_base.PageMeasurementUnitTestBase):
+class SkpicturePrinterUnitTest(page_test_test_case.PageTestTestCase):
   def setUp(self):
     self._options = options_for_unittests.GetCopy()
     self._options.skp_outdir = tempfile.mkdtemp('_skp_test')

tools/perf/measurements/smoothness_unittest.py

@@ -8,8 +8,8 @@
 from telemetry.core import exceptions
 from telemetry.core import wpr_modes
 from telemetry.page import page
-from telemetry.page import page_measurement_unittest_base
 from telemetry.page import page_test
+from telemetry.testing import page_test_test_case
 from telemetry.unittest import options_for_unittests
 
 class FakePlatform(object):
@@ -45,8 +45,7 @@ def __init__(self):
   def ExecuteJavaScript(self, js):
     pass
 
-class SmoothnessUnitTest(
-      page_measurement_unittest_base.PageMeasurementUnitTestBase):
+class SmoothnessUnitTest(page_test_test_case.PageTestTestCase):
   """Smoke test for smoothness measurement
 
      Runs smoothness measurement on a simple page and verifies

tools/perf/measurements/thread_times_unittest.py

@@ -6,15 +6,13 @@
 from measurements import smoothness_unittest
 from metrics import timeline
 from telemetry.core import wpr_modes
-from telemetry.page import page_measurement_unittest_base
-
+from telemetry.testing import page_test_test_case
 from telemetry.unittest import options_for_unittests
 from telemetry.unittest import test
 
 
 
-class ThreadTimesUnitTest(
-      page_measurement_unittest_base.PageMeasurementUnitTestBase):
+class ThreadTimesUnitTest(page_test_test_case.PageTestTestCase):
   def setUp(self):
     self._options = options_for_unittests.GetCopy()
     self._options.browser_options.wpr_mode = wpr_modes.WPR_OFF

tools/telemetry/telemetry/page/page_measurement_unittest.py

@@ -9,10 +9,10 @@
 from telemetry.core import exceptions
 from telemetry.core import wpr_modes
 from telemetry.page import page as page_module
-from telemetry.page import page_measurement_unittest_base
 from telemetry.page import page_set
 from telemetry.page import page_set_archive_info
 from telemetry.page import page_test
+from telemetry.testing import page_test_test_case
 from telemetry.unittest import options_for_unittests
 from telemetry.value import scalar
 
@@ -70,8 +70,7 @@ def __init__(self, url, ps):
   def RunTestAction(self, _):
     self.run_test_action_called = True
 
-class PageMeasurementUnitTest(
-  page_measurement_unittest_base.PageMeasurementUnitTestBase):
+class PageMeasurementUnitTest(page_test_test_case.PageTestTestCase):
 
   def setUp(self):
     self._options = options_for_unittests.GetCopy()

tools/telemetry/telemetry/testing/__init__.py

@@ -0,0 +1,3 @@
+# Copyright 2014 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.

tools/telemetry/telemetry/page/page_measurement_unittest_base.py → tools/telemetry/telemetry/testing/page_test_test_case.py

@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+"""Provide a TestCase base class for PageTest subclasses' unittests."""
+
 import unittest
 
 from telemetry import benchmark
@@ -31,9 +33,9 @@ class EmptyMetadataForTest(benchmark.BenchmarkMetadata):
   def __init__(self):
     super(EmptyMetadataForTest, self).__init__('')
 
-class PageMeasurementUnitTestBase(unittest.TestCase):
-  """unittest.TestCase-derived class to help in the construction of unit tests
-  for a measurement."""
+
+class PageTestTestCase(unittest.TestCase):
+  """A base class to simplify writing unit tests for PageTest subclasses."""
 
   def CreatePageSetFromFileInUnittestDataDir(self, test_filename):
     ps = self.CreateEmptyPageSet()

tools/telemetry/telemetry/web_perf/timeline_based_measurement_unittest.py

@@ -8,10 +8,10 @@
 from telemetry import benchmark
 from telemetry.core import wpr_modes
 from telemetry.page import page as page_module
-from telemetry.page import page_measurement_unittest_base
-from telemetry.page import page_set
 from telemetry.page import page as page_module
+from telemetry.page import page_set
 from telemetry.results import page_test_results
+from telemetry.testing import page_test_test_case
 from telemetry.timeline import async_slice
 from telemetry.timeline import model as model_module
 from telemetry.unittest import options_for_unittests
@@ -194,8 +194,7 @@ def RunSmoothness(self, action_runner):
       action_runner.WaitForJavaScriptCondition('window.jankScriptDone')
 
 
-class TimelineBasedMeasurementTest(
-    page_measurement_unittest_base.PageMeasurementUnitTestBase):
+class TimelineBasedMeasurementTest(page_test_test_case.PageTestTestCase):
 
   def setUp(self):
     self._options = options_for_unittests.GetCopy()