Index: tools/telemetry/telemetry/value/merge_values_unittest.py |
diff --git a/tools/telemetry/telemetry/value/merge_values_unittest.py b/tools/telemetry/telemetry/value/merge_values_unittest.py |
index 4633efc7cc3dea245f71eae8b4b4589fcd3f024a..a183c2e575ded1eb8547e4950ccb181403692509 100644 |
--- a/tools/telemetry/telemetry/value/merge_values_unittest.py |
+++ b/tools/telemetry/telemetry/value/merge_values_unittest.py |
@@ -6,6 +6,7 @@ import unittest |
from telemetry import page as page_module |
from telemetry.page import page_set |
+from telemetry.value import improvement_direction |
from telemetry.value import list_of_scalar_values |
from telemetry.value import merge_values |
from telemetry.value import scalar |
@@ -28,10 +29,18 @@ class MergeValueTest(TestBase): |
page0 = self.pages[0] |
page1 = self.pages[1] |
- all_values = [scalar.ScalarValue(page0, 'x', 'units', 1), |
- scalar.ScalarValue(page1, 'x', 'units', 4), |
- scalar.ScalarValue(page0, 'x', 'units', 2), |
- scalar.ScalarValue(page1, 'x', 'units', 5)] |
+ all_values = [scalar.ScalarValue( |
+ page0, 'x', 'units', 1, |
+ improvement_direction=improvement_direction.UP), |
+ scalar.ScalarValue( |
+ page1, 'x', 'units', 4, |
+ improvement_direction=improvement_direction.UP), |
+ scalar.ScalarValue( |
+ page0, 'x', 'units', 2, |
+ improvement_direction=improvement_direction.UP), |
+ scalar.ScalarValue( |
+ page1, 'x', 'units', 5, |
+ improvement_direction=improvement_direction.UP)] |
merged_values = merge_values.MergeLikeValuesFromSamePage(all_values) |
# Sort the results so that their order is predictable for the subsequent |
@@ -51,7 +60,9 @@ class MergeValueTest(TestBase): |
def testSamePageMergeOneValue(self): |
page0 = self.pages[0] |
- all_values = [scalar.ScalarValue(page0, 'x', 'units', 1)] |
+ all_values = [scalar.ScalarValue( |
+ page0, 'x', 'units', 1, |
+ improvement_direction=improvement_direction.DOWN)] |
# Sort the results so that their order is predictable for the subsequent |
# assertions. |
@@ -64,10 +75,18 @@ class MergeValueTest(TestBase): |
page0 = self.pages[0] |
page1 = self.pages[1] |
- all_values = [scalar.ScalarValue(page0, 'x', 'units', 1), |
- scalar.ScalarValue(page1, 'x', 'units', 2), |
- scalar.ScalarValue(page0, 'y', 'units', 10), |
- scalar.ScalarValue(page1, 'y', 'units', 20)] |
+ all_values = [scalar.ScalarValue( |
+ page0, 'x', 'units', 1, |
+ improvement_direction=improvement_direction.UP), |
+ scalar.ScalarValue( |
+ page1, 'x', 'units', 2, |
+ improvement_direction=improvement_direction.UP), |
+ scalar.ScalarValue( |
+ page0, 'y', 'units', 10, |
+ improvement_direction=improvement_direction.UP), |
+ scalar.ScalarValue( |
+ page1, 'y', 'units', 20, |
+ improvement_direction=improvement_direction.UP)] |
# Sort the results so that their order is predictable for the subsequent |
# assertions. |
@@ -86,7 +105,9 @@ class MergeValueTest(TestBase): |
def testDifferentPageMergeSingleValueStillMerges(self): |
page0 = self.pages[0] |
- all_values = [scalar.ScalarValue(page0, 'x', 'units', 1)] |
+ all_values = [scalar.ScalarValue( |
+ page0, 'x', 'units', 1, |
+ improvement_direction=improvement_direction.DOWN)] |
# Sort the results so that their order is predictable for the subsequent |
# assertions. |
@@ -103,8 +124,12 @@ class MergeValueTest(TestBase): |
page0 = self.pages[0] |
page1 = self.pages[1] |
- all_values = [scalar.ScalarValue(page0, 'x.score', 'units', 1), |
- scalar.ScalarValue(page1, 'y.score', 'units', 2)] |
+ all_values = [scalar.ScalarValue( |
+ page0, 'x.score', 'units', 1, |
+ improvement_direction=improvement_direction.UP), |
+ scalar.ScalarValue( |
+ page1, 'y.score', 'units', 2, |
+ improvement_direction=improvement_direction.UP)] |
# Sort the results so that their order is predictable for the subsequent |
# assertions. |
merged_values = merge_values.MergeLikeValuesFromDifferentPages( |