Added support for improvement_direction to relevant values, which is propogated to chartjson.

tools/telemetry/telemetry/value/scalar_unittest.py

 # Copyright 2013 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.
 import os
 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 none_values
 from telemetry.value import scalar
 
 
 class TestBase(unittest.TestCase):
   def setUp(self):
     ps = page_set.PageSet(file_path=os.path.dirname(__file__))
     ps.AddUserStory(page_module.Page('http://www.bar.com/', ps, ps.base_dir))
     ps.AddUserStory(page_module.Page('http://www.baz.com/', ps, ps.base_dir))
     ps.AddUserStory(page_module.Page('http://www.foo.com/', ps, ps.base_dir))
     self.page_set = ps
 
   @property
   def pages(self):
     return self.page_set.pages
 
 class ValueTest(TestBase):
   def testBuildbotValueType(self):
     page0 = self.pages[0]
-    v = scalar.ScalarValue(page0, 'x', 'unit', 3, important=True)
+    v = scalar.ScalarValue(page0, 'x', 'unit', 3, important=True,
+                           improvement_direction=improvement_direction.DOWN)
     self.assertEquals('default', v.GetBuildbotDataType(
         value.COMPUTED_PER_PAGE_SUMMARY_OUTPUT_CONTEXT))
     self.assertEquals([3], v.GetBuildbotValue())
     self.assertEquals(('x', page0.display_name),
                       v.GetChartAndTraceNameForPerPageResult())
 
-    v = scalar.ScalarValue(page0, 'x', 'unit', 3, important=False)
+    v = scalar.ScalarValue(page0, 'x', 'unit', 3, important=False,
+                           improvement_direction=improvement_direction.DOWN)
     self.assertEquals(
         'unimportant',
         v.GetBuildbotDataType(value.COMPUTED_PER_PAGE_SUMMARY_OUTPUT_CONTEXT))
 
   def testScalarSamePageMerging(self):
     page0 = self.pages[0]
-    v0 = scalar.ScalarValue(page0, 'x', 'unit', 1)
-    v1 = scalar.ScalarValue(page0, 'x', 'unit', 2)
+    v0 = scalar.ScalarValue(page0, 'x', 'unit', 1,
+                            improvement_direction=improvement_direction.UP)
+    v1 = scalar.ScalarValue(page0, 'x', 'unit', 2,
+                            improvement_direction=improvement_direction.UP)
     self.assertTrue(v1.IsMergableWith(v0))
 
     vM = scalar.ScalarValue.MergeLikeValuesFromSamePage([v0, v1])
     self.assertEquals(page0, vM.page)
     self.assertEquals('x', vM.name)
     self.assertEquals('unit', vM.units)
     self.assertEquals(True, vM.important)
     self.assertEquals([1, 2], vM.values)
+    self.assertEquals(improvement_direction.UP, vM.improvement_direction)
 
   def testScalarDifferentPageMerging(self):
     page0 = self.pages[0]
     page1 = self.pages[1]
-    v0 = scalar.ScalarValue(page0, 'x', 'unit', 1)
-    v1 = scalar.ScalarValue(page1, 'x', 'unit', 2)
+    v0 = scalar.ScalarValue(
+        page0, 'x', 'unit', 1, improvement_direction=improvement_direction.UP)
+    v1 = scalar.ScalarValue(
+        page1, 'x', 'unit', 2, improvement_direction=improvement_direction.UP)
 
     vM = scalar.ScalarValue.MergeLikeValuesFromDifferentPages([v0, v1])
     self.assertEquals(None, vM.page)
     self.assertEquals('x', vM.name)
     self.assertEquals('unit', vM.units)
     self.assertEquals(True, vM.important)
     self.assertEquals([1, 2], vM.values)
+    self.assertEquals(improvement_direction.UP, vM.improvement_direction)
 
   def testScalarWithNoneValueMerging(self):
     page0 = self.pages[0]
-    v0 = scalar.ScalarValue(page0, 'x', 'unit', 1)
-    v1 = scalar.ScalarValue(page0, 'x', 'unit', None, none_value_reason='n')
+    v0 = scalar.ScalarValue(
+        page0, 'x', 'unit', 1, improvement_direction=improvement_direction.DOWN)
+    v1 = scalar.ScalarValue(page0, 'x', 'unit', None, none_value_reason='n',
+                            improvement_direction=improvement_direction.DOWN)
     self.assertTrue(v1.IsMergableWith(v0))
 
     vM = scalar.ScalarValue.MergeLikeValuesFromSamePage([v0, v1])
     self.assertEquals(None, vM.values)
     self.assertEquals(none_values.MERGE_FAILURE_REASON,
                       vM.none_value_reason)
 
   def testScalarWithNoneValueMustHaveNoneReason(self):
     page0 = self.pages[0]
     self.assertRaises(none_values.NoneValueMissingReason,
-                      lambda: scalar.ScalarValue(page0, 'x', 'unit', None))
+                      lambda: scalar.ScalarValue(
+                          page0, 'x', 'unit', None,
+                          improvement_direction=improvement_direction.UP))
 
   def testScalarWithNoneReasonMustHaveNoneValue(self):
     page0 = self.pages[0]
     self.assertRaises(none_values.ValueMustHaveNoneValue,
-                      lambda: scalar.ScalarValue(page0, 'x', 'unit', 1,
-                                                 none_value_reason='n'))
+                      lambda: scalar.ScalarValue(
+                          page0, 'x', 'unit', 1, none_value_reason='n',
+                          improvement_direction=improvement_direction.UP))
 
   def testAsDict(self):
-    v = scalar.ScalarValue(None, 'x', 'unit', 42, important=False)
+    v = scalar.ScalarValue(None, 'x', 'unit', 42, important=False,
+                           improvement_direction=improvement_direction.DOWN)
     d = v.AsDictWithoutBaseClassEntries()
 
     self.assertEquals(d, {
           'value': 42
         })
 
   def testNoneValueAsDict(self):
     v = scalar.ScalarValue(None, 'x', 'unit', None, important=False,
-                           none_value_reason='n')
+                           none_value_reason='n',
+                           improvement_direction=improvement_direction.DOWN)
     d = v.AsDictWithoutBaseClassEntries()
 
     self.assertEquals(d, {
           'value': None,
           'none_value_reason': 'n'
         })
 
   def testFromDictInt(self):
     d = {
       'type': 'scalar',
       'name': 'x',
       'units': 'unit',
-      'value': 42
+      'value': 42,
+      'improvement_direction': improvement_direction.DOWN,
     }
 
     v = value.Value.FromDict(d, {})
 
     self.assertTrue(isinstance(v, scalar.ScalarValue))
     self.assertEquals(v.value, 42)
+    self.assertEquals(v.improvement_direction, improvement_direction.DOWN)
 
   def testFromDictFloat(self):
     d = {
       'type': 'scalar',
       'name': 'x',
       'units': 'unit',
-      'value': 42.4
+      'value': 42.4,
+      'improvement_direction': improvement_direction.UP,
     }
 
     v = value.Value.FromDict(d, {})
 
     self.assertTrue(isinstance(v, scalar.ScalarValue))
     self.assertEquals(v.value, 42.4)
 
   def testFromDictNoneValue(self):
     d = {
       'type': 'scalar',
       'name': 'x',
       'units': 'unit',
       'value': None,
-      'none_value_reason': 'n'
+      'none_value_reason': 'n',
+      'improvement_direction': improvement_direction.UP,
     }
 
     v = value.Value.FromDict(d, {})
 
     self.assertTrue(isinstance(v, scalar.ScalarValue))
     self.assertEquals(v.value, None)
     self.assertEquals(v.none_value_reason, 'n')