c6f4b532f3
Tests that run against mainline modules generally need to be built twice: once for aosp (unsigned) and once for internal (signed). The override_android_test rule is really useful for generating a signed version of the unsigned test. However, mainline tests need to use a MainlineTestModuleController to only run tests on targets with the expected module. Since unsigned and signed mainline modules have different package names, this means the test config needs to be updated when overriding a test. Add a new "mainline_package_name" argument so that android test rules can update the targeted mainline package. Without this, the only way to create a mainline package test is to instead use android_test, which results in a lot of copy-pasta. Test: added tests to soong Test: manual, using a locally-modified RkpdAppUnitTest Test: test_config_fixer_test.py Change-Id: Idaffd63f225719a2bfda41018fda630b17db0080
157 lines
6.3 KiB
Python
157 lines
6.3 KiB
Python
#!/usr/bin/env python
|
|
#
|
|
# Copyright (C) 2019 The Android Open Source Project
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
#
|
|
"""Unit tests for test_config_fixer.py."""
|
|
|
|
import io
|
|
import sys
|
|
import unittest
|
|
from xml.dom import minidom
|
|
|
|
import test_config_fixer
|
|
|
|
from manifest import write_xml
|
|
|
|
sys.dont_write_bytecode = True
|
|
|
|
|
|
class OverwritePackageNameTest(unittest.TestCase):
|
|
""" Unit tests for overwrite_package_name function """
|
|
|
|
manifest = (
|
|
'<?xml version="1.0" encoding="utf-8"?>\n'
|
|
'<manifest xmlns:android="http://schemas.android.com/apk/res/android"\n'
|
|
' package="com.android.foo">\n'
|
|
' <application>\n'
|
|
' </application>\n'
|
|
'</manifest>\n')
|
|
|
|
test_config = (
|
|
'<?xml version="1.0" encoding="utf-8"?>\n'
|
|
'<configuration description="Runs some tests.">\n'
|
|
' <option name="test-suite-tag" value="apct"/>\n'
|
|
' <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">\n'
|
|
' <option name="package" value="%s"/>\n'
|
|
' </target_preparer>\n'
|
|
' <test class="com.android.tradefed.testtype.AndroidJUnitTest">\n'
|
|
' <option name="package" value="%s"/>\n'
|
|
' <option name="runtime-hint" value="20s"/>\n'
|
|
' </test>\n'
|
|
' <test class="com.android.tradefed.testtype.AndroidJUnitTest">\n'
|
|
' <option name="package" value="%s"/>\n'
|
|
' <option name="runtime-hint" value="15s"/>\n'
|
|
' </test>\n'
|
|
'</configuration>\n')
|
|
|
|
def test_all(self):
|
|
doc = minidom.parseString(self.test_config % ("com.android.foo", "com.android.foo", "com.android.bar"))
|
|
manifest = minidom.parseString(self.manifest)
|
|
|
|
test_config_fixer.overwrite_package_name(doc, manifest, "com.soong.foo")
|
|
output = io.StringIO()
|
|
test_config_fixer.write_xml(output, doc)
|
|
|
|
# Only the matching package name in a test node should be updated.
|
|
expected = self.test_config % ("com.android.foo", "com.soong.foo", "com.android.bar")
|
|
self.assertEqual(expected, output.getvalue())
|
|
|
|
|
|
class OverwriteTestFileNameTest(unittest.TestCase):
|
|
""" Unit tests for overwrite_test_file_name function """
|
|
|
|
test_config_test_app_install_setup = (
|
|
'<?xml version="1.0" encoding="utf-8"?>\n'
|
|
'<configuration description="Runs some tests.">\n'
|
|
' <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">\n'
|
|
' <option name="test-file-name" value="%s"/>\n'
|
|
' </target_preparer>\n'
|
|
' <test class="com.android.tradefed.testtype.AndroidJUnitTest">\n'
|
|
' <option name="package" value="com.android.foo"/>\n'
|
|
' <option name="runtime-hint" value="20s"/>\n'
|
|
' </test>\n'
|
|
'</configuration>\n')
|
|
|
|
test_config_suite_apk_installer = (
|
|
'<?xml version="1.0" encoding="utf-8"?>\n'
|
|
'<configuration description="Runs some tests.">\n'
|
|
' <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">\n'
|
|
' <option name="test-file-name" value="%s"/>\n'
|
|
' </target_preparer>\n'
|
|
' <test class="com.android.tradefed.testtype.AndroidJUnitTest">\n'
|
|
' <option name="package" value="com.android.foo"/>\n'
|
|
' <option name="runtime-hint" value="20s"/>\n'
|
|
' </test>\n'
|
|
'</configuration>\n')
|
|
|
|
def test_testappinstallsetup(self):
|
|
doc = minidom.parseString(self.test_config_test_app_install_setup % ("foo.apk"))
|
|
|
|
test_config_fixer.overwrite_test_file_name(doc, "bar.apk")
|
|
output = io.StringIO()
|
|
test_config_fixer.write_xml(output, doc)
|
|
|
|
# Only the matching package name in a test node should be updated.
|
|
expected = self.test_config_test_app_install_setup % ("bar.apk")
|
|
self.assertEqual(expected, output.getvalue())
|
|
|
|
def test_suiteapkinstaller(self):
|
|
doc = minidom.parseString(self.test_config_suite_apk_installer % ("foo.apk"))
|
|
|
|
test_config_fixer.overwrite_test_file_name(doc, "bar.apk")
|
|
output = io.StringIO()
|
|
test_config_fixer.write_xml(output, doc)
|
|
|
|
# Only the matching package name in a test node should be updated.
|
|
expected = self.test_config_suite_apk_installer % ("bar.apk")
|
|
self.assertEqual(expected, output.getvalue())
|
|
|
|
|
|
class OverwriteMainlineModulePackageNameTest(unittest.TestCase):
|
|
""" Unit tests for overwrite_mainline_module_package_name function """
|
|
|
|
test_config = (
|
|
'<?xml version="1.0" encoding="utf-8"?>\n'
|
|
'<configuration description="Runs some tests.">\n'
|
|
' <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">\n'
|
|
' <option name="test-file-name" value="foo.apk"/>\n'
|
|
' </target_preparer>\n'
|
|
' <test class="com.android.tradefed.testtype.AndroidJUnitTest">\n'
|
|
' <option name="package" value="com.android.foo"/>\n'
|
|
' <option name="runtime-hint" value="20s"/>\n'
|
|
' </test>\n'
|
|
' <object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">\n'
|
|
' <option name="enable" value="true"/>\n'
|
|
' <option name="mainline-module-package-name" value="%s"/>\n'
|
|
' </object>\n'
|
|
'</configuration>\n')
|
|
|
|
def test_testappinstallsetup(self):
|
|
doc = minidom.parseString(self.test_config % ("com.android.old.package.name"))
|
|
|
|
test_config_fixer.overwrite_mainline_module_package_name(doc, "com.android.new.package.name")
|
|
output = io.StringIO()
|
|
test_config_fixer.write_xml(output, doc)
|
|
|
|
# Only the mainline module package name should be updated. Format the xml
|
|
# with minidom first to avoid mismatches due to trivial reformatting.
|
|
expected = io.StringIO()
|
|
write_xml(expected, minidom.parseString(self.test_config % ("com.android.new.package.name")))
|
|
self.maxDiff = None
|
|
self.assertEqual(expected.getvalue(), output.getvalue())
|
|
|
|
|
|
if __name__ == '__main__':
|
|
unittest.main(verbosity=2)
|