Index: tools/telemetry/telemetry/value/list_of_scalar_values_unittest.py |
diff --git a/tools/telemetry/telemetry/value/list_of_scalar_values_unittest.py b/tools/telemetry/telemetry/value/list_of_scalar_values_unittest.py |
index 47a3c0bdcfe1eaa189a3ff3911e79640e494a4d8..f18dae10cb7792242763f97df35891cb92ec603e 100644 |
--- a/tools/telemetry/telemetry/value/list_of_scalar_values_unittest.py |
+++ b/tools/telemetry/telemetry/value/list_of_scalar_values_unittest.py |
@@ -7,6 +7,7 @@ import unittest |
from telemetry import page as page_module |
from telemetry import value |
from telemetry.page import page_set |
+from telemetry.value import improvement_direction |
from telemetry.value import list_of_scalar_values |
from telemetry.value import none_values |
@@ -28,10 +29,12 @@ class ValueTest(TestBase): |
page0 = self.pages[0] |
v0 = list_of_scalar_values.ListOfScalarValues( |
page0, 'x', 'unit', |
- [1, 2], same_page_merge_policy=value.CONCATENATE) |
+ [1, 2], same_page_merge_policy=value.CONCATENATE, |
+ improvement_direction=improvement_direction.DOWN) |
v1 = list_of_scalar_values.ListOfScalarValues( |
page0, 'x', 'unit', |
- [3, 4], same_page_merge_policy=value.CONCATENATE) |
+ [3, 4], same_page_merge_policy=value.CONCATENATE, |
+ improvement_direction=improvement_direction.DOWN) |
self.assertTrue(v1.IsMergableWith(v0)) |
vM = (list_of_scalar_values.ListOfScalarValues. |
@@ -42,15 +45,18 @@ class ValueTest(TestBase): |
self.assertEquals(value.CONCATENATE, vM.same_page_merge_policy) |
self.assertEquals(True, vM.important) |
self.assertEquals([1, 2, 3, 4], vM.values) |
+ self.assertEquals(improvement_direction.DOWN, vM.improvement_direction) |
def testListSamePageMergingWithPickFirstPolicy(self): |
page0 = self.pages[0] |
v0 = list_of_scalar_values.ListOfScalarValues( |
page0, 'x', 'unit', |
- [1, 2], same_page_merge_policy=value.PICK_FIRST) |
+ [1, 2], same_page_merge_policy=value.PICK_FIRST, |
+ improvement_direction=improvement_direction.UP) |
v1 = list_of_scalar_values.ListOfScalarValues( |
page0, 'x', 'unit', |
- [3, 4], same_page_merge_policy=value.PICK_FIRST) |
+ [3, 4], same_page_merge_policy=value.PICK_FIRST, |
+ improvement_direction=improvement_direction.UP) |
self.assertTrue(v1.IsMergableWith(v0)) |
vM = (list_of_scalar_values.ListOfScalarValues. |
@@ -61,16 +67,19 @@ class ValueTest(TestBase): |
self.assertEquals(value.PICK_FIRST, vM.same_page_merge_policy) |
self.assertEquals(True, vM.important) |
self.assertEquals([1, 2], vM.values) |
+ self.assertEquals(improvement_direction.UP, vM.improvement_direction) |
def testListDifferentPageMerging(self): |
page0 = self.pages[0] |
page1 = self.pages[1] |
v0 = list_of_scalar_values.ListOfScalarValues( |
page0, 'x', 'unit', |
- [1, 2], same_page_merge_policy=value.CONCATENATE) |
+ [1, 2], same_page_merge_policy=value.CONCATENATE, |
+ improvement_direction=improvement_direction.DOWN) |
v1 = list_of_scalar_values.ListOfScalarValues( |
page1, 'x', 'unit', |
- [3, 4], same_page_merge_policy=value.CONCATENATE) |
+ [3, 4], same_page_merge_policy=value.CONCATENATE, |
+ improvement_direction=improvement_direction.DOWN) |
self.assertTrue(v1.IsMergableWith(v0)) |
vM = (list_of_scalar_values.ListOfScalarValues. |
@@ -81,15 +90,18 @@ class ValueTest(TestBase): |
self.assertEquals(value.CONCATENATE, vM.same_page_merge_policy) |
self.assertEquals(True, vM.important) |
self.assertEquals([1, 2, 3, 4], vM.values) |
+ self.assertEquals(improvement_direction.DOWN, vM.improvement_direction) |
def testListWithNoneValueMerging(self): |
page0 = self.pages[0] |
v0 = list_of_scalar_values.ListOfScalarValues( |
page0, 'x', 'unit', |
- [1, 2], same_page_merge_policy=value.CONCATENATE) |
+ [1, 2], same_page_merge_policy=value.CONCATENATE, |
+ improvement_direction=improvement_direction.UP) |
v1 = list_of_scalar_values.ListOfScalarValues( |
page0, 'x', 'unit', |
- None, same_page_merge_policy=value.CONCATENATE, none_value_reason='n') |
+ None, same_page_merge_policy=value.CONCATENATE, none_value_reason='n', |
+ improvement_direction=improvement_direction.UP) |
self.assertTrue(v1.IsMergableWith(v0)) |
vM = (list_of_scalar_values.ListOfScalarValues. |
@@ -97,24 +109,28 @@ class ValueTest(TestBase): |
self.assertEquals(None, vM.values) |
self.assertEquals(none_values.MERGE_FAILURE_REASON, |
vM.none_value_reason) |
+ self.assertEquals(improvement_direction.UP, vM.improvement_direction) |
def testListWithNoneValueMustHaveNoneReason(self): |
page0 = self.pages[0] |
self.assertRaises(none_values.NoneValueMissingReason, |
lambda: list_of_scalar_values.ListOfScalarValues( |
- page0, 'x', 'unit', None)) |
+ page0, 'x', 'unit', None, |
+ improvement_direction=improvement_direction.DOWN)) |
def testListWithNoneReasonMustHaveNoneValue(self): |
page0 = self.pages[0] |
self.assertRaises(none_values.ValueMustHaveNoneValue, |
lambda: list_of_scalar_values.ListOfScalarValues( |
page0, 'x', 'unit', [1, 2], |
- none_value_reason='n')) |
+ none_value_reason='n', |
+ improvement_direction=improvement_direction.UP)) |
def testAsDict(self): |
v = list_of_scalar_values.ListOfScalarValues( |
None, 'x', 'unit', [1, 2], |
- same_page_merge_policy=value.PICK_FIRST, important=False) |
+ same_page_merge_policy=value.PICK_FIRST, important=False, |
+ improvement_direction=improvement_direction.DOWN) |
d = v.AsDictWithoutBaseClassEntries() |
self.assertEquals(d, { |
@@ -124,7 +140,8 @@ class ValueTest(TestBase): |
def testNoneValueAsDict(self): |
v = list_of_scalar_values.ListOfScalarValues( |
None, 'x', 'unit', None, same_page_merge_policy=value.PICK_FIRST, |
- important=False, none_value_reason='n') |
+ important=False, none_value_reason='n', |
+ improvement_direction=improvement_direction.UP) |
d = v.AsDictWithoutBaseClassEntries() |
self.assertEquals(d, { |
@@ -137,19 +154,22 @@ class ValueTest(TestBase): |
'type': 'list_of_scalar_values', |
'name': 'x', |
'units': 'unit', |
- 'values': [1, 2] |
+ 'values': [1, 2], |
+ 'improvement_direction': improvement_direction.DOWN, |
} |
v = value.Value.FromDict(d, {}) |
self.assertTrue(isinstance(v, list_of_scalar_values.ListOfScalarValues)) |
self.assertEquals(v.values, [1, 2]) |
+ self.assertEquals(improvement_direction.DOWN, v.improvement_direction) |
def testFromDictFloats(self): |
d = { |
'type': 'list_of_scalar_values', |
'name': 'x', |
'units': 'unit', |
- 'values': [1.3, 2.7] |
+ 'values': [1.3, 2.7], |
+ 'improvement_direction': improvement_direction.UP |
} |
v = value.Value.FromDict(d, {}) |
@@ -162,7 +182,8 @@ class ValueTest(TestBase): |
'name': 'x', |
'units': 'unit', |
'values': None, |
- 'none_value_reason': 'n' |
+ 'none_value_reason': 'n', |
+ 'improvement_direction': improvement_direction.DOWN, |
} |
v = value.Value.FromDict(d, {}) |