Merge "Add tests for RRO of APK-in-APEX." into rvc-dev am: 4914d4cd4c (9f8f3ff9) · Commits · e / os / android_frameworks_base

core/tests/overlaytests/remount/Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,8 @@ java_test_host {
		],
		test_suites: ["general-tests"],
		java_resources: [
		":com.android.overlaytest.overlaid",
		":com.android.overlaytest.overlay",
		":OverlayRemountedTest_SharedLibrary",
		":OverlayRemountedTest_SharedLibraryOverlay",
		":OverlayRemountedTest_Target",

core/tests/overlaytests/remount/src/com/android/overlaytest/remounted/OverlayApexTest.java

0 → 100644

+66 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 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.
		*/

		package com.android.overlaytest.remounted;

		import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;

		import org.junit.Test;
		import org.junit.runner.RunWith;

		@RunWith(DeviceJUnit4ClassRunner.class)
		public class OverlayApexTest extends OverlayRemountedTestBase {
		private static final String OVERLAID_APEX = "com.android.overlaytest.overlaid.apex";
		private static final String OVERLAY_APEX = "com.android.overlaytest.overlay.apex";

		@Test
		public void testApkInApexCanBeOverlaid() throws Exception {
		final String targetResource = resourceName(TARGET_PACKAGE, "bool", "target_overlaid");

		// The target APK will be installed inside the overlaid APEX.
		mPreparer.pushResourceFile(OVERLAID_APEX,
		"/system/apex/com.android.overlaytest.overlaid.apex")
		.installResourceApk(OVERLAY_APK, OVERLAY_PACKAGE)
		.reboot()
		.setOverlayEnabled(OVERLAY_PACKAGE, false);

		// The resource is not currently overlaid.
		assertResource(targetResource, "false");

		// Overlay the resource.
		mPreparer.setOverlayEnabled(OVERLAY_PACKAGE, true);
		assertResource(targetResource, "true");
		}

		@Test
		public void testApkInApexCanOverlay() throws Exception {
		final String targetResource = resourceName(TARGET_PACKAGE, "bool", "target_overlaid");

		// The overlay APK will be installed inside the overlay APEX.
		mPreparer.pushResourceFile(OVERLAY_APEX,
		"/system/apex/com.android.overlaytest.overlay.apex")
		.installResourceApk(TARGET_APK, TARGET_PACKAGE)
		.reboot()
		.setOverlayEnabled(OVERLAY_PACKAGE, false);

		// The resource is not currently overlaid.
		assertResource(targetResource, "false");

		// Overlay the resource.
		mPreparer.setOverlayEnabled(OVERLAY_PACKAGE, true);
		assertResource(targetResource, "true");
		}
		}

core/tests/overlaytests/remount/src/com/android/overlaytest/remounted/OverlayRemountedTestBase.java

+1 −11

Original line number	Diff line number	Diff line
		@@ -27,21 +27,11 @@ import org.junit.rules.RuleChain;
		import org.junit.rules.TemporaryFolder;

		public class OverlayRemountedTestBase extends BaseHostJUnit4Test {
		static final long ASSERT_RESOURCE_TIMEOUT_MS = 30000;

		private static final long ASSERT_RESOURCE_TIMEOUT_MS = 30000;
		static final String TARGET_APK = "OverlayRemountedTest_Target.apk";
		static final String TARGET_PACKAGE = "com.android.overlaytest.remounted.target";
		static final String TARGET_UPGRADE_APK = "OverlayRemountedTest_TargetUpgrade.apk";
		static final String OVERLAY_APK = "OverlayRemountedTest_Overlay.apk";
		static final String OVERLAY_PACKAGE = "com.android.overlaytest.remounted.target.overlay";
		static final String SHARED_LIBRARY_APK =
		"OverlayRemountedTest_SharedLibrary.apk";
		static final String SHARED_LIBRARY_PACKAGE =
		"com.android.overlaytest.remounted.shared_library";
		static final String SHARED_LIBRARY_OVERLAY_APK =
		"OverlayRemountedTest_SharedLibraryOverlay.apk";
		static final String SHARED_LIBRARY_OVERLAY_PACKAGE =
		"com.android.overlaytest.remounted.shared_library.overlay";

		private final TemporaryFolder mTemporaryFolder = new TemporaryFolder();
		protected final SystemPreparer mPreparer = new SystemPreparer(mTemporaryFolder,

core/tests/overlaytests/remount/src/com/android/overlaytest/remounted/OverlaySharedLibraryTest.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,14 @@ import org.junit.runner.RunWith;

		@RunWith(DeviceJUnit4ClassRunner.class)
		public class OverlaySharedLibraryTest extends OverlayRemountedTestBase {
		private static final String SHARED_LIBRARY_APK =
		"OverlayRemountedTest_SharedLibrary.apk";
		private static final String SHARED_LIBRARY_PACKAGE =
		"com.android.overlaytest.remounted.shared_library";
		private static final String SHARED_LIBRARY_OVERLAY_APK =
		"OverlayRemountedTest_SharedLibraryOverlay.apk";
		private static final String SHARED_LIBRARY_OVERLAY_PACKAGE =
		"com.android.overlaytest.remounted.shared_library.overlay";

		@Test
		public void testSharedLibrary() throws Exception {

core/tests/overlaytests/remount/src/com/android/overlaytest/remounted/PackagedUpgradedTest.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import org.junit.runner.RunWith;

		@RunWith(DeviceJUnit4ClassRunner.class)
		public class PackagedUpgradedTest extends OverlayRemountedTestBase {
		private static final String TARGET_UPGRADE_APK = "OverlayRemountedTest_TargetUpgrade.apk";

		@Test
		public void testTargetUpgrade() throws Exception {