diff options
Diffstat (limited to 'tests')
3 files changed, 18 insertions, 1 deletions
diff --git a/tests/functional/com/android/documentsui/FileCopyUiTest.java b/tests/functional/com/android/documentsui/FileCopyUiTest.java index 65a5d257f..42681ee82 100644 --- a/tests/functional/com/android/documentsui/FileCopyUiTest.java +++ b/tests/functional/com/android/documentsui/FileCopyUiTest.java @@ -489,7 +489,7 @@ public class FileCopyUiTest extends ActivityTest<FilesActivity> { } @HugeLongTest - public void ignored_testRecursiveCopyDocuments_InternalStorageToDownloadsProvider() + public void testRecursiveCopyDocuments_InternalStorageToDownloadsProvider() throws Exception { // Create Download folder if it doesn't exist. DocumentInfo info = mStorageDocsHelper.findFile(mPrimaryRoot.documentId, "Download"); diff --git a/tests/unit/com/android/documentsui/UserManagerStateTest.java b/tests/unit/com/android/documentsui/UserManagerStateTest.java index 574d65552..6f869dcd5 100644 --- a/tests/unit/com/android/documentsui/UserManagerStateTest.java +++ b/tests/unit/com/android/documentsui/UserManagerStateTest.java @@ -67,6 +67,7 @@ public class UserManagerStateTest { private static final String PERSONAL = "Personal"; private static final String WORK = "Work"; private static final String PRIVATE = "Private"; + private static final String PACKAGE_NAME = "com.android.documentsui"; /** * Assume that the current user is SYSTEM_USER. @@ -158,6 +159,20 @@ public class UserManagerStateTest { .thenReturn(mDevicePolicyManager); when(mMockContext.getResources()).thenReturn( InstrumentationRegistry.getInstrumentation().getTargetContext().getResources()); + + when(mMockContext.getPackageName()).thenReturn(PACKAGE_NAME); + when(mMockContext.createPackageContextAsUser(PACKAGE_NAME, 0, mSystemUser)).thenReturn( + mMockContext); + when(mMockContext.createPackageContextAsUser(PACKAGE_NAME, 0, mManagedUser)).thenReturn( + mMockContext); + when(mMockContext.createPackageContextAsUser(PACKAGE_NAME, 0, mPrivateUser)).thenReturn( + mMockContext); + when(mMockContext.createPackageContextAsUser(PACKAGE_NAME, 0, mOtherUser)).thenReturn( + mMockContext); + when(mMockContext.createPackageContextAsUser(PACKAGE_NAME, 0, mNormalUser)).thenReturn( + mMockContext); + when(mMockContext.createPackageContextAsUser(PACKAGE_NAME, 0, mPrimaryUser)).thenReturn( + mMockContext); } @Test diff --git a/tests/unit/com/android/documentsui/loaders/SearchLoaderTest.kt b/tests/unit/com/android/documentsui/loaders/SearchLoaderTest.kt index fdaadcda1..e480337ab 100644 --- a/tests/unit/com/android/documentsui/loaders/SearchLoaderTest.kt +++ b/tests/unit/com/android/documentsui/loaders/SearchLoaderTest.kt @@ -33,6 +33,7 @@ import java.util.concurrent.Executors import junit.framework.Assert.assertEquals import org.junit.Assert.assertThrows import org.junit.Before +import org.junit.Ignore import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith @@ -119,6 +120,7 @@ class SearchLoaderTest(private val testParams: LoaderTestParams) : BaseLoaderTes @Test @RequiresFlagsEnabled(FLAG_USE_SEARCH_V2_RW) + @Ignore("b/397095797") fun testBlankQueryAndRecency() { val userIds = listOf(TestProvidersAccess.DOWNLOADS.userId) val rootIds = listOf(TestProvidersAccess.DOWNLOADS) |