From ff589c95302cbdf14f9c536cb5d8644984af2861 Mon Sep 17 00:00:00 2001 From: Bernardo Rufino Date: Sun, 25 Feb 2018 12:51:25 +0000 Subject: [PATCH] Remove FrameworkShadowPackageManager Robolectruc upstreamed this and we picked up in 3.6.1 already :) Test: m - j RunFrameworksServicesRoboTests Change-Id: I9df1d1dfc56c5aa1d27e36396ddd21c053a3199d --- .../server/backup/PerformBackupTaskTest.java | 6 +--- .../server/backup/TransportManagerTest.java | 8 ++---- .../shadows/FrameworkShadowPackageManager.java | 33 ---------------------- 3 files changed, 4 insertions(+), 43 deletions(-) delete mode 100644 services/robotests/src/com/android/server/testing/shadows/FrameworkShadowPackageManager.java diff --git a/services/robotests/src/com/android/server/backup/PerformBackupTaskTest.java b/services/robotests/src/com/android/server/backup/PerformBackupTaskTest.java index 60704e74f177..91d4937c104c 100644 --- a/services/robotests/src/com/android/server/backup/PerformBackupTaskTest.java +++ b/services/robotests/src/com/android/server/backup/PerformBackupTaskTest.java @@ -48,7 +48,6 @@ import android.app.backup.BackupDataInput; import android.app.backup.BackupDataOutput; import android.app.backup.BackupManager; import android.app.backup.BackupTransport; -import android.app.backup.FullBackupDataOutput; import android.app.backup.IBackupManager; import android.app.backup.IBackupManagerMonitor; import android.app.backup.IBackupObserver; @@ -76,7 +75,6 @@ import com.android.server.backup.transport.TransportClient; import com.android.server.testing.FrameworkRobolectricTestRunner; import com.android.server.testing.SystemLoaderClasses; import com.android.server.testing.SystemLoaderPackages; -import com.android.server.testing.shadows.FrameworkShadowPackageManager; import com.android.server.testing.shadows.ShadowBackupDataInput; import com.android.server.testing.shadows.ShadowBackupDataOutput; @@ -90,7 +88,6 @@ import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowLooper; import org.robolectric.shadows.ShadowPackageManager; import org.robolectric.shadows.ShadowQueuedWork; @@ -106,7 +103,6 @@ import java.util.stream.Stream; manifest = Config.NONE, sdk = 26, shadows = { - FrameworkShadowPackageManager.class, ShadowBackupDataInput.class, ShadowBackupDataOutput.class, ShadowQueuedWork.class @@ -151,7 +147,7 @@ public class PerformBackupTaskTest { assertThat(dataDir.mkdir()).isTrue(); PackageManager packageManager = application.getPackageManager(); - mShadowPackageManager = Shadow.extract(packageManager); + mShadowPackageManager = shadowOf(packageManager); mWakeLock = createBackupWakeLock(application); diff --git a/services/robotests/src/com/android/server/backup/TransportManagerTest.java b/services/robotests/src/com/android/server/backup/TransportManagerTest.java index 32697bd57c51..02514b82ffba 100644 --- a/services/robotests/src/com/android/server/backup/TransportManagerTest.java +++ b/services/robotests/src/com/android/server/backup/TransportManagerTest.java @@ -30,7 +30,7 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.robolectric.shadow.api.Shadow.extract; +import static org.robolectric.Shadows.shadowOf; import static org.testng.Assert.expectThrows; import static java.util.Arrays.asList; @@ -58,7 +58,6 @@ import com.android.server.backup.transport.TransportNotRegisteredException; import com.android.server.testing.FrameworkRobolectricTestRunner; import com.android.server.testing.SystemLoaderPackages; import com.android.server.testing.shadows.FrameworkShadowContextImpl; -import com.android.server.testing.shadows.FrameworkShadowPackageManager; import org.junit.Before; import org.junit.Test; @@ -79,7 +78,7 @@ import java.util.stream.Stream; @Config( manifest = Config.NONE, sdk = 26, - shadows = {FrameworkShadowPackageManager.class, FrameworkShadowContextImpl.class} + shadows = {FrameworkShadowContextImpl.class} ) @SystemLoaderPackages({"com.android.server.backup"}) @Presubmit @@ -107,8 +106,7 @@ public class TransportManagerTest { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; - mShadowPackageManager = - (FrameworkShadowPackageManager) extract(mContext.getPackageManager()); + mShadowPackageManager = shadowOf(mContext.getPackageManager()); mTransportA1 = genericTransport(PACKAGE_A, "TransportFoo"); mTransportA2 = genericTransport(PACKAGE_A, "TransportBar"); diff --git a/services/robotests/src/com/android/server/testing/shadows/FrameworkShadowPackageManager.java b/services/robotests/src/com/android/server/testing/shadows/FrameworkShadowPackageManager.java deleted file mode 100644 index 5cdbe7ff09ba..000000000000 --- a/services/robotests/src/com/android/server/testing/shadows/FrameworkShadowPackageManager.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2017 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.server.testing.shadows; - -import android.app.ApplicationPackageManager; -import android.content.Intent; -import android.content.pm.ResolveInfo; -import java.util.List; -import org.robolectric.annotation.Implements; -import org.robolectric.shadows.ShadowApplicationPackageManager; - -/** Extension of ShadowApplicationPackageManager */ -@Implements(value = ApplicationPackageManager.class, inheritImplementationMethods = true) -public class FrameworkShadowPackageManager extends ShadowApplicationPackageManager { - @Override - public List queryIntentServicesAsUser(Intent intent, int flags, int userId) { - return queryIntentServices(intent, flags); - } -} -- 2.11.0