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

Commit 08050324 authored by Ben Reich's avatar Ben Reich
Browse files

Update MenuManager tests to assert invisible select action icons 

The MenuManager tests are currently failing as there are 2 tests which
assert that the "SELECT" button is enabled and visible. This is not true
when material 3 flag is enabled as they are moved to buttons at the
bottom of the screen. Update the tests appropriately.

Bug: 412776499
Test: atest com.android.documentsui.picker.MenuManagerTest
Flag: com.android.documentsui.flags.use_material3
Change-Id: Ie46ad6503fe20f54aca98f27f8e8cd53057856f7
parent bd578399

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

+29 −1
Original line number Diff line number Diff line
@@ -19,17 +19,20 @@ package com.android.documentsui.picker; 
import static com.android.documentsui.base.State.ACTION_CREATE;

import static com.android.documentsui.base.State.ACTION_GET_CONTENT;

import static com.android.documentsui.base.State.ACTION_OPEN;

import static com.android.documentsui.flags.Flags.FLAG_USE_MATERIAL3;



import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertTrue;



import android.annotation.SuppressLint;

import android.database.MatrixCursor;

import android.platform.test.annotations.RequiresFlagsDisabled;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.provider.DocumentsContract.Document;

import android.provider.DocumentsContract.Root;



import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.documentsui.DirectoryResult;

import com.android.documentsui.Model;
@@ -38,6 +41,7 @@ import com.android.documentsui.base.DocumentInfo; 
import com.android.documentsui.base.RootInfo;

import com.android.documentsui.base.State;

import com.android.documentsui.roots.RootCursorWrapper;

import com.android.documentsui.rules.CheckAndForceMaterial3Flag;

import com.android.documentsui.testing.TestDirectoryDetails;

import com.android.documentsui.testing.TestFeatures;

import com.android.documentsui.testing.TestMenu;
@@ -46,6 +50,7 @@ import com.android.documentsui.testing.TestSearchViewManager; 
import com.android.documentsui.testing.TestSelectionDetails;



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -53,6 +58,9 @@ import org.junit.runner.RunWith; 
@SmallTest

public final class MenuManagerTest {



    @Rule

    public final CheckAndForceMaterial3Flag mCheckFlagsRule = new CheckAndForceMaterial3Flag();



    private TestMenu testMenu;



    /* Directory Context Menu items */
@@ -208,6 +216,7 @@ public final class MenuManagerTest { 
    }



    @Test

    @RequiresFlagsDisabled(FLAG_USE_MATERIAL3)

    public void testActionMenu_selectAction() {

        state.action = ACTION_OPEN;

        mgr.updateActionMenu(testMenu, selectionDetails);
@@ -215,6 +224,15 @@ public final class MenuManagerTest { 
        actionModeSelect.assertEnabledAndVisible();

    }



    @Test

    @RequiresFlagsEnabled(FLAG_USE_MATERIAL3)

    public void testActionMenu_selectAction_useMaterial3Enabled() {

        state.action = ACTION_OPEN;

        mgr.updateActionMenu(testMenu, selectionDetails);



        actionModeSelect.assertDisabledAndInvisible();

    }



    @Test

    public void testActionMenu_selectActionTitle() {

        state.action = ACTION_OPEN;
@@ -224,6 +242,7 @@ public final class MenuManagerTest { 
    }



    @Test

    @RequiresFlagsDisabled(FLAG_USE_MATERIAL3)

    public void testActionMenu_getContentAction() {

        state.action = ACTION_GET_CONTENT;

        mgr.updateActionMenu(testMenu, selectionDetails);
@@ -231,6 +250,15 @@ public final class MenuManagerTest { 
        actionModeSelect.assertEnabledAndVisible();

    }



    @Test

    @RequiresFlagsEnabled(FLAG_USE_MATERIAL3)

    public void testActionMenu_getContentAction_useMaterial3Enabled() {

        state.action = ACTION_GET_CONTENT;

        mgr.updateActionMenu(testMenu, selectionDetails);



        actionModeSelect.assertDisabledAndInvisible();

    }



    @Test

    public void testActionMenu_getContentActionTitle() {

        state.action = ACTION_GET_CONTENT;