Support for string value

tools/telemetry/telemetry/value/string_unittest.py

Index: tools/telemetry/telemetry/value/string_unittest.py
diff --git a/tools/telemetry/telemetry/value/scalar_unittest.py b/tools/telemetry/telemetry/value/string_unittest.py
similarity index 62%
copy from tools/telemetry/telemetry/value/scalar_unittest.py
copy to tools/telemetry/telemetry/value/string_unittest.py
index 3666c8baa1b8ac76f3a8a3ab269cc00d4980fc7a..a9751f926152a0ef810a7e67cfd631490eafc33c 100644
--- a/tools/telemetry/telemetry/value/scalar_unittest.py
+++ b/tools/telemetry/telemetry/value/string_unittest.py
@@ -6,7 +6,7 @@ import unittest
 
 from telemetry import value
 from telemetry.page import page_set
-from telemetry.value import scalar
+from telemetry.value import string
 
 class TestBase(unittest.TestCase):
   def setUp(self):
@@ -24,43 +24,43 @@ class TestBase(unittest.TestCase):
   def pages(self):
     return self.page_set.pages
 
-class ValueTest(TestBase):
+class StringValueTest(TestBase):
   def testBuildbotValueType(self):
     page0 = self.pages[0]
-    v = scalar.ScalarValue(page0, 'x', 'unit', 3, important=True)
+    v = string.StringValue(page0, 'x', 'label', 'L1', important=True)
     self.assertEquals('default', v.GetBuildbotDataType(
         value.COMPUTED_PER_PAGE_SUMMARY_OUTPUT_CONTEXT))
-    self.assertEquals([3], v.GetBuildbotValue())
+    self.assertEquals(['L1'], v.GetBuildbotValue())
     self.assertEquals(('x_by_url', page0.display_name),
                       v.GetBuildbotMeasurementAndTraceNameForPerPageResult())
 
-    v = scalar.ScalarValue(page0, 'x', 'unit', 3, important=False)
+    v = string.StringValue(page0, 'x', 'label', 'L1', important=False)
     self.assertEquals(
         'unimportant',
         v.GetBuildbotDataType(value.COMPUTED_PER_PAGE_SUMMARY_OUTPUT_CONTEXT))
 
-  def testScalarSamePageMerging(self):
+  def testStringSamePageMerging(self):
     page0 = self.pages[0]
-    v0 = scalar.ScalarValue(page0, 'x', 'unit', 1)
-    v1 = scalar.ScalarValue(page0, 'x', 'unit', 2)
+    v0 = string.StringValue(page0, 'x', 'label', 'L1')
+    v1 = string.StringValue(page0, 'x', 'label', 'L2')
     self.assertTrue(v1.IsMergableWith(v0))
 
-    vM = scalar.ScalarValue.MergeLikeValuesFromSamePage([v0, v1])
+    vM = string.StringValue.MergeLikeValuesFromSamePage([v0, v1])
     self.assertEquals(page0, vM.page)
     self.assertEquals('x', vM.name)
-    self.assertEquals('unit', vM.units)
+    self.assertEquals('label', vM.units)
     self.assertEquals(True, vM.important)
-    self.assertEquals([1, 2], vM.values)
+    self.assertEquals(['L1', 'L2'], vM.values)
 
-  def testScalarDifferentSiteMerging(self):
+  def testStringDifferentSiteMerging(self):
     page0 = self.pages[0]
     page1 = self.pages[1]
-    v0 = scalar.ScalarValue(page0, 'x', 'unit', 1)
-    v1 = scalar.ScalarValue(page1, 'x', 'unit', 2)
+    v0 = string.StringValue(page0, 'x', 'label', 'L1')
+    v1 = string.StringValue(page1, 'x', 'label', 'L2')
 
-    vM = scalar.ScalarValue.MergeLikeValuesFromDifferentPages([v0, v1])
+    vM = string.StringValue.MergeLikeValuesFromDifferentPages([v0, v1])
     self.assertEquals(None, vM.page)
     self.assertEquals('x', vM.name)
-    self.assertEquals('unit', vM.units)
+    self.assertEquals('label', vM.units)
     self.assertEquals(True, vM.important)
-    self.assertEquals([1, 2], vM.values)
+    self.assertEquals(['L1', 'L2'], vM.values)