Reland allow JUnit3/4 tests within the same apk to be run by test_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 unittest
@@ skipping 26 matching lines @@
          mock.patch('%s._initializeTestCoverageAttributes' % c)):
       return instrumentation_test_instance.InstrumentationTestInstance(
           mock.MagicMock(), mock.MagicMock(), lambda s: None)
 
   def testGetTests_noFilter(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': ['Foo']},
           'SmallTest': None,
         },
         'class': 'org.chromium.test.SampleTest',
         'method': 'testMethod1',
+        'is_junit4': True,
       },
       {
         'annotations': {
           'Feature': {'value': ['Foo']},
           'MediumTest': None,
         },
         'class': 'org.chromium.test.SampleTest',
         'method': 'testMethod2',
+        'is_junit4': True,
       },
       {
         'annotations': {
           'Feature': {'value': ['Bar']},
           'SmallTest': None,
         },
         'class': 'org.chromium.test.SampleTest2',
         'method': 'testMethod1',
+        'is_junit4': True,
       },
     ]
 
     o._test_jar = 'path/to/test.jar'
+    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',
         '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 = 'org.chromium.test.SampleTest.testMethod1'
     o._test_jar = 'path/to/test.jar'
+    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_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._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',
         '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': ['Foo']},
           'MediumTest': None,
         },
         'class': 'org.chromium.test.SampleTest',
+        'is_junit4': True,
         'method': 'testMethod2',
       },
       {
         'annotations': {
           'Feature': {'value': ['Bar']},
           '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._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',
         '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': ['Foo']},
           'SmallTest': None,
         },
         'class': 'org.chromium.test.SampleTest',
+        'is_junit4': True,
         'method': 'testMethod1',
       },
       {
         'annotations': {
           'Feature': {'value': ['Bar']},
           'SmallTest': None,
         },
         'class': 'org.chromium.test.SampleTest2',
+        'is_junit4': True,
         'method': 'testMethod1',
       },
     ]
 
     o._annotations = [('SmallTest', None)]
     o._test_jar = 'path/to/test.jar'
+    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',
         'methods': [
           {
             'annotations': {'SmallTest': None},
             'method': 'testMethod1',
           },
           {
             'annotations': {'MediumTest': None},
             'method': 'testMethod2',
           },
         ],
       },
       {
         'annotations': {'Feature': {'value': ['Bar']}},
         'class': 'org.chromium.test.SampleTest2',
+        'superclass': 'junit.framework.TestCase',
         'methods': [
           {
             'annotations': {'SmallTest': None},
             'method': 'testMethod1',
           },
         ],
       }
     ]
 
     expected_tests = [
       {
         'annotations': {
           'Feature': {'value': ['Foo']},
           '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._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',
         'methods': [
           {
             'annotations': {
               'SmallTest': None,
               'TestValue': '1',
             },
             'method': 'testMethod1',
           },
           {
             'annotations': {
               'MediumTest': None,
               'TestValue': '2',
             },
             'method': 'testMethod2',
           },
         ],
       },
       {
         'annotations': {'Feature': {'value': ['Bar']}},
         'class': 'org.chromium.test.SampleTest2',
+        'superclass': 'junit.framework.TestCase',
         'methods': [
           {
             'annotations': {
               'SmallTest': None,
               'TestValue': '3',
             },
             'method': 'testMethod1',
           },
         ],
       }
     ]
 
     expected_tests = [
       {
         'annotations': {
           'Feature': {'value': ['Foo']},
           'SmallTest': None,
           'TestValue': '1',
         },
         'class': 'org.chromium.test.SampleTest',
+        'is_junit4': False,
         'method': 'testMethod1',
       },
     ]
 
     o._annotations = [('TestValue', '1')]
     o._test_jar = 'path/to/test.jar'
+    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',
         '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._annotations = [('Feature', 'Bar')]
     o._test_jar = 'path/to/test.jar'
+    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_multipleAnnotationValuesRequested(self):
     o = self.createTestInstance()
     raw_tests = [
       {
         'annotations': {'Feature': {'value': ['Foo']}},
         'class': 'org.chromium.test.SampleTest',
+        'superclass': 'junit.framework.TestCase',
         'methods': [
           {
             'annotations': {'SmallTest': None},
             'method': 'testMethod1',
           },
           {
             'annotations': {
               'Feature': {'value': ['Baz']},
               'MediumTest': None,
             },
             'method': 'testMethod2',
           },
         ],
       },
       {
         'annotations': {'Feature': {'value': ['Bar']}},
         'class': 'org.chromium.test.SampleTest2',
+        'superclass': 'junit.framework.TestCase',
         'methods': [
           {
             'annotations': {'SmallTest': None},
             'method': 'testMethod1',
           },
         ],
       }
     ]
 
     expected_tests = [
       {
         'annotations': {
           'Feature': {'value': ['Baz']},
           'MediumTest': None,
         },
         'class': 'org.chromium.test.SampleTest',
+        'is_junit4': False,
         'method': 'testMethod2',
       },
       {
         'annotations': {
           'Feature': {'value': ['Bar']},
           '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._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)
@@ skipping 101 matching lines @@
       }),
     ]
     results = instrumentation_test_instance.GenerateTestResults(
         None, None, statuses, 0, 1000)
     self.assertEqual(1, len(results))
     self.assertEqual(base_test_result.ResultType.SKIP, results[0].GetType())
 
 
 if __name__ == '__main__':
   unittest.main(verbosity=2)