Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix failed tests for ApplicationPackageManagerTest"

Browse Source
This commit is contained in:
Michael Wright
2021-06-21 10:20:24 +00:00
committed by Gerrit Code Review
parent 2d6933bbae 8d16e1b7de
commit 03a3eb4b3d
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/tests/coretests/src/android/app/ApplicationPackageManagerTest.java
View File

@@ -26,8 +26,11 @@ import android.content.pm.PackageInfo;
import android.os.storage.StorageManager; import android.os.storage.StorageManager;
import android.os.storage.VolumeInfo; import android.os.storage.VolumeInfo;
import androidx.annotation.NonNull;
import androidx.test.filters.LargeTest; import androidx.test.filters.LargeTest;
import com.android.internal.annotations.VisibleForTesting;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.mockito.Mockito; import org.mockito.Mockito;
@@ -110,6 +113,13 @@ public class ApplicationPackageManagerTest extends TestCase {
public boolean isAllow3rdPartyOnInternal(Context context) { public boolean isAllow3rdPartyOnInternal(Context context) {
return mAllow3rdPartyOnInternal; return mAllow3rdPartyOnInternal;
} }
@Override
@VisibleForTesting
protected @NonNull List<VolumeInfo> getPackageCandidateVolumes(ApplicationInfo app,
StorageManager storageManager, IPackageManager pm) {
return super.getPackageCandidateVolumes(app, storageManager, pm);
}
} }
private StorageManager getMockedStorageManager() { private StorageManager getMockedStorageManager() {
@@ -223,7 +233,7 @@ public class ApplicationPackageManagerTest extends TestCase {
appInfo.flags = 0; appInfo.flags = 0;
appInfo.volumeUuid = sInternalVolUuid; appInfo.volumeUuid = sInternalVolUuid;
Mockito.when(pm.isPackageDeviceAdminOnAnyUser(Mockito.anyString())).thenReturn(false); Mockito.when(pm.isPackageDeviceAdminOnAnyUser(appInfo.packageName)).thenReturn(false);
appPkgMgr.setAllow3rdPartyOnInternal(true); appPkgMgr.setAllow3rdPartyOnInternal(true);
List<VolumeInfo> candidates = appPkgMgr.getPackageCandidateVolumes( List<VolumeInfo> candidates = appPkgMgr.getPackageCandidateVolumes(
appInfo, storageManager, pm); appInfo, storageManager, pm);
@@ -231,7 +241,7 @@ public class ApplicationPackageManagerTest extends TestCase {
appInfo.volumeUuid = sInternalVolUuid; appInfo.volumeUuid = sInternalVolUuid;
appPkgMgr.setAllow3rdPartyOnInternal(true); appPkgMgr.setAllow3rdPartyOnInternal(true);
Mockito.when(pm.isPackageDeviceAdminOnAnyUser(Mockito.anyString())).thenReturn(true); Mockito.when(pm.isPackageDeviceAdminOnAnyUser(appInfo.packageName)).thenReturn(true);
candidates = appPkgMgr.getPackageCandidateVolumes(appInfo, storageManager, pm); candidates = appPkgMgr.getPackageCandidateVolumes(appInfo, storageManager, pm);
verifyReturnedVolumes(candidates, sInternalVol); verifyReturnedVolumes(candidates, sInternalVol);