diff options
Diffstat (limited to 'tests')
4 files changed, 14 insertions, 8 deletions
diff --git a/tests/common/com/android/documentsui/bots/UiBot.java b/tests/common/com/android/documentsui/bots/UiBot.java index 161510e2a..47e0acd5a 100644 --- a/tests/common/com/android/documentsui/bots/UiBot.java +++ b/tests/common/com/android/documentsui/bots/UiBot.java @@ -25,7 +25,7 @@ import static androidx.test.espresso.matcher.ViewMatchers.withClassName; import static androidx.test.espresso.matcher.ViewMatchers.withId; import static androidx.test.espresso.matcher.ViewMatchers.withText; -import static com.android.documentsui.flags.Flags.useMaterial3; +import static com.android.documentsui.util.FlagUtils.isUseMaterial3FlagEnabled; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNotNull; @@ -211,7 +211,7 @@ public class UiBot extends Bots.BaseBot { } public void clickActionbarOverflowItem(String label) { - if (useMaterial3()) { + if (isUseMaterial3FlagEnabled()) { onView(TOOLBAR_OVERFLOW).perform(click()); } else { onView(ACTIONBAR_OVERFLOW).perform(click()); @@ -231,7 +231,7 @@ public class UiBot extends Bots.BaseBot { } public boolean waitForActionModeBarToAppear() { - String actionModeId = useMaterial3() ? "toolbar" : "action_mode_bar"; + String actionModeId = isUseMaterial3FlagEnabled() ? "toolbar" : "action_mode_bar"; UiObject2 bar = mDevice.wait( Until.findObject(By.res(mTargetPackage + ":id/" + actionModeId)), mTimeout); diff --git a/tests/common/com/android/documentsui/services/TestJob.java b/tests/common/com/android/documentsui/services/TestJob.java index 10addebd9..426cb9575 100644 --- a/tests/common/com/android/documentsui/services/TestJob.java +++ b/tests/common/com/android/documentsui/services/TestJob.java @@ -23,11 +23,11 @@ import android.app.Notification; import android.app.Notification.Builder; import android.content.Context; -import com.android.documentsui.base.Features; -import com.android.documentsui.clipping.UrisSupplier; import com.android.documentsui.R; import com.android.documentsui.base.DocumentInfo; import com.android.documentsui.base.DocumentStack; +import com.android.documentsui.base.Features; +import com.android.documentsui.clipping.UrisSupplier; import com.android.documentsui.services.FileOperationService.OpType; import java.text.NumberFormat; @@ -97,6 +97,10 @@ public class TestJob extends Job { throw new UnsupportedOperationException(); } + JobProgress getJobProgress() { + return new JobProgress(id, getState(), "test job", false); + } + @Override Builder createProgressBuilder() { ++mNumOfNotifications; diff --git a/tests/unit/com/android/documentsui/files/ActionHandlerTest.java b/tests/unit/com/android/documentsui/files/ActionHandlerTest.java index 01dfa1c76..54a685776 100644 --- a/tests/unit/com/android/documentsui/files/ActionHandlerTest.java +++ b/tests/unit/com/android/documentsui/files/ActionHandlerTest.java @@ -16,7 +16,7 @@ package com.android.documentsui.files; -import static com.android.documentsui.flags.Flags.useMaterial3; +import static com.android.documentsui.util.FlagUtils.isUseMaterial3FlagEnabled; import static com.android.documentsui.testing.IntentAsserts.assertHasAction; import static com.android.documentsui.testing.IntentAsserts.assertHasData; import static com.android.documentsui.testing.IntentAsserts.assertHasExtra; @@ -160,7 +160,7 @@ public class ActionHandlerTest { } private void assertSelectionContainerClosed() { - if (useMaterial3()) { + if (isUseMaterial3FlagEnabled()) { verify(mMockCloseSelectionBar, times(1)).run(); } else { assertTrue(mActionModeAddons.finishActionModeCalled); diff --git a/tests/unit/com/android/documentsui/files/MenuManagerTest.java b/tests/unit/com/android/documentsui/files/MenuManagerTest.java index 394537784..f9737dc39 100644 --- a/tests/unit/com/android/documentsui/files/MenuManagerTest.java +++ b/tests/unit/com/android/documentsui/files/MenuManagerTest.java @@ -16,6 +16,8 @@ package com.android.documentsui.files; +import static com.android.documentsui.util.FlagUtils.isZipNgFlagEnabled; + import static junit.framework.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -492,7 +494,7 @@ public final class MenuManagerTest { public void testOptionMenu_ExtractAll() { dirDetails.isInArchive = true; mgr.updateOptionMenu(testMenu); - if (Flags.zipNg()) { + if (isZipNgFlagEnabled()) { mOptionExtractAll.assertEnabledAndVisible(); } else { mOptionExtractAll.assertDisabledAndInvisible(); |