Merge "Add unit test for AtraceLegacyAgent"
diff --git a/run_unittest.py b/run_unittest.py
index 98f5628..8c7933c 100755
--- a/run_unittest.py
+++ b/run_unittest.py
@@ -24,6 +24,10 @@
 SYSTRACE_LIST_CATEGORIES_CMD = ['./systrace.py', '-e', DEVICE_SERIAL, '-l']
 TRACE_LIST_CATEGORIES_CMD = (ADB_SHELL + ['atrace', '--list_categories'])
 
+LEGACY_ATRACE_ARGS = ['atrace', '-z', '-t', '10', '-s']
+LEGACY_TRACE_CMD = (['adb', '-s', DEVICE_SERIAL, 'shell'] + LEGACY_ATRACE_ARGS +
+             [';', 'ps', '-t'])
+
 TEST_DIR = 'test_data/'
 ATRACE_DATA = TEST_DIR + 'atrace_data'
 ATRACE_DATA_RAW = TEST_DIR + 'atrace_data_raw'
@@ -109,6 +113,13 @@
     self.assertEqual(' '.join(TRACE_LIST_CATEGORIES_CMD), ' '.join(tracer_args))
     self.assertEqual(False, agent.expect_trace())
 
+class AtraceLegacyAgentUnitTest(unittest.TestCase):
+  def test_construct_trace_command(self):
+    options, categories = systrace.parse_options(SYSTRACE_CMD)
+    agent = atrace_agent.try_create_agent(options, categories)
+    tracer_args = agent._construct_trace_command()
+    self.assertEqual(' '.join(LEGACY_TRACE_CMD), ' '.join(tracer_args))
+    self.assertEqual(True, agent.expect_trace())
 
 if __name__ == '__main__':
     unittest.main()