Revert of List Java Instru Test Information From JUnit Runner

build/android/pylib/instrumentation/instrumentation_test_instance_test.py

 #!/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.
 
 """Unit tests for instrumentation_test_instance."""
 
 # pylint: disable=protected-access
 
 import collections
@@ skipping 126 matching lines @@
           'Feature': {'value': ['Bar']},
           'SmallTest': None,
         },
         'class': 'org.chromium.test.SampleTest2',
         'method': 'testMethod1',
         'is_junit4': True,
       },
     ]
 
     o._test_jar = 'path/to/test.jar'
-    o._junit4_runner_class = 'J4Runner'
-    actual_tests = o.ProcessRawTests(raw_tests)
+    o._test_runner_junit4 = 'J4Runner'
+    with mock.patch(_INSTRUMENTATION_TEST_INSTANCE_PATH % '_GetTestsFromPickle',
+                    return_value=raw_tests):
+      actual_tests = o.GetTests()
 
     self.assertEquals(actual_tests, expected_tests)
 
   def testGetTests_simpleGtestFilter(self):
     o = self.createTestInstance()
     raw_tests = [
       {
         'annotations': {'Feature': {'value': ['Foo']}},
         'class': 'org.chromium.test.SampleTest',
         'superclass': 'java.lang.Object',
@@ skipping 17 matching lines @@
           'SmallTest': None,
         },
         'class': 'org.chromium.test.SampleTest',
         'is_junit4': True,
         'method': 'testMethod1',
       },
     ]
 
     o._test_filter = 'org.chromium.test.SampleTest.testMethod1'
     o._test_jar = 'path/to/test.jar'
-    o._junit4_runner_class = 'J4Runner'
-    actual_tests = o.ProcessRawTests(raw_tests)
+    o._test_runner_junit4 = 'J4Runner'
+    with mock.patch(_INSTRUMENTATION_TEST_INSTANCE_PATH % '_GetTestsFromPickle',
+                    return_value=raw_tests):
+      actual_tests = o.GetTests()
 
     self.assertEquals(actual_tests, expected_tests)
 
-  def testGetTests_simpleGtestUnqualifiedNameFilter(self):
+  def testGetTests_wildcardGtestFilter(self):
     o = self.createTestInstance()
     raw_tests = [
       {
         'annotations': {'Feature': {'value': ['Foo']}},
         'class': 'org.chromium.test.SampleTest',
         'superclass': 'java.lang.Object',
         'methods': [
           {
             'annotations': {'SmallTest': None},
             'method': 'testMethod1',
           },
           {
             'annotations': {'MediumTest': None},
             'method': 'testMethod2',
           },
         ],
-      }
-    ]
-
-    expected_tests = [
-      {
-        'annotations': {
-          'Feature': {'value': ['Foo']},
-          'SmallTest': None,
-        },
-        'class': 'org.chromium.test.SampleTest',
-        'is_junit4': True,
-        'method': 'testMethod1',
-      },
-    ]
-
-    o._test_filter = 'SampleTest.testMethod1'
-    o._test_jar = 'path/to/test.jar'
-    o._junit4_runner_class = 'J4Runner'
-    actual_tests = o.ProcessRawTests(raw_tests)
-
-    self.assertEquals(actual_tests, expected_tests)
-
-  def testGetTests_parameterizedTestGtestFilter(self):
-    o = self.createTestInstance()
-    raw_tests = [
-      {
-        'annotations': {'Feature': {'value': ['Foo']}},
-        'class': 'org.chromium.test.SampleTest',
-        'superclass': 'java.lang.Object',
-        'methods': [
-          {
-            'annotations': {'SmallTest': None},
-            'method': 'testMethod1',
-          },
-          {
-            'annotations': {'SmallTest': None},
-            'method': 'testMethod1__sandboxed_mode',
-          },
-        ],
       },
       {
         'annotations': {'Feature': {'value': ['Bar']}},
         'class': 'org.chromium.test.SampleTest2',
         'superclass': 'java.lang.Object',
         'methods': [
           {
             'annotations': {'SmallTest': None},
             'method': 'testMethod1',
           },
         ],
       }
     ]
 
     expected_tests = [
       {
         'annotations': {
-          'Feature': {'value': ['Foo']},
-          'SmallTest': None,
-        },
-        'class': 'org.chromium.test.SampleTest',
-        'method': 'testMethod1',
-        'is_junit4': True,
-      },
-      {
-        'annotations': {
-          'Feature': {'value': ['Foo']},
-          'SmallTest': None,
-        },
-        'class': 'org.chromium.test.SampleTest',
-        'method': 'testMethod1__sandboxed_mode',
-        'is_junit4': True,
-      },
-    ]
-
-    o._test_jar = 'path/to/test.jar'
-    o._junit4_runner_class = 'J4Runner'
-    o._test_filter = 'org.chromium.test.SampleTest.testMethod1'
-    actual_tests = o.ProcessRawTests(raw_tests)
-
-    self.assertEquals(actual_tests, expected_tests)
-
-  def testGetTests_wildcardGtestFilter(self):
-    o = self.createTestInstance()
-    raw_tests = [
-      {
-        'annotations': {'Feature': {'value': ['Foo']}},
-        'class': 'org.chromium.test.SampleTest',
-        'superclass': 'java.lang.Object',
-        'methods': [
-          {
-            'annotations': {'SmallTest': None},
-            'method': 'testMethod1',
-          },
-          {
-            'annotations': {'MediumTest': None},
-            'method': 'testMethod2',
-          },
-        ],
-      },
-      {
-        'annotations': {'Feature': {'value': ['Bar']}},
-        'class': 'org.chromium.test.SampleTest2',
-        'superclass': 'java.lang.Object',
-        'methods': [
-          {
-            'annotations': {'SmallTest': None},
-            'method': 'testMethod1',
-          },
-        ],
-      }
-    ]
-
-    expected_tests = [
-      {
-        'annotations': {
           'Feature': {'value': ['Bar']},
           'SmallTest': None,
         },
         'class': 'org.chromium.test.SampleTest2',
         'is_junit4': True,
         'method': 'testMethod1',
       },
     ]
 
     o._test_filter = 'org.chromium.test.SampleTest2.*'
     o._test_jar = 'path/to/test.jar'
-    o._junit4_runner_class = 'J4Runner'
-    actual_tests = o.ProcessRawTests(raw_tests)
+    o._test_runner_junit4 = 'J4Runner'
+    with mock.patch(_INSTRUMENTATION_TEST_INSTANCE_PATH % '_GetTestsFromPickle',
+                    return_value=raw_tests):
+      actual_tests = o.GetTests()
 
     self.assertEquals(actual_tests, expected_tests)
 
   def testGetTests_negativeGtestFilter(self):
     o = self.createTestInstance()
     raw_tests = [
       {
         'annotations': {'Feature': {'value': ['Foo']}},
         'class': 'org.chromium.test.SampleTest',
         'superclass': 'java.lang.Object',
@@ skipping 37 matching lines @@
           'SmallTest': None,
         },
         'class': 'org.chromium.test.SampleTest2',
         'is_junit4': True,
         'method': 'testMethod1',
       },
     ]
 
     o._test_filter = '*-org.chromium.test.SampleTest.testMethod1'
     o._test_jar = 'path/to/test.jar'
-    o._junit4_runner_class = 'J4Runner'
-    actual_tests = o.ProcessRawTests(raw_tests)
+    o._test_runner_junit4 = 'J4Runner'
+    with mock.patch(_INSTRUMENTATION_TEST_INSTANCE_PATH % '_GetTestsFromPickle',
+                    return_value=raw_tests):
+      actual_tests = o.GetTests()
 
     self.assertEquals(actual_tests, expected_tests)
 
   def testGetTests_annotationFilter(self):
     o = self.createTestInstance()
     raw_tests = [
       {
         'annotations': {'Feature': {'value': ['Foo']}},
         'class': 'org.chromium.test.SampleTest',
         'superclass': 'java.lang.Object',
@@ skipping 37 matching lines @@
           'SmallTest': None,
         },
         'class': 'org.chromium.test.SampleTest2',
         'is_junit4': True,
         'method': 'testMethod1',
       },
     ]
 
     o._annotations = [('SmallTest', None)]
     o._test_jar = 'path/to/test.jar'
-    o._junit4_runner_class = 'J4Runner'
-    actual_tests = o.ProcessRawTests(raw_tests)
+    o._test_runner_junit4 = 'J4Runner'
+    with mock.patch(_INSTRUMENTATION_TEST_INSTANCE_PATH % '_GetTestsFromPickle',
+                    return_value=raw_tests):
+      actual_tests = o.GetTests()
 
     self.assertEquals(actual_tests, expected_tests)
 
   def testGetTests_excludedAnnotationFilter(self):
     o = self.createTestInstance()
     raw_tests = [
       {
         'annotations': {'Feature': {'value': ['Foo']}},
         'class': 'org.chromium.test.SampleTest',
         'superclass': 'junit.framework.TestCase',
@@ skipping 28 matching lines @@
           'MediumTest': None,
         },
         'class': 'org.chromium.test.SampleTest',
         'is_junit4': False,
         'method': 'testMethod2',
       },
     ]
 
     o._excluded_annotations = [('SmallTest', None)]
     o._test_jar = 'path/to/test.jar'
-    o._junit4_runner_class = 'J4Runner'
-    actual_tests = o.ProcessRawTests(raw_tests)
+    o._test_runner_junit4 = 'J4Runner'
+    with mock.patch(_INSTRUMENTATION_TEST_INSTANCE_PATH % '_GetTestsFromPickle',
+                    return_value=raw_tests):
+      actual_tests = o.GetTests()
 
     self.assertEquals(actual_tests, expected_tests)
 
   def testGetTests_annotationSimpleValueFilter(self):
     o = self.createTestInstance()
     raw_tests = [
       {
         'annotations': {'Feature': {'value': ['Foo']}},
         'class': 'org.chromium.test.SampleTest',
         'superclass': 'junit.framework.TestCase',
@@ skipping 38 matching lines @@
           'TestValue': '1',
         },
         'class': 'org.chromium.test.SampleTest',
         'is_junit4': False,
         'method': 'testMethod1',
       },
     ]
 
     o._annotations = [('TestValue', '1')]
     o._test_jar = 'path/to/test.jar'
-    o._junit4_runner_class = 'J4Runner'
-    actual_tests = o.ProcessRawTests(raw_tests)
+    o._test_runner_junit4 = 'J4Runner'
+    with mock.patch(_INSTRUMENTATION_TEST_INSTANCE_PATH % '_GetTestsFromPickle',
+                    return_value=raw_tests):
+      actual_tests = o.GetTests()
 
     self.assertEquals(actual_tests, expected_tests)
 
   def testGetTests_annotationDictValueFilter(self):
     o = self.createTestInstance()
     raw_tests = [
       {
         'annotations': {'Feature': {'value': ['Foo']}},
         'class': 'org.chromium.test.SampleTest',
         'superclass': 'java.lang.Object',
@@ skipping 28 matching lines @@
           'SmallTest': None,
         },
         'class': 'org.chromium.test.SampleTest2',
         'is_junit4': True,
         'method': 'testMethod1',
       },
     ]
 
     o._annotations = [('Feature', 'Bar')]
     o._test_jar = 'path/to/test.jar'
-    o._junit4_runner_class = 'J4Runner'
-    actual_tests = o.ProcessRawTests(raw_tests)
+    o._test_runner_junit4 = 'J4Runner'
+    with mock.patch(_INSTRUMENTATION_TEST_INSTANCE_PATH % '_GetTestsFromPickle',
+                    return_value=raw_tests):
+      actual_tests = o.GetTests()
 
     self.assertEquals(actual_tests, expected_tests)
 
-  def testGetTestName(self):
-    test = {
-      'annotations': {
-        'RunWith': {'value': 'class J4Runner'},
-        'SmallTest': {},
-        'Test': {'expected': 'class org.junit.Test$None',
-                 'timeout': '0'},
-                 'UiThreadTest': {}},
-      'class': 'org.chromium.TestA',
-      'is_junit4': True,
-      'method': 'testSimple'}
-    unqualified_class_test = {
-      'class': test['class'].split('.')[-1],
-      'method': test['method']
-    }
-
-    self.assertEquals(
-        instrumentation_test_instance.GetTestName(test, sep='.'),
-        'org.chromium.TestA.testSimple')
-    self.assertEquals(
-        instrumentation_test_instance.GetTestName(
-            unqualified_class_test, sep='.'),
-        'TestA.testSimple')
-
-  def testGetUniqueTestName(self):
-    test = {
-      'annotations': {
-        'RunWith': {'value': 'class J4Runner'},
-        'SmallTest': {},
-        'Test': {'expected': 'class org.junit.Test$None', 'timeout': '0'},
-                 'UiThreadTest': {}},
-      'class': 'org.chromium.TestA',
-      'flags': ['enable_features=abc'],
-      'is_junit4': True,
-      'method': 'testSimple'}
-    self.assertEquals(
-        instrumentation_test_instance.GetUniqueTestName(
-            test, sep='.'),
-        'org.chromium.TestA.testSimple with enable_features=abc')
-
-  def testGetTestNameWithoutParameterPostfix(self):
-    test = {
-      'annotations': {
-        'RunWith': {'value': 'class J4Runner'},
-        'SmallTest': {},
-        'Test': {'expected': 'class org.junit.Test$None', 'timeout': '0'},
-                 'UiThreadTest': {}},
-      'class': 'org.chromium.TestA__sandbox_mode',
-      'flags': 'enable_features=abc',
-      'is_junit4': True,
-      'method': 'testSimple'}
-    unqualified_class_test = {
-      'class': test['class'].split('.')[-1],
-      'method': test['method']
-    }
-    self.assertEquals(
-        instrumentation_test_instance.GetTestNameWithoutParameterPostfix(
-            test, sep='.'),
-        'org.chromium.TestA')
-    self.assertEquals(
-        instrumentation_test_instance.GetTestNameWithoutParameterPostfix(
-            unqualified_class_test, sep='.'),
-        'TestA')
-
   def testGetTests_multipleAnnotationValuesRequested(self):
     o = self.createTestInstance()
     raw_tests = [
       {
         'annotations': {'Feature': {'value': ['Foo']}},
         'class': 'org.chromium.test.SampleTest',
         'superclass': 'junit.framework.TestCase',
         'methods': [
           {
             'annotations': {'SmallTest': None},
@@ skipping 37 matching lines @@
           'SmallTest': None,
         },
         'class': 'org.chromium.test.SampleTest2',
         'is_junit4': False,
         'method': 'testMethod1',
       },
     ]
 
     o._annotations = [('Feature', 'Bar'), ('Feature', 'Baz')]
     o._test_jar = 'path/to/test.jar'
-    o._junit4_runner_class = 'J4Runner'
-    actual_tests = o.ProcessRawTests(raw_tests)
+    o._test_runner_junit4 = 'J4Runner'
+    with mock.patch(_INSTRUMENTATION_TEST_INSTANCE_PATH % '_GetTestsFromPickle',
+                    return_value=raw_tests):
+      actual_tests = o.GetTests()
 
     self.assertEquals(actual_tests, expected_tests)
 
   def testGenerateTestResults_noStatus(self):
     results = instrumentation_test_instance.GenerateTestResults(
         None, None, [], 0, 1000)
     self.assertEqual([], results)
 
   def testGenerateTestResults_testPassed(self):
     statuses = [
@@ skipping 151 matching lines @@
         {
           'annotations': {
             'CommandLineParameter': {'value': ['', 'enable-features=abc']},
              'MediumTest': None},
           'class': 'org.chromium.test.SampleTest',
           'flags': ['--enable-features=abc'],
           'is_junit4': True,
           'method': 'testMethod2'}]
 
     o._test_jar = 'path/to/test.jar'
-    o._junit4_runner_class = 'J4Runner'
-    actual_tests = o.ProcessRawTests(raw_tests)
+    o._test_runner_junit4 = 'J4Runner'
+    with mock.patch(_INSTRUMENTATION_TEST_INSTANCE_PATH % '_GetTestsFromPickle',
+                    return_value=raw_tests):
+      actual_tests = o.GetTests()
     self.assertEquals(actual_tests, expected_tests)
 
   def testCommandLineParameterization_skipped(self):
     o = self.createTestInstance()
     raw_tests = [
       {
         'annotations': {'CommandLineParameter': {
           'value': ['', 'enable-features=abc']}},
         'class': 'org.chromium.test.SampleTest',
         'superclass': 'java.lang.Object',
@@ skipping 32 matching lines @@
         {
           'annotations': {
             'CommandLineParameter': {'value': ['', 'enable-features=abc']},
              'MediumTest': None},
           'class': 'org.chromium.test.SampleTest',
           'flags': ['--enable-features=abc'],
           'is_junit4': True,
           'method': 'testMethod2'}]
 
     o._test_jar = 'path/to/test.jar'
-    o._junit4_runner_class = 'J4Runner'
-    actual_tests = o.ProcessRawTests(raw_tests)
+    o._test_runner_junit4 = 'J4Runner'
+    with mock.patch(_INSTRUMENTATION_TEST_INSTANCE_PATH % '_GetTestsFromPickle',
+                    return_value=raw_tests):
+      actual_tests = o.GetTests()
     self.assertEquals(actual_tests, expected_tests)
 
 if __name__ == '__main__':
   unittest.main(verbosity=2)