Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(834)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/android/pylib/instrumentation/instrumentation_test_instance_test.py

Issue 2991833003: Revert of List Java Instru Test Information From JUnit Runner (Closed)
Patch Set: Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/pylib/instrumentation/instrumentation_test_instance.py ('k') | build/android/pylib/local/device/local_device_instrumentation_test_run.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/instrumentation/instrumentation_test_instance_test.py
diff --git a/build/android/pylib/instrumentation/instrumentation_test_instance_test.py b/build/android/pylib/instrumentation/instrumentation_test_instance_test.py
index 9b4f9c159ed3044bee4b718968e7462349015662..a71095dc82fb49e9a909f5b18c6e3c46131aadec 100755
--- a/build/android/pylib/instrumentation/instrumentation_test_instance_test.py
+++ b/build/android/pylib/instrumentation/instrumentation_test_instance_test.py
@@ -144,8 +144,10 @@
]
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)
@@ -183,12 +185,14 @@
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)
-
- self.assertEquals(actual_tests, expected_tests)
-
- def testGetTests_simpleGtestUnqualifiedNameFilter(self):
+ 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 = [
{
@@ -205,45 +209,6 @@
'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']}},
@@ -261,65 +226,6 @@
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,
},
@@ -331,8 +237,10 @@
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)
@@ -390,8 +298,10 @@
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)
@@ -449,8 +359,10 @@
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)
@@ -499,8 +411,10 @@
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)
@@ -559,8 +473,10 @@
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)
@@ -609,74 +525,12 @@
o._annotations = [('Feature', 'Bar')]
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 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')
+ 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()
@@ -735,8 +589,10 @@
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)
@@ -908,8 +764,10 @@
'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):
@@ -962,8 +820,10 @@
'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__':
« no previous file with comments | « build/android/pylib/instrumentation/instrumentation_test_instance.py ('k') | build/android/pylib/local/device/local_device_instrumentation_test_run.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698