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

Commit ebb48f9e authored by François Degros's avatar François Degros
Browse files

Enhance tests for visibility of "Extract all" menu item 

Bug: 391731541
Flag: com.android.documentsui.flags.zip_ng
Test: atest DocumentsUIGoogleTests:com.android.documentsui.files.MenuManagerTest
Test: atest DocumentsUIGoogleTests:com.android.documentsui.picker.MenuManagerTest
Change-Id: I3fa98a9844f9f86c5a2b7eb82f82d576f47f2854
parent 5d24d067

res/flag(!com.android.documentsui.flags.use_material3)/menu/activity.xml

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ 
            android:id="@+id/option_menu_extract_all"

            android:title="@string/menu_extract_all"

            android:icon="@drawable/ic_menu_extract"

            android:enabled="false"

            android:visible="false"

            app:showAsAction="always"/>

        <item

res/flag(com.android.documentsui.flags.use_material3)/menu/activity.xml

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ 
            android:id="@+id/option_menu_extract_all"

            android:title="@string/menu_extract_all"

            android:icon="@drawable/ic_menu_extract"

            android:enabled="false"

            android:visible="false"

            app:showAsAction="always"/>

        <item

tests/common/com/android/documentsui/testing/TestMenu.java

+5 −0
Original line number Diff line number Diff line
@@ -102,6 +102,11 @@ public abstract class TestMenu implements Menu { 
            if (id == R.id.option_menu_search) {

                item.setActionView(Mockito.mock(SearchView.class));

            }



            if (id == R.id.option_menu_extract_all) {

                item.setEnabled(false);

                item.setVisible(false);

            }

        }

        return menu;

    }

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

+2 −0
Original line number Diff line number Diff line
@@ -255,6 +255,7 @@ public final class MenuManagerTest { 
        actionModeSort.assertEnabledAndVisible();

        actionModeSelectAll.assertEnabledAndVisible();

        mActionModeDeselectAll.assertDisabledAndInvisible();

        mOptionExtractAll.assertDisabledAndInvisible();

    }



    @Test
@@ -270,6 +271,7 @@ public final class MenuManagerTest { 
        actionModeExtractTo.assertDisabledAndInvisible();

        actionModeMoveTo.assertDisabledAndInvisible();

        actionModeViewInOwner.assertDisabledAndInvisible();

        mOptionExtractAll.assertDisabledAndInvisible();

    }



    @Test

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

+4 −0
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ public final class MenuManagerTest { 
        mActionModeDeselectAll.assertDisabledAndInvisible();

        actionModeViewInOwner.assertDisabledAndInvisible();

        actionModeSort.assertEnabledAndVisible();

        mOptionExtractAll.assertDisabledAndInvisible();

    }



    @Test
@@ -272,6 +273,7 @@ public final class MenuManagerTest { 
        optionSort.assertEnabledAndVisible();

        mOptionLauncher.assertDisabledAndInvisible();

        mOptionShowHiddenFiles.assertEnabledAndVisible();

        mOptionExtractAll.assertDisabledAndInvisible();

        assertTrue(testSearchManager.showMenuCalled());

    }
@@ -285,6 +287,7 @@ public final class MenuManagerTest { 
        optionCreateDir.assertDisabledAndInvisible();

        subOptionGrid.assertEnabledAndVisible();

        subOptionList.assertDisabledAndInvisible();

        mOptionExtractAll.assertDisabledAndInvisible();

        assertFalse(testSearchManager.showMenuCalled());

    }
@@ -304,6 +307,7 @@ public final class MenuManagerTest { 


        subOptionGrid.assertDisabledAndInvisible();

        subOptionList.assertDisabledAndInvisible();

        mOptionExtractAll.assertDisabledAndInvisible();

    }