Rename DummyUiActivity to BlankUiTestActivity
This CL renames the DummyUiActivity class to BlankUiTestActivity.
Per Google's documentation and style guidelines, the words "dummy" and
"dumb down" should be avoided. For this reason we are replacing the
DummyUiActivity with the more appropriately named BlankUiTestActivity.
We also make the following renames:
DummyUiActivityTestRule -> BlankUiTestActivityTestRule
DummySettingsForTest -> PlaceholderSettingsForTest
This CL also makes updates to comments and method names where needed
to match these changes.
Bug: 1295312
Change-Id: Ib712a292e0dcee32a97e9d7c487af2fb920f5084
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3445111
Reviewed-by: Ted Choc <[email protected]>
Reviewed-by: Theresa Sullivan <[email protected]>
Reviewed-by: Yaron Friedman <[email protected]>
Reviewed-by: Michael Thiessen <[email protected]>
Commit-Queue: Mark Schillaci <[email protected]>
Cr-Commit-Position: refs/heads/main@{#969056}
diff --git a/chrome/android/features/keyboard_accessory/javatests/src/org/chromium/chrome/browser/keyboard_accessory/sheet_component/AccessorySheetRenderTest.java b/chrome/android/features/keyboard_accessory/javatests/src/org/chromium/chrome/browser/keyboard_accessory/sheet_component/AccessorySheetRenderTest.java
index 9bf8119..ddf898ea 100644
--- a/chrome/android/features/keyboard_accessory/javatests/src/org/chromium/chrome/browser/keyboard_accessory/sheet_component/AccessorySheetRenderTest.java
+++ b/chrome/android/features/keyboard_accessory/javatests/src/org/chromium/chrome/browser/keyboard_accessory/sheet_component/AccessorySheetRenderTest.java
@@ -67,7 +67,7 @@
import org.chromium.ui.modelutil.LazyConstructionPropertyMcp;
import org.chromium.ui.modelutil.ListModel;
import org.chromium.ui.modelutil.PropertyModel;
-import org.chromium.ui.test.util.DummyUiActivity;
+import org.chromium.ui.test.util.BlankUiTestActivity;
import org.chromium.ui.test.util.NightModeTestUtils;
import org.chromium.ui.test.util.ViewUtils;
@@ -94,8 +94,8 @@
// No @Rule since we only need the launching helpers. Adding the rule to the chain breaks with
// any ParameterizedRunnerDelegate.
- private BaseActivityTestRule<DummyUiActivity> mActivityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ private BaseActivityTestRule<BlankUiTestActivity> mActivityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
@Rule
public final ChromeRenderTestRule mRenderTestRule =
@@ -105,7 +105,7 @@
FeatureList.setTestFeatures(
Collections.singletonMap(ChromeFeatureList.AUTOFILL_KEYBOARD_ACCESSORY, true));
setRtlForTesting(useRtlLayout);
- NightModeTestUtils.setUpNightModeForDummyUiActivity(nightModeEnabled);
+ NightModeTestUtils.setUpNightModeForBlankUiTestActivity(nightModeEnabled);
mRenderTestRule.setNightModeEnabled(nightModeEnabled);
mRenderTestRule.setVariantPrefix(useRtlLayout ? "RTL" : "LTR");
}
@@ -144,7 +144,7 @@
@After
public void tearDown() {
- NightModeTestUtils.tearDownNightModeForDummyUiActivity();
+ NightModeTestUtils.tearDownNightModeForBlankUiTestActivity();
setRtlForTesting(false);
try {
ApplicationTestUtils.finishActivity(mActivityTestRule.getActivity());
diff --git a/chrome/android/features/keyboard_accessory/javatests/src/org/chromium/chrome/browser/keyboard_accessory/tab_layout_component/KeyboardAccessoryTabLayoutViewTest.java b/chrome/android/features/keyboard_accessory/javatests/src/org/chromium/chrome/browser/keyboard_accessory/tab_layout_component/KeyboardAccessoryTabLayoutViewTest.java
index e04536a..1d84da10 100644
--- a/chrome/android/features/keyboard_accessory/javatests/src/org/chromium/chrome/browser/keyboard_accessory/tab_layout_component/KeyboardAccessoryTabLayoutViewTest.java
+++ b/chrome/android/features/keyboard_accessory/javatests/src/org/chromium/chrome/browser/keyboard_accessory/tab_layout_component/KeyboardAccessoryTabLayoutViewTest.java
@@ -32,15 +32,15 @@
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.ui.modelutil.ListModel;
import org.chromium.ui.modelutil.PropertyModel;
-import org.chromium.ui.test.util.DummyUiActivity;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivity;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
/**
* View tests for the keyboard accessory tab layout component.
*/
@RunWith(ChromeJUnit4ClassRunner.class)
@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE})
-public class KeyboardAccessoryTabLayoutViewTest extends DummyUiActivityTestCase {
+public class KeyboardAccessoryTabLayoutViewTest extends BlankUiTestActivityTestCase {
private PropertyModel mModel;
private KeyboardAccessoryTabLayoutView mView;
@@ -60,7 +60,7 @@
@BeforeClass
public static void setUpBeforeActivityLaunched() {
- DummyUiActivity.setTestLayout(R.layout.keyboard_accessory_tabs);
+ BlankUiTestActivity.setTestLayout(R.layout.keyboard_accessory_tabs);
}
@Override
diff --git a/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/BottomBarViewBinderTest.java b/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/BottomBarViewBinderTest.java
index 8b92080..3a2d671 100644
--- a/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/BottomBarViewBinderTest.java
+++ b/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/BottomBarViewBinderTest.java
@@ -30,14 +30,14 @@
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modelutil.PropertyModel;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import java.util.concurrent.atomic.AtomicBoolean;
/** Tests for {@link BottomBarViewBinder}. */
@SuppressWarnings("ConstantConditions")
@RunWith(ChromeJUnit4ClassRunner.class)
-public class BottomBarViewBinderTest extends DummyUiActivityTestCase {
+public class BottomBarViewBinderTest extends BlankUiTestActivityTestCase {
@SuppressWarnings("unused")
private BottomBarCoordinator mBottomBarCoordinator;
private TabLayout mTabLayout;
diff --git a/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/ExploreSurfaceViewBinderTest.java b/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/ExploreSurfaceViewBinderTest.java
index 0ebc8b2..0e68adef 100644
--- a/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/ExploreSurfaceViewBinderTest.java
+++ b/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/ExploreSurfaceViewBinderTest.java
@@ -71,9 +71,9 @@
public void setUp() throws Exception {
mActivityTestRule.startMainActivityFromLauncher();
- // TODO(crbug.com/1025296): Investigate to use DummyUiActivityTestCase. We can not do that
- // since mocked FeedSurfaceCoordinator does not work as expected in release build (works
- // well in debug build).
+ // TODO(crbug.com/1025296): Investigate to use BlankUiTestActivityTestCase. We can not do
+ // that since mocked FeedSurfaceCoordinator does not work as expected in release build
+ // (works well in debug build).
TestThreadUtils.runOnUiThreadBlocking(() -> {
mPropertyModel = new PropertyModel(StartSurfaceProperties.ALL_KEYS);
mExploreSurfaceCoordinatorFactory = new ExploreSurfaceCoordinatorFactory(
diff --git a/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/SecondaryTasksSurfaceViewBinderTest.java b/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/SecondaryTasksSurfaceViewBinderTest.java
index 0bfa9a8..9f52493 100644
--- a/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/SecondaryTasksSurfaceViewBinderTest.java
+++ b/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/SecondaryTasksSurfaceViewBinderTest.java
@@ -29,11 +29,11 @@
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modelutil.PropertyModel;
import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
/** Tests for {@link SecondaryTasksSurfaceViewBinder}. */
@RunWith(ChromeJUnit4ClassRunner.class)
-public class SecondaryTasksSurfaceViewBinderTest extends DummyUiActivityTestCase {
+public class SecondaryTasksSurfaceViewBinderTest extends BlankUiTestActivityTestCase {
private ViewGroup mParentView;
private View mTasksSurfaceView;
private View mTopToolbarPlaceholderView;
diff --git a/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/TasksSurfaceViewBinderTest.java b/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/TasksSurfaceViewBinderTest.java
index 4d0f622..4f9d457 100644
--- a/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/TasksSurfaceViewBinderTest.java
+++ b/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/TasksSurfaceViewBinderTest.java
@@ -28,11 +28,11 @@
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modelutil.PropertyModel;
import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
/** Tests for {@link TasksSurfaceViewBinder}. */
@RunWith(ChromeJUnit4ClassRunner.class)
-public class TasksSurfaceViewBinderTest extends DummyUiActivityTestCase {
+public class TasksSurfaceViewBinderTest extends BlankUiTestActivityTestCase {
private ViewGroup mParentView;
private ViewGroup mTasksSurfaceView;
private View mTopToolbarPlaceholderView;
diff --git a/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/SingleTabViewBinderTest.java b/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/SingleTabViewBinderTest.java
index c03f1f13..da45b80 100644
--- a/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/SingleTabViewBinderTest.java
+++ b/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/SingleTabViewBinderTest.java
@@ -35,11 +35,11 @@
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modelutil.PropertyModel;
import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
/** Tests for {@link SingleTabViewBinder}. */
@RunWith(ChromeJUnit4ClassRunner.class)
-public class SingleTabViewBinderTest extends DummyUiActivityTestCase {
+public class SingleTabViewBinderTest extends BlankUiTestActivityTestCase {
private SingleTabView mSingleTabView;
private PropertyModelChangeProcessor mPropertyModelChangeProcessor;
private PropertyModel mPropertyModel;
diff --git a/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/TasksViewBinderTest.java b/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/TasksViewBinderTest.java
index 28db02d0..ca4a6cd 100644
--- a/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/TasksViewBinderTest.java
+++ b/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/TasksViewBinderTest.java
@@ -56,13 +56,13 @@
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modelutil.PropertyModel;
import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import java.util.concurrent.atomic.AtomicBoolean;
/** Tests for {@link TasksViewBinder}. */
@RunWith(ChromeJUnit4ClassRunner.class)
-public class TasksViewBinderTest extends DummyUiActivityTestCase {
+public class TasksViewBinderTest extends BlankUiTestActivityTestCase {
private TasksView mTasksView;
private PropertyModel mTasksViewPropertyModel;
private AtomicBoolean mViewClicked = new AtomicBoolean();
diff --git a/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/LargeMessageCardViewBinderTest.java b/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/LargeMessageCardViewBinderTest.java
index abe267a..806c0c8 100644
--- a/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/LargeMessageCardViewBinderTest.java
+++ b/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/LargeMessageCardViewBinderTest.java
@@ -28,7 +28,7 @@
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modelutil.PropertyModel;
import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import org.chromium.ui.widget.ButtonCompat;
import org.chromium.ui.widget.ChromeImageView;
@@ -38,7 +38,7 @@
* Tests for {@link LargeMessageCardViewBinder}.
*/
@RunWith(ChromeJUnit4ClassRunner.class)
-public class LargeMessageCardViewBinderTest extends DummyUiActivityTestCase {
+public class LargeMessageCardViewBinderTest extends BlankUiTestActivityTestCase {
private static final String TITLE_TEXT = "titleText";
private static final String ACTION_TEXT = "actionText";
private static final String DESCRIPTION_TEXT = "descriptionText";
diff --git a/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardProviderTest.java b/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardProviderTest.java
index 7c4f522..8c6f789 100644
--- a/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardProviderTest.java
+++ b/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardProviderTest.java
@@ -36,7 +36,7 @@
import org.chromium.ui.modelutil.LayoutViewBuilder;
import org.chromium.ui.modelutil.MVCListAdapter;
import org.chromium.ui.modelutil.SimpleRecyclerViewAdapter;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -45,7 +45,7 @@
* Integration tests for MessageCardProvider component.
*/
@Features.DisableFeatures(ChromeFeatureList.TAB_TO_GTS_ANIMATION)
-public class MessageCardProviderTest extends DummyUiActivityTestCase {
+public class MessageCardProviderTest extends BlankUiTestActivityTestCase {
private static final int SUGGESTED_TAB_COUNT = 2;
@Rule
diff --git a/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardViewBinderTest.java b/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardViewBinderTest.java
index de3252c..d6b6b24 100644
--- a/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardViewBinderTest.java
+++ b/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardViewBinderTest.java
@@ -28,7 +28,7 @@
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modelutil.PropertyModel;
import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -36,7 +36,7 @@
* Tests for {@link MessageCardViewBinder}.
*/
@RunWith(ChromeJUnit4ClassRunner.class)
-public class MessageCardViewBinderTest extends DummyUiActivityTestCase {
+public class MessageCardViewBinderTest extends BlankUiTestActivityTestCase {
private static final String ACTION_TEXT = "actionText";
private static final String DESCRIPTION_TEXT = "descriptionText";
private static final String DISMISS_BUTTON_CONTENT_DESCRIPTION = "dismiss";
diff --git a/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogViewTest.java b/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogViewTest.java
index 5f8ee309..6bd115a7 100644
--- a/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogViewTest.java
+++ b/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogViewTest.java
@@ -31,15 +31,15 @@
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.components.browser_ui.widget.scrim.ScrimCoordinator;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import java.util.concurrent.atomic.AtomicReference;
/**
- * DummyUiActivity Tests for the {@link TabGridDialogView}.
+ * BlankUiTestActivity Tests for the {@link TabGridDialogView}.
*/
@RunWith(ChromeJUnit4ClassRunner.class)
-public class TabGridDialogViewTest extends DummyUiActivityTestCase {
+public class TabGridDialogViewTest extends BlankUiTestActivityTestCase {
private int mToolbarHeight;
private int mTopMargin;
private int mSideMargin;
diff --git a/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridPanelViewBinderTest.java b/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridPanelViewBinderTest.java
index 8fb36c6..1e249ea4 100644
--- a/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridPanelViewBinderTest.java
+++ b/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridPanelViewBinderTest.java
@@ -40,7 +40,7 @@
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modelutil.PropertyModel;
import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import org.chromium.ui.widget.ChromeImageView;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -49,7 +49,7 @@
* Tests for {@link TabGridPanelViewBinder}.
*/
@RunWith(ChromeJUnit4ClassRunner.class)
-public class TabGridPanelViewBinderTest extends DummyUiActivityTestCase {
+public class TabGridPanelViewBinderTest extends BlankUiTestActivityTestCase {
private static final String TAG = "TGPVBT";
private static final int CONTENT_TOP_MARGIN = 56;
diff --git a/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiViewBinderTest.java b/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiViewBinderTest.java
index c7dad25..6ff4acaa 100644
--- a/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiViewBinderTest.java
+++ b/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiViewBinderTest.java
@@ -33,7 +33,7 @@
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modelutil.PropertyModel;
import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -41,7 +41,7 @@
* Tests for {@link TabGroupUiViewBinder}.
*/
@RunWith(ChromeJUnit4ClassRunner.class)
-public class TabGroupUiViewBinderTest extends DummyUiActivityTestCase {
+public class TabGroupUiViewBinderTest extends BlankUiTestActivityTestCase {
private ImageView mLeftButton;
private ImageView mRightButton;
private ViewGroup mContainerView;
diff --git a/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerViewBinderTest.java b/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerViewBinderTest.java
index c57e673..c2e208c 100644
--- a/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerViewBinderTest.java
+++ b/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerViewBinderTest.java
@@ -42,17 +42,17 @@
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modelutil.PropertyModel;
import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
-import org.chromium.ui.test.util.DummyUiActivity;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivity;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
/**
* Tests for {@link TabListRecyclerView} and {@link TabListContainerViewBinder}
*/
@RunWith(ChromeJUnit4ClassRunner.class)
@Features.EnableFeatures({ChromeFeatureList.TAB_GRID_LAYOUT_ANDROID})
-public class TabListContainerViewBinderTest extends DummyUiActivityTestCase {
+public class TabListContainerViewBinderTest extends BlankUiTestActivityTestCase {
/**
- * DummyUiActivityTestCase also needs {@link ChromeFeatureList}'s
+ * BlankUiTestActivityTestCase also needs {@link ChromeFeatureList}'s
* internal test-only feature map, not the {@link CommandLine} provided by
* {@link Features.InstrumentationProcessor}.
*/
@@ -97,7 +97,7 @@
@BeforeClass
public static void setUpBeforeActivityLaunched() {
- DummyUiActivity.setTestLayout(R.layout.tab_list_recycler_view_layout);
+ BlankUiTestActivity.setTestLayout(R.layout.tab_list_recycler_view_layout);
}
@Override
diff --git a/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabListViewHolderTest.java b/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabListViewHolderTest.java
index 14b47da..c257dbdd 100644
--- a/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabListViewHolderTest.java
+++ b/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabListViewHolderTest.java
@@ -79,7 +79,7 @@
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modelutil.PropertyModel;
import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import org.chromium.ui.widget.ButtonCompat;
import org.chromium.ui.widget.ChromeImageView;
import org.chromium.url.GURL;
@@ -96,7 +96,7 @@
@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE,
"enable-features=" + ChromeFeatureList.COMMERCE_PRICE_TRACKING + "<Study",
"force-fieldtrials=Study/Group"})
-public class TabListViewHolderTest extends DummyUiActivityTestCase {
+public class TabListViewHolderTest extends BlankUiTestActivityTestCase {
@Rule
public JniMocker mMocker = new JniMocker();
diff --git a/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorLayoutBinderTest.java b/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorLayoutBinderTest.java
index 09a7bd4..8709fd94 100644
--- a/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorLayoutBinderTest.java
+++ b/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorLayoutBinderTest.java
@@ -31,7 +31,7 @@
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modelutil.PropertyModel;
import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import java.util.Arrays;
import java.util.HashSet;
@@ -42,7 +42,7 @@
*/
@SuppressWarnings("ArraysAsListWithZeroOrOneArgument")
@RunWith(ChromeJUnit4ClassRunner.class)
-public class TabSelectionEditorLayoutBinderTest extends DummyUiActivityTestCase {
+public class TabSelectionEditorLayoutBinderTest extends BlankUiTestActivityTestCase {
private TabSelectionEditorLayout mEditorLayoutView;
private PropertyModel mModel;
private PropertyModelChangeProcessor mMCP;
diff --git a/chrome/android/javatests/AndroidManifest.xml b/chrome/android/javatests/AndroidManifest.xml
index a5fc44f7..3acc81b7 100644
--- a/chrome/android/javatests/AndroidManifest.xml
+++ b/chrome/android/javatests/AndroidManifest.xml
@@ -57,7 +57,7 @@
<activity android:name="org.chromium.test.broker.OnDeviceInstrumentationBroker"
android:exported="true"/>
- <activity android:name="org.chromium.ui.test.util.DummyUiActivity"
+ <activity android:name="org.chromium.ui.test.util.BlankUiTestActivity"
android:theme="@style/Theme.Chromium.Activity"
android:exported="true"/>
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkShoppingItemRowRenderTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkShoppingItemRowRenderTest.java
index b743c192..e9733e1 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkShoppingItemRowRenderTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkShoppingItemRowRenderTest.java
@@ -42,7 +42,7 @@
import org.chromium.components.image_fetcher.ImageFetcher;
import org.chromium.components.payments.CurrencyFormatter;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import org.chromium.ui.test.util.NightModeTestUtils;
import org.chromium.ui.test.util.NightModeTestUtils.NightModeParams;
@@ -54,7 +54,7 @@
*/
@RunWith(ParameterizedRunner.class)
@ParameterAnnotations.UseRunnerDelegate(ChromeJUnit4RunnerDelegate.class)
-public class PowerBookmarkShoppingItemRowRenderTest extends DummyUiActivityTestCase {
+public class PowerBookmarkShoppingItemRowRenderTest extends BlankUiTestActivityTestCase {
@ParameterAnnotations.ClassParameter
private static List<ParameterSet> sClassParams = new NightModeParams().getParameters();
@@ -84,7 +84,7 @@
public PowerBookmarkShoppingItemRowRenderTest(boolean nightModeEnabled) {
// Sets a fake background color to make the screenshots easier to compare with bare eyes.
- NightModeTestUtils.setUpNightModeForDummyUiActivity(nightModeEnabled);
+ NightModeTestUtils.setUpNightModeForBlankUiTestActivity(nightModeEnabled);
mRenderTestRule.setNightModeEnabled(nightModeEnabled);
}
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkShoppingItemRowTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkShoppingItemRowTest.java
index e7beacc9..c06d7a9 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkShoppingItemRowTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkShoppingItemRowTest.java
@@ -37,13 +37,13 @@
import org.chromium.components.image_fetcher.ImageFetcher;
import org.chromium.components.payments.CurrencyFormatter;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
/**
* Tests for the Shopping power bookmarks experience.
*/
@RunWith(ChromeJUnit4ClassRunner.class)
-public class PowerBookmarkShoppingItemRowTest extends DummyUiActivityTestCase {
+public class PowerBookmarkShoppingItemRowTest extends BlankUiTestActivityTestCase {
private static final long CURRENCY_MUTLIPLIER = 1000000;
@Rule
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkTagChipListTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkTagChipListTest.java
index 6981bd2..ba48503 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkTagChipListTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkTagChipListTest.java
@@ -30,7 +30,7 @@
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.chrome.test.util.ChromeRenderTestRule;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import java.io.IOException;
@@ -38,7 +38,7 @@
* Tests for the power bookmark experience.
*/
@RunWith(ChromeJUnit4ClassRunner.class)
-public class PowerBookmarkTagChipListTest extends DummyUiActivityTestCase {
+public class PowerBookmarkTagChipListTest extends BlankUiTestActivityTestCase {
@Rule
public ChromeRenderTestRule mRenderTestRule =
ChromeRenderTestRule.Builder.withPublicCorpus().build();
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelBaseTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelBaseTest.java
index 45aae57..dd4961d 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelBaseTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelBaseTest.java
@@ -37,8 +37,8 @@
import org.chromium.ui.base.ActivityWindowAndroid;
import org.chromium.ui.base.IntentRequestTracker;
import org.chromium.ui.base.WindowAndroid;
+import org.chromium.ui.test.util.BlankUiTestActivity;
import org.chromium.ui.test.util.DisableAnimationsTestRule;
-import org.chromium.ui.test.util.DummyUiActivity;
/**
* Tests logic in the OverlayPanelBase.
@@ -58,8 +58,8 @@
@ClassRule
public static DisableAnimationsTestRule disableAnimationsRule = new DisableAnimationsTestRule();
@ClassRule
- public static BaseActivityTestRule<DummyUiActivity> activityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public static BaseActivityTestRule<BlankUiTestActivity> activityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
@Rule
public MockitoRule mMockitoRule = MockitoJUnit.rule();
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelEventFilterTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelEventFilterTest.java
index f3e250d..d2d3fa4 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelEventFilterTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelEventFilterTest.java
@@ -38,8 +38,8 @@
import org.chromium.ui.base.ActivityWindowAndroid;
import org.chromium.ui.base.IntentRequestTracker;
import org.chromium.ui.base.WindowAndroid;
+import org.chromium.ui.test.util.BlankUiTestActivity;
import org.chromium.ui.test.util.DisableAnimationsTestRule;
-import org.chromium.ui.test.util.DummyUiActivity;
/**
* Class responsible for testing the OverlayPanelEventFilter.
*/
@@ -60,8 +60,8 @@
@ClassRule
public static DisableAnimationsTestRule disableAnimationsRule = new DisableAnimationsTestRule();
@ClassRule
- public static BaseActivityTestRule<DummyUiActivity> activityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public static BaseActivityTestRule<BlankUiTestActivity> activityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
@Rule
public MockitoRule mMockitoRule = MockitoJUnit.rule();
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelManagerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelManagerTest.java
index 0fd85d0b..aac5ba6 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelManagerTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelManagerTest.java
@@ -41,8 +41,8 @@
import org.chromium.ui.base.IntentRequestTracker;
import org.chromium.ui.base.WindowAndroid;
import org.chromium.ui.resources.dynamics.DynamicResourceLoader;
+import org.chromium.ui.test.util.BlankUiTestActivity;
import org.chromium.ui.test.util.DisableAnimationsTestRule;
-import org.chromium.ui.test.util.DummyUiActivity;
import java.util.concurrent.TimeoutException;
@@ -57,8 +57,8 @@
@ClassRule
public static DisableAnimationsTestRule disableAnimationsRule = new DisableAnimationsTestRule();
@ClassRule
- public static BaseActivityTestRule<DummyUiActivity> activityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public static BaseActivityTestRule<BlankUiTestActivity> activityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
@Rule
public MockitoRule mMockitoRule = MockitoJUnit.rule();
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuChipControllerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuChipControllerTest.java
index d0a991a..7ec62c3 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuChipControllerTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuChipControllerTest.java
@@ -26,14 +26,14 @@
import org.chromium.chrome.R;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.ui.test.util.DummyUiActivity;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivity;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
/**
* Tests for ContextMenuHeader view and {@link ContextMenuHeaderViewBinder}
*/
@RunWith(ChromeJUnit4ClassRunner.class)
-public class ContextMenuChipControllerTest extends DummyUiActivityTestCase {
+public class ContextMenuChipControllerTest extends BlankUiTestActivityTestCase {
// This is the combination of the expected vertical margins and the chip height.
private static final int EXPECTED_VERTICAL_DP = 80;
// Computed by taking the 338dp max width and subtracting:
@@ -61,7 +61,7 @@
@BeforeClass
public static void setUpBeforeActivityLaunched() {
- DummyUiActivity.setTestLayout(R.layout.context_menu_fullscreen_container);
+ BlankUiTestActivity.setTestLayout(R.layout.context_menu_fullscreen_container);
}
@Override
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuHeaderViewTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuHeaderViewTest.java
index fce1b538..2c56841 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuHeaderViewTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuHeaderViewTest.java
@@ -29,14 +29,14 @@
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modelutil.PropertyModel;
import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
-import org.chromium.ui.test.util.DummyUiActivity;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivity;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
/**
* Tests for ContextMenuHeader view and {@link ContextMenuHeaderViewBinder}
*/
@RunWith(ChromeJUnit4ClassRunner.class)
-public class ContextMenuHeaderViewTest extends DummyUiActivityTestCase {
+public class ContextMenuHeaderViewTest extends BlankUiTestActivityTestCase {
private static final String TITLE_STRING = "Some Very Cool Title";
private static final String URL_STRING = "www.website.com";
@@ -53,7 +53,7 @@
@BeforeClass
public static void setUpBeforeActivityLaunched() {
- DummyUiActivity.setTestLayout(R.layout.context_menu_header);
+ BlankUiTestActivity.setTestLayout(R.layout.context_menu_header);
}
@Override
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuItemViewTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuItemViewTest.java
index b8f87df..2177bae2 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuItemViewTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuItemViewTest.java
@@ -27,15 +27,15 @@
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modelutil.PropertyModel;
import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
-import org.chromium.ui.test.util.DummyUiActivity;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivity;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
/**
* Tests for ContextMenu item view, {@link ContextMenuItemViewBinder}, and {@link
* ContextMenuItemWithIconButtonViewBinder}.
*/
@RunWith(ChromeJUnit4ClassRunner.class)
-public class ContextMenuItemViewTest extends DummyUiActivityTestCase {
+public class ContextMenuItemViewTest extends BlankUiTestActivityTestCase {
private static final String TEXT = "Useful menu item";
private static final String APP = "Some app";
@@ -49,7 +49,7 @@
@BeforeClass
public static void setUpBeforeActivityLaunched() {
- DummyUiActivity.setTestLayout(org.chromium.chrome.R.layout.context_menu_share_row);
+ BlankUiTestActivity.setTestLayout(org.chromium.chrome.R.layout.context_menu_share_row);
}
@Override
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuRenderTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuRenderTest.java
index 3e308215..c7e07d1f 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuRenderTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuRenderTest.java
@@ -34,7 +34,7 @@
import org.chromium.ui.modelutil.MVCListAdapter.ModelList;
import org.chromium.ui.modelutil.ModelListAdapter;
import org.chromium.ui.modelutil.PropertyModel;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import org.chromium.ui.test.util.NightModeTestUtils;
import java.io.IOException;
@@ -45,7 +45,7 @@
*/
@RunWith(ParameterizedRunner.class)
@ParameterAnnotations.UseRunnerDelegate(ChromeJUnit4RunnerDelegate.class)
-public class ContextMenuRenderTest extends DummyUiActivityTestCase {
+public class ContextMenuRenderTest extends BlankUiTestActivityTestCase {
@ParameterAnnotations.ClassParameter
private static List<ParameterSet> sClassParams =
new NightModeTestUtils.NightModeParams().getParameters();
@@ -62,7 +62,7 @@
private FeatureList.TestValues mTestValues;
public ContextMenuRenderTest(boolean nightModeEnabled) {
- NightModeTestUtils.setUpNightModeForDummyUiActivity(nightModeEnabled);
+ NightModeTestUtils.setUpNightModeForBlankUiTestActivity(nightModeEnabled);
mRenderTestRule.setNightModeEnabled(nightModeEnabled);
}
@@ -110,7 +110,7 @@
@Override
public void tearDownTest() throws Exception {
TestThreadUtils.runOnUiThreadBlocking(() -> {
- NightModeTestUtils.tearDownNightModeForDummyUiActivity();
+ NightModeTestUtils.tearDownNightModeForBlankUiTestActivity();
mListItems.clear();
});
FeatureList.setTestValues(null);
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationDialogTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationDialogTest.java
index 74b6f9b..adc5563 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationDialogTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationDialogTest.java
@@ -51,7 +51,7 @@
import org.chromium.components.user_prefs.UserPrefsJni;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modaldialog.ModalDialogManager;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import java.util.ArrayList;
import java.util.HashMap;
@@ -62,7 +62,7 @@
*/
@RunWith(ChromeJUnit4ClassRunner.class)
@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE})
-public class DownloadLocationDialogTest extends DummyUiActivityTestCase {
+public class DownloadLocationDialogTest extends BlankUiTestActivityTestCase {
private static final long TOTAL_BYTES = 1024L;
private static final String SUGGESTED_PATH = "download.png";
private static final String PRIMARY_STORAGE_PATH = "/sdcard";
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/init/FirstDrawDetectorTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/init/FirstDrawDetectorTest.java
index 51c70bb..9466cfd 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/init/FirstDrawDetectorTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/init/FirstDrawDetectorTest.java
@@ -16,7 +16,7 @@
import org.chromium.base.test.BaseActivityTestRule;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.ui.test.util.DummyUiActivity;
+import org.chromium.ui.test.util.BlankUiTestActivity;
import java.util.concurrent.CountDownLatch;
@@ -24,8 +24,8 @@
@RunWith(ChromeJUnit4ClassRunner.class)
public class FirstDrawDetectorTest {
@Rule
- public BaseActivityTestRule<DummyUiActivity> mActivityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public BaseActivityTestRule<BlankUiTestActivity> mActivityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
@Test
@SmallTest
@@ -33,7 +33,7 @@
mActivityTestRule.launchActivity(null);
final CountDownLatch firstDrawEvent = new CountDownLatch(1);
TestThreadUtils.runOnUiThreadBlocking(() -> {
- DummyUiActivity activity = mActivityTestRule.getActivity();
+ BlankUiTestActivity activity = mActivityTestRule.getActivity();
View view = new FrameLayout(activity);
activity.setContentView(view);
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/metrics/MainIntentBehaviorMetricsIntegrationTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/metrics/MainIntentBehaviorMetricsIntegrationTest.java
index 296982c..47d5b1d 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/metrics/MainIntentBehaviorMetricsIntegrationTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/metrics/MainIntentBehaviorMetricsIntegrationTest.java
@@ -35,7 +35,7 @@
import org.chromium.chrome.browser.history.HistoryActivity;
import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
-import org.chromium.chrome.browser.settings.DummySettingsForTest;
+import org.chromium.chrome.browser.settings.PlaceholderSettingsForTest;
import org.chromium.chrome.browser.settings.SettingsActivity;
import org.chromium.chrome.browser.settings.SettingsActivityTestRule;
import org.chromium.chrome.test.ChromeActivityTestRule;
@@ -57,8 +57,8 @@
@Rule
public ChromeTabbedActivityTestRule mActivityTestRule = new ChromeTabbedActivityTestRule();
@Rule
- public SettingsActivityTestRule<DummySettingsForTest> mSettingsActivityTestRule =
- new SettingsActivityTestRule<>(DummySettingsForTest.class);
+ public SettingsActivityTestRule<PlaceholderSettingsForTest> mSettingsActivityTestRule =
+ new SettingsActivityTestRule<>(PlaceholderSettingsForTest.class);
private UserActionTester mActionTester;
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/modaldialog/ModalDialogViewRenderTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/modaldialog/ModalDialogViewRenderTest.java
index 93e6e7e..59540cf 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/modaldialog/ModalDialogViewRenderTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/modaldialog/ModalDialogViewRenderTest.java
@@ -40,7 +40,7 @@
import org.chromium.ui.UiUtils;
import org.chromium.ui.modaldialog.ModalDialogProperties;
import org.chromium.ui.modelutil.PropertyModel;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import org.chromium.ui.test.util.NightModeTestUtils;
import org.chromium.ui.test.util.RenderTestRule;
@@ -54,7 +54,7 @@
@RunWith(ParameterizedRunner.class)
@ParameterAnnotations.UseRunnerDelegate(ChromeJUnit4RunnerDelegate.class)
@Batch(Batch.PER_CLASS)
-public class ModalDialogViewRenderTest extends DummyUiActivityTestCase {
+public class ModalDialogViewRenderTest extends BlankUiTestActivityTestCase {
@ParameterAnnotations.ClassParameter
private static List<ParameterSet> sClassParams =
new NightModeTestUtils.NightModeParams().getParameters();
@@ -76,13 +76,13 @@
public ModalDialogViewRenderTest(boolean nightModeEnabled) {
// Sets a fake background color to make the screenshots easier to compare with bare eyes.
mFakeBgColor = nightModeEnabled ? Color.BLACK : Color.WHITE;
- NightModeTestUtils.setUpNightModeForDummyUiActivity(nightModeEnabled);
+ NightModeTestUtils.setUpNightModeForBlankUiTestActivity(nightModeEnabled);
mRenderTestRule.setNightModeEnabled(nightModeEnabled);
}
@Override
public void tearDownTest() throws Exception {
- NightModeTestUtils.tearDownNightModeForDummyUiActivity();
+ NightModeTestUtils.tearDownNightModeForBlankUiTestActivity();
super.tearDownTest();
}
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/IncognitoDescriptionViewRenderTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/IncognitoDescriptionViewRenderTest.java
index 6acc943c..79fbef5 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/IncognitoDescriptionViewRenderTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/IncognitoDescriptionViewRenderTest.java
@@ -22,7 +22,7 @@
import org.chromium.chrome.test.ChromeJUnit4RunnerDelegate;
import org.chromium.chrome.test.util.ChromeRenderTestRule;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import org.chromium.ui.test.util.NightModeTestUtils;
import java.io.IOException;
@@ -33,7 +33,7 @@
*/
@RunWith(ParameterizedRunner.class)
@UseRunnerDelegate(ChromeJUnit4RunnerDelegate.class)
-public class IncognitoDescriptionViewRenderTest extends DummyUiActivityTestCase {
+public class IncognitoDescriptionViewRenderTest extends BlankUiTestActivityTestCase {
@ParameterAnnotations.ClassParameter
private static List<ParameterSet> sClassParams =
new NightModeTestUtils.NightModeParams().getParameters();
@@ -43,7 +43,7 @@
ChromeRenderTestRule.Builder.withPublicCorpus().setRevision(1).build();
public IncognitoDescriptionViewRenderTest(boolean nightModeEnabled) {
- NightModeTestUtils.setUpNightModeForDummyUiActivity(nightModeEnabled);
+ NightModeTestUtils.setUpNightModeForBlankUiTestActivity(nightModeEnabled);
mRenderTestRule.setNightModeEnabled(nightModeEnabled);
}
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/RevampedIncognitoDescriptionViewRenderTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/RevampedIncognitoDescriptionViewRenderTest.java
index 086de3df..b33d40d 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/RevampedIncognitoDescriptionViewRenderTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/RevampedIncognitoDescriptionViewRenderTest.java
@@ -21,7 +21,7 @@
import org.chromium.chrome.test.ChromeJUnit4RunnerDelegate;
import org.chromium.chrome.test.util.ChromeRenderTestRule;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import org.chromium.ui.test.util.NightModeTestUtils;
import java.io.IOException;
@@ -32,7 +32,7 @@
*/
@RunWith(ParameterizedRunner.class)
@UseRunnerDelegate(ChromeJUnit4RunnerDelegate.class)
-public class RevampedIncognitoDescriptionViewRenderTest extends DummyUiActivityTestCase {
+public class RevampedIncognitoDescriptionViewRenderTest extends BlankUiTestActivityTestCase {
@ClassParameter
private static List<ParameterSet> sClassParams =
new NightModeTestUtils.NightModeParams().getParameters();
@@ -42,7 +42,7 @@
ChromeRenderTestRule.Builder.withPublicCorpus().setRevision(1).build();
public RevampedIncognitoDescriptionViewRenderTest(boolean nightModeEnabled) {
- NightModeTestUtils.setUpNightModeForDummyUiActivity(nightModeEnabled);
+ NightModeTestUtils.setUpNightModeForBlankUiTestActivity(nightModeEnabled);
mRenderTestRule.setNightModeEnabled(nightModeEnabled);
}
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/status/StatusViewRenderTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/status/StatusViewRenderTest.java
index e434201..0631b7f 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/status/StatusViewRenderTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/status/StatusViewRenderTest.java
@@ -43,7 +43,7 @@
import org.chromium.components.content_settings.ContentSettingsType;
import org.chromium.ui.modelutil.PropertyModel;
import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import java.io.IOException;
@@ -51,7 +51,7 @@
* Render tests for {@link StatusView}.
*/
@RunWith(ChromeJUnit4ClassRunner.class)
-public class StatusViewRenderTest extends DummyUiActivityTestCase {
+public class StatusViewRenderTest extends BlankUiTestActivityTestCase {
@Rule
public ChromeRenderTestRule mRenderTestRule =
ChromeRenderTestRule.Builder.withPublicCorpus().build();
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/status/StatusViewTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/status/StatusViewTest.java
index 3d5f5b21..72c2158bb 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/status/StatusViewTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/status/StatusViewTest.java
@@ -41,14 +41,14 @@
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modelutil.PropertyModel;
import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import org.chromium.ui.test.util.UiRestriction;
/**
* Tests for {@link StatusView} and {@link StatusViewBinder}.
*/
@RunWith(ChromeJUnit4ClassRunner.class)
-public class StatusViewTest extends DummyUiActivityTestCase {
+public class StatusViewTest extends BlankUiTestActivityTestCase {
@Mock
private SearchEngineLogoUtils mSearchEngineLogoUtils;
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/voice/AssistantVoiceSearchConsentUiRenderTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/voice/AssistantVoiceSearchConsentUiRenderTest.java
index 75d8ffe5..f36d61fe 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/voice/AssistantVoiceSearchConsentUiRenderTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/voice/AssistantVoiceSearchConsentUiRenderTest.java
@@ -21,14 +21,14 @@
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.chrome.test.util.ChromeRenderTestRule;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import java.io.IOException;
/** Render tests for AssistantVoiceSearchConsentDialog */
@RunWith(ChromeJUnit4ClassRunner.class)
@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE})
-public class AssistantVoiceSearchConsentUiRenderTest extends DummyUiActivityTestCase {
+public class AssistantVoiceSearchConsentUiRenderTest extends BlankUiTestActivityTestCase {
@Rule
public ChromeRenderTestRule mRenderTestRule =
ChromeRenderTestRule.Builder.withPublicCorpus().build();
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettingsTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettingsTest.java
index 1c285e88..5997090 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettingsTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettingsTest.java
@@ -47,7 +47,7 @@
import org.chromium.chrome.browser.password_check.PasswordCheckFactory;
import org.chromium.chrome.browser.preferences.Pref;
import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.browser.settings.DummySettingsForTest;
+import org.chromium.chrome.browser.settings.PlaceholderSettingsForTest;
import org.chromium.chrome.browser.settings.SettingsActivity;
import org.chromium.chrome.browser.settings.SettingsActivityTestRule;
import org.chromium.chrome.browser.sync.SyncService;
@@ -68,8 +68,9 @@
@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE})
public class PasswordSettingsTest {
@Rule
- public SettingsActivityTestRule<DummySettingsForTest> mDummySettingsActivityTestRule =
- new SettingsActivityTestRule<>(DummySettingsForTest.class);
+ public SettingsActivityTestRule<PlaceholderSettingsForTest>
+ mPlaceholderSettingsActivityTestRule =
+ new SettingsActivityTestRule<>(PlaceholderSettingsForTest.class);
@Rule
public SettingsActivityTestRule<PasswordSettings> mPasswordSettingsActivityTestRule =
@@ -95,9 +96,9 @@
// This initializes the browser, so some tests can do setup before PasswordSettings is
// launched. ChromeTabbedActivityTestRule.startMainActivityOnBlankPage() is more commonly
// used for this end, but using another settings activity instead makes these tests more
- // isolated, i.e. avoids exercising unnecessary logic. DummyUiActivityTestCase also won't
- // fit here, it doesn't initialize enough of the browser.
- mDummySettingsActivityTestRule.startSettingsActivity(null);
+ // isolated, i.e. avoids exercising unnecessary logic. BlankUiTestActivityTestCase also
+ // won't fit here, it doesn't initialize enough of the browser.
+ mPlaceholderSettingsActivityTestRule.startSettingsActivity(null);
}
@After
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/AndroidPaymentAppFinderUnitTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/AndroidPaymentAppFinderUnitTest.java
index 8f50249..4f81d38 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/AndroidPaymentAppFinderUnitTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/AndroidPaymentAppFinderUnitTest.java
@@ -50,7 +50,7 @@
import org.chromium.ui.base.ActivityWindowAndroid;
import org.chromium.ui.base.IntentRequestTracker;
import org.chromium.ui.base.WindowAndroid;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import org.chromium.url.GURL;
import org.chromium.url.Origin;
@@ -62,7 +62,7 @@
/** Tests for the native Android payment app finder. */
@RunWith(BaseJUnit4ClassRunner.class)
@Batch(AndroidPaymentAppFinderUnitTest.PAYMENTS_BROWSER_UNIT_TESTS)
-public class AndroidPaymentAppFinderUnitTest extends DummyUiActivityTestCase {
+public class AndroidPaymentAppFinderUnitTest extends BlankUiTestActivityTestCase {
// Collection of payments unit tests that require the browser process to be initialized.
static final String PAYMENTS_BROWSER_UNIT_TESTS = "PaymentsBrowserUnitTests";
private static final IntentArgumentMatcher sPayIntentArgumentMatcher =
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/signin/SyncConsentFragmentTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/signin/SyncConsentFragmentTest.java
index dd7ea9d..51afc2dc 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/signin/SyncConsentFragmentTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/signin/SyncConsentFragmentTest.java
@@ -72,8 +72,8 @@
import org.chromium.components.signin.identitymanager.ConsentLevel;
import org.chromium.components.signin.metrics.SigninAccessPoint;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
+import org.chromium.ui.test.util.BlankUiTestActivity;
import org.chromium.ui.test.util.DisableAnimationsTestRule;
-import org.chromium.ui.test.util.DummyUiActivity;
import java.io.IOException;
import java.util.List;
@@ -127,8 +127,8 @@
new ChromeTabbedActivityTestRule();
@Rule
- public final BaseActivityTestRule<DummyUiActivity> mActivityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public final BaseActivityTestRule<BlankUiTestActivity> mActivityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
@Rule
public final ChromeRenderTestRule mRenderTestRule =
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorViewBinderTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorViewBinderTest.java
index 69f51a70..75cf296 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorViewBinderTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorViewBinderTest.java
@@ -35,14 +35,14 @@
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modelutil.PropertyModel;
import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
-import org.chromium.ui.test.util.DummyUiActivity;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivity;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
/**
* Tests for {@link StatusIndicatorViewBinder}.
*/
@RunWith(ChromeJUnit4ClassRunner.class)
-public class StatusIndicatorViewBinderTest extends DummyUiActivityTestCase {
+public class StatusIndicatorViewBinderTest extends BlankUiTestActivityTestCase {
private static final String STATUS_TEXT = "Offline";
private ViewResourceFrameLayout mContainer;
@@ -54,7 +54,7 @@
@BeforeClass
public static void setUpBeforeActivityLaunched() {
- DummyUiActivity.setTestLayout(R.layout.status_indicator_container);
+ BlankUiTestActivity.setTestLayout(R.layout.status_indicator_container);
}
@Override
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/suggestions/tile/TileRendererTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/suggestions/tile/TileRendererTest.java
index a95cc67..101ddb6 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/suggestions/tile/TileRendererTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/suggestions/tile/TileRendererTest.java
@@ -25,7 +25,7 @@
import org.chromium.chrome.browser.suggestions.SiteSuggestion;
import org.chromium.chrome.browser.suggestions.SuggestionsConfig.TileStyle;
import org.chromium.chrome.test.util.browser.Features;
-import org.chromium.ui.test.util.DummyUiActivity;
+import org.chromium.ui.test.util.BlankUiTestActivity;
import org.chromium.url.GURL;
/** A simple test for {@link TileRenderer} using real {@link android.view.View} objects. */
@@ -37,8 +37,8 @@
@Rule
public TestRule mFeaturesProcessor = new Features.JUnitProcessor();
@Rule
- public BaseActivityTestRule<DummyUiActivity> mActivityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public BaseActivityTestRule<BlankUiTestActivity> mActivityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
@Mock
private ImageFetcher mMockImageFetcher;
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/ui/PassphraseTypeDialogFragmentTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/sync/ui/PassphraseTypeDialogFragmentTest.java
index e2802d4..fa51db9d 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/ui/PassphraseTypeDialogFragmentTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/sync/ui/PassphraseTypeDialogFragmentTest.java
@@ -31,7 +31,7 @@
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.chrome.test.util.ActivityTestUtils;
import org.chromium.components.sync.PassphraseType;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import org.chromium.ui.test.util.RenderTestRule;
import java.io.IOException;
@@ -41,7 +41,7 @@
*/
@RunWith(ChromeJUnit4ClassRunner.class)
@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE})
-public class PassphraseTypeDialogFragmentTest extends DummyUiActivityTestCase {
+public class PassphraseTypeDialogFragmentTest extends BlankUiTestActivityTestCase {
@Rule
public RenderTestRule mRenderTestRule =
RenderTestRule.Builder.withPublicCorpus().setRevision(1).build();
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/HomeButtonTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/HomeButtonTest.java
index a429c0c1..be2880cb 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/HomeButtonTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/HomeButtonTest.java
@@ -35,14 +35,14 @@
import org.chromium.chrome.test.util.browser.Features;
import org.chromium.components.browser_ui.settings.SettingsLauncher;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
/**
* Test related to {@link HomeButton}.
* TODO: Add more test when features related has update.
*/
@RunWith(ChromeJUnit4ClassRunner.class)
-public class HomeButtonTest extends DummyUiActivityTestCase {
+public class HomeButtonTest extends BlankUiTestActivityTestCase {
private static final String ASSERT_MSG_MENU_IS_CREATED =
"ContextMenu is not created after long press.";
private static final String ASSERT_MSG_MENU_SIZE =
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveButtonActionMenuRenderTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveButtonActionMenuRenderTest.java
index 191d3d28..9d70357 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveButtonActionMenuRenderTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveButtonActionMenuRenderTest.java
@@ -35,8 +35,8 @@
import org.chromium.chrome.test.util.browser.Features.EnableFeatures;
import org.chromium.components.browser_ui.widget.listmenu.ListMenuButton;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
+import org.chromium.ui.test.util.BlankUiTestActivity;
import org.chromium.ui.test.util.DisableAnimationsTestRule;
-import org.chromium.ui.test.util.DummyUiActivity;
import org.chromium.ui.test.util.NightModeTestUtils;
import java.io.IOException;
@@ -58,8 +58,8 @@
public static DisableAnimationsTestRule disableAnimationsRule = new DisableAnimationsTestRule();
@Rule
- public BaseActivityTestRule<DummyUiActivity> mActivityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public BaseActivityTestRule<BlankUiTestActivity> mActivityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
@Rule
public ChromeRenderTestRule mRenderTestRule =
@@ -68,7 +68,7 @@
private View mView;
public AdaptiveButtonActionMenuRenderTest(boolean nightModeEnabled) {
- NightModeTestUtils.setUpNightModeForDummyUiActivity(nightModeEnabled);
+ NightModeTestUtils.setUpNightModeForBlankUiTestActivity(nightModeEnabled);
mRenderTestRule.setNightModeEnabled(nightModeEnabled);
}
@@ -97,7 +97,7 @@
@After
public void tearDownTest() throws Exception {
TestThreadUtils.runOnUiThreadBlocking(
- () -> NightModeTestUtils.tearDownNightModeForDummyUiActivity());
+ () -> NightModeTestUtils.tearDownNightModeForBlankUiTestActivity());
}
@Test
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/top/TabSwitcherActionMenuRenderTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/top/TabSwitcherActionMenuRenderTest.java
index 54c4dfc..c07ba630 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/top/TabSwitcherActionMenuRenderTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/top/TabSwitcherActionMenuRenderTest.java
@@ -28,7 +28,7 @@
import org.chromium.chrome.test.util.ChromeRenderTestRule;
import org.chromium.components.browser_ui.widget.listmenu.ListMenuButton;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import org.chromium.ui.test.util.NightModeTestUtils;
import java.io.IOException;
@@ -39,7 +39,7 @@
*/
@RunWith(ParameterizedRunner.class)
@ParameterAnnotations.UseRunnerDelegate(ChromeJUnit4RunnerDelegate.class)
-public class TabSwitcherActionMenuRenderTest extends DummyUiActivityTestCase {
+public class TabSwitcherActionMenuRenderTest extends BlankUiTestActivityTestCase {
@ParameterAnnotations.ClassParameter
private static List<ParameterSet> sClassParams =
new NightModeTestUtils.NightModeParams().getParameters();
@@ -51,13 +51,13 @@
private View mView;
public TabSwitcherActionMenuRenderTest(boolean nightModeEnabled) {
- NightModeTestUtils.setUpNightModeForDummyUiActivity(nightModeEnabled);
+ NightModeTestUtils.setUpNightModeForBlankUiTestActivity(nightModeEnabled);
mRenderTestRule.setNightModeEnabled(nightModeEnabled);
}
@Override
public void tearDownTest() throws Exception {
- NightModeTestUtils.tearDownNightModeForDummyUiActivity();
+ NightModeTestUtils.tearDownNightModeForBlankUiTestActivity();
super.tearDownTest();
}
diff --git a/chrome/browser/attribution_reporting/android/internal/java/src/org/chromium/chrome/browser/attribution_reporting/InputEventValidatorManualTest.java b/chrome/browser/attribution_reporting/android/internal/java/src/org/chromium/chrome/browser/attribution_reporting/InputEventValidatorManualTest.java
index 4559fdf..63004e3 100644
--- a/chrome/browser/attribution_reporting/android/internal/java/src/org/chromium/chrome/browser/attribution_reporting/InputEventValidatorManualTest.java
+++ b/chrome/browser/attribution_reporting/android/internal/java/src/org/chromium/chrome/browser/attribution_reporting/InputEventValidatorManualTest.java
@@ -17,7 +17,7 @@
import org.chromium.base.ThreadUtils;
import org.chromium.base.test.util.Manual;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicReference;
@@ -32,7 +32,7 @@
* These tests only work on R+.
*/
@RunWith(ChromeJUnit4ClassRunner.class)
-public class InputEventValidatorManualTest extends DummyUiActivityTestCase {
+public class InputEventValidatorManualTest extends BlankUiTestActivityTestCase {
private String mPackageName = "com.android.packageName";
private byte mPackageMac[];
diff --git a/chrome/browser/commerce/merchant_viewer/android/javatests/src/org/chromium/chrome/browser/merchant_viewer/BottomSheetToolbarViewBinderTest.java b/chrome/browser/commerce/merchant_viewer/android/javatests/src/org/chromium/chrome/browser/merchant_viewer/BottomSheetToolbarViewBinderTest.java
index 074594c..63fea73 100644
--- a/chrome/browser/commerce/merchant_viewer/android/javatests/src/org/chromium/chrome/browser/merchant_viewer/BottomSheetToolbarViewBinderTest.java
+++ b/chrome/browser/commerce/merchant_viewer/android/javatests/src/org/chromium/chrome/browser/merchant_viewer/BottomSheetToolbarViewBinderTest.java
@@ -28,7 +28,7 @@
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modelutil.PropertyModel;
import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import org.chromium.url.GURL;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -37,7 +37,7 @@
* Tests for {@link BottomSheetToolbarViewBinder}.
*/
@RunWith(ChromeJUnit4ClassRunner.class)
-public class BottomSheetToolbarViewBinderTest extends DummyUiActivityTestCase {
+public class BottomSheetToolbarViewBinderTest extends BlankUiTestActivityTestCase {
private final AtomicBoolean mIconClicked = new AtomicBoolean();
private BottomSheetToolbarView mItemView;
diff --git a/chrome/browser/commerce/merchant_viewer/android/javatests/src/org/chromium/chrome/browser/merchant_viewer/MerchantTrustMessageViewTest.java b/chrome/browser/commerce/merchant_viewer/android/javatests/src/org/chromium/chrome/browser/merchant_viewer/MerchantTrustMessageViewTest.java
index efdc216a..f243351 100644
--- a/chrome/browser/commerce/merchant_viewer/android/javatests/src/org/chromium/chrome/browser/merchant_viewer/MerchantTrustMessageViewTest.java
+++ b/chrome/browser/commerce/merchant_viewer/android/javatests/src/org/chromium/chrome/browser/merchant_viewer/MerchantTrustMessageViewTest.java
@@ -34,7 +34,7 @@
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modelutil.PropertyModel;
import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import org.chromium.ui.test.util.NightModeTestUtils;
import java.io.IOException;
@@ -45,7 +45,7 @@
*/
@RunWith(ParameterizedRunner.class)
@ParameterAnnotations.UseRunnerDelegate(ChromeJUnit4RunnerDelegate.class)
-public class MerchantTrustMessageViewTest extends DummyUiActivityTestCase {
+public class MerchantTrustMessageViewTest extends BlankUiTestActivityTestCase {
@ClassParameter
private static List<ParameterSet> sClassParams =
new NightModeTestUtils.NightModeParams().getParameters();
@@ -58,7 +58,7 @@
ChromeRenderTestRule.Builder.withPublicCorpus().build();
public MerchantTrustMessageViewTest(boolean nightModeEnabled) {
- NightModeTestUtils.setUpNightModeForDummyUiActivity(nightModeEnabled);
+ NightModeTestUtils.setUpNightModeForBlankUiTestActivity(nightModeEnabled);
mRenderTestRule.setNightModeEnabled(nightModeEnabled);
}
@@ -81,7 +81,7 @@
@Override
public void tearDownTest() throws Exception {
- NightModeTestUtils.tearDownNightModeForDummyUiActivity();
+ NightModeTestUtils.tearDownNightModeForBlankUiTestActivity();
super.tearDownTest();
}
diff --git a/chrome/browser/continuous_search/android/javatests/org/chromium/chrome/browser/continuous_search/ContinuousSearchChipViewTest.java b/chrome/browser/continuous_search/android/javatests/org/chromium/chrome/browser/continuous_search/ContinuousSearchChipViewTest.java
index 4977c78..0f8901b 100644
--- a/chrome/browser/continuous_search/android/javatests/org/chromium/chrome/browser/continuous_search/ContinuousSearchChipViewTest.java
+++ b/chrome/browser/continuous_search/android/javatests/org/chromium/chrome/browser/continuous_search/ContinuousSearchChipViewTest.java
@@ -21,7 +21,7 @@
import org.chromium.base.test.util.Batch;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.ui.test.util.DummyUiActivity;
+import org.chromium.ui.test.util.BlankUiTestActivity;
/**
* Tests for {@link ContinuousSearchChipView}.
@@ -30,8 +30,8 @@
@Batch(Batch.UNIT_TESTS)
public class ContinuousSearchChipViewTest {
@ClassRule
- public static BaseActivityTestRule<DummyUiActivity> sActivityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public static BaseActivityTestRule<BlankUiTestActivity> sActivityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
private static Activity sActivity;
private ContinuousSearchChipView mChipView;
diff --git a/chrome/browser/continuous_search/android/javatests/org/chromium/chrome/browser/continuous_search/ContinuousSearchUiTest.java b/chrome/browser/continuous_search/android/javatests/org/chromium/chrome/browser/continuous_search/ContinuousSearchUiTest.java
index e94b61f2..787c4a9 100644
--- a/chrome/browser/continuous_search/android/javatests/org/chromium/chrome/browser/continuous_search/ContinuousSearchUiTest.java
+++ b/chrome/browser/continuous_search/android/javatests/org/chromium/chrome/browser/continuous_search/ContinuousSearchUiTest.java
@@ -46,7 +46,7 @@
import org.chromium.components.url_formatter.UrlFormatter;
import org.chromium.components.url_formatter.UrlFormatterJni;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.ui.test.util.DummyUiActivity;
+import org.chromium.ui.test.util.BlankUiTestActivity;
import org.chromium.url.GURL;
import org.chromium.url.JUnitTestGURLs;
@@ -61,8 +61,8 @@
@Batch(Batch.UNIT_TESTS)
public class ContinuousSearchUiTest {
@ClassRule
- public static BaseActivityTestRule<DummyUiActivity> sActivityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public static BaseActivityTestRule<BlankUiTestActivity> sActivityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
private static Activity sActivity;
diff --git a/chrome/browser/download/internal/android/java/src/org/chromium/chrome/browser/download/home/DownloadActivityV2Test.java b/chrome/browser/download/internal/android/java/src/org/chromium/chrome/browser/download/home/DownloadActivityV2Test.java
index 6c5b67c..ecc0d5c 100644
--- a/chrome/browser/download/internal/android/java/src/org/chromium/chrome/browser/download/home/DownloadActivityV2Test.java
+++ b/chrome/browser/download/internal/android/java/src/org/chromium/chrome/browser/download/home/DownloadActivityV2Test.java
@@ -77,7 +77,7 @@
import org.chromium.content_public.browser.UiThreadTaskTraits;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modaldialog.ModalDialogManager;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import org.chromium.ui.test.util.UiRestriction;
import org.chromium.url.JUnitTestGURLs;
@@ -88,7 +88,7 @@
/** Tests the DownloadActivity home V2. */
@RunWith(ChromeJUnit4ClassRunner.class)
@Restriction(UiRestriction.RESTRICTION_TYPE_PHONE)
-public class DownloadActivityV2Test extends DummyUiActivityTestCase {
+public class DownloadActivityV2Test extends BlankUiTestActivityTestCase {
@Mock
private Tracker mTracker;
@Mock
diff --git a/chrome/browser/image_descriptions/android/java/src/org/chromium/chrome/browser/image_descriptions/ImageDescriptionsControllerTest.java b/chrome/browser/image_descriptions/android/java/src/org/chromium/chrome/browser/image_descriptions/ImageDescriptionsControllerTest.java
index 99a00a6..0b0e864 100644
--- a/chrome/browser/image_descriptions/android/java/src/org/chromium/chrome/browser/image_descriptions/ImageDescriptionsControllerTest.java
+++ b/chrome/browser/image_descriptions/android/java/src/org/chromium/chrome/browser/image_descriptions/ImageDescriptionsControllerTest.java
@@ -49,14 +49,14 @@
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.net.ConnectionType;
import org.chromium.ui.modaldialog.ModalDialogManager;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
/**
* Unit tests for {@link ImageDescriptionsController}
*/
@RunWith(ChromeJUnit4ClassRunner.class)
@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE})
-public class ImageDescriptionsControllerTest extends DummyUiActivityTestCase {
+public class ImageDescriptionsControllerTest extends BlankUiTestActivityTestCase {
@Rule
public JniMocker mJniMocker = new JniMocker();
diff --git a/chrome/browser/image_descriptions/android/java/src/org/chromium/chrome/browser/image_descriptions/ImageDescriptionsDialogTest.java b/chrome/browser/image_descriptions/android/java/src/org/chromium/chrome/browser/image_descriptions/ImageDescriptionsDialogTest.java
index 83c5871a..55e5607 100644
--- a/chrome/browser/image_descriptions/android/java/src/org/chromium/chrome/browser/image_descriptions/ImageDescriptionsDialogTest.java
+++ b/chrome/browser/image_descriptions/android/java/src/org/chromium/chrome/browser/image_descriptions/ImageDescriptionsDialogTest.java
@@ -54,14 +54,14 @@
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.net.ConnectionType;
import org.chromium.ui.modaldialog.ModalDialogManager;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
/**
* Unit tests for {@link ImageDescriptionsDialog}
*/
@RunWith(ChromeJUnit4ClassRunner.class)
@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE})
-public class ImageDescriptionsDialogTest extends DummyUiActivityTestCase {
+public class ImageDescriptionsDialogTest extends BlankUiTestActivityTestCase {
@Rule
public JniMocker mJniMocker = new JniMocker();
diff --git a/chrome/browser/incognito/android/javatests/src/org/chromium/chrome/browser/incognito/reauth/IncognitoReauthSettingSwitchPreferenceTest.java b/chrome/browser/incognito/android/javatests/src/org/chromium/chrome/browser/incognito/reauth/IncognitoReauthSettingSwitchPreferenceTest.java
index 42d6e577..6d23ae66 100644
--- a/chrome/browser/incognito/android/javatests/src/org/chromium/chrome/browser/incognito/reauth/IncognitoReauthSettingSwitchPreferenceTest.java
+++ b/chrome/browser/incognito/android/javatests/src/org/chromium/chrome/browser/incognito/reauth/IncognitoReauthSettingSwitchPreferenceTest.java
@@ -25,7 +25,7 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.chromium.chrome.browser.settings.DummySettingsForTest;
+import org.chromium.chrome.browser.settings.PlaceholderSettingsForTest;
import org.chromium.chrome.browser.settings.SettingsActivityTestRule;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
@@ -38,8 +38,8 @@
private static final String SUMMARY = "This is a summary.";
@Rule
- public SettingsActivityTestRule<DummySettingsForTest> mSettingsActivityTestRule =
- new SettingsActivityTestRule<>(DummySettingsForTest.class);
+ public SettingsActivityTestRule<PlaceholderSettingsForTest> mSettingsActivityTestRule =
+ new SettingsActivityTestRule<>(PlaceholderSettingsForTest.class);
private IncognitoReauthSettingSwitchPreference mPreference;
private Context mContext;
diff --git a/chrome/browser/incognito/android/javatests/src/org/chromium/chrome/browser/incognito/reauth/IncognitoReauthViewTest.java b/chrome/browser/incognito/android/javatests/src/org/chromium/chrome/browser/incognito/reauth/IncognitoReauthViewTest.java
index 85efe5e6..020e711 100644
--- a/chrome/browser/incognito/android/javatests/src/org/chromium/chrome/browser/incognito/reauth/IncognitoReauthViewTest.java
+++ b/chrome/browser/incognito/android/javatests/src/org/chromium/chrome/browser/incognito/reauth/IncognitoReauthViewTest.java
@@ -27,7 +27,7 @@
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.chrome.test.util.ChromeRenderTestRule;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import java.io.IOException;
@@ -36,7 +36,7 @@
*/
@RunWith(ChromeJUnit4ClassRunner.class)
@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE})
-public class IncognitoReauthViewTest extends DummyUiActivityTestCase {
+public class IncognitoReauthViewTest extends BlankUiTestActivityTestCase {
private View mView;
@Rule
diff --git a/chrome/browser/password_edit_dialog/android/java/src/org/chromium/chrome/browser/password_edit_dialog/PasswordEditDialogViewTest.java b/chrome/browser/password_edit_dialog/android/java/src/org/chromium/chrome/browser/password_edit_dialog/PasswordEditDialogViewTest.java
index 3d8152b2..738bb2e 100644
--- a/chrome/browser/password_edit_dialog/android/java/src/org/chromium/chrome/browser/password_edit_dialog/PasswordEditDialogViewTest.java
+++ b/chrome/browser/password_edit_dialog/android/java/src/org/chromium/chrome/browser/password_edit_dialog/PasswordEditDialogViewTest.java
@@ -24,7 +24,7 @@
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modelutil.PropertyModel;
import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
-import org.chromium.ui.test.util.DummyUiActivity;
+import org.chromium.ui.test.util.BlankUiTestActivity;
import java.util.Arrays;
@@ -38,8 +38,8 @@
private static final String FOOTER = "Footer";
@ClassRule
- public static BaseActivityTestRule<DummyUiActivity> sActivityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public static BaseActivityTestRule<BlankUiTestActivity> sActivityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
private static Activity sActivity;
diff --git a/chrome/browser/settings/BUILD.gn b/chrome/browser/settings/BUILD.gn
index e4f6410..d2b04b8 100644
--- a/chrome/browser/settings/BUILD.gn
+++ b/chrome/browser/settings/BUILD.gn
@@ -22,8 +22,8 @@
sources = [
"android/java/src/org/chromium/chrome/browser/settings/ChromeBasePreferenceTest.java",
"android/java/src/org/chromium/chrome/browser/settings/ChromeImageViewPreferenceTest.java",
- "android/java/src/org/chromium/chrome/browser/settings/DummySettingsForTest.java",
"android/java/src/org/chromium/chrome/browser/settings/ManagedPreferencesUtilsTest.java",
+ "android/java/src/org/chromium/chrome/browser/settings/PlaceholderSettingsForTest.java",
]
deps = [
diff --git a/chrome/browser/settings/android/java/src/org/chromium/chrome/browser/settings/ChromeBasePreferenceTest.java b/chrome/browser/settings/android/java/src/org/chromium/chrome/browser/settings/ChromeBasePreferenceTest.java
index e9af1be2..df2c257 100644
--- a/chrome/browser/settings/android/java/src/org/chromium/chrome/browser/settings/ChromeBasePreferenceTest.java
+++ b/chrome/browser/settings/android/java/src/org/chromium/chrome/browser/settings/ChromeBasePreferenceTest.java
@@ -43,8 +43,8 @@
@RunWith(ChromeJUnit4ClassRunner.class)
public class ChromeBasePreferenceTest {
@Rule
- public SettingsActivityTestRule<DummySettingsForTest> mActivityRule =
- new SettingsActivityTestRule<>(DummySettingsForTest.class);
+ public SettingsActivityTestRule<PlaceholderSettingsForTest> mActivityRule =
+ new SettingsActivityTestRule<>(PlaceholderSettingsForTest.class);
private PreferenceScreen mPreferenceScreen;
private Context mContext;
diff --git a/chrome/browser/settings/android/java/src/org/chromium/chrome/browser/settings/ChromeImageViewPreferenceTest.java b/chrome/browser/settings/android/java/src/org/chromium/chrome/browser/settings/ChromeImageViewPreferenceTest.java
index 3149772..d0aa751f 100644
--- a/chrome/browser/settings/android/java/src/org/chromium/chrome/browser/settings/ChromeImageViewPreferenceTest.java
+++ b/chrome/browser/settings/android/java/src/org/chromium/chrome/browser/settings/ChromeImageViewPreferenceTest.java
@@ -57,7 +57,7 @@
SettingsLauncher settingsLauncher = new SettingsLauncherImpl();
Intent intent = settingsLauncher.createSettingsActivityIntent(
InstrumentationRegistry.getInstrumentation().getContext(),
- DummySettingsForTest.class.getName());
+ PlaceholderSettingsForTest.class.getName());
mRule.launchActivity(intent);
PreferenceFragmentCompat fragment =
diff --git a/chrome/browser/settings/android/java/src/org/chromium/chrome/browser/settings/ManagedPreferencesUtilsTest.java b/chrome/browser/settings/android/java/src/org/chromium/chrome/browser/settings/ManagedPreferencesUtilsTest.java
index 9293dea..979a7dd5 100644
--- a/chrome/browser/settings/android/java/src/org/chromium/chrome/browser/settings/ManagedPreferencesUtilsTest.java
+++ b/chrome/browser/settings/android/java/src/org/chromium/chrome/browser/settings/ManagedPreferencesUtilsTest.java
@@ -124,7 +124,7 @@
SettingsLauncher settingsLauncher = new SettingsLauncherImpl();
Intent intent = settingsLauncher.createSettingsActivityIntent(
InstrumentationRegistry.getInstrumentation().getContext(),
- DummySettingsForTest.class.getName());
+ PlaceholderSettingsForTest.class.getName());
mRule.launchActivity(intent);
PreferenceFragmentCompat fragment =
diff --git a/chrome/browser/settings/android/java/src/org/chromium/chrome/browser/settings/DummySettingsForTest.java b/chrome/browser/settings/android/java/src/org/chromium/chrome/browser/settings/PlaceholderSettingsForTest.java
similarity index 76%
rename from chrome/browser/settings/android/java/src/org/chromium/chrome/browser/settings/DummySettingsForTest.java
rename to chrome/browser/settings/android/java/src/org/chromium/chrome/browser/settings/PlaceholderSettingsForTest.java
index 59bd03f..e535a6d 100644
--- a/chrome/browser/settings/android/java/src/org/chromium/chrome/browser/settings/DummySettingsForTest.java
+++ b/chrome/browser/settings/android/java/src/org/chromium/chrome/browser/settings/PlaceholderSettingsForTest.java
@@ -11,12 +11,12 @@
import androidx.preference.PreferenceScreen;
/**
- * A dummy {@link PreferenceFragmentCompat} for use in tests.
+ * A placeholder {@link PreferenceFragmentCompat} for use in tests.
*/
-public class DummySettingsForTest extends PreferenceFragmentCompat {
+public class PlaceholderSettingsForTest extends PreferenceFragmentCompat {
@Override
public void onCreatePreferences(Bundle bundle, String rootKey) {
- getActivity().setTitle("Dummy Settings");
+ getActivity().setTitle("Placeholder Settings");
Context context = getPreferenceManager().getContext();
PreferenceScreen screen = getPreferenceManager().createPreferenceScreen(context);
diff --git a/chrome/browser/share/android/javatests/src/org/chromium/chrome/browser/share/SaveBitmapDelegateTest.java b/chrome/browser/share/android/javatests/src/org/chromium/chrome/browser/share/SaveBitmapDelegateTest.java
index 0e37b95..4361d724 100644
--- a/chrome/browser/share/android/javatests/src/org/chromium/chrome/browser/share/SaveBitmapDelegateTest.java
+++ b/chrome/browser/share/android/javatests/src/org/chromium/chrome/browser/share/SaveBitmapDelegateTest.java
@@ -24,7 +24,7 @@
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.ui.permissions.AndroidPermissionDelegate;
import org.chromium.ui.permissions.PermissionCallback;
-import org.chromium.ui.test.util.DummyUiActivity;
+import org.chromium.ui.test.util.BlankUiTestActivity;
/**
* Tests for the {@link SaveBitmapDelegate}.
@@ -34,8 +34,8 @@
private SaveBitmapDelegate mSaveBitmapDelegate;
@Rule
- public BaseActivityTestRule<DummyUiActivity> mActivityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public BaseActivityTestRule<BlankUiTestActivity> mActivityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
@Mock
private Runnable mCloseDialogRunnable;
diff --git a/chrome/browser/share/android/javatests/src/org/chromium/chrome/browser/share/long_screenshots/LongScreenshotsMediatorTest.java b/chrome/browser/share/android/javatests/src/org/chromium/chrome/browser/share/long_screenshots/LongScreenshotsMediatorTest.java
index 1551470c..bc189d1 100644
--- a/chrome/browser/share/android/javatests/src/org/chromium/chrome/browser/share/long_screenshots/LongScreenshotsMediatorTest.java
+++ b/chrome/browser/share/android/javatests/src/org/chromium/chrome/browser/share/long_screenshots/LongScreenshotsMediatorTest.java
@@ -26,7 +26,7 @@
import org.chromium.chrome.browser.flags.ChromeSwitches;
import org.chromium.chrome.browser.share.long_screenshots.bitmap_generation.EntryManager;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
-import org.chromium.ui.test.util.DummyUiActivity;
+import org.chromium.ui.test.util.BlankUiTestActivity;
/** Tests for the LongScreenshotsMediator. */
@RunWith(ChromeJUnit4ClassRunner.class)
@@ -38,8 +38,8 @@
private LongScreenshotsMediator mMediator;
@Rule
- public BaseActivityTestRule<DummyUiActivity> mActivityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public BaseActivityTestRule<BlankUiTestActivity> mActivityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
@Mock
private View mView;
diff --git a/chrome/browser/share/android/javatests/src/org/chromium/chrome/browser/share/screenshot/ScreenshotShareSheetViewTest.java b/chrome/browser/share/android/javatests/src/org/chromium/chrome/browser/share/screenshot/ScreenshotShareSheetViewTest.java
index 2a1a2038..ca20e33 100644
--- a/chrome/browser/share/android/javatests/src/org/chromium/chrome/browser/share/screenshot/ScreenshotShareSheetViewTest.java
+++ b/chrome/browser/share/android/javatests/src/org/chromium/chrome/browser/share/screenshot/ScreenshotShareSheetViewTest.java
@@ -23,7 +23,7 @@
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modelutil.PropertyModel;
import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -31,7 +31,7 @@
* Tests for the {@link ScreenshotShareSheetView}.
*/
@RunWith(ChromeJUnit4ClassRunner.class)
-public class ScreenshotShareSheetViewTest extends DummyUiActivityTestCase {
+public class ScreenshotShareSheetViewTest extends BlankUiTestActivityTestCase {
private ScreenshotShareSheetView mScreenshotView;
private PropertyModel mScreenshotModel;
private PropertyModelChangeProcessor mScreenshotMCP;
diff --git a/chrome/browser/share/android/javatests/src/org/chromium/chrome/browser/share/share_sheet/ChromeProvidedSharingOptionsProviderTest.java b/chrome/browser/share/android/javatests/src/org/chromium/chrome/browser/share/share_sheet/ChromeProvidedSharingOptionsProviderTest.java
index f9ff0627..0b8c476a 100644
--- a/chrome/browser/share/android/javatests/src/org/chromium/chrome/browser/share/share_sheet/ChromeProvidedSharingOptionsProviderTest.java
+++ b/chrome/browser/share/android/javatests/src/org/chromium/chrome/browser/share/share_sheet/ChromeProvidedSharingOptionsProviderTest.java
@@ -59,7 +59,7 @@
import org.chromium.components.user_prefs.UserPrefsJni;
import org.chromium.content_public.browser.WebContents;
import org.chromium.ui.modelutil.PropertyModel;
-import org.chromium.ui.test.util.DummyUiActivity;
+import org.chromium.ui.test.util.BlankUiTestActivity;
import org.chromium.url.GURL;
import java.util.ArrayList;
@@ -74,8 +74,8 @@
public final ChromeBrowserTestRule mBrowserTestRule = new ChromeBrowserTestRule();
@Rule
- public BaseActivityTestRule<DummyUiActivity> mActivityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public BaseActivityTestRule<BlankUiTestActivity> mActivityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
@Rule
public TestRule mFeatureProcessor = new Features.JUnitProcessor();
diff --git a/chrome/browser/share/android/javatests/src/org/chromium/chrome/browser/share/share_sheet/ShareSheetBottomSheetContentTest.java b/chrome/browser/share/android/javatests/src/org/chromium/chrome/browser/share/share_sheet/ShareSheetBottomSheetContentTest.java
index c6d604e..92909c3c 100644
--- a/chrome/browser/share/android/javatests/src/org/chromium/chrome/browser/share/share_sheet/ShareSheetBottomSheetContentTest.java
+++ b/chrome/browser/share/android/javatests/src/org/chromium/chrome/browser/share/share_sheet/ShareSheetBottomSheetContentTest.java
@@ -50,7 +50,7 @@
import org.chromium.components.feature_engagement.TriggerDetails;
import org.chromium.components.url_formatter.UrlFormatter;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.ui.test.util.DummyUiActivity;
+import org.chromium.ui.test.util.BlankUiTestActivity;
import org.chromium.url.GURL;
import java.util.ArrayList;
@@ -64,8 +64,8 @@
public final ChromeBrowserTestRule mBrowserTestRule = new ChromeBrowserTestRule();
@Rule
- public BaseActivityTestRule<DummyUiActivity> mActivityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public BaseActivityTestRule<BlankUiTestActivity> mActivityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
@Mock
private ShareSheetLinkToggleCoordinator mShareSheetLinkToggleCoordinator;
diff --git a/chrome/browser/share/android/javatests/src/org/chromium/chrome/browser/share/share_sheet/ShareSheetPropertyModelBuilderTest.java b/chrome/browser/share/android/javatests/src/org/chromium/chrome/browser/share/share_sheet/ShareSheetPropertyModelBuilderTest.java
index 9929814..17c6046 100644
--- a/chrome/browser/share/android/javatests/src/org/chromium/chrome/browser/share/share_sheet/ShareSheetPropertyModelBuilderTest.java
+++ b/chrome/browser/share/android/javatests/src/org/chromium/chrome/browser/share/share_sheet/ShareSheetPropertyModelBuilderTest.java
@@ -43,7 +43,7 @@
import org.chromium.chrome.test.util.browser.Features;
import org.chromium.components.browser_ui.share.ShareParams;
import org.chromium.ui.modelutil.PropertyModel;
-import org.chromium.ui.test.util.DummyUiActivity;
+import org.chromium.ui.test.util.BlankUiTestActivity;
import java.util.ArrayList;
import java.util.List;
@@ -58,8 +58,8 @@
public final ChromeBrowserTestRule mBrowserTestRule = new ChromeBrowserTestRule();
@Rule
- public BaseActivityTestRule<DummyUiActivity> mActivityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public BaseActivityTestRule<BlankUiTestActivity> mActivityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
@Rule
public TestRule mFeatureProcessor = new Features.JUnitProcessor();
diff --git a/chrome/browser/signin/services/android/java/src/org/chromium/chrome/browser/signin/services/ProfileDataCacheRenderTest.java b/chrome/browser/signin/services/android/java/src/org/chromium/chrome/browser/signin/services/ProfileDataCacheRenderTest.java
index 1377288..889dbb5 100644
--- a/chrome/browser/signin/services/android/java/src/org/chromium/chrome/browser/signin/services/ProfileDataCacheRenderTest.java
+++ b/chrome/browser/signin/services/android/java/src/org/chromium/chrome/browser/signin/services/ProfileDataCacheRenderTest.java
@@ -56,7 +56,7 @@
import org.chromium.components.signin.identitymanager.IdentityManager;
import org.chromium.components.signin.identitymanager.IdentityManagerJni;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import org.chromium.ui.widget.ChromeImageView;
import java.io.IOException;
@@ -69,7 +69,7 @@
@RunWith(ParameterizedRunner.class)
@UseRunnerDelegate(ChromeJUnit4RunnerDelegate.class)
@Batch(ProfileDataCacheRenderTest.PROFILE_DATA_BATCH_NAME)
-public class ProfileDataCacheRenderTest extends DummyUiActivityTestCase {
+public class ProfileDataCacheRenderTest extends BlankUiTestActivityTestCase {
public static final String PROFILE_DATA_BATCH_NAME = "profile_data";
public static final String ACCOUNT_EMAIL = "[email protected]";
private static final long NATIVE_IDENTITY_MANAGER = 10002L;
diff --git a/chrome/browser/signin/services/android/java/src/org/chromium/chrome/browser/signin/services/ProfileDataCacheWithBadgeRenderTest.java b/chrome/browser/signin/services/android/java/src/org/chromium/chrome/browser/signin/services/ProfileDataCacheWithBadgeRenderTest.java
index ce7676c..73c9b3b 100644
--- a/chrome/browser/signin/services/android/java/src/org/chromium/chrome/browser/signin/services/ProfileDataCacheWithBadgeRenderTest.java
+++ b/chrome/browser/signin/services/android/java/src/org/chromium/chrome/browser/signin/services/ProfileDataCacheWithBadgeRenderTest.java
@@ -26,7 +26,7 @@
import org.chromium.chrome.test.util.ChromeRenderTestRule;
import org.chromium.chrome.test.util.browser.signin.AccountManagerTestRule;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import org.chromium.ui.widget.ChromeImageView;
import java.io.IOException;
@@ -37,7 +37,7 @@
*/
@RunWith(ChromeJUnit4ClassRunner.class)
@Batch(ProfileDataCacheRenderTest.PROFILE_DATA_BATCH_NAME)
-public class ProfileDataCacheWithBadgeRenderTest extends DummyUiActivityTestCase {
+public class ProfileDataCacheWithBadgeRenderTest extends BlankUiTestActivityTestCase {
private static final String TEST_ACCOUNT_NAME = "[email protected]";
@Rule
diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuItemViewBinderRenderTest.java b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuItemViewBinderRenderTest.java
index 7e91af9..4d5e0aa 100644
--- a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuItemViewBinderRenderTest.java
+++ b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuItemViewBinderRenderTest.java
@@ -37,8 +37,8 @@
import org.chromium.ui.modelutil.LayoutViewBuilder;
import org.chromium.ui.modelutil.ModelListAdapter;
import org.chromium.ui.modelutil.PropertyModel;
+import org.chromium.ui.test.util.BlankUiTestActivity;
import org.chromium.ui.test.util.DisableAnimationsTestRule;
-import org.chromium.ui.test.util.DummyUiActivity;
import org.chromium.ui.test.util.NightModeTestUtils;
import java.io.IOException;
@@ -61,8 +61,8 @@
@ClassRule
public static DisableAnimationsTestRule disableAnimationsRule = new DisableAnimationsTestRule();
@ClassRule
- public static BaseActivityTestRule<DummyUiActivity> mActivityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public static BaseActivityTestRule<BlankUiTestActivity> mActivityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
@Rule
public ChromeRenderTestRule mRenderTestRule =
ChromeRenderTestRule.Builder.withPublicCorpus().build();
@@ -87,7 +87,7 @@
public AppMenuItemViewBinderRenderTest(boolean nightMode, boolean menuItemEnabled) {
mMenuItemEnabled = menuItemEnabled;
- NightModeTestUtils.setUpNightModeForDummyUiActivity(nightMode);
+ NightModeTestUtils.setUpNightModeForBlankUiTestActivity(nightMode);
mRenderTestRule.setNightModeEnabled(nightMode);
mRenderTestRule.setVariantPrefix(menuItemEnabled ? "MenuItemEnabled" : "MenuItemDisabled");
}
@@ -131,7 +131,7 @@
@AfterClass
public static void afterClass() {
- NightModeTestUtils.tearDownNightModeForDummyUiActivity();
+ NightModeTestUtils.tearDownNightModeForBlankUiTestActivity();
}
private PropertyModel createStandardMenuItem(
diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuItemViewBinderTest.java b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuItemViewBinderTest.java
index 24637b6..953a903 100644
--- a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuItemViewBinderTest.java
+++ b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuItemViewBinderTest.java
@@ -38,8 +38,8 @@
import org.chromium.ui.modelutil.ModelListAdapter;
import org.chromium.ui.modelutil.PropertyKey;
import org.chromium.ui.modelutil.PropertyModel;
+import org.chromium.ui.test.util.BlankUiTestActivity;
import org.chromium.ui.test.util.DisableAnimationsTestRule;
-import org.chromium.ui.test.util.DummyUiActivity;
import org.chromium.ui.widget.ChromeImageView;
import java.util.concurrent.ExecutionException;
@@ -182,8 +182,8 @@
@ClassRule
public static DisableAnimationsTestRule disableAnimationsRule = new DisableAnimationsTestRule();
@ClassRule
- public static BaseActivityTestRule<DummyUiActivity> activityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public static BaseActivityTestRule<BlankUiTestActivity> activityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
private static Activity sActivity;
private static FrameLayout sParentView;
diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuTest.java b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuTest.java
index 1fd08db..13f85d0 100644
--- a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuTest.java
+++ b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuTest.java
@@ -41,8 +41,8 @@
import org.chromium.components.browser_ui.widget.chips.ChipView;
import org.chromium.components.browser_ui.widget.highlight.ViewHighlighterTestUtils;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.ui.test.util.DummyUiActivity;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivity;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import org.chromium.ui.test.util.UiDisableIf;
import java.util.ArrayList;
@@ -57,7 +57,7 @@
@RunWith(ChromeJUnit4ClassRunner.class)
@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE})
@Batch(Batch.PER_CLASS)
-public class AppMenuTest extends DummyUiActivityTestCase {
+public class AppMenuTest extends BlankUiTestActivityTestCase {
private AppMenuCoordinatorImpl mAppMenuCoordinator;
private AppMenuHandlerImpl mAppMenuHandler;
private TestAppMenuPropertiesDelegate mPropertiesDelegate;
@@ -74,7 +74,7 @@
@BeforeClass
public static void setUpBeforeActivityLaunched() {
- DummyUiActivity.setTestLayout(R.layout.test_app_menu_activity_layout);
+ BlankUiTestActivity.setTestLayout(R.layout.test_app_menu_activity_layout);
}
@Override
diff --git a/chrome/browser/ui/android/logo/java/src/org/chromium/chrome/browser/logo/LogoViewTest.java b/chrome/browser/ui/android/logo/java/src/org/chromium/chrome/browser/logo/LogoViewTest.java
index 010c0bf..c997bbbf 100644
--- a/chrome/browser/ui/android/logo/java/src/org/chromium/chrome/browser/logo/LogoViewTest.java
+++ b/chrome/browser/ui/android/logo/java/src/org/chromium/chrome/browser/logo/LogoViewTest.java
@@ -32,12 +32,12 @@
import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
import org.chromium.components.search_engines.TemplateUrlService;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
/** Instrumentation tests for {@link LogoView}. */
@RunWith(BaseJUnit4ClassRunner.class)
@Batch(Batch.UNIT_TESTS)
-public class LogoViewTest extends DummyUiActivityTestCase {
+public class LogoViewTest extends BlankUiTestActivityTestCase {
@Rule
public MockitoRule mMockitoRule = MockitoJUnit.rule();
@Mock
diff --git a/chrome/browser/ui/android/multiwindow/java/src/org/chromium/chrome/browser/multiwindow/InstanceSwitcherCoordinatorTest.java b/chrome/browser/ui/android/multiwindow/java/src/org/chromium/chrome/browser/multiwindow/InstanceSwitcherCoordinatorTest.java
index 95b6b2e5..19e460b 100644
--- a/chrome/browser/ui/android/multiwindow/java/src/org/chromium/chrome/browser/multiwindow/InstanceSwitcherCoordinatorTest.java
+++ b/chrome/browser/ui/android/multiwindow/java/src/org/chromium/chrome/browser/multiwindow/InstanceSwitcherCoordinatorTest.java
@@ -37,10 +37,9 @@
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.components.browser_ui.modaldialog.AppModalPresenter;
import org.chromium.components.favicon.LargeIconBridge;
-import org.chromium.components.favicon.LargeIconBridge.LargeIconCallback;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modaldialog.ModalDialogManager;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import org.chromium.url.GURL;
import java.util.Arrays;
@@ -50,7 +49,7 @@
*/
@RunWith(ChromeJUnit4ClassRunner.class)
@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE})
-public class InstanceSwitcherCoordinatorTest extends DummyUiActivityTestCase {
+public class InstanceSwitcherCoordinatorTest extends BlankUiTestActivityTestCase {
private LargeIconBridge mIconBridge;
private ModalDialogManager mModalDialogManager;
diff --git a/chrome/browser/ui/android/multiwindow/java/src/org/chromium/chrome/browser/multiwindow/TargetSelectorCoordinatorTest.java b/chrome/browser/ui/android/multiwindow/java/src/org/chromium/chrome/browser/multiwindow/TargetSelectorCoordinatorTest.java
index 1c41fbf..b7de316a 100644
--- a/chrome/browser/ui/android/multiwindow/java/src/org/chromium/chrome/browser/multiwindow/TargetSelectorCoordinatorTest.java
+++ b/chrome/browser/ui/android/multiwindow/java/src/org/chromium/chrome/browser/multiwindow/TargetSelectorCoordinatorTest.java
@@ -24,10 +24,9 @@
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.components.browser_ui.modaldialog.AppModalPresenter;
import org.chromium.components.favicon.LargeIconBridge;
-import org.chromium.components.favicon.LargeIconBridge.LargeIconCallback;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modaldialog.ModalDialogManager;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import org.chromium.url.GURL;
import java.util.Arrays;
@@ -37,7 +36,7 @@
*/
@RunWith(ChromeJUnit4ClassRunner.class)
@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE})
-public class TargetSelectorCoordinatorTest extends DummyUiActivityTestCase {
+public class TargetSelectorCoordinatorTest extends BlankUiTestActivityTestCase {
private LargeIconBridge mIconBridge;
private ModalDialogManager mModalDialogManager;
diff --git a/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/settings/ThemeSettingsFragmentTest.java b/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/settings/ThemeSettingsFragmentTest.java
index cdc01484..f6ef5b4 100644
--- a/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/settings/ThemeSettingsFragmentTest.java
+++ b/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/settings/ThemeSettingsFragmentTest.java
@@ -43,14 +43,14 @@
import org.chromium.components.browser_ui.widget.RadioButtonWithDescriptionLayout;
import org.chromium.components.content_settings.ContentSettingsType;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
/**
* Tests for ThemeSettingsFragment.
*/
// clang-format off
@RunWith(ChromeJUnit4ClassRunner.class)
-public class ThemeSettingsFragmentTest extends DummyUiActivityTestCase {
+public class ThemeSettingsFragmentTest extends BlankUiTestActivityTestCase {
// clang-format on
@Rule
public SettingsActivityTestRule<ThemeSettingsFragment> mSettingsActivityTestRule =
diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/ConfirmImportSyncDataDialogTest.java b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/ConfirmImportSyncDataDialogTest.java
index 7483178..558160bde9 100644
--- a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/ConfirmImportSyncDataDialogTest.java
+++ b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/ConfirmImportSyncDataDialogTest.java
@@ -53,8 +53,8 @@
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modaldialog.ModalDialogManager;
import org.chromium.ui.modaldialog.ModalDialogManager.ModalDialogType;
+import org.chromium.ui.test.util.BlankUiTestActivity;
import org.chromium.ui.test.util.DisableAnimationsTestRule;
-import org.chromium.ui.test.util.DummyUiActivity;
/**
* Instrumentation tests for {@link ConfirmImportSyncDataDialogCoordinator}.
@@ -94,8 +94,8 @@
new DisableAnimationsTestRule();
@ClassRule
- public static final BaseActivityTestRule<DummyUiActivity> sActivityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public static final BaseActivityTestRule<BlankUiTestActivity> sActivityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
@Mock
private ConfirmImportSyncDataDialogCoordinator.Listener mListenerMock;
diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/ConfirmManagedSyncDataDialogIntegrationTest.java b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/ConfirmManagedSyncDataDialogIntegrationTest.java
index 9456edd..7dc169c 100644
--- a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/ConfirmManagedSyncDataDialogIntegrationTest.java
+++ b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/ConfirmManagedSyncDataDialogIntegrationTest.java
@@ -22,8 +22,8 @@
import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.chrome.browser.flags.ChromeSwitches;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
-import org.chromium.ui.test.util.DummyUiActivity;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivity;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
/**
* Test for {@link ConfirmManagedSyncDataDialog}
@@ -31,7 +31,7 @@
@RunWith(ChromeJUnit4ClassRunner.class)
@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE})
@Batch(ConfirmSyncDataIntegrationTest.CONFIRM_SYNC_DATA_BATCH_NAME)
-public class ConfirmManagedSyncDataDialogIntegrationTest extends DummyUiActivityTestCase {
+public class ConfirmManagedSyncDataDialogIntegrationTest extends BlankUiTestActivityTestCase {
private static final String TEST_DOMAIN = "test.domain.example.com";
@Rule
@@ -48,7 +48,7 @@
dialog.show(getActivity().getSupportFragmentManager(), null);
InstrumentationRegistry.getInstrumentation().waitForIdleSync();
Assert.assertTrue("The dialog should be visible!", dialog.getDialog().isShowing());
- DummyUiActivity activity = ApplicationTestUtils.recreateActivity(getActivity());
+ BlankUiTestActivity activity = ApplicationTestUtils.recreateActivity(getActivity());
Assert.assertNull("The dialog should be dismissed!", dialog.getDialog());
ApplicationTestUtils.finishActivity(activity);
}
diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/ConfirmSyncDataIntegrationTest.java b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/ConfirmSyncDataIntegrationTest.java
index 5ea4a2ab..a131e405 100644
--- a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/ConfirmSyncDataIntegrationTest.java
+++ b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/ConfirmSyncDataIntegrationTest.java
@@ -44,7 +44,7 @@
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modaldialog.ModalDialogManager;
import org.chromium.ui.modaldialog.ModalDialogManager.ModalDialogType;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
/**
* This class regroups the integration tests for {@link ConfirmSyncDataStateMachine}.
@@ -59,7 +59,7 @@
@RunWith(ChromeJUnit4ClassRunner.class)
@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE})
@Batch(ConfirmSyncDataIntegrationTest.CONFIRM_SYNC_DATA_BATCH_NAME)
-public class ConfirmSyncDataIntegrationTest extends DummyUiActivityTestCase {
+public class ConfirmSyncDataIntegrationTest extends BlankUiTestActivityTestCase {
public static final String CONFIRM_SYNC_DATA_BATCH_NAME = "confirm_sync_data";
private static final String OLD_ACCOUNT_NAME = "[email protected]";
diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SignOutDialogRenderTest.java b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SignOutDialogRenderTest.java
index 3e4c20c9..cb9b5739 100644
--- a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SignOutDialogRenderTest.java
+++ b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SignOutDialogRenderTest.java
@@ -37,8 +37,8 @@
import org.chromium.chrome.test.util.ChromeRenderTestRule;
import org.chromium.components.signin.GAIAServiceType;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import org.chromium.ui.test.util.DisableAnimationsTestRule;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
/**
* Render tests for {@link SignOutDialogFragment}
@@ -46,7 +46,7 @@
@RunWith(ChromeJUnit4ClassRunner.class)
@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE})
@Batch(Batch.PER_CLASS)
-public class SignOutDialogRenderTest extends DummyUiActivityTestCase {
+public class SignOutDialogRenderTest extends BlankUiTestActivityTestCase {
private static final String TEST_DOMAIN = "test.domain.example.com";
@Rule
diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/account_picker/AccountPickerDialogTest.java b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/account_picker/AccountPickerDialogTest.java
index a803738..6d09957 100644
--- a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/account_picker/AccountPickerDialogTest.java
+++ b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/account_picker/AccountPickerDialogTest.java
@@ -39,7 +39,7 @@
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modaldialog.ModalDialogManager;
import org.chromium.ui.modaldialog.ModalDialogManager.ModalDialogType;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import java.io.IOException;
@@ -49,7 +49,7 @@
@RunWith(ChromeJUnit4ClassRunner.class)
@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE})
@Batch(Batch.PER_CLASS)
-public class AccountPickerDialogTest extends DummyUiActivityTestCase {
+public class AccountPickerDialogTest extends BlankUiTestActivityTestCase {
@Rule
public final ChromeRenderTestRule mRenderTestRule =
ChromeRenderTestRule.Builder.withPublicCorpus().build();
diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/fre/FreUMADialogTest.java b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/fre/FreUMADialogTest.java
index ecfb4f6..9817ee4 100644
--- a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/fre/FreUMADialogTest.java
+++ b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/fre/FreUMADialogTest.java
@@ -51,7 +51,7 @@
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modaldialog.ModalDialogManager;
import org.chromium.ui.modaldialog.ModalDialogManager.ModalDialogType;
-import org.chromium.ui.test.util.DummyUiActivity;
+import org.chromium.ui.test.util.BlankUiTestActivity;
import org.chromium.ui.test.util.NightModeTestUtils;
import java.io.IOException;
@@ -63,8 +63,8 @@
@Batch(Batch.PER_CLASS)
public class FreUMADialogTest {
@ClassRule
- public static BaseActivityTestRule<DummyUiActivity> activityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public static BaseActivityTestRule<BlankUiTestActivity> activityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
@Rule
public final MockitoRule mMockitoRule = MockitoJUnit.rule();
diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ToolbarProgressBarTest.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ToolbarProgressBarTest.java
index 3c3a95f..84fa831 100644
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ToolbarProgressBarTest.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ToolbarProgressBarTest.java
@@ -29,7 +29,7 @@
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.components.browser_ui.widget.ClipDrawableProgressBar.ProgressBarObserver;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import org.chromium.ui.test.util.UiRestriction;
import java.util.concurrent.TimeoutException;
@@ -39,7 +39,7 @@
*/
@RunWith(ChromeJUnit4ClassRunner.class)
@Restriction(UiRestriction.RESTRICTION_TYPE_PHONE)
-public class ToolbarProgressBarTest extends DummyUiActivityTestCase {
+public class ToolbarProgressBarTest extends BlankUiTestActivityTestCase {
private final CallbackHelper mProgressUpdateHelper = new CallbackHelper();
private final CallbackHelper mProgressVisibilityHelper = new CallbackHelper();
private ToolbarProgressBar mProgressBar;
diff --git a/chrome/browser/ui/android/webid/internal/java/src/org/chromium/chrome/browser/ui/android/webid/AccountSelectionViewTest.java b/chrome/browser/ui/android/webid/internal/java/src/org/chromium/chrome/browser/ui/android/webid/AccountSelectionViewTest.java
index 96f6b1e..dd5b01fd 100644
--- a/chrome/browser/ui/android/webid/internal/java/src/org/chromium/chrome/browser/ui/android/webid/AccountSelectionViewTest.java
+++ b/chrome/browser/ui/android/webid/internal/java/src/org/chromium/chrome/browser/ui/android/webid/AccountSelectionViewTest.java
@@ -51,7 +51,7 @@
import org.chromium.ui.modelutil.MVCListAdapter;
import org.chromium.ui.modelutil.MVCListAdapter.ModelList;
import org.chromium.ui.modelutil.PropertyModel;
-import org.chromium.ui.test.util.DummyUiActivity;
+import org.chromium.ui.test.util.BlankUiTestActivity;
import org.chromium.url.GURL;
import org.chromium.url.JUnitTestGURLs;
@@ -76,12 +76,12 @@
private Callback<Account> mAccountCallback;
private Runnable mAutoSignInCancelCallback;
- private DummyUiActivity mActivity;
+ private BlankUiTestActivity mActivity;
private ModelList mSheetItems;
private View mContentView;
@Rule
- public BaseActivityTestRule<DummyUiActivity> mActivityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public BaseActivityTestRule<BlankUiTestActivity> mActivityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
@Before
public void setUp() throws Exception {
diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarTest.java b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarTest.java
index 73f893d2..ac7b35b 100644
--- a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarTest.java
+++ b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarTest.java
@@ -28,8 +28,8 @@
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.content_public.browser.UiThreadTaskTraits;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
+import org.chromium.ui.test.util.BlankUiTestActivity;
import org.chromium.ui.test.util.DisableAnimationsTestRule;
-import org.chromium.ui.test.util.DummyUiActivity;
import java.util.concurrent.TimeUnit;
@@ -61,8 +61,8 @@
@ClassRule
public static DisableAnimationsTestRule disableAnimationsRule = new DisableAnimationsTestRule();
@ClassRule
- public static BaseActivityTestRule<DummyUiActivity> activityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public static BaseActivityTestRule<BlankUiTestActivity> activityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
private static Activity sActivity;
private boolean mDismissed;
diff --git a/chrome/browser/user_education/java/src/org/chromium/chrome/browser/user_education/UserEducationHelperTest.java b/chrome/browser/user_education/java/src/org/chromium/chrome/browser/user_education/UserEducationHelperTest.java
index b219b76..d7cfa13 100644
--- a/chrome/browser/user_education/java/src/org/chromium/chrome/browser/user_education/UserEducationHelperTest.java
+++ b/chrome/browser/user_education/java/src/org/chromium/chrome/browser/user_education/UserEducationHelperTest.java
@@ -49,14 +49,14 @@
import org.chromium.components.feature_engagement.Tracker;
import org.chromium.components.feature_engagement.TriggerDetails;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.ui.test.util.DummyUiActivity;
+import org.chromium.ui.test.util.BlankUiTestActivity;
/** Integration tests for UserEducationHelper. */
@RunWith(BaseJUnit4ClassRunner.class)
public final class UserEducationHelperTest {
@ClassRule
- public static BaseActivityTestRule<DummyUiActivity> activityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public static BaseActivityTestRule<BlankUiTestActivity> activityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
@Mock
private Tracker mTracker;
diff --git a/chrome/browser/video_tutorials/internal/android/java/src/org/chromium/chrome/browser/video_tutorials/iph/VideoIPHTest.java b/chrome/browser/video_tutorials/internal/android/java/src/org/chromium/chrome/browser/video_tutorials/iph/VideoIPHTest.java
index c8c137d4..13e6163 100644
--- a/chrome/browser/video_tutorials/internal/android/java/src/org/chromium/chrome/browser/video_tutorials/iph/VideoIPHTest.java
+++ b/chrome/browser/video_tutorials/internal/android/java/src/org/chromium/chrome/browser/video_tutorials/iph/VideoIPHTest.java
@@ -36,7 +36,7 @@
import org.chromium.chrome.browser.video_tutorials.test.TestImageFetcher;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.ui.test.util.DummyUiActivity;
+import org.chromium.ui.test.util.BlankUiTestActivity;
import java.util.HashMap;
@@ -46,8 +46,8 @@
@RunWith(ChromeJUnit4ClassRunner.class)
public class VideoIPHTest {
@Rule
- public BaseActivityTestRule<DummyUiActivity> mActivityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public BaseActivityTestRule<BlankUiTestActivity> mActivityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
private Activity mActivity;
private VideoIPHCoordinator mCoordinator;
diff --git a/chrome/browser/video_tutorials/internal/android/java/src/org/chromium/chrome/browser/video_tutorials/languages/LanguagePickerTest.java b/chrome/browser/video_tutorials/internal/android/java/src/org/chromium/chrome/browser/video_tutorials/languages/LanguagePickerTest.java
index e818d80..171c37c5 100644
--- a/chrome/browser/video_tutorials/internal/android/java/src/org/chromium/chrome/browser/video_tutorials/languages/LanguagePickerTest.java
+++ b/chrome/browser/video_tutorials/internal/android/java/src/org/chromium/chrome/browser/video_tutorials/languages/LanguagePickerTest.java
@@ -33,7 +33,7 @@
import org.chromium.chrome.browser.video_tutorials.test.TestVideoTutorialService;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.ui.test.util.DummyUiActivity;
+import org.chromium.ui.test.util.BlankUiTestActivity;
/**
* Tests for {@link LanguagePickerCoordinator}.
@@ -41,8 +41,8 @@
@RunWith(ChromeJUnit4ClassRunner.class)
public class LanguagePickerTest {
@Rule
- public BaseActivityTestRule<DummyUiActivity> mActivityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public BaseActivityTestRule<BlankUiTestActivity> mActivityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
private Activity mActivity;
private View mContentView;
diff --git a/chrome/browser/video_tutorials/internal/android/java/src/org/chromium/chrome/browser/video_tutorials/list/TutorialListCoordinatorTest.java b/chrome/browser/video_tutorials/internal/android/java/src/org/chromium/chrome/browser/video_tutorials/list/TutorialListCoordinatorTest.java
index 61d563fd..a04b060 100644
--- a/chrome/browser/video_tutorials/internal/android/java/src/org/chromium/chrome/browser/video_tutorials/list/TutorialListCoordinatorTest.java
+++ b/chrome/browser/video_tutorials/internal/android/java/src/org/chromium/chrome/browser/video_tutorials/list/TutorialListCoordinatorTest.java
@@ -36,7 +36,7 @@
import org.chromium.chrome.browser.video_tutorials.test.TestVideoTutorialService;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.ui.test.util.DummyUiActivity;
+import org.chromium.ui.test.util.BlankUiTestActivity;
/**
* Tests for {@link TutorialListCoordinator}.
@@ -44,8 +44,8 @@
@RunWith(ChromeJUnit4ClassRunner.class)
public class TutorialListCoordinatorTest {
@Rule
- public BaseActivityTestRule<DummyUiActivity> mActivityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public BaseActivityTestRule<BlankUiTestActivity> mActivityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
private Activity mActivity;
private View mContentView;
diff --git a/chrome/browser/video_tutorials/internal/android/java/src/org/chromium/chrome/browser/video_tutorials/player/VideoPlayerViewBinderTest.java b/chrome/browser/video_tutorials/internal/android/java/src/org/chromium/chrome/browser/video_tutorials/player/VideoPlayerViewBinderTest.java
index 809f228..e0747502 100644
--- a/chrome/browser/video_tutorials/internal/android/java/src/org/chromium/chrome/browser/video_tutorials/player/VideoPlayerViewBinderTest.java
+++ b/chrome/browser/video_tutorials/internal/android/java/src/org/chromium/chrome/browser/video_tutorials/player/VideoPlayerViewBinderTest.java
@@ -35,7 +35,7 @@
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modelutil.PropertyModel;
import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
-import org.chromium.ui.test.util.DummyUiActivity;
+import org.chromium.ui.test.util.BlankUiTestActivity;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -45,8 +45,8 @@
@RunWith(ChromeJUnit4ClassRunner.class)
public class VideoPlayerViewBinderTest {
@Rule
- public BaseActivityTestRule<DummyUiActivity> mActivityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public BaseActivityTestRule<BlankUiTestActivity> mActivityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
private Activity mActivity;
private VideoPlayerView mVideoPlayerView;
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/Features.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/Features.java
index 4ca1ae4..bc94df3 100644
--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/Features.java
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/Features.java
@@ -137,7 +137,7 @@
}
/**
- * Feature processor intended to be used in Robolectric and {@link DummyUiActivityTestCase}
+ * Feature processor intended to be used in Robolectric and {@link BlankUiTestActivityTestCase}
* tests. The collected feature states would be applied to {@link ChromeFeatureList}'s
* internal test-only feature map.
*/
diff --git a/components/browser_ui/bottomsheet/android/internal/java/src/org/chromium/components/browser_ui/bottomsheet/BottomSheetObserverTest.java b/components/browser_ui/bottomsheet/android/internal/java/src/org/chromium/components/browser_ui/bottomsheet/BottomSheetObserverTest.java
index 92ebeff2..789a93c3 100644
--- a/components/browser_ui/bottomsheet/android/internal/java/src/org/chromium/components/browser_ui/bottomsheet/BottomSheetObserverTest.java
+++ b/components/browser_ui/bottomsheet/android/internal/java/src/org/chromium/components/browser_ui/bottomsheet/BottomSheetObserverTest.java
@@ -29,7 +29,7 @@
import org.chromium.components.browser_ui.bottomsheet.BottomSheetController.StateChangeReason;
import org.chromium.components.browser_ui.widget.scrim.ScrimCoordinator;
import org.chromium.ui.KeyboardVisibilityDelegate;
-import org.chromium.ui.test.util.DummyUiActivity;
+import org.chromium.ui.test.util.BlankUiTestActivity;
import org.chromium.ui.test.util.UiRestriction;
import java.util.concurrent.TimeoutException;
@@ -98,8 +98,8 @@
}
@ClassRule
- public static BaseActivityTestRule<DummyUiActivity> mTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public static BaseActivityTestRule<BlankUiTestActivity> mTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
private TestSheetObserver mObserver;
private TestBottomSheetContent mSheetContent;
private BottomSheetController mBottomSheetController;
diff --git a/components/browser_ui/contacts_picker/android/java/src/org/chromium/components/browser_ui/contacts_picker/ContactsPickerDialogTest.java b/components/browser_ui/contacts_picker/android/java/src/org/chromium/components/browser_ui/contacts_picker/ContactsPickerDialogTest.java
index f165e8c..10cd2a28c 100644
--- a/components/browser_ui/contacts_picker/android/java/src/org/chromium/components/browser_ui/contacts_picker/ContactsPickerDialogTest.java
+++ b/components/browser_ui/contacts_picker/android/java/src/org/chromium/components/browser_ui/contacts_picker/ContactsPickerDialogTest.java
@@ -50,8 +50,8 @@
import org.chromium.ui.base.ActivityWindowAndroid;
import org.chromium.ui.base.IntentRequestTracker;
import org.chromium.ui.base.WindowAndroid;
+import org.chromium.ui.test.util.BlankUiTestActivity;
import org.chromium.ui.test.util.DisableAnimationsTestRule;
-import org.chromium.ui.test.util.DummyUiActivity;
import org.chromium.ui.test.util.RenderTestRule;
import java.nio.ByteBuffer;
@@ -71,8 +71,8 @@
public static DisableAnimationsTestRule mDisableAnimationsTestRule =
new DisableAnimationsTestRule();
@ClassRule
- public static BaseActivityTestRule<DummyUiActivity> activityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public static BaseActivityTestRule<BlankUiTestActivity> activityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
private Activity mActivity;
private WindowAndroid mWindowAndroid;
diff --git a/components/browser_ui/modaldialog/android/java/src/org/chromium/components/browser_ui/modaldialog/AppModalPresenterTest.java b/components/browser_ui/modaldialog/android/java/src/org/chromium/components/browser_ui/modaldialog/AppModalPresenterTest.java
index 602bb92..6a015ff 100644
--- a/components/browser_ui/modaldialog/android/java/src/org/chromium/components/browser_ui/modaldialog/AppModalPresenterTest.java
+++ b/components/browser_ui/modaldialog/android/java/src/org/chromium/components/browser_ui/modaldialog/AppModalPresenterTest.java
@@ -47,8 +47,8 @@
import org.chromium.ui.modaldialog.ModalDialogManager.ModalDialogType;
import org.chromium.ui.modaldialog.ModalDialogProperties;
import org.chromium.ui.modelutil.PropertyModel;
+import org.chromium.ui.test.util.BlankUiTestActivity;
import org.chromium.ui.test.util.DisableAnimationsTestRule;
-import org.chromium.ui.test.util.DummyUiActivity;
/**
* Tests for {@link AppModalPresenter}.
@@ -59,8 +59,8 @@
@ClassRule
public static DisableAnimationsTestRule disableAnimationsRule = new DisableAnimationsTestRule();
@ClassRule
- public static BaseActivityTestRule<DummyUiActivity> activityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public static BaseActivityTestRule<BlankUiTestActivity> activityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
private class TestObserver implements ModalDialogTestUtils.TestDialogDismissedObserver {
public final CallbackHelper onDialogDismissedCallback = new CallbackHelper();
diff --git a/components/browser_ui/modaldialog/android/java/src/org/chromium/components/browser_ui/modaldialog/ModalDialogViewTest.java b/components/browser_ui/modaldialog/android/java/src/org/chromium/components/browser_ui/modaldialog/ModalDialogViewTest.java
index 9c79f57a6..8ef30fe 100644
--- a/components/browser_ui/modaldialog/android/java/src/org/chromium/components/browser_ui/modaldialog/ModalDialogViewTest.java
+++ b/components/browser_ui/modaldialog/android/java/src/org/chromium/components/browser_ui/modaldialog/ModalDialogViewTest.java
@@ -49,8 +49,8 @@
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modaldialog.ModalDialogProperties;
import org.chromium.ui.modelutil.PropertyModel;
+import org.chromium.ui.test.util.BlankUiTestActivity;
import org.chromium.ui.test.util.DisableAnimationsTestRule;
-import org.chromium.ui.test.util.DummyUiActivity;
/**
* Tests for {@link ModalDialogView}.
@@ -61,8 +61,8 @@
@ClassRule
public static DisableAnimationsTestRule disableAnimationsRule = new DisableAnimationsTestRule();
@ClassRule
- public static BaseActivityTestRule<DummyUiActivity> activityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public static BaseActivityTestRule<BlankUiTestActivity> activityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
private static Activity sActivity;
private static Resources sResources;
diff --git a/components/browser_ui/photo_picker/android/java/src/org/chromium/components/browser_ui/photo_picker/PhotoPickerDialogTest.java b/components/browser_ui/photo_picker/android/java/src/org/chromium/components/browser_ui/photo_picker/PhotoPickerDialogTest.java
index 00a614c..22e77b9 100644
--- a/components/browser_ui/photo_picker/android/java/src/org/chromium/components/browser_ui/photo_picker/PhotoPickerDialogTest.java
+++ b/components/browser_ui/photo_picker/android/java/src/org/chromium/components/browser_ui/photo_picker/PhotoPickerDialogTest.java
@@ -44,8 +44,8 @@
import org.chromium.ui.base.IntentRequestTracker;
import org.chromium.ui.base.PhotoPickerListener;
import org.chromium.ui.base.WindowAndroid;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import org.chromium.ui.test.util.DisableAnimationsTestRule;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
import org.chromium.ui.test.util.RenderTestRule;
import java.io.File;
@@ -58,7 +58,7 @@
* Tests for the PhotoPickerDialog class.
*/
@RunWith(BaseJUnit4ClassRunner.class)
-public class PhotoPickerDialogTest extends DummyUiActivityTestCase
+public class PhotoPickerDialogTest extends BlankUiTestActivityTestCase
implements PhotoPickerListener, SelectionObserver<PickerBitmap>,
DecoderServiceHost.DecoderStatusCallback,
PickerVideoPlayer.VideoPlaybackStatusCallback, AnimationListener {
diff --git a/components/browser_ui/share/android/java/src/org/chromium/components/browser_ui/share/ShareImageFileUtilsTest.java b/components/browser_ui/share/android/java/src/org/chromium/components/browser_ui/share/ShareImageFileUtilsTest.java
index 94a64b65..e346ca2 100644
--- a/components/browser_ui/share/android/java/src/org/chromium/components/browser_ui/share/ShareImageFileUtilsTest.java
+++ b/components/browser_ui/share/android/java/src/org/chromium/components/browser_ui/share/ShareImageFileUtilsTest.java
@@ -38,7 +38,7 @@
import org.chromium.base.test.util.DisabledTest;
import org.chromium.chrome.browser.FileProviderHelper;
import org.chromium.ui.base.Clipboard;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import java.io.File;
import java.io.IOException;
@@ -49,7 +49,7 @@
* Tests of {@link ShareImageFileUtils}.
*/
@RunWith(BaseJUnit4ClassRunner.class)
-public class ShareImageFileUtilsTest extends DummyUiActivityTestCase {
+public class ShareImageFileUtilsTest extends BlankUiTestActivityTestCase {
private static final long WAIT_TIMEOUT_SECONDS = 30L;
private static final byte[] TEST_IMAGE_DATA = new byte[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
private static final String TEST_IMAGE_FILE_NAME = "chrome-test-bitmap";
diff --git a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/MoreProgressButtonTest.java b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/MoreProgressButtonTest.java
index 3ed1c29..793ff43 100644
--- a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/MoreProgressButtonTest.java
+++ b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/MoreProgressButtonTest.java
@@ -29,8 +29,8 @@
import org.chromium.base.test.util.Feature;
import org.chromium.components.browser_ui.widget.MoreProgressButton.State;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
+import org.chromium.ui.test.util.BlankUiTestActivity;
import org.chromium.ui.test.util.DisableAnimationsTestRule;
-import org.chromium.ui.test.util.DummyUiActivity;
/**
* Tests for {@link MoreProgressButton}.
@@ -41,8 +41,8 @@
@ClassRule
public static DisableAnimationsTestRule disableAnimationsRule = new DisableAnimationsTestRule();
@ClassRule
- public static BaseActivityTestRule<DummyUiActivity> activityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public static BaseActivityTestRule<BlankUiTestActivity> activityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
private static Activity sActivity;
private static FrameLayout sContentView;
diff --git a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/PromoDialogRenderTest.java b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/PromoDialogRenderTest.java
index 8fed184d..6ce4aa1a 100644
--- a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/PromoDialogRenderTest.java
+++ b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/PromoDialogRenderTest.java
@@ -25,7 +25,7 @@
import org.chromium.components.browser_ui.widget.PromoDialog.DialogParams;
import org.chromium.components.browser_ui.widget.test.R;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import org.chromium.ui.test.util.NightModeTestUtils;
import org.chromium.ui.test.util.RenderTestRule;
@@ -36,7 +36,7 @@
*/
@RunWith(ParameterizedRunner.class)
@UseRunnerDelegate(BaseJUnit4RunnerDelegate.class)
-public class PromoDialogRenderTest extends DummyUiActivityTestCase {
+public class PromoDialogRenderTest extends BlankUiTestActivityTestCase {
@ClassParameter
private static List<ParameterSet> sClassParams =
new NightModeTestUtils.NightModeParams().getParameters();
@@ -48,7 +48,7 @@
+ "very very very very long string";
public PromoDialogRenderTest(boolean nightModeEnabled) {
- NightModeTestUtils.setUpNightModeForDummyUiActivity(nightModeEnabled);
+ NightModeTestUtils.setUpNightModeForBlankUiTestActivity(nightModeEnabled);
mRenderTestRule.setNightModeEnabled(nightModeEnabled);
}
diff --git a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/PromoDialogTest.java b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/PromoDialogTest.java
index 2797bab..bda78e2 100644
--- a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/PromoDialogTest.java
+++ b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/PromoDialogTest.java
@@ -30,8 +30,8 @@
import org.chromium.components.browser_ui.widget.PromoDialog.DialogParams;
import org.chromium.components.browser_ui.widget.test.R;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
+import org.chromium.ui.test.util.BlankUiTestActivity;
import org.chromium.ui.test.util.DisableAnimationsTestRule;
-import org.chromium.ui.test.util.DummyUiActivity;
import java.util.concurrent.Callable;
@@ -44,8 +44,8 @@
@ClassRule
public static DisableAnimationsTestRule disableAnimationsRule = new DisableAnimationsTestRule();
@ClassRule
- public static BaseActivityTestRule<DummyUiActivity> activityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public static BaseActivityTestRule<BlankUiTestActivity> activityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
/**
* Creates a PromoDialog. Doesn't call {@link PromoDialog#show} because there is no Window to
diff --git a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/RadioButtonRenderTest.java b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/RadioButtonRenderTest.java
index e747e215..dc2dd94 100644
--- a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/RadioButtonRenderTest.java
+++ b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/RadioButtonRenderTest.java
@@ -24,7 +24,7 @@
import org.chromium.base.test.util.Feature;
import org.chromium.components.browser_ui.widget.test.R;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import org.chromium.ui.test.util.NightModeTestUtils;
import org.chromium.ui.test.util.RenderTestRule;
@@ -37,7 +37,7 @@
*/
@RunWith(ParameterizedRunner.class)
@UseRunnerDelegate(BaseJUnit4RunnerDelegate.class)
-public class RadioButtonRenderTest extends DummyUiActivityTestCase {
+public class RadioButtonRenderTest extends BlankUiTestActivityTestCase {
@ClassParameter
private static List<ParameterSet> sClassParams =
new NightModeTestUtils.NightModeParams().getParameters();
@@ -71,7 +71,7 @@
public RadioButtonRenderTest(boolean nightModeEnabled) {
mFakeBgColor = nightModeEnabled ? Color.BLACK : Color.WHITE;
- NightModeTestUtils.setUpNightModeForDummyUiActivity(nightModeEnabled);
+ NightModeTestUtils.setUpNightModeForBlankUiTestActivity(nightModeEnabled);
mRenderTestRule.setNightModeEnabled(nightModeEnabled);
}
diff --git a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/RadioButtonWithDescriptionAndAuxButtonTest.java b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/RadioButtonWithDescriptionAndAuxButtonTest.java
index 75f4ae6..457541c 100644
--- a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/RadioButtonWithDescriptionAndAuxButtonTest.java
+++ b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/RadioButtonWithDescriptionAndAuxButtonTest.java
@@ -27,8 +27,8 @@
import org.chromium.base.test.util.CallbackHelper;
import org.chromium.components.browser_ui.widget.test.R;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
+import org.chromium.ui.test.util.BlankUiTestActivity;
import org.chromium.ui.test.util.DisableAnimationsTestRule;
-import org.chromium.ui.test.util.DummyUiActivity;
/**
* Unit tests for {@link RadioButtonWithDescriptionAndAuxButton}.
@@ -39,8 +39,8 @@
@ClassRule
public static DisableAnimationsTestRule disableAnimationsRule = new DisableAnimationsTestRule();
@ClassRule
- public static BaseActivityTestRule<DummyUiActivity> activityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public static BaseActivityTestRule<BlankUiTestActivity> activityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
private class AuxButtonClickedListener
implements RadioButtonWithDescriptionAndAuxButton.OnAuxButtonClickedListener {
diff --git a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/RadioButtonWithEditTextTest.java b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/RadioButtonWithEditTextTest.java
index 1fd1c90f..fe2885d 100644
--- a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/RadioButtonWithEditTextTest.java
+++ b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/RadioButtonWithEditTextTest.java
@@ -38,8 +38,8 @@
import org.chromium.components.browser_ui.widget.test.R;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.KeyboardVisibilityDelegate;
+import org.chromium.ui.test.util.BlankUiTestActivity;
import org.chromium.ui.test.util.DisableAnimationsTestRule;
-import org.chromium.ui.test.util.DummyUiActivity;
/**
* Unit tests for {@link RadioButtonWithEditText}.
@@ -50,8 +50,8 @@
@ClassRule
public static DisableAnimationsTestRule disableAnimationsRule = new DisableAnimationsTestRule();
@ClassRule
- public static BaseActivityTestRule<DummyUiActivity> activityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public static BaseActivityTestRule<BlankUiTestActivity> activityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
private class TestListener implements RadioButtonWithEditText.OnTextChangeListener {
private CharSequence mCurrentText;
diff --git a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/RadioButtonWithIconRenderTest.java b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/RadioButtonWithIconRenderTest.java
index 97890b4..23c65bb 100644
--- a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/RadioButtonWithIconRenderTest.java
+++ b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/RadioButtonWithIconRenderTest.java
@@ -24,7 +24,7 @@
import org.chromium.base.test.util.Feature;
import org.chromium.components.browser_ui.widget.test.R;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import org.chromium.ui.test.util.NightModeTestUtils;
import org.chromium.ui.test.util.RenderTestRule;
@@ -35,7 +35,7 @@
*/
@RunWith(ParameterizedRunner.class)
@UseRunnerDelegate(BaseJUnit4RunnerDelegate.class)
-public class RadioButtonWithIconRenderTest extends DummyUiActivityTestCase {
+public class RadioButtonWithIconRenderTest extends BlankUiTestActivityTestCase {
@ClassParameter
private static List<ParameterSet> sClassParams =
new NightModeTestUtils.NightModeParams().getParameters();
@@ -61,7 +61,7 @@
public RadioButtonWithIconRenderTest(boolean nightModeEnabled) {
mFakeBgColor = nightModeEnabled ? Color.BLACK : Color.WHITE;
- NightModeTestUtils.setUpNightModeForDummyUiActivity(nightModeEnabled);
+ NightModeTestUtils.setUpNightModeForBlankUiTestActivity(nightModeEnabled);
mRenderTestRule.setNightModeEnabled(nightModeEnabled);
}
diff --git a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/listmenu/ListMenuButtonTest.java b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/listmenu/ListMenuButtonTest.java
index 6a0f7a6..672a79f 100644
--- a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/listmenu/ListMenuButtonTest.java
+++ b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/listmenu/ListMenuButtonTest.java
@@ -19,7 +19,7 @@
import org.chromium.base.test.BaseJUnit4ClassRunner;
import org.chromium.base.test.util.Batch;
import org.chromium.components.browser_ui.widget.R;
-import org.chromium.ui.test.util.DummyUiActivity;
+import org.chromium.ui.test.util.BlankUiTestActivity;
/**
* Unit tests for {@link ListMenuButton}.
@@ -28,8 +28,8 @@
@Batch(Batch.UNIT_TESTS)
public class ListMenuButtonTest {
@ClassRule
- public static BaseActivityTestRule<DummyUiActivity> activityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public static BaseActivityTestRule<BlankUiTestActivity> activityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
private Context mContext;
@Before
diff --git a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/listmenu/ListMenuRenderTest.java b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/listmenu/ListMenuRenderTest.java
index d513c35..de72c8f 100644
--- a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/listmenu/ListMenuRenderTest.java
+++ b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/listmenu/ListMenuRenderTest.java
@@ -26,7 +26,7 @@
import org.chromium.components.browser_ui.widget.test.R;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modelutil.MVCListAdapter.ModelList;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import org.chromium.ui.test.util.NightModeTestUtils;
import org.chromium.ui.test.util.RenderTestRule;
@@ -38,7 +38,7 @@
*/
@RunWith(ParameterizedRunner.class)
@UseRunnerDelegate(BaseJUnit4RunnerDelegate.class)
-public class ListMenuRenderTest extends DummyUiActivityTestCase {
+public class ListMenuRenderTest extends BlankUiTestActivityTestCase {
@ParameterAnnotations.ClassParameter
private static List<ParameterSet> sClassParams =
new NightModeTestUtils.NightModeParams().getParameters();
@@ -49,7 +49,7 @@
private View mView;
public ListMenuRenderTest(boolean nightModeEnabled) {
- NightModeTestUtils.setUpNightModeForDummyUiActivity(nightModeEnabled);
+ NightModeTestUtils.setUpNightModeForBlankUiTestActivity(nightModeEnabled);
mRenderTestRule.setNightModeEnabled(nightModeEnabled);
}
@@ -82,7 +82,7 @@
@Override
public void tearDownTest() throws Exception {
- NightModeTestUtils.tearDownNightModeForDummyUiActivity();
+ NightModeTestUtils.tearDownNightModeForBlankUiTestActivity();
super.tearDownTest();
}
diff --git a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/promo/PromoCardImpressionTest.java b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/promo/PromoCardImpressionTest.java
index 2c17fb772..b903303 100644
--- a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/promo/PromoCardImpressionTest.java
+++ b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/promo/PromoCardImpressionTest.java
@@ -26,8 +26,8 @@
import org.chromium.base.test.util.FlakyTest;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modelutil.PropertyModel;
+import org.chromium.ui.test.util.BlankUiTestActivity;
import org.chromium.ui.test.util.DisableAnimationsTestRule;
-import org.chromium.ui.test.util.DummyUiActivity;
import java.util.concurrent.TimeoutException;
@@ -41,8 +41,8 @@
@ClassRule
public static DisableAnimationsTestRule disableAnimationsRule = new DisableAnimationsTestRule();
@ClassRule
- public static BaseActivityTestRule<DummyUiActivity> activityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public static BaseActivityTestRule<BlankUiTestActivity> activityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
private static Activity sActivity;
private static FrameLayout sContent;
diff --git a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/promo/PromoCardViewRenderTest.java b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/promo/PromoCardViewRenderTest.java
index 781e1fc62..c9a16cf 100644
--- a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/promo/PromoCardViewRenderTest.java
+++ b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/promo/PromoCardViewRenderTest.java
@@ -31,7 +31,7 @@
import org.chromium.components.browser_ui.widget.test.R;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modelutil.PropertyModel;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import org.chromium.ui.test.util.NightModeTestUtils;
import org.chromium.ui.test.util.RenderTestRule;
@@ -42,7 +42,7 @@
*/
@RunWith(ParameterizedRunner.class)
@UseRunnerDelegate(BaseJUnit4RunnerDelegate.class)
-public class PromoCardViewRenderTest extends DummyUiActivityTestCase {
+public class PromoCardViewRenderTest extends BlankUiTestActivityTestCase {
@ClassParameter
private static List<ParameterSet> sClassParams =
new NightModeTestUtils.NightModeParams().getParameters();
@@ -51,7 +51,7 @@
public RenderTestRule mRenderTestRule = RenderTestRule.Builder.withPublicCorpus().build();
public PromoCardViewRenderTest(boolean nightModeEnabled) {
- NightModeTestUtils.setUpNightModeForDummyUiActivity(nightModeEnabled);
+ NightModeTestUtils.setUpNightModeForBlankUiTestActivity(nightModeEnabled);
mRenderTestRule.setNightModeEnabled(nightModeEnabled);
}
diff --git a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/scrim/ScrimTest.java b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/scrim/ScrimTest.java
index a46a763..f379f0e 100644
--- a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/scrim/ScrimTest.java
+++ b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/scrim/ScrimTest.java
@@ -42,8 +42,8 @@
import org.chromium.base.test.util.Feature;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modelutil.PropertyModel;
+import org.chromium.ui.test.util.BlankUiTestActivity;
import org.chromium.ui.test.util.DisableAnimationsTestRule;
-import org.chromium.ui.test.util.DummyUiActivity;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
@@ -55,8 +55,8 @@
@ClassRule
public static DisableAnimationsTestRule disableAnimationsRule = new DisableAnimationsTestRule();
@ClassRule
- public static BaseActivityTestRule<DummyUiActivity> activityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public static BaseActivityTestRule<BlankUiTestActivity> activityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
private static Activity sActivity;
private static FrameLayout sParent;
diff --git a/components/embedder_support/android/javatests/src/org/chromium/components/embedder_support/delegate/ColorPickerDialogRenderTest.java b/components/embedder_support/android/javatests/src/org/chromium/components/embedder_support/delegate/ColorPickerDialogRenderTest.java
index 30a3a8e..06c293b 100644
--- a/components/embedder_support/android/javatests/src/org/chromium/components/embedder_support/delegate/ColorPickerDialogRenderTest.java
+++ b/components/embedder_support/android/javatests/src/org/chromium/components/embedder_support/delegate/ColorPickerDialogRenderTest.java
@@ -25,7 +25,7 @@
import org.chromium.base.test.util.Feature;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.R;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import org.chromium.ui.test.util.NightModeTestUtils;
import org.chromium.ui.test.util.RenderTestRule;
@@ -37,7 +37,7 @@
*/
@RunWith(ParameterizedRunner.class)
@UseRunnerDelegate(BaseJUnit4RunnerDelegate.class)
-public class ColorPickerDialogRenderTest extends DummyUiActivityTestCase {
+public class ColorPickerDialogRenderTest extends BlankUiTestActivityTestCase {
@ParameterAnnotations.ClassParameter
private static List<ParameterSet> sClassParams =
new NightModeTestUtils.NightModeParams().getParameters();
@@ -48,7 +48,7 @@
private View mView;
public ColorPickerDialogRenderTest(boolean nightModeEnabled) {
- NightModeTestUtils.setUpNightModeForDummyUiActivity(nightModeEnabled);
+ NightModeTestUtils.setUpNightModeForBlankUiTestActivity(nightModeEnabled);
mRenderTestRule.setNightModeEnabled(nightModeEnabled);
}
diff --git a/components/external_intents/android/javatests/src/org/chromium/components/external_intents/ExternalNavigationHandlerTest.java b/components/external_intents/android/javatests/src/org/chromium/components/external_intents/ExternalNavigationHandlerTest.java
index 15508b2..2ba899fe 100644
--- a/components/external_intents/android/javatests/src/org/chromium/components/external_intents/ExternalNavigationHandlerTest.java
+++ b/components/external_intents/android/javatests/src/org/chromium/components/external_intents/ExternalNavigationHandlerTest.java
@@ -56,7 +56,7 @@
import org.chromium.content_public.browser.test.NativeLibraryTestUtils;
import org.chromium.ui.base.PageTransition;
import org.chromium.ui.base.WindowAndroid;
-import org.chromium.ui.test.util.DummyUiActivity;
+import org.chromium.ui.test.util.BlankUiTestActivity;
import org.chromium.url.GURL;
import org.chromium.url.Origin;
@@ -1009,7 +1009,7 @@
filter.addDataScheme("market");
ActivityMonitor monitor = InstrumentationRegistry.getInstrumentation().addMonitor(
filter, new Instrumentation.ActivityResult(Activity.RESULT_OK, null), true);
- Intent dummyIntent = new Intent(mApplicationContextToRestore, DummyUiActivity.class);
+ Intent dummyIntent = new Intent(mApplicationContextToRestore, BlankUiTestActivity.class);
dummyIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
Activity activity =
InstrumentationRegistry.getInstrumentation().startActivitySync(dummyIntent);
@@ -1065,7 +1065,7 @@
@MediumTest
public void testFallbackUrl_ChromeCanHandle_Incognito() {
mDelegate.add(new IntentActivity("https", "package"));
- Intent dummyIntent = new Intent(mApplicationContextToRestore, DummyUiActivity.class);
+ Intent dummyIntent = new Intent(mApplicationContextToRestore, BlankUiTestActivity.class);
dummyIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
Activity activity =
InstrumentationRegistry.getInstrumentation().startActivitySync(dummyIntent);
@@ -1119,7 +1119,7 @@
filter.addDataScheme("market");
ActivityMonitor monitor = InstrumentationRegistry.getInstrumentation().addMonitor(
filter, new Instrumentation.ActivityResult(Activity.RESULT_OK, null), true);
- Intent dummyIntent = new Intent(mApplicationContextToRestore, DummyUiActivity.class);
+ Intent dummyIntent = new Intent(mApplicationContextToRestore, BlankUiTestActivity.class);
dummyIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
Activity activity =
InstrumentationRegistry.getInstrumentation().startActivitySync(dummyIntent);
@@ -1185,7 +1185,7 @@
@MediumTest
public void testFallbackUrl_ChromeCanHandle_Incognito_DelegateHandleDialogPresentation() {
mDelegate.add(new IntentActivity("https", "package"));
- Intent dummyIntent = new Intent(mApplicationContextToRestore, DummyUiActivity.class);
+ Intent dummyIntent = new Intent(mApplicationContextToRestore, BlankUiTestActivity.class);
dummyIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
Activity activity =
InstrumentationRegistry.getInstrumentation().startActivitySync(dummyIntent);
diff --git a/components/messages/android/internal/java/src/org/chromium/components/messages/MessageBannerRenderTest.java b/components/messages/android/internal/java/src/org/chromium/components/messages/MessageBannerRenderTest.java
index bd8332da..1b6ffd2 100644
--- a/components/messages/android/internal/java/src/org/chromium/components/messages/MessageBannerRenderTest.java
+++ b/components/messages/android/internal/java/src/org/chromium/components/messages/MessageBannerRenderTest.java
@@ -32,7 +32,7 @@
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modelutil.PropertyModel;
import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import org.chromium.ui.test.util.NightModeTestUtils;
import org.chromium.ui.test.util.RenderTestRule;
@@ -42,7 +42,7 @@
*/
@RunWith(ParameterizedRunner.class)
@UseRunnerDelegate(BaseJUnit4RunnerDelegate.class)
-public class MessageBannerRenderTest extends DummyUiActivityTestCase {
+public class MessageBannerRenderTest extends BlankUiTestActivityTestCase {
@ClassParameter
private static List<ParameterSet> sClassParams =
new NightModeTestUtils.NightModeParams().getParameters();
@@ -51,7 +51,7 @@
public RenderTestRule mRenderTestRule = RenderTestRule.Builder.withPublicCorpus().build();
public MessageBannerRenderTest(boolean nightModeEnabled) {
- NightModeTestUtils.setUpNightModeForDummyUiActivity(nightModeEnabled);
+ NightModeTestUtils.setUpNightModeForBlankUiTestActivity(nightModeEnabled);
mRenderTestRule.setNightModeEnabled(nightModeEnabled);
}
diff --git a/components/messages/android/internal/java/src/org/chromium/components/messages/MessageBannerViewTest.java b/components/messages/android/internal/java/src/org/chromium/components/messages/MessageBannerViewTest.java
index f3943d0..5cc3401 100644
--- a/components/messages/android/internal/java/src/org/chromium/components/messages/MessageBannerViewTest.java
+++ b/components/messages/android/internal/java/src/org/chromium/components/messages/MessageBannerViewTest.java
@@ -35,8 +35,8 @@
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modelutil.PropertyModel;
import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
+import org.chromium.ui.test.util.BlankUiTestActivity;
import org.chromium.ui.test.util.DisableAnimationsTestRule;
-import org.chromium.ui.test.util.DummyUiActivity;
/**
* Instrumentation tests for MessageBannerView.
@@ -51,8 +51,8 @@
new DisableAnimationsTestRule();
@ClassRule
- public static BaseActivityTestRule<DummyUiActivity> sActivityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public static BaseActivityTestRule<BlankUiTestActivity> sActivityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
private static Activity sActivity;
private static ViewGroup sContentView;
diff --git a/components/messages/android/internal/java/src/org/chromium/components/messages/SingleActionMessageTest.java b/components/messages/android/internal/java/src/org/chromium/components/messages/SingleActionMessageTest.java
index b96743cc..874da49 100644
--- a/components/messages/android/internal/java/src/org/chromium/components/messages/SingleActionMessageTest.java
+++ b/components/messages/android/internal/java/src/org/chromium/components/messages/SingleActionMessageTest.java
@@ -33,8 +33,8 @@
import org.chromium.base.test.util.CallbackHelper;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.modelutil.PropertyModel;
+import org.chromium.ui.test.util.BlankUiTestActivity;
import org.chromium.ui.test.util.DisableAnimationsTestRule;
-import org.chromium.ui.test.util.DummyUiActivity;
/**
* Tests for {@link SingleActionMessage}.
@@ -45,8 +45,8 @@
public static DisableAnimationsTestRule sDisableAnimationsRule =
new DisableAnimationsTestRule();
@ClassRule
- public static BaseActivityTestRule<DummyUiActivity> sActivityTestRule =
- new BaseActivityTestRule<>(DummyUiActivity.class);
+ public static BaseActivityTestRule<BlankUiTestActivity> sActivityTestRule =
+ new BaseActivityTestRule<>(BlankUiTestActivity.class);
private static Activity sActivity;
diff --git a/components/paint_preview/player/android/javatests/src/org/chromium/components/paintpreview/player/PaintPreviewPlayerTest.java b/components/paint_preview/player/android/javatests/src/org/chromium/components/paintpreview/player/PaintPreviewPlayerTest.java
index 2b16f6d..2dec1c4d 100644
--- a/components/paint_preview/player/android/javatests/src/org/chromium/components/paintpreview/player/PaintPreviewPlayerTest.java
+++ b/components/paint_preview/player/android/javatests/src/org/chromium/components/paintpreview/player/PaintPreviewPlayerTest.java
@@ -31,7 +31,7 @@
import org.chromium.base.test.util.CriteriaHelper;
import org.chromium.base.test.util.DisableIf;
import org.chromium.content_public.browser.UiThreadTaskTraits;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import org.chromium.url.GURL;
import java.util.List;
@@ -40,7 +40,7 @@
* Instrumentation tests for the Paint Preview player.
*/
@RunWith(BaseJUnit4ClassRunner.class)
-public class PaintPreviewPlayerTest extends DummyUiActivityTestCase {
+public class PaintPreviewPlayerTest extends BlankUiTestActivityTestCase {
private static final long TIMEOUT_MS = 5000;
private static final String TEST_DIRECTORY_KEY = "test_dir";
diff --git a/docs/ui/android/mvc_testing.md b/docs/ui/android/mvc_testing.md
index 8bdeface..179a325 100644
--- a/docs/ui/android/mvc_testing.md
+++ b/docs/ui/android/mvc_testing.md
@@ -50,7 +50,7 @@
### Best practices for testability for your View:
- * Tests for UI should be based on the [DummyUiActivity](/ui/android/javatests/src/org/chromium/ui/test/util/DummyUiActivity.java). This activity does not have any dependencies on the Chrome browser and allows you to test your UI in isolation. This ensures you are not competing against other Chrome tasks and can write a test that is much faster and less flaky than legacy UI instrumentation tests.
+ * Tests for UI should be based on the [BlankUiTestActivity](/ui/android/javatests/src/org/chromium/ui/test/util/BlankUiTestActivity.java). This activity does not have any dependencies on the Chrome browser and allows you to test your UI in isolation. This ensures you are not competing against other Chrome tasks and can write a test that is much faster and less flaky than legacy UI instrumentation tests.
* When adding tests for your UI component, add a [RenderTest](/ui/android/javatests/src/org/chromium/ui/test/util/RENDER_TESTS.md) to ensure the UI is consistent from release to release unless you explicitly changed it.
### Useful helpers / Links
diff --git a/docs/ui/android/night_mode.md b/docs/ui/android/night_mode.md
index eb9e24f..0a650e9 100644
--- a/docs/ui/android/night_mode.md
+++ b/docs/ui/android/night_mode.md
@@ -122,13 +122,13 @@
Render tests are the recommended way to verify the appearance of night mode UI. If you are not familiar with render tests, please take a look at [render test instructions](/ui/android/javatests/src/org/chromium/ui/test/util/RENDER_TESTS.md) to learn about how to write a new render test and upload golden images.
-**For tests using DummyUiActivity:**
+**For tests using BlankUiTestActivity:**
* Put all the render tests into a separate test suite
* Use class parameter [`NightModeTestUtils.NightModeParams.class`](https://cs.chromium.org/chromium/src/ui/android/javatests/src/org/chromium/ui/test/util/NightModeTestUtils.java?type=cs&q=NightModeTestUtils.NightModeParams)
* Pass in a boolean parameter that indicates night mode state in constructor
-* Set up night mode in constructor by calling [`NightModeTestUtils#setUpNightModeForDummyUiActivity()`](https://cs.chromium.org/chromium/src/ui/android/javatests/src/org/chromium/ui/test/util/NightModeTestUtils.java?type=cs&q=setUpNightModeForDummyUiActivity&sq=package:chromium) and [`RenderTestRule#setNightModeEnabled()`](https://cs.chromium.org/chromium/src/ui/android/javatests/src/org/chromium/ui/test/util/RenderTestRule.java?type=cs&q=setNightModeEnabled)
-* During [`tearDownTest()`](https://cs.chromium.org/chromium/src/ui/android/javatests/src/org/chromium/ui/test/util/DummyUiActivityTestCase.java?type=cs&q=tearDownTest), reset night mode state by calling [`NightModeTestUtils#tearDownNightModeForDummyUiActivity()`](https://cs.chromium.org/chromium/src/ui/android/javatests/src/org/chromium/ui/test/util/NightModeTestUtils.java?type=cs&q=tearDownNightModeForDummyUiActivity)
+* Set up night mode in constructor by calling [`NightModeTestUtils#setUpNightModeForBlankUiTestActivity()`](https://cs.chromium.org/chromium/src/ui/android/javatests/src/org/chromium/ui/test/util/NightModeTestUtils.java?type=cs&q=setUpNightModeForBlankUiTestActivity&sq=package:chromium) and [`RenderTestRule#setNightModeEnabled()`](https://cs.chromium.org/chromium/src/ui/android/javatests/src/org/chromium/ui/test/util/RenderTestRule.java?type=cs&q=setNightModeEnabled)
+* During [`tearDownTest()`](https://cs.chromium.org/chromium/src/ui/android/javatests/src/org/chromium/ui/test/util/BlankUiTestActivityTestCase.java?type=cs&q=tearDownTest), reset night mode state by calling [`NightModeTestUtils#tearDownNightModeForBlankUiTestActivity()`](https://cs.chromium.org/chromium/src/ui/android/javatests/src/org/chromium/ui/test/util/NightModeTestUtils.java?type=cs&q=tearDownNightModeForBlankUiTestActivity)
See [this CL](https://chromium-review.googlesource.com/c/chromium/src/+/1613883) as an example
diff --git a/ui/android/BUILD.gn b/ui/android/BUILD.gn
index 8e1a2307..848dc91 100644
--- a/ui/android/BUILD.gn
+++ b/ui/android/BUILD.gn
@@ -413,9 +413,9 @@
android_library("ui_java_test_support") {
testonly = true
sources = [
+ "javatests/src/org/chromium/ui/test/util/BlankUiTestActivity.java",
+ "javatests/src/org/chromium/ui/test/util/BlankUiTestActivityTestCase.java",
"javatests/src/org/chromium/ui/test/util/DisableAnimationsTestRule.java",
- "javatests/src/org/chromium/ui/test/util/DummyUiActivity.java",
- "javatests/src/org/chromium/ui/test/util/DummyUiActivityTestCase.java",
"javatests/src/org/chromium/ui/test/util/NightModeTestUtils.java",
"javatests/src/org/chromium/ui/test/util/RenderTestRule.java",
"javatests/src/org/chromium/ui/test/util/UiDisableIf.java",
diff --git a/ui/android/DEPS b/ui/android/DEPS
index a46a1565..3e15afd 100644
--- a/ui/android/DEPS
+++ b/ui/android/DEPS
@@ -29,7 +29,7 @@
".*test\.(cc|h)": [
"+components/viz/test"
],
- ".*DummyUiActivity\.java": [
+ ".*BlankUiTestActivity\.java": [
"+components/browser_ui/modaldialog/android/java/src/org/chromium/components/browser_ui/modaldialog",
],
}
diff --git a/ui/android/java/src/org/chromium/ui/widget/TextViewWithTightWrapTest.java b/ui/android/java/src/org/chromium/ui/widget/TextViewWithTightWrapTest.java
index ac32944..2303e20 100644
--- a/ui/android/java/src/org/chromium/ui/widget/TextViewWithTightWrapTest.java
+++ b/ui/android/java/src/org/chromium/ui/widget/TextViewWithTightWrapTest.java
@@ -21,14 +21,14 @@
import org.chromium.base.test.util.Feature;
import org.chromium.components.browser_ui.widget.R;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import org.chromium.ui.test.util.RenderTestRule;
/**
Render tests for {@link TextViewWithTightWrap}.
*/
@RunWith(BaseJUnit4ClassRunner.class)
-public class TextViewWithTightWrapTest extends DummyUiActivityTestCase {
+public class TextViewWithTightWrapTest extends BlankUiTestActivityTestCase {
private static final int RENDER_TEST_REVISION = 2;
private static final String RENDER_TEST_REVISION_DESCRIPTION = "Update the text style.";
diff --git a/ui/android/javatests/src/org/chromium/ui/base/ClipboardAndroidTest.java b/ui/android/javatests/src/org/chromium/ui/base/ClipboardAndroidTest.java
index ed900f4..f30e210a 100644
--- a/ui/android/javatests/src/org/chromium/ui/base/ClipboardAndroidTest.java
+++ b/ui/android/javatests/src/org/chromium/ui/base/ClipboardAndroidTest.java
@@ -27,7 +27,7 @@
import org.chromium.base.test.util.MinAndroidSdkLevel;
import org.chromium.content_public.browser.test.NativeLibraryTestUtils;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.ui.test.util.DummyUiActivityTestCase;
+import org.chromium.ui.test.util.BlankUiTestActivityTestCase;
import java.util.concurrent.TimeoutException;
@@ -36,7 +36,7 @@
*/
@RunWith(BaseJUnit4ClassRunner.class)
@Batch(Batch.UNIT_TESTS)
-public class ClipboardAndroidTest extends DummyUiActivityTestCase {
+public class ClipboardAndroidTest extends BlankUiTestActivityTestCase {
private static final String TEXT_URL = "http://www.foo.com/";
private static final String MIX_TEXT_URL = "test http://www.foo.com http://www.bar.com";
private static final String MIX_TEXT_URL_NO_PROTOCOL = "test www.foo.com www.bar.com";
diff --git a/ui/android/javatests/src/org/chromium/ui/test/util/DummyUiActivity.java b/ui/android/javatests/src/org/chromium/ui/test/util/BlankUiTestActivity.java
similarity index 93%
rename from ui/android/javatests/src/org/chromium/ui/test/util/DummyUiActivity.java
rename to ui/android/javatests/src/org/chromium/ui/test/util/BlankUiTestActivity.java
index 2d93f5c..acb08f6 100644
--- a/ui/android/javatests/src/org/chromium/ui/test/util/DummyUiActivity.java
+++ b/ui/android/javatests/src/org/chromium/ui/test/util/BlankUiTestActivity.java
@@ -18,8 +18,8 @@
import org.chromium.ui.modaldialog.ModalDialogManager.ModalDialogType;
import org.chromium.ui.modaldialog.ModalDialogManagerHolder;
-/** Dummy activity to test UI components without Chrome browser initialization and natives. */
-public class DummyUiActivity extends AppCompatActivity implements ModalDialogManagerHolder {
+/** Simplified activity to test UI components without Chrome browser initialization and natives. */
+public class BlankUiTestActivity extends AppCompatActivity implements ModalDialogManagerHolder {
private static int sTestTheme;
private static int sTestLayout;
diff --git a/ui/android/javatests/src/org/chromium/ui/test/util/DummyUiActivityTestCase.java b/ui/android/javatests/src/org/chromium/ui/test/util/BlankUiTestActivityTestCase.java
similarity index 79%
rename from ui/android/javatests/src/org/chromium/ui/test/util/DummyUiActivityTestCase.java
rename to ui/android/javatests/src/org/chromium/ui/test/util/BlankUiTestActivityTestCase.java
index 390d1df..3be022c 100644
--- a/ui/android/javatests/src/org/chromium/ui/test/util/DummyUiActivityTestCase.java
+++ b/ui/android/javatests/src/org/chromium/ui/test/util/BlankUiTestActivityTestCase.java
@@ -17,14 +17,14 @@
import org.chromium.base.test.util.ApplicationTestUtils;
/**
- * Test case to instrument DummyUiActivity for UI testing scenarios.
+ * Test case to instrument BlankUiTestActivity for UI testing scenarios.
* Recommend to use setUpTest() and tearDownTest() to setup and tear down instead of @Before and
* @After.
*/
-public class DummyUiActivityTestCase {
- private DummyUiActivity mActivity;
+public class BlankUiTestActivityTestCase {
+ private BlankUiTestActivity mActivity;
- private final BaseActivityTestRule<? extends DummyUiActivity> mActivityTestRule;
+ private final BaseActivityTestRule<? extends BlankUiTestActivity> mActivityTestRule;
// Disable animations to reduce flakiness.
@ClassRule
@@ -34,17 +34,17 @@
@Rule
public final TestRule ruleChain;
- /** Default constructor that creates a {@link DummyUiActivity} as expected. */
- public DummyUiActivityTestCase() {
- this(new BaseActivityTestRule<DummyUiActivity>(DummyUiActivity.class));
+ /** Default constructor that creates a {@link BlankUiTestActivity} as expected. */
+ public BlankUiTestActivityTestCase() {
+ this(new BaseActivityTestRule<BlankUiTestActivity>(BlankUiTestActivity.class));
}
/**
* Constructor to allow subclasses to inject activity and rule subclasses.
* @param activityTestRule Injected rule to use for activity interactions.
*/
- protected DummyUiActivityTestCase(
- BaseActivityTestRule<? extends DummyUiActivity> activityTestRule) {
+ protected BlankUiTestActivityTestCase(
+ BaseActivityTestRule<? extends BlankUiTestActivity> activityTestRule) {
mActivityTestRule = activityTestRule;
ruleChain = RuleChain.outerRule(mActivityTestRule).around(new TestDriverRule());
}
@@ -83,7 +83,7 @@
// Override this to tear down after test.
public void tearDownTest() throws Exception {}
- public DummyUiActivity getActivity() {
+ public BlankUiTestActivity getActivity() {
return mActivity;
}
}
diff --git a/ui/android/javatests/src/org/chromium/ui/test/util/NightModeTestUtils.java b/ui/android/javatests/src/org/chromium/ui/test/util/NightModeTestUtils.java
index aac37abd..b2275fb 100644
--- a/ui/android/javatests/src/org/chromium/ui/test/util/NightModeTestUtils.java
+++ b/ui/android/javatests/src/org/chromium/ui/test/util/NightModeTestUtils.java
@@ -32,10 +32,10 @@
}
/**
- * Sets up the night mode state for {@link DummyUiActivity}.
+ * Sets up the night mode state for {@link BlankUiTestActivity}.
* @param nightModeEnabled Whether night mode should be enabled.
*/
- public static void setUpNightModeForDummyUiActivity(boolean nightModeEnabled) {
+ public static void setUpNightModeForBlankUiTestActivity(boolean nightModeEnabled) {
ThreadUtils.runOnUiThreadBlocking(() -> {
AppCompatDelegate.setDefaultNightMode(nightModeEnabled
? AppCompatDelegate.MODE_NIGHT_YES
@@ -44,9 +44,9 @@
}
/**
- * Resets the night mode state for {@link DummyUiActivity}.
+ * Resets the night mode state for {@link BlankUiTestActivity}.
*/
- public static void tearDownNightModeForDummyUiActivity() {
+ public static void tearDownNightModeForBlankUiTestActivity() {
ThreadUtils.runOnUiThreadBlocking(() -> {
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
});
diff --git a/ui/android/javatests/src/org/chromium/ui/test/util/RenderTestRule.java b/ui/android/javatests/src/org/chromium/ui/test/util/RenderTestRule.java
index e18d5d71d..9c885e3 100644
--- a/ui/android/javatests/src/org/chromium/ui/test/util/RenderTestRule.java
+++ b/ui/android/javatests/src/org/chromium/ui/test/util/RenderTestRule.java
@@ -46,7 +46,7 @@
* {@code
*
* @RunWith(BaseJUnit4ClassRunner.class)
- * public class MyTest extends DummyUiActivityTestCase {
+ * public class MyTest extends BlankUiTestActivityTestCase {
* @Rule
* public RenderTestRule mRenderTestRule = new RenderTestRule.Builder()
* // Required. If using ANDROID_RENDER_TESTS_PUBLIC, the Builder can be created with
