Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce1fa25d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Default test to AndroidJUnitTest for auto-generated test config."

parents 3aee4dfa 96068b77

tools/auto_gen_test_config.py

+3 −2
Original line number Diff line number Diff line
@@ -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()

tools/auto_gen_test_config_test.py

+1 −1
Original line number Diff line number Diff line
@@ -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)