Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(54)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: telemetry/telemetry/value/list_of_scalar_values_unittest.py

Issue 2162963002: [polymer] Merge of master into polymer10-migration (Closed) Base URL: git@github.com:catapult-project/catapult.git@polymer10-migration
Patch Set: Merge polymer10-migration int polymer10-merge Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « telemetry/telemetry/value/list_of_scalar_values.py ('k') | telemetry/telemetry/value/scalar.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: telemetry/telemetry/value/list_of_scalar_values_unittest.py
diff --git a/telemetry/telemetry/value/list_of_scalar_values_unittest.py b/telemetry/telemetry/value/list_of_scalar_values_unittest.py
index 7a8ccd7fb3cdc150ef188d25f4d8fab125b8a6fe..d2c1e38a7d23530f0d82cb792bf3fdbbe5783549 100644
--- a/telemetry/telemetry/value/list_of_scalar_values_unittest.py
+++ b/telemetry/telemetry/value/list_of_scalar_values_unittest.py
@@ -72,28 +72,25 @@ class ValueTest(TestBase):
page = self.pages[0]
v = list_of_scalar_values.ListOfScalarValues(
page, 'x', 'unit', [10, 9, 9, 7], important=True, description='desc',
- tir_label='my_ir', std=42, same_page_merge_policy=value.CONCATENATE,
+ tir_label='my_ir', std=42,
improvement_direction=improvement_direction.DOWN)
expected = ('ListOfScalarValues(http://www.bar.com/, x, unit, '
'[10, 9, 9, 7], important=True, description=desc, '
'tir_label=my_ir, std=42, '
- 'same_page_merge_policy=CONCATENATE, '
'improvement_direction=down, grouping_keys={})')
self.assertEquals(expected, str(v))
- def testListSamePageMergingWithSamePageConcatenatePolicy(self):
+ def testListSamePageMerging(self):
page0 = self.pages[0]
v0 = list_of_scalar_values.ListOfScalarValues(
page0, 'x', 'unit',
- [10, 9, 9, 7], same_page_merge_policy=value.CONCATENATE,
- description='list-based metric',
+ [10, 9, 9, 7], description='list-based metric',
improvement_direction=improvement_direction.DOWN)
v1 = list_of_scalar_values.ListOfScalarValues(
page0, 'x', 'unit',
- [300, 302, 303, 304], same_page_merge_policy=value.CONCATENATE,
- description='list-based metric',
+ [300, 302, 303, 304], description='list-based metric',
improvement_direction=improvement_direction.DOWN)
self.assertTrue(v1.IsMergableWith(v0))
@@ -102,7 +99,6 @@ class ValueTest(TestBase):
self.assertEquals(page0, vM.page)
self.assertEquals('x', vM.name)
self.assertEquals('unit', vM.units)
- self.assertEquals(value.CONCATENATE, vM.same_page_merge_policy)
self.assertEquals(True, vM.important)
self.assertEquals([10, 9, 9, 7, 300, 302, 303, 304], vM.values)
# Values from the same page use regular standard deviation.
@@ -110,39 +106,15 @@ class ValueTest(TestBase):
self.assertEquals('list-based metric', vM.description)
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,
- improvement_direction=improvement_direction.UP)
- v1 = list_of_scalar_values.ListOfScalarValues(
- page0, 'x', 'unit',
- [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.
- MergeLikeValuesFromSamePage([v0, v1]))
- self.assertEquals(page0, vM.page)
- self.assertEquals('x', vM.name)
- self.assertEquals('unit', vM.units)
- 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',
- [10, 9, 9, 7], same_page_merge_policy=value.CONCATENATE,
- improvement_direction=improvement_direction.DOWN)
+ [10, 9, 9, 7], improvement_direction=improvement_direction.DOWN)
v1 = list_of_scalar_values.ListOfScalarValues(
page1, 'x', 'unit',
- [300, 302, 303, 304], same_page_merge_policy=value.CONCATENATE,
- improvement_direction=improvement_direction.DOWN)
+ [300, 302, 303, 304], improvement_direction=improvement_direction.DOWN)
self.assertTrue(v1.IsMergableWith(v0))
vM = (list_of_scalar_values.ListOfScalarValues.
@@ -150,7 +122,6 @@ class ValueTest(TestBase):
self.assertEquals(None, vM.page)
self.assertEquals('x', vM.name)
self.assertEquals('unit', vM.units)
- self.assertEquals(value.CONCATENATE, vM.same_page_merge_policy)
self.assertEquals(True, vM.important)
self.assertEquals([10, 9, 9, 7, 300, 302, 303, 304], vM.values)
# Values from different pages use pooled standard deviation.
@@ -162,19 +133,22 @@ class ValueTest(TestBase):
page0 = self.pages[0]
v0 = list_of_scalar_values.ListOfScalarValues(
page0, 'x', 'unit',
- [1, 2], same_page_merge_policy=value.CONCATENATE,
- improvement_direction=improvement_direction.UP)
+ [1, 2], 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, none_value_reason='n',
improvement_direction=improvement_direction.UP)
self.assertTrue(v1.IsMergableWith(v0))
vM = (list_of_scalar_values.ListOfScalarValues.
MergeLikeValuesFromSamePage([v0, v1]))
self.assertEquals(None, vM.values)
- self.assertEquals(none_values.MERGE_FAILURE_REASON,
- vM.none_value_reason)
+ expected_none_value_reason = (
+ 'Merging values containing a None value results in a None value. '
+ 'None values: [ListOfScalarValues(http://www.bar.com/, x, unit, None, '
+ 'important=True, description=None, tir_label=None, std=None,'
+ ' improvement_direction=up, grouping_keys={})]')
+ self.assertEquals(expected_none_value_reason, vM.none_value_reason)
self.assertEquals(improvement_direction.UP, vM.improvement_direction)
def testListWithNoneValueMustHaveNoneReason(self):
@@ -195,8 +169,7 @@ class ValueTest(TestBase):
def testAsDict(self):
v = list_of_scalar_values.ListOfScalarValues(
None, 'x', 'unit', [1, 2],
- same_page_merge_policy=value.PICK_FIRST, important=False,
- improvement_direction=improvement_direction.DOWN)
+ important=False, improvement_direction=improvement_direction.DOWN)
d = v.AsDictWithoutBaseClassEntries()
self.assertEquals(d['values'], [1, 2])
@@ -206,12 +179,10 @@ class ValueTest(TestBase):
page0 = self.pages[0]
v0 = list_of_scalar_values.ListOfScalarValues(
page0, 'x', 'unit',
- [10, 9, 9, 7], same_page_merge_policy=value.CONCATENATE,
- improvement_direction=improvement_direction.DOWN)
+ [10, 9, 9, 7], improvement_direction=improvement_direction.DOWN)
v1 = list_of_scalar_values.ListOfScalarValues(
page0, 'x', 'unit',
- [300, 302, 303, 304], same_page_merge_policy=value.CONCATENATE,
- improvement_direction=improvement_direction.DOWN)
+ [300, 302, 303, 304], improvement_direction=improvement_direction.DOWN)
self.assertTrue(v1.IsMergableWith(v0))
vM = (list_of_scalar_values.ListOfScalarValues.
@@ -224,7 +195,7 @@ class ValueTest(TestBase):
def testNoneValueAsDict(self):
v = list_of_scalar_values.ListOfScalarValues(
- None, 'x', 'unit', None, same_page_merge_policy=value.PICK_FIRST,
+ None, 'x', 'unit', None,
important=False, none_value_reason='n',
improvement_direction=improvement_direction.UP)
d = v.AsDictWithoutBaseClassEntries()
« no previous file with comments | « telemetry/telemetry/value/list_of_scalar_values.py ('k') | telemetry/telemetry/value/scalar.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698