Merge "Migrate RollbackTest and StagedRollbackTest to cts utils" (aaeeaaaf) · Commits · e / os / android_frameworks_base

tests/RollbackTest/Android.bp

+1 −77

Original line number	Diff line number	Diff line
		@@ -12,88 +12,12 @@
		// See the License for the specific language governing permissions and
		// limitations under the License.

		android_test_helper_app {
		name: "RollbackTestAppAv1",
		manifest: "TestApp/Av1.xml",
		sdk_version: "current",
		srcs: ["TestApp/src/*/.java"],
		resource_dirs: ["TestApp/res_v1"],
		}

		android_test_helper_app {
		name: "RollbackTestAppAv2",
		manifest: "TestApp/Av2.xml",
		sdk_version: "current",
		srcs: ["TestApp/src/*/.java"],
		resource_dirs: ["TestApp/res_v2"],
		}

		android_test_helper_app {
		name: "RollbackTestAppAv3",
		manifest: "TestApp/Av3.xml",
		sdk_version: "current",
		srcs: ["TestApp/src/*/.java"],
		resource_dirs: ["TestApp/res_v3"],
		}

		android_test_helper_app {
		name: "RollbackTestAppACrashingV2",
		manifest: "TestApp/ACrashingV2.xml",
		sdk_version: "current",
		srcs: ["TestApp/src/*/.java"],
		resource_dirs: ["TestApp/res_v2"],
		}

		android_test_helper_app {
		name: "RollbackTestAppBv1",
		manifest: "TestApp/Bv1.xml",
		sdk_version: "current",
		srcs: ["TestApp/src/*/.java"],
		resource_dirs: ["TestApp/res_v1"],
		}

		android_test_helper_app {
		name: "RollbackTestAppBv2",
		manifest: "TestApp/Bv2.xml",
		sdk_version: "current",
		srcs: ["TestApp/src/*/.java"],
		resource_dirs: ["TestApp/res_v2"],
		}

		android_test_helper_app {
		name: "RollbackTestAppASplitV1",
		manifest: "TestApp/Av1.xml",
		sdk_version: "current",
		srcs: ["TestApp/src/*/.java"],
		resource_dirs: ["TestApp/res_v1"],
		package_splits: ["anydpi"],
		}

		android_test_helper_app {
		name: "RollbackTestAppASplitV2",
		manifest: "TestApp/Av2.xml",
		sdk_version: "current",
		srcs: ["TestApp/src/*/.java"],
		resource_dirs: ["TestApp/res_v2"],
		package_splits: ["anydpi"],
		}

		android_test {
		name: "RollbackTest",
		manifest: "RollbackTest/AndroidManifest.xml",
		srcs: ["RollbackTest/src/*/.java"],
		static_libs: ["androidx.test.rules"],
		static_libs: ["androidx.test.rules", "cts-rollback-lib", "cts-install-lib"],
		test_suites: ["general-tests"],
		java_resources: [
		":RollbackTestAppAv1",
		":RollbackTestAppAv2",
		":RollbackTestAppAv3",
		":RollbackTestAppACrashingV2",
		":RollbackTestAppBv1",
		":RollbackTestAppBv2",
		":RollbackTestAppASplitV1",
		":RollbackTestAppASplitV2",
		],
		test_config: "RollbackTest.xml",
		// TODO: sdk_version: "test_current" when Intent#resolveSystemservice is TestApi
		}

tests/RollbackTest/RollbackTest/AndroidManifest.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@
		package="com.android.tests.rollback" >

		<application>
		<receiver android:name="com.android.tests.rollback.LocalIntentSender"
		<receiver android:name="com.android.cts.install.lib.LocalIntentSender"
		android:exported="true" />
		<uses-library android:name="android.test.runner" />
		</application>

tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/LocalIntentSender.java

deleted100644 → 0

+0 −60

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 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.tests.rollback;

		import android.app.PendingIntent;
		import android.content.BroadcastReceiver;
		import android.content.Context;
		import android.content.Intent;
		import android.content.IntentSender;

		import androidx.test.InstrumentationRegistry;

		import java.util.concurrent.BlockingQueue;
		import java.util.concurrent.LinkedBlockingQueue;

		/**
		* Make IntentSender that sends intent locally.
		*/
		public class LocalIntentSender extends BroadcastReceiver {

		private static final String TAG = "RollbackTest";

		private static final BlockingQueue<Intent> sIntentSenderResults = new LinkedBlockingQueue<>();

		@Override
		public void onReceive(Context context, Intent intent) {
		sIntentSenderResults.add(intent);
		}

		/**
		* Get a LocalIntentSender.
		*/
		static IntentSender getIntentSender() {
		Context context = InstrumentationRegistry.getContext();
		Intent intent = new Intent(context, LocalIntentSender.class);
		PendingIntent pending = PendingIntent.getBroadcast(context, 0, intent, 0);
		return pending.getIntentSender();
		}

		/**
		* Returns the most recent Intent sent by a LocalIntentSender.
		*/
		static Intent getIntentSenderResult() throws InterruptedException {
		return sIntentSenderResults.take();
		}
		}

tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/RollbackBroadcastReceiver.java

deleted100644 → 0

+0 −78

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 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.tests.rollback;

		import android.content.BroadcastReceiver;
		import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.util.Log;

		import androidx.test.InstrumentationRegistry;

		import java.util.concurrent.BlockingQueue;
		import java.util.concurrent.LinkedBlockingQueue;
		import java.util.concurrent.TimeUnit;

		/**
		* A broadcast receiver that can be used to get
		* ACTION_ROLLBACK_COMMITTED broadcasts.
		*/
		class RollbackBroadcastReceiver extends BroadcastReceiver {

		private static final String TAG = "RollbackTest";

		private final BlockingQueue<Intent> mRollbackBroadcasts = new LinkedBlockingQueue<>();

		/**
		* Creates a RollbackBroadcastReceiver and registers it with the given
		* context.
		*/
		RollbackBroadcastReceiver() {
		IntentFilter filter = new IntentFilter();
		filter.addAction(Intent.ACTION_ROLLBACK_COMMITTED);
		InstrumentationRegistry.getContext().registerReceiver(this, filter);
		}

		@Override
		public void onReceive(Context context, Intent intent) {
		Log.i(TAG, "Received rollback broadcast intent");
		mRollbackBroadcasts.add(intent);
		}

		/**
		* Polls for at most the given amount of time for the next rollback
		* broadcast.
		*/
		Intent poll(long timeout, TimeUnit unit) throws InterruptedException {
		return mRollbackBroadcasts.poll(timeout, unit);
		}

		/**
		* Waits forever for the next rollback broadcast.
		*/
		Intent take() throws InterruptedException {
		return mRollbackBroadcasts.take();
		}

		/**
		* Unregisters this broadcast receiver.
		*/
		void unregister() {
		InstrumentationRegistry.getContext().unregisterReceiver(this);
		}
		}

tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/RollbackTest.java

+407 −344

File changed.

Preview size limit exceeded, changes collapsed.