Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 465f2c7b authored by Bernardo Rufino's avatar Bernardo Rufino Committed by Android (Google) Code Review
Browse files

Merge "Remove FrameworkShadowPackageManager"

parents c44d5053 ff589c95
Loading
Loading
Loading
Loading
+1 −5
Original line number Original line Diff line number Diff line
@@ -48,7 +48,6 @@ import android.app.backup.BackupDataInput;
import android.app.backup.BackupDataOutput;
import android.app.backup.BackupDataOutput;
import android.app.backup.BackupManager;
import android.app.backup.BackupManager;
import android.app.backup.BackupTransport;
import android.app.backup.BackupTransport;
import android.app.backup.FullBackupDataOutput;
import android.app.backup.IBackupManager;
import android.app.backup.IBackupManager;
import android.app.backup.IBackupManagerMonitor;
import android.app.backup.IBackupManagerMonitor;
import android.app.backup.IBackupObserver;
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.FrameworkRobolectricTestRunner;
import com.android.server.testing.SystemLoaderClasses;
import com.android.server.testing.SystemLoaderClasses;
import com.android.server.testing.SystemLoaderPackages;
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.ShadowBackupDataInput;
import com.android.server.testing.shadows.ShadowBackupDataOutput;
import com.android.server.testing.shadows.ShadowBackupDataOutput;


@@ -90,7 +88,6 @@ import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.mockito.stubbing.Answer;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.Config;
import org.robolectric.shadow.api.Shadow;
import org.robolectric.shadows.ShadowLooper;
import org.robolectric.shadows.ShadowLooper;
import org.robolectric.shadows.ShadowPackageManager;
import org.robolectric.shadows.ShadowPackageManager;
import org.robolectric.shadows.ShadowQueuedWork;
import org.robolectric.shadows.ShadowQueuedWork;
@@ -106,7 +103,6 @@ import java.util.stream.Stream;
    manifest = Config.NONE,
    manifest = Config.NONE,
    sdk = 26,
    sdk = 26,
    shadows = {
    shadows = {
        FrameworkShadowPackageManager.class,
        ShadowBackupDataInput.class,
        ShadowBackupDataInput.class,
        ShadowBackupDataOutput.class,
        ShadowBackupDataOutput.class,
        ShadowQueuedWork.class
        ShadowQueuedWork.class
@@ -151,7 +147,7 @@ public class PerformBackupTaskTest {
        assertThat(dataDir.mkdir()).isTrue();
        assertThat(dataDir.mkdir()).isTrue();


        PackageManager packageManager = application.getPackageManager();
        PackageManager packageManager = application.getPackageManager();
        mShadowPackageManager = Shadow.extract(packageManager);
        mShadowPackageManager = shadowOf(packageManager);


        mWakeLock = createBackupWakeLock(application);
        mWakeLock = createBackupWakeLock(application);


+3 −5
Original line number Original line Diff line number Diff line
@@ -30,7 +30,7 @@ import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
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 org.testng.Assert.expectThrows;


import static java.util.Arrays.asList;
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.FrameworkRobolectricTestRunner;
import com.android.server.testing.SystemLoaderPackages;
import com.android.server.testing.SystemLoaderPackages;
import com.android.server.testing.shadows.FrameworkShadowContextImpl;
import com.android.server.testing.shadows.FrameworkShadowContextImpl;
import com.android.server.testing.shadows.FrameworkShadowPackageManager;


import org.junit.Before;
import org.junit.Before;
import org.junit.Test;
import org.junit.Test;
@@ -79,7 +78,7 @@ import java.util.stream.Stream;
@Config(
@Config(
    manifest = Config.NONE,
    manifest = Config.NONE,
    sdk = 26,
    sdk = 26,
    shadows = {FrameworkShadowPackageManager.class, FrameworkShadowContextImpl.class}
    shadows = {FrameworkShadowContextImpl.class}
)
)
@SystemLoaderPackages({"com.android.server.backup"})
@SystemLoaderPackages({"com.android.server.backup"})
@Presubmit
@Presubmit
@@ -107,8 +106,7 @@ public class TransportManagerTest {
        MockitoAnnotations.initMocks(this);
        MockitoAnnotations.initMocks(this);


        mContext = RuntimeEnvironment.application;
        mContext = RuntimeEnvironment.application;
        mShadowPackageManager =
        mShadowPackageManager = shadowOf(mContext.getPackageManager());
                (FrameworkShadowPackageManager) extract(mContext.getPackageManager());


        mTransportA1 = genericTransport(PACKAGE_A, "TransportFoo");
        mTransportA1 = genericTransport(PACKAGE_A, "TransportFoo");
        mTransportA2 = genericTransport(PACKAGE_A, "TransportBar");
        mTransportA2 = genericTransport(PACKAGE_A, "TransportBar");
+0 −33
Original line number Original line Diff line number Diff line
/*
 * 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<ResolveInfo> queryIntentServicesAsUser(Intent intent, int flags, int userId) {
        return queryIntentServices(intent, flags);
    }
}