Commit 65435edb authored by Yun Liu's avatar Yun Liu Committed by Commit Bot

Use a basic theme for DummyUiActivity by default so that doesn't need to set theme for all tests

Bug: 728297
Change-Id: I563b49e1c6d37b3c3e2a408be46920ab3f7f87e1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1504306Reviewed-by: default avatarTed Choc <tedchoc@chromium.org>
Commit-Queue: Yun Liu <yliuyliu@google.com>
Cr-Commit-Position: refs/heads/master@{#637938}
parent f15526aa
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
android:exported="true"/> android:exported="true"/>
<activity android:name="org.chromium.chrome.test.ui.DummyUiActivity" <activity android:name="org.chromium.chrome.test.ui.DummyUiActivity"
android:theme="@style/Theme.Chromium.Activity"
android:exported="true"/> android:exported="true"/>
{% endblock %} {% endblock %}
......
...@@ -19,7 +19,6 @@ import org.mockito.MockitoAnnotations; ...@@ -19,7 +19,6 @@ import org.mockito.MockitoAnnotations;
import org.chromium.base.ThreadUtils; import org.chromium.base.ThreadUtils;
import org.chromium.base.test.util.Restriction; import org.chromium.base.test.util.Restriction;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.ChromeFeatureList; import org.chromium.chrome.browser.ChromeFeatureList;
import org.chromium.chrome.browser.UrlConstants; import org.chromium.chrome.browser.UrlConstants;
import org.chromium.chrome.browser.download.home.list.UiUtils; import org.chromium.chrome.browser.download.home.list.UiUtils;
...@@ -29,7 +28,6 @@ import org.chromium.chrome.browser.feature_engagement.TrackerFactory; ...@@ -29,7 +28,6 @@ import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.snackbar.SnackbarManager; import org.chromium.chrome.browser.snackbar.SnackbarManager;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner; import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.chrome.test.ui.DummyUiActivity;
import org.chromium.chrome.test.ui.DummyUiActivityTestCase; import org.chromium.chrome.test.ui.DummyUiActivityTestCase;
import org.chromium.components.feature_engagement.Tracker; import org.chromium.components.feature_engagement.Tracker;
import org.chromium.components.offline_items_collection.OfflineItem; import org.chromium.components.offline_items_collection.OfflineItem;
...@@ -59,7 +57,6 @@ public class DownloadActivityV2Test extends DummyUiActivityTestCase { ...@@ -59,7 +57,6 @@ public class DownloadActivityV2Test extends DummyUiActivityTestCase {
@BeforeClass @BeforeClass
public static void setUpBeforeActivityLaunched() { public static void setUpBeforeActivityLaunched() {
UiUtils.setDisableUrlFormattingForTests(true); UiUtils.setDisableUrlFormattingForTests(true);
DummyUiActivity.setTestTheme(R.style.Theme_Chromium_Activity_Fullscreen);
} }
@Override @Override
......
...@@ -74,7 +74,7 @@ public class TabGridContainerViewBinderTest extends DummyUiActivityTestCase { ...@@ -74,7 +74,7 @@ public class TabGridContainerViewBinderTest extends DummyUiActivityTestCase {
@BeforeClass @BeforeClass
public static void setUpBeforeActivityLaunched() { public static void setUpBeforeActivityLaunched() {
DummyUiActivity.setTestTheme(R.style.Theme_Chromium_Activity_Fullscreen); DummyUiActivity.setTestLayout(R.layout.tab_list_recycler_view_layout);
} }
@Override @Override
...@@ -82,8 +82,6 @@ public class TabGridContainerViewBinderTest extends DummyUiActivityTestCase { ...@@ -82,8 +82,6 @@ public class TabGridContainerViewBinderTest extends DummyUiActivityTestCase {
super.setUpTest(); super.setUpTest();
ThreadUtils.runOnUiThreadBlocking(() -> { ThreadUtils.runOnUiThreadBlocking(() -> {
getActivity().setContentView(R.layout.tab_list_recycler_view_layout);
mRecyclerView = getActivity().findViewById(R.id.tab_list_view); mRecyclerView = getActivity().findViewById(R.id.tab_list_view);
}); });
......
...@@ -18,16 +18,13 @@ import android.widget.FrameLayout; ...@@ -18,16 +18,13 @@ import android.widget.FrameLayout;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import org.junit.Assert; import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.chromium.base.Callback; import org.chromium.base.Callback;
import org.chromium.base.ThreadUtils; import org.chromium.base.ThreadUtils;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner; import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.chrome.test.ui.DummyUiActivity;
import org.chromium.chrome.test.ui.DummyUiActivityTestCase; import org.chromium.chrome.test.ui.DummyUiActivityTestCase;
import org.chromium.ui.modelutil.PropertyModel; import org.chromium.ui.modelutil.PropertyModel;
import org.chromium.ui.modelutil.PropertyModelChangeProcessor; import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
...@@ -78,11 +75,6 @@ public class TabListViewHolderTest extends DummyUiActivityTestCase { ...@@ -78,11 +75,6 @@ public class TabListViewHolderTest extends DummyUiActivityTestCase {
private AtomicBoolean mSelectClicked = new AtomicBoolean(); private AtomicBoolean mSelectClicked = new AtomicBoolean();
private boolean mShouldReturnBitmap; private boolean mShouldReturnBitmap;
@BeforeClass
public static void setUpBeforeActivityLaunched() {
DummyUiActivity.setTestTheme(R.style.Theme_Chromium_Activity_Fullscreen);
}
@Override @Override
public void setUpTest() throws Exception { public void setUpTest() throws Exception {
super.setUpTest(); super.setUpTest();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment