Rename legacy-test related files to android-test-base
This is to make it consistent with the test-runner and test-mock
directories. A following change will update the targets.
Bug: 30188076
Test: make checkbuild
Change-Id: I6f952dda633faffaae44fafb7ec84add1595a98a
diff --git a/tests/signature/api-check/legacy-test-26-api/Android.mk b/tests/signature/api-check/android-test-base-27-api/Android.mk
similarity index 87%
rename from tests/signature/api-check/legacy-test-26-api/Android.mk
rename to tests/signature/api-check/android-test-base-27-api/Android.mk
index 699bd0c..1adcb12c 100644
--- a/tests/signature/api-check/legacy-test-26-api/Android.mk
+++ b/tests/signature/api-check/android-test-base-27-api/Android.mk
@@ -16,9 +16,9 @@
include $(CLEAR_VARS)
-LOCAL_PACKAGE_NAME := CtsLegacyTest26ApiSignatureTestCases
+LOCAL_PACKAGE_NAME := CtsAndroidTestBase27ApiSignatureTestCases
LOCAL_SIGNATURE_API_FILES := \
- legacy-test-current.api \
+ android-test-base-current.api \
include $(LOCAL_PATH)/../build_signature_apk.mk
diff --git a/tests/signature/api-check/legacy-test-26-api/AndroidManifest.xml b/tests/signature/api-check/android-test-base-27-api/AndroidManifest.xml
similarity index 85%
rename from tests/signature/api-check/legacy-test-26-api/AndroidManifest.xml
rename to tests/signature/api-check/android-test-base-27-api/AndroidManifest.xml
index 636dfd3..c65bfdf 100644
--- a/tests/signature/api-check/legacy-test-26-api/AndroidManifest.xml
+++ b/tests/signature/api-check/android-test-base-27-api/AndroidManifest.xml
@@ -16,16 +16,16 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.signature.cts.api.legacy_test_26">
+ package="android.signature.cts.api.android_test_base_26">
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
- <uses-sdk android:minSdkVersion="25" android:targetSdkVersion="26"/>
+ <uses-sdk android:minSdkVersion="25" android:targetSdkVersion="27"/>
<application/>
<instrumentation android:name="repackaged.android.test.InstrumentationTestRunner"
- android:targetPackage="android.signature.cts.api.legacy_test_26"
- android:label="Legacy Test 26 API Signature Test"/>
+ android:targetPackage="android.signature.cts.api.android_test_base_27"
+ android:label="Android Test Base 27 API Signature Test"/>
</manifest>
diff --git a/tests/signature/api-check/legacy-test-26-api/AndroidTest.xml b/tests/signature/api-check/android-test-base-27-api/AndroidTest.xml
similarity index 81%
rename from tests/signature/api-check/legacy-test-26-api/AndroidTest.xml
rename to tests/signature/api-check/android-test-base-27-api/AndroidTest.xml
index ecb3299..c9cbd9a 100644
--- a/tests/signature/api-check/legacy-test-26-api/AndroidTest.xml
+++ b/tests/signature/api-check/android-test-base-27-api/AndroidTest.xml
@@ -13,23 +13,23 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<configuration description="Config for CTS Legacy Test 26 API Signature test cases">
+<configuration description="Config for CTS Android Test Base 27 API Signature test cases">
<option name="config-descriptor:metadata" key="component" value="systems" />
<target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
<option name="run-command" value="mkdir -p /data/local/tmp/signature-test" />
<option name="teardown-command" value="rm -rf /data/local/tmp/signature-test" />
</target_preparer>
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
- <option name="push" value="legacy-test-current.api->/data/local/tmp/signature-test/legacy-test-current.api" />
+ <option name="push" value="android-test-base-current.api->/data/local/tmp/signature-test/android-test-base-current.api" />
</target_preparer>
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
- <option name="test-file-name" value="CtsLegacyTest26ApiSignatureTestCases.apk" />
+ <option name="test-file-name" value="CtsAndroidTestBase27ApiSignatureTestCases.apk" />
</target_preparer>
<test class="com.android.tradefed.testtype.AndroidJUnitTest" >
- <option name="package" value="android.signature.cts.api.legacy_test_26" />
+ <option name="package" value="android.signature.cts.api.android_test_base_27" />
<option name="runner" value="repackaged.android.test.InstrumentationTestRunner" />
- <option name="instrumentation-arg" key="expected-api-files" value="legacy-test-current.api" />
+ <option name="instrumentation-arg" key="expected-api-files" value="android-test-base-current.api" />
<option name="runtime-hint" value="5s" />
</test>
</configuration>