| Index: tools/telemetry/telemetry/results/chart_json_output_formatter_unittest.py
|
| diff --git a/tools/telemetry/telemetry/results/chart_json_output_formatter_unittest.py b/tools/telemetry/telemetry/results/chart_json_output_formatter_unittest.py
|
| index b9e62e385a38ad77fcccd1d88c69085e36424a41..d25474a63a08f40fb085cd288db3d01601377ae5 100644
|
| --- a/tools/telemetry/telemetry/results/chart_json_output_formatter_unittest.py
|
| +++ b/tools/telemetry/telemetry/results/chart_json_output_formatter_unittest.py
|
| @@ -12,8 +12,9 @@ from telemetry import page as page_module
|
| from telemetry.results import chart_json_output_formatter
|
| from telemetry.results import page_test_results
|
| from telemetry.page import page_set
|
| -from telemetry.value import scalar
|
| +from telemetry.value import improvement_direction
|
| from telemetry.value import list_of_scalar_values
|
| +from telemetry.value import scalar
|
|
|
|
|
| def _MakePageSet():
|
| @@ -37,7 +38,8 @@ class ChartJsonTest(unittest.TestCase):
|
| self._output.truncate(0)
|
|
|
| results.WillRunPage(self._page_set[0])
|
| - v0 = scalar.ScalarValue(results.current_page, 'foo', 'seconds', 3)
|
| + v0 = scalar.ScalarValue(results.current_page, 'foo', 'seconds', 3,
|
| + improvement_direction=improvement_direction.DOWN)
|
| results.AddValue(v0)
|
| results.DidRunPage(self._page_set[0])
|
|
|
| @@ -46,7 +48,8 @@ class ChartJsonTest(unittest.TestCase):
|
| self.assertIn('foo', d['charts'])
|
|
|
| def testAsChartDictSerializable(self):
|
| - v0 = scalar.ScalarValue(self._page_set[0], 'foo', 'seconds', 3)
|
| + v0 = scalar.ScalarValue(self._page_set[0], 'foo', 'seconds', 3,
|
| + improvement_direction=improvement_direction.DOWN)
|
| page_specific_values = [v0]
|
| summary_values = []
|
|
|
| @@ -81,8 +84,10 @@ class ChartJsonTest(unittest.TestCase):
|
| self.assertEquals('', d['benchmark_description'])
|
|
|
| def testAsChartDictPageSpecificValuesSamePage(self):
|
| - v0 = scalar.ScalarValue(self._page_set[0], 'foo', 'seconds', 3)
|
| - v1 = scalar.ScalarValue(self._page_set[0], 'foo', 'seconds', 4)
|
| + v0 = scalar.ScalarValue(self._page_set[0], 'foo', 'seconds', 3,
|
| + improvement_direction=improvement_direction.DOWN)
|
| + v1 = scalar.ScalarValue(self._page_set[0], 'foo', 'seconds', 4,
|
| + improvement_direction=improvement_direction.DOWN)
|
| page_specific_values = [v0, v1]
|
| summary_values = []
|
|
|
| @@ -95,8 +100,10 @@ class ChartJsonTest(unittest.TestCase):
|
| self.assertTrue('http://www.foo.com/' in d['charts']['foo'])
|
|
|
| def testAsChartDictPageSpecificValuesAndComputedSummaryWithTraceName(self):
|
| - v0 = scalar.ScalarValue(self._page_set[0], 'foo.bar', 'seconds', 3)
|
| - v1 = scalar.ScalarValue(self._page_set[1], 'foo.bar', 'seconds', 4)
|
| + v0 = scalar.ScalarValue(self._page_set[0], 'foo.bar', 'seconds', 3,
|
| + improvement_direction=improvement_direction.DOWN)
|
| + v1 = scalar.ScalarValue(self._page_set[1], 'foo.bar', 'seconds', 4,
|
| + improvement_direction=improvement_direction.DOWN)
|
| page_specific_values = [v0, v1]
|
| summary_values = []
|
|
|
| @@ -111,8 +118,10 @@ class ChartJsonTest(unittest.TestCase):
|
| self.assertTrue('bar' in d['charts']['foo'])
|
|
|
| def testAsChartDictPageSpecificValuesAndComputedSummaryWithoutTraceName(self):
|
| - v0 = scalar.ScalarValue(self._page_set[0], 'foo', 'seconds', 3)
|
| - v1 = scalar.ScalarValue(self._page_set[1], 'foo', 'seconds', 4)
|
| + v0 = scalar.ScalarValue(self._page_set[0], 'foo', 'seconds', 3,
|
| + improvement_direction=improvement_direction.DOWN)
|
| + v1 = scalar.ScalarValue(self._page_set[1], 'foo', 'seconds', 4,
|
| + improvement_direction=improvement_direction.DOWN)
|
| page_specific_values = [v0, v1]
|
| summary_values = []
|
|
|
| @@ -127,8 +136,9 @@ class ChartJsonTest(unittest.TestCase):
|
| self.assertTrue('summary' in d['charts']['foo'])
|
|
|
| def testAsChartDictSummaryValueWithTraceName(self):
|
| - v0 = list_of_scalar_values.ListOfScalarValues(None, 'foo.bar', 'seconds',
|
| - [3, 4])
|
| + v0 = list_of_scalar_values.ListOfScalarValues(
|
| + None, 'foo.bar', 'seconds', [3, 4],
|
| + improvement_direction=improvement_direction.DOWN)
|
| page_specific_values = []
|
| summary_values = [v0]
|
|
|
| @@ -140,8 +150,9 @@ class ChartJsonTest(unittest.TestCase):
|
| self.assertTrue('bar' in d['charts']['foo'])
|
|
|
| def testAsChartDictSummaryValueWithoutTraceName(self):
|
| - v0 = list_of_scalar_values.ListOfScalarValues(None, 'foo', 'seconds',
|
| - [3, 4])
|
| + v0 = list_of_scalar_values.ListOfScalarValues(
|
| + None, 'foo', 'seconds', [3, 4],
|
| + improvement_direction=improvement_direction.DOWN)
|
| page_specific_values = []
|
| summary_values = [v0]
|
|
|
| @@ -153,8 +164,9 @@ class ChartJsonTest(unittest.TestCase):
|
| self.assertTrue('summary' in d['charts']['foo'])
|
|
|
| def testAsChartDictValueSmokeTest(self):
|
| - v0 = list_of_scalar_values.ListOfScalarValues(None, 'foo.bar', 'seconds',
|
| - [3, 4])
|
| + v0 = list_of_scalar_values.ListOfScalarValues(
|
| + None, 'foo.bar', 'seconds', [3, 4],
|
| + improvement_direction=improvement_direction.DOWN)
|
| page_specific_values = []
|
| summary_values = [v0]
|
|
|
|
|