Support for string value

tools/telemetry/telemetry/value/list_of_string_values_unittest.py

Index: tools/telemetry/telemetry/value/list_of_string_values_unittest.py
diff --git a/tools/telemetry/telemetry/value/list_of_scalar_values_unittest.py b/tools/telemetry/telemetry/value/list_of_string_values_unittest.py
similarity index 55%
copy from tools/telemetry/telemetry/value/list_of_scalar_values_unittest.py
copy to tools/telemetry/telemetry/value/list_of_string_values_unittest.py
index c54ca26306e77cc5378dbf47f5535f7e78657a20..cf83871233d468f0f4e43e71d994d32e4719a5b5 100644
--- a/tools/telemetry/telemetry/value/list_of_scalar_values_unittest.py
+++ b/tools/telemetry/telemetry/value/list_of_string_values_unittest.py
@@ -6,7 +6,7 @@ import unittest
 
 from telemetry import value
 from telemetry.page import page_set
-from telemetry.value import list_of_scalar_values
+from telemetry.value import list_of_string_values
 
 class TestBase(unittest.TestCase):
   def setUp(self):
@@ -24,60 +24,60 @@ class TestBase(unittest.TestCase):
   def pages(self):
     return self.page_set.pages
 
-class ValueTest(TestBase):
+class ListOfStringValuesTest(TestBase):
   def testListSamePageMergingWithSamePageConcatenatePolicy(self):
     page0 = self.pages[0]
-    v0 = list_of_scalar_values.ListOfScalarValues(
-        page0, 'x', 'unit',
-        [1,2], same_page_merge_policy=value.CONCATENATE)
-    v1 = list_of_scalar_values.ListOfScalarValues(
-        page0, 'x', 'unit',
-        [3,4], same_page_merge_policy=value.CONCATENATE)
+    v0 = list_of_string_values.ListOfStringValues(
+        page0, 'x', 'label',
+        ['L1','L2'], same_page_merge_policy=value.CONCATENATE)
+    v1 = list_of_string_values.ListOfStringValues(
+        page0, 'x', 'label',
+        ['L3','L4'], same_page_merge_policy=value.CONCATENATE)
     self.assertTrue(v1.IsMergableWith(v0))
 
-    vM = (list_of_scalar_values.ListOfScalarValues.
+    vM = (list_of_string_values.ListOfStringValues.
           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(value.CONCATENATE, vM.same_page_merge_policy)
     self.assertEquals(True, vM.important)
-    self.assertEquals([1, 2, 3, 4], vM.values)
+    self.assertEquals(['L1', 'L2', 'L3', 'L4'], vM.values)
 
   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)
-    v1 = list_of_scalar_values.ListOfScalarValues(
-        page0, 'x', 'unit',
-        [3,4], same_page_merge_policy=value.PICK_FIRST)
+    v0 = list_of_string_values.ListOfStringValues(
+        page0, 'x', 'label',
+        ['L1','L2'], same_page_merge_policy=value.PICK_FIRST)
+    v1 = list_of_string_values.ListOfStringValues(
+        page0, 'x', 'label',
+        ['L3','L4'], same_page_merge_policy=value.PICK_FIRST)
     self.assertTrue(v1.IsMergableWith(v0))
 
-    vM = (list_of_scalar_values.ListOfScalarValues.
+    vM = (list_of_string_values.ListOfStringValues.
           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(value.PICK_FIRST, vM.same_page_merge_policy)
     self.assertEquals(True, vM.important)
-    self.assertEquals([1, 2], vM.values)
+    self.assertEquals(['L1', 'L2'], vM.values)
 
   def testListDifferentPageMerging(self):
     page0 = self.pages[0]
-    v0 = list_of_scalar_values.ListOfScalarValues(
-        page0, 'x', 'unit',
-        [1, 2], same_page_merge_policy=value.PICK_FIRST)
-    v1 = list_of_scalar_values.ListOfScalarValues(
-        page0, 'x', 'unit',
-        [3, 4], same_page_merge_policy=value.PICK_FIRST)
+    v0 = list_of_string_values.ListOfStringValues(
+        page0, 'x', 'label',
+        ['L1', 'L2'], same_page_merge_policy=value.PICK_FIRST)
+    v1 = list_of_string_values.ListOfStringValues(
+        page0, 'x', 'label',
+        ['L3', 'L4'], same_page_merge_policy=value.PICK_FIRST)
     self.assertTrue(v1.IsMergableWith(v0))
 
-    vM = (list_of_scalar_values.ListOfScalarValues.
+    vM = (list_of_string_values.ListOfStringValues.
           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(value.PICK_FIRST, vM.same_page_merge_policy)
     self.assertEquals(True, vM.important)
-    self.assertEquals([1, 2, 3, 4], vM.values)
+    self.assertEquals(['L1', 'L2', 'L3', 'L4'], vM.values)