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] |