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

Commit b420e10d authored by Diksha Gohlyan's avatar Diksha Gohlyan
Browse files

Run UserProfile and menu enabled tests on R 

Test: atest DocumentUIGoogleTests
Bug: 150651613
Change-Id: I2738ee42066f8365298c4ad323e9b64da3184ca7
(cherry picked from commit 37fbf791)
Merge-Id: I2738ee42066f8365298c4ad323e9b64da3184ca7
parent 83a271b7

tests/functional/com/android/documentsui/RenameDocumentUiTest.java

+26 −19
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.support.test.uiautomator.UiObjectNotFoundException; 
import androidx.test.filters.LargeTest;



import com.android.documentsui.files.FilesActivity;

import com.android.documentsui.util.VersionUtils;



@LargeTest

public class RenameDocumentUiTest extends ActivityTest<FilesActivity> {
@@ -48,6 +49,7 @@ public class RenameDocumentUiTest extends ActivityTest<FilesActivity> { 
    }



    public void testNoRenameSupport_SingleSelection() throws Exception {

        if (VersionUtils.isAtLeastR()) {

            bots.directory.selectDocument(fileNameNoRename, 1);

            bots.main.openOverflowMenu();

            bots.main.assertMenuEnabled(R.string.menu_rename, false);
@@ -55,8 +57,10 @@ public class RenameDocumentUiTest extends ActivityTest<FilesActivity> { 
            // Dismiss more options window

            device.pressBack();

        }

    }



    public void testOneHasRenameSupport_MultipleSelection() throws Exception {

        if (VersionUtils.isAtLeastR()) {

            bots.directory.selectDocument(fileName1, 1);

            bots.directory.selectDocument(fileNameNoRename, 2);

            bots.main.openOverflowMenu();
@@ -65,8 +69,10 @@ public class RenameDocumentUiTest extends ActivityTest<FilesActivity> { 
            // Dismiss more options window

            device.pressBack();

        }

    }



    public void testRenameDisabled_MultipleSelection() throws Exception {

        if (VersionUtils.isAtLeastR()) {

            bots.directory.selectDocument(fileName1, 1);

            bots.directory.selectDocument(fileName2, 2);

            bots.main.openOverflowMenu();
@@ -75,6 +81,7 @@ public class RenameDocumentUiTest extends ActivityTest<FilesActivity> { 
            // Dismiss more options window

            device.pressBack();

        }

    }



    public void testRenameFile_OkButton() throws Exception {

        bots.directory.selectDocument(fileName1, 1);

tests/unit/com/android/documentsui/PickActivityTest.java

+16 −13
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import com.android.documentsui.base.DocumentInfo; 
import com.android.documentsui.picker.PickActivity;

import com.android.documentsui.testing.TestProvidersAccess;

import com.android.documentsui.ui.TestDialogController;

import com.android.documentsui.util.VersionUtils;



import org.junit.Before;

import org.junit.Rule;
@@ -89,6 +90,7 @@ public class PickActivityTest { 


    @Test

    public void testOnDocumentPicked_otherUser() {

        if (VersionUtils.isAtLeastR()) {

            DocumentInfo doc = new DocumentInfo();

            doc.userId = TestProvidersAccess.OtherUser.USER_ID;

            doc.authority = "authority";
@@ -103,6 +105,7 @@ public class PickActivityTest { 
            assertThat(result.getResultCode()).isEqualTo(Activity.RESULT_OK);

            assertThat(result.getResultData().getData()).isEqualTo(doc.getDocumentUri());

        }

    }



    @Test

    public void testOnDocumentPicked_otherUserDoesNotReturn() {

tests/unit/com/android/documentsui/picker/ActionHandlerTest.java

+8 −4
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import com.android.documentsui.testing.TestEnv; 
import com.android.documentsui.testing.TestLastAccessedStorage;

import com.android.documentsui.testing.TestProvidersAccess;

import com.android.documentsui.testing.TestResolveInfo;

import com.android.documentsui.util.VersionUtils;



import org.junit.AfterClass;

import org.junit.Before;
@@ -681,6 +682,8 @@ public class ActionHandlerTest { 


    @Test

    public void testPreviewItem_onOtherUser() throws Exception {

        if (VersionUtils.isAtLeastR()) {



            mActivity.resources.setQuickViewerPackage("corptropolis.viewer");

            mActivity.currentRoot = TestProvidersAccess.OtherUser.DOWNLOADS;
@@ -689,6 +692,7 @@ public class ActionHandlerTest { 
            mActivity.assertActivityAsUserStarted(Intent.ACTION_QUICK_VIEW,

                TestProvidersAccess.OtherUser.USER_HANDLE);

        }

    }



    @Test

    public void testPreviewItem_archives() throws Exception {