Merge "Default test to AndroidJUnitTest for auto-generated test config."
This commit is contained in:
commit
ce1fa25d1b
2 changed files with 4 additions and 3 deletions
|
@ -70,8 +70,9 @@ def main(argv):
|
|||
label = module
|
||||
runner = instrumentation.attributes[ATTRIBUTE_RUNNER].value
|
||||
package = manifest.attributes[ATTRIBUTE_PACKAGE].value
|
||||
test_type = ('AndroidJUnitTest' if runner.endswith('.AndroidJUnitRunner')
|
||||
else 'InstrumentationTest')
|
||||
test_type = ('InstrumentationTest'
|
||||
if runner.endswith('.InstrumentationTestRunner')
|
||||
else 'AndroidJUnitTest')
|
||||
|
||||
with open(instrumentation_test_config_template) as template:
|
||||
config = template.read()
|
||||
|
|
|
@ -155,7 +155,7 @@ class AutoGenTestConfigUnittests(unittest.TestCase):
|
|||
self.assertEqual(config_file.read(), EXPECTED_JUNIT_TEST_CONFIG)
|
||||
|
||||
def testCreateInstrumentationTestConfig(self):
|
||||
"""Test creating test config for AndroidJUnitTest.
|
||||
"""Test creating test config for InstrumentationTest.
|
||||
"""
|
||||
with open(self.manifest_file, 'w') as f:
|
||||
f.write(MANIFEST_INSTRUMENTATION_TEST)
|
||||
|
|
Loading…
Reference in a new issue