Merge changes I6aaa0b56,I5bb9b8b4 (2b3dff4a) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/infra/AndroidFuture.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -513,6 +513,11 @@ public class AndroidFuture<T> extends CompletableFuture<T> implements Parcelable
		try {
		result = get();
		} catch (Exception t) {
		// Exceptions coming out of get() are wrapped in ExecutionException, which is not
		// handled by Parcel.
		if (t instanceof ExecutionException && t.getCause() instanceof Exception) {
		t = (Exception) t.getCause();
		}
		dest.writeBoolean(true);
		dest.writeException(t);
		return;

core/java/com/android/internal/infra/TEST_MAPPING

+12 −4

Original line number	Diff line number	Diff line
		@@ -10,6 +10,14 @@
		"include-filter": "android.permission.cts.PermissionControllerTest"
		}
		]
		},
		{
		"name": "FrameworksCoreTests",
		"options": [
		{
		"include-filter": "com.android.internal.infra."
		}
		]
		}
		]
		}

core/tests/coretests/src/com/android/internal/infra/AndroidFutureTest.java

0 → 100644

+126 −0

Original line number	Diff line number	Diff line
		/*
		* 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.
		*/

		package com.android.internal.infra;

		import static com.google.common.truth.Truth.assertThat;

		import static org.testng.Assert.expectThrows;

		import android.os.Parcel;

		import androidx.test.runner.AndroidJUnit4;

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

		import java.util.concurrent.CountDownLatch;
		import java.util.concurrent.ExecutionException;

		/**
		* Unit test for {@link AndroidFuture}.
		*
		* <p>To run it:
		* {@code atest FrameworksCoreTests:com.android.internal.infra.AndroidFutureTest}
		*/

		@RunWith(AndroidJUnit4.class)
		public class AndroidFutureTest {
		@Test
		public void testGet() throws Exception {
		AndroidFuture<Integer> future = new AndroidFuture<>();
		future.complete(5);
		assertThat(future.get()).isEqualTo(5);
		}

		@Test
		public void testWhenComplete_AlreadyComplete() throws Exception {
		AndroidFuture<Integer> future = new AndroidFuture<>();
		future.complete(5);
		CountDownLatch latch = new CountDownLatch(1);
		future.whenComplete((obj, err) -> {
		assertThat(obj).isEqualTo(5);
		assertThat(err).isNull();
		latch.countDown();
		});
		latch.await();
		}

		@Test
		public void testWhenComplete_NotYetComplete() throws Exception {
		AndroidFuture<Integer> future = new AndroidFuture<>();
		CountDownLatch latch = new CountDownLatch(1);
		future.whenComplete((obj, err) -> {
		assertThat(obj).isEqualTo(5);
		assertThat(err).isNull();
		latch.countDown();
		});
		assertThat(latch.getCount()).isEqualTo(1);
		future.complete(5);
		latch.await();
		assertThat(latch.getCount()).isEqualTo(0);
		}

		@Test
		public void testCompleteExceptionally() {
		AndroidFuture<Integer> future = new AndroidFuture<>();
		Exception origException = new UnsupportedOperationException();
		future.completeExceptionally(origException);
		ExecutionException executionException =
		expectThrows(ExecutionException.class, future::get);
		assertThat(executionException.getCause()).isSameAs(origException);
		}

		@Test
		public void testCompleteExceptionally_Listener() throws Exception {
		AndroidFuture<Integer> future = new AndroidFuture<>();
		Exception origException = new UnsupportedOperationException();
		future.completeExceptionally(origException);
		CountDownLatch latch = new CountDownLatch(1);
		future.whenComplete((obj, err) -> {
		assertThat(obj).isNull();
		assertThat(err).isSameAs(origException);
		latch.countDown();
		});
		latch.await();
		}

		@Test
		public void testWriteToParcel() throws Exception {
		Parcel parcel = Parcel.obtain();
		AndroidFuture<Integer> future1 = new AndroidFuture<>();
		future1.complete(5);
		future1.writeToParcel(parcel, 0);

		parcel.setDataPosition(0);
		AndroidFuture future2 = AndroidFuture.CREATOR.createFromParcel(parcel);
		assertThat(future2.get()).isEqualTo(5);
		}

		@Test
		public void testWriteToParcel_Exceptionally() throws Exception {
		Parcel parcel = Parcel.obtain();
		AndroidFuture<Integer> future1 = new AndroidFuture<>();
		future1.completeExceptionally(new UnsupportedOperationException());
		future1.writeToParcel(parcel, 0);

		parcel.setDataPosition(0);
		AndroidFuture future2 = AndroidFuture.CREATOR.createFromParcel(parcel);
		ExecutionException executionException =
		expectThrows(ExecutionException.class, future2::get);
		assertThat(executionException.getCause()).isInstanceOf(UnsupportedOperationException.class);
		}
		}