1 files changed, 60 insertions, 10 deletions
diff --git a/catapult/common/py_trace_event/py_trace_event/trace_event_impl/perfetto_trace_writer_unittest.py b/catapult/common/py_trace_event/py_trace_event/trace_event_impl/perfetto_trace_writer_unittest.py
index e49a0a4b..00dafa46 100644
--- a/catapult/common/py_trace_event/py_trace_event/trace_event_impl/perfetto_trace_writer_unittest.py
+++ b/catapult/common/py_trace_event/py_trace_event/trace_event_impl/perfetto_trace_writer_unittest.py
@@ -15,7 +15,8 @@ class PerfettoTraceWriterTest(unittest.TestCase):
   TODO(crbug.com/944078): Switch to using python-protobuf library
   and implement proper protobuf parsing then.
   """
-
+  def setUp(self):
+    perfetto_trace_writer.reset_global_state()
 
   def testWriteThreadDescriptorEvent(self):
     result = StringIO.StringIO()
@@ -26,8 +27,8 @@ class PerfettoTraceWriterTest(unittest.TestCase):
         ts=1556716807306000,
     )
     expected_output = (
-        '\n\x17P\x80\x80@\xc8\x02\x01\xe2\x02\r\x08\x01\x10'
-        '\x020\x90\xf6\xc2\x82\xb6\xfa\xe1\x02'
+        '\n\x1b@\x80\xec\xea\xda\x83\xb6\xa4\xcd\x15P\x80\x80@'
+        '\xc8\x02\x01\xe2\x02\x04\x08\x01\x10\x02\xd0\x03@'
     )
     self.assertEqual(expected_output, result.getvalue())
 
@@ -49,10 +50,11 @@ class PerfettoTraceWriterTest(unittest.TestCase):
         tid=2,
     )
     expected_output = (
-       '\n\x17P\x80\x80@\xc8\x02\x01\xe2\x02\r\x08\x01\x10'
-       '\x020\x90\xf6\xc2\x82\xb6\xfa\xe1\x02\n2P\x80\x80@Z\x0c\x08'
-       '\xa0\x8d\x06\x18\x012\x04\x08\x01\x10Mb\x1e\n\x0c\x08\x01'
-       '\x12\x08category\x12\x0e\x08\x01\x12\nevent_name'
+        '\n\x1b@\x80\xec\xea\xda\x83\xb6\xa4\xcd\x15P\x80\x80@'
+        '\xc8\x02\x01\xe2\x02\x04\x08\x01\x10\x02\xd0\x03@\n;@'
+        '\x80\xb0\xc2\x8a\x84\xb6\xa4\xcd\x15P\x80\x80@Z\x08'
+        '\x18\x012\x04\x08\x01\x10Mb\x1e\n\x0c\x08\x01\x12\x08'
+        'category\x12\x0e\x08\x01\x12\nevent_name\xd0\x03@'
     )
     self.assertEqual(expected_output, result.getvalue())
 
@@ -68,13 +70,61 @@ class PerfettoTraceWriterTest(unittest.TestCase):
         story_tags=["foo", "bar"],
         story_run_index=0,
         label="label",
-        had_failures=False,
     )
     expected_output = (
-        '\nI\x82\x03F\x08\x90\xf6\xc2\x82\xb6\xfa\xe1'
+        '\nG\x82\x03D\x08\x90\xf6\xc2\x82\xb6\xfa\xe1'
         '\x02\x10\xb0\x83\xc9\x82\xb6\xfa\xe1\x02\x1a\tbenchmark"'
-        '\x0bdescription*\x05label2\x05story:\x03foo:\x03bar@\x00H\x00'
+        '\x0bdescription*\x05label2\x05story:\x03foo:\x03bar@\x00'
+    )
+    self.assertEqual(expected_output, result.getvalue())
+
+  def testWriteArgs(self):
+    result = StringIO.StringIO()
+    perfetto_trace_writer.write_thread_descriptor_event(
+        output=result,
+        pid=1,
+        tid=2,
+        ts=0,
+    )
+    perfetto_trace_writer.write_event(
+        output=result,
+        ph="M",
+        category="",
+        name="",
+        ts=0,
+        args={'int': 123, 'double': 1.23, 'string': 'onetwothree'},
+        tid=2,
+    )
+    expected_output = (
+        '\n\x13@\x00P\x80\x80@\xc8\x02\x01\xe2\x02\x04\x08\x01\x10'
+        '\x02\xd0\x03@\nT@\x00P\x80\x80@Z;\x18\x01"\x07R\x03int {"\x11'
+        'R\x06double)\xaeG\xe1z\x14\xae\xf3?"\x15R\x06string2\x0bonetwothree2'
+        '\x04\x08\x01\x10Mb\x0c\n\x04\x08\x01\x12\x00\x12\x04\x08\x01\x12\x00'
+        '\xd0\x03@'
     )
     self.assertEqual(expected_output, result.getvalue())
 
+  def testWriteChromeMetadata(self):
+    result = StringIO.StringIO()
+    perfetto_trace_writer.write_chrome_metadata(
+        output=result,
+        clock_domain='FOO',
+    )
+    expected_output = (
+       '\n\x17*\x15\x12\x13\n\x0cclock-domain\x12\x03FOO'
+    )
+    self.assertEqual(expected_output, result.getvalue())
 
+  def testWriteClockSnapshot(self):
+    result = StringIO.StringIO()
+    perfetto_trace_writer.write_clock_snapshot(
+        output=result,
+        tid=1,
+        telemetry_ts=1234.567,
+        boottime_ts=7654.321,
+    )
+    expected_output = (
+       '\n\x172\x11\n\x06\x08@\x10\x87\xadK\n\x07\x08\x06\x10'
+       '\xb1\x97\xd3\x03P\x80\x80@'
+    )
+    self.assertEqual(expected_output, result.getvalue())