[Android] Update gtest test list parsing.

build/android/pylib/gtest/test_package_test.py

Index: build/android/pylib/gtest/test_package_test.py
diff --git a/build/android/pylib/gtest/test_package_test.py b/build/android/pylib/gtest/test_package_test.py
new file mode 100755
index 0000000000000000000000000000000000000000..9e91c5ae9bb8d0b0fd66afe11b658d234558e553
--- /dev/null
+++ b/build/android/pylib/gtest/test_package_test.py
@@ -0,0 +1,62 @@
+#!/usr/bin/env python
+# 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 unittest
+
+from pylib.gtest import test_package
+
+# pylint: disable=W0212
+
+
+class TestPackageTest(unittest.TestCase):
+
+  def testParseGTestListTests_simple(self):
+    raw_output = [
+      'TestCaseOne.',
+      '  testOne',
+      '  testTwo',
+      'TestCaseTwo.',
+      '  testThree',
+      '  testFour',
+    ]
+    actual = test_package.TestPackage._ParseGTestListTests(raw_output)
+    expected = [
+      'TestCaseOne.testOne',
+      'TestCaseOne.testTwo',
+      'TestCaseTwo.testThree',
+      'TestCaseTwo.testFour',
+    ]
+    self.assertEqual(expected, actual)
+
+  def testParseGTestListTests_parameterized_old(self):
+    raw_output = [
+      'PTestCase.',
+      '  testWithValueParam/0',
+      '  testWithValueParam/1',
+    ]
+    actual = test_package.TestPackage._ParseGTestListTests(raw_output)
+    expected = [
+      'PTestCase.testWithValueParam/0',
+      'PTestCase.testWithValueParam/1',
+    ]
+    self.assertEqual(expected, actual)
+
+  def testParseGTestListTests_parameterized_new(self):
+    raw_output = [
+      'PTestCase.',
+      '  testWithValueParam/0  # GetParam() = 0',
+      '  testWithValueParam/1  # GetParam() = 1',
+    ]
+    actual = test_package.TestPackage._ParseGTestListTests(raw_output)
+    expected = [
+      'PTestCase.testWithValueParam/0',
+      'PTestCase.testWithValueParam/1',
+    ]
+    self.assertEqual(expected, actual)
+
+
+if __name__ == '__main__':
+  unittest.main(verbosity=2)
+