Refactor TraceData to encapsulate internal traces' representation

telemetry/telemetry/timeline/trace_data_unittest.py

Index: telemetry/telemetry/timeline/trace_data_unittest.py
diff --git a/telemetry/telemetry/timeline/trace_data_unittest.py b/telemetry/telemetry/timeline/trace_data_unittest.py
index 4d057b0bbaf1b32a1ac1203726c24867af296d2b..ffa476a98489a353f0c1a3f7deeec98eb917cfd5 100644
--- a/telemetry/telemetry/timeline/trace_data_unittest.py
+++ b/telemetry/telemetry/timeline/trace_data_unittest.py
@@ -2,45 +2,29 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import cStringIO
 import datetime
 import exceptions
-import json
 import os
 import tempfile
 import unittest
-import zipfile
 
+from tracing_build import html2trace
 from telemetry.timeline import trace_data
 
+
 class TraceDataTest(unittest.TestCase):
   def testSerialize(self):
-    ri = trace_data.CreateTraceDataFromRawData({'traceEvents': [1, 2, 3]})
-    f = cStringIO.StringIO()
-    ri.Serialize(f)
-    d = f.getvalue()
-
-    self.assertIn('traceEvents', d)
-    self.assertIn('[1, 2, 3]', d)
-
-    json.loads(d)
-
-  def testSerializeZip(self):
-    data = trace_data.CreateTraceDataFromRawData({'traceEvents': [1, 2, 3],
-                                 'powerTraceAsString': 'battor_data'})
-    tf = tempfile.NamedTemporaryFile(delete=False)
-    temp_name = tf.name
-    tf.close()
+    test_temp_file = tempfile.NamedTemporaryFile(delete=False)
+    test_temp_file.close()
+    trace_path = test_temp_file.name
     try:
-      data.Serialize(temp_name, gzip_result=True)
-      self.assertTrue(zipfile.is_zipfile(temp_name))
-      z = zipfile.ZipFile(temp_name, 'r')
-
-      self.assertIn('powerTraceAsString', z.namelist())
-      self.assertIn('traceEvents', z.namelist())
-      z.close()
+      ri = trace_data.CreateTraceDataFromRawData({'traceEvents': [1, 2, 3]})
+      ri.Serialize(trace_path)
+      with open(trace_path) as f:
+        json_traces = html2trace.ReadTracesFromHTMLFilePath(f)
+      self.assertEqual(json_traces, [{'traceEvents': [1, 2, 3]}])
     finally:
-      os.remove(temp_name)
+      os.remove(trace_path)
 
   def testEmptyArrayValue(self):
     # We can import empty lists and empty string.