[BattOr][Telemetry] Changes needed to run BattOr tests on telemetry.

telemetry/telemetry/timeline/trace_data_unittest.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import cStringIO
 import json
 import os
 import tempfile
 import unittest
 import zipfile
 
 from telemetry.timeline import trace_data
 
 class TraceDataTest(unittest.TestCase):
   def testSerialize(self):
     ri = trace_data.TraceData({'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.TraceData({'traceEvents': [1, 2, 3],
-                                 'battor': ['battor_data']})
+                                 'powerTraceAsString': 'battor_data'})
     tf = tempfile.NamedTemporaryFile(delete=False)
     temp_name = tf.name
     tf.close()
     try:
       data.Serialize(temp_name, gzip_result=True)
       self.assertTrue(zipfile.is_zipfile(temp_name))
       z = zipfile.ZipFile(temp_name, 'r')
 
-      self.assertIn('battor', z.namelist())
+      self.assertIn('powerTraceAsString', z.namelist())
       self.assertIn('traceEvents', z.namelist())
       z.close()
     finally:
       os.remove(temp_name)
 
   def testValidateWithNonPrimativeRaises(self):
     with self.assertRaises(trace_data.NonSerializableTraceData):
       trace_data.TraceData({'hello': TraceDataTest})
 
   def testValidateWithCircularReferenceRaises(self):
@@ skipping 35 matching lines @@
   def testCorrectlyMalformedStringForm2(self):
     d = trace_data.TraceData("""[
       {"ph": "B"},""")
     self.assertTrue(d.HasEventsFor(trace_data.CHROME_TRACE_PART))
 
 class TraceDataBuilderTest(unittest.TestCase):
   def testBasicChrome(self):
     builder = trace_data.TraceDataBuilder()
     builder.AddEventsTo(trace_data.CHROME_TRACE_PART, [1, 2, 3])
     builder.AddEventsTo(trace_data.TAB_ID_PART, ['tab-7'])
-    builder.AddEventsTo(trace_data.BATTOR_TRACE_PART, ['battor data here'])
+    builder.AddEventsTo(
+        trace_data.BATTOR_TRACE_PART, 'battor data here', as_string=True)
 
     d = builder.AsData()
     self.assertTrue(d.HasEventsFor(trace_data.CHROME_TRACE_PART))
     self.assertTrue(d.HasEventsFor(trace_data.TAB_ID_PART))
     self.assertTrue(d.HasEventsFor(trace_data.BATTOR_TRACE_PART))
 
     self.assertRaises(Exception, builder.AsData)
+
+  def testAsStringWithList(self):
+    builder = trace_data.TraceDataBuilder()
+    with self.assertRaises(AssertionError):
+      builder.AddEventsTo(trace_data.BATTOR_TRACE_PART,
+                          ['battor data here'], as_string=True)
+
+  def testNotAsStringWithString(self):
+    builder = trace_data.TraceDataBuilder()
+    with self.assertRaises(AssertionError):
+      builder.AddEventsTo(trace_data.CHROME_TRACE_PART, 'data here')