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

Unified Diff: tools/telemetry/telemetry/timeline/inspector_importer_unittest.py

Issue 441873007: Move timeline and importers to use telemetry.value.TraceValue (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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
Index: tools/telemetry/telemetry/timeline/inspector_importer_unittest.py
diff --git a/tools/telemetry/telemetry/timeline/inspector_importer_unittest.py b/tools/telemetry/telemetry/timeline/inspector_importer_unittest.py
index 2fb9d7a9a8c359a91ab28b1d85ef009b77a4df63..8ebd9e43b942cf83ffe9880f272fafceb5fc0bfa 100644
--- a/tools/telemetry/telemetry/timeline/inspector_importer_unittest.py
+++ b/tools/telemetry/telemetry/timeline/inspector_importer_unittest.py
@@ -3,9 +3,9 @@
# found in the LICENSE file.
import unittest
-from telemetry.timeline import inspector_timeline_data
from telemetry.timeline import inspector_importer
from telemetry.timeline import model
+from telemetry.value import trace as trace_value_module
_BACKGROUND_MESSAGE = {
'data': {},
@@ -110,7 +110,9 @@ class InspectorEventParsingTest(unittest.TestCase):
self.assertEquals(1, event.end)
def testOutOfOrderData(self):
- raw_event = {
+ builder = trace_value_module.TraceValueBuilder()
+ builder.AddEventsTo(
+ trace_value_module.INSPECTOR_TRACE_PART, {
'startTime': 5295.004, 'endTime': 5305.004,
'data': {}, 'type': 'Program',
'children': [
@@ -124,15 +126,15 @@ class InspectorEventParsingTest(unittest.TestCase):
{'startTime': 5301.004, 'endTime': 5305.004, 'data': {},
'type': 'CompositeLayers', 'children': []},
{'startTime': 5305.004, 'data': {}, 'type': 'MarkFirstPaint'}
- ]}
- timeline_data = inspector_timeline_data.InspectorTimelineData([raw_event])
- model.TimelineModel(timeline_data=timeline_data, shift_world_to_zero=False)
+ ]})
+ model.TimelineModel(builder.AsValue(), shift_world_to_zero=False)
class InspectorImporterTest(unittest.TestCase):
def testImport(self):
- messages = [_BACKGROUND_MESSAGE, _SAMPLE_MESSAGE]
- timeline_data = inspector_timeline_data.InspectorTimelineData(messages)
- m = model.TimelineModel(timeline_data=timeline_data,
+ builder = trace_value_module.TraceValueBuilder()
+ builder.AddEventsTo(trace_value_module.INSPECTOR_TRACE_PART,
+ [_BACKGROUND_MESSAGE, _SAMPLE_MESSAGE])
+ m = model.TimelineModel(builder.AsValue(),
shift_world_to_zero=False)
self.assertEquals(1, len(m.processes))
process = m.processes.values()[0]

Powered by Google App Engine
This is Rietveld 408576698