Index: tools/telemetry/telemetry/value/string.py |
diff --git a/tools/telemetry/telemetry/value/scalar.py b/tools/telemetry/telemetry/value/string.py |
similarity index 74% |
copy from tools/telemetry/telemetry/value/scalar.py |
copy to tools/telemetry/telemetry/value/string.py |
index 4b57654de80b0efda16ef49af6cb8ef6f84a953c..b88089e695ec5a035c94bfccab5161aad707248a 100644 |
--- a/tools/telemetry/telemetry/value/scalar.py |
+++ b/tools/telemetry/telemetry/value/string.py |
@@ -2,21 +2,19 @@ |
# Use of this source code is governed by a BSD-style license that can be |
# found in the LICENSE file. |
-import numbers |
- |
from telemetry import value as value_module |
-from telemetry.value import list_of_scalar_values |
+from telemetry.value import list_of_string_values |
-class ScalarValue(value_module.Value): |
+class StringValue(value_module.Value): |
def __init__(self, page, name, units, value, important=True): |
- """A single value (float or integer) result from a test. |
+ """A single value (float, integer or string) result from a test. |
- A test that counts the number of DOM elements in a page might produce a |
- scalar value: |
- ScalarValue(page, 'num_dom_elements', 'count', num_elements) |
+ A test that output a hash of the content in a page might produce a |
+ string value: |
+ StringValue(page, 'page_hash', 'hash', '74E377FF') |
""" |
- super(ScalarValue, self).__init__(page, name, units, important) |
- assert isinstance(value, numbers.Number) |
+ super(StringValue, self).__init__(page, name, units, important) |
+ assert isinstance(value, basestring) |
self.value = value |
def __repr__(self): |
@@ -50,7 +48,7 @@ class ScalarValue(value_module.Value): |
def MergeLikeValuesFromSamePage(cls, values): |
assert len(values) > 0 |
v0 = values[0] |
- return list_of_scalar_values.ListOfScalarValues( |
+ return list_of_string_values.ListOfStringValues( |
v0.page, v0.name, v0.units, |
[v.value for v in values], |
important=v0.important) |
@@ -64,7 +62,7 @@ class ScalarValue(value_module.Value): |
name = v0.name |
else: |
name = v0.name_suffix |
- return list_of_scalar_values.ListOfScalarValues( |
+ return list_of_string_values.ListOfStringValues( |
None, name, v0.units, |
[v.value for v in values], |
important=v0.important) |