Commit bc802c69 authored by Hazem Ashmawy's avatar Hazem Ashmawy Committed by Commit Bot

[AW][DevUI] batch devui tests

Batch all espresso devui tests in PER_CLASS batches.

Bug: 1120847
Test: run_webview_instrumentation_test_apk -A Batch=android_webview_devui
Change-Id: I59c117d0f26e75dfe4200954ce2153db81d842e2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2438536
Commit-Queue: Hazem Ashmawy <hazems@chromium.org>
Reviewed-by: default avatarNate Fischer <ntfschr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#812573}
parent 6d4f845a
...@@ -76,6 +76,7 @@ import org.chromium.android_webview.devui.util.WebViewPackageHelper; ...@@ -76,6 +76,7 @@ import org.chromium.android_webview.devui.util.WebViewPackageHelper;
import org.chromium.android_webview.test.AwJUnit4ClassRunner; import org.chromium.android_webview.test.AwJUnit4ClassRunner;
import org.chromium.base.Callback; import org.chromium.base.Callback;
import org.chromium.base.FileUtils; import org.chromium.base.FileUtils;
import org.chromium.base.test.util.Batch;
import org.chromium.base.test.util.CallbackHelper; import org.chromium.base.test.util.CallbackHelper;
import org.chromium.base.test.util.Feature; import org.chromium.base.test.util.Feature;
import org.chromium.components.minidump_uploader.CrashFileManager; import org.chromium.components.minidump_uploader.CrashFileManager;
...@@ -95,6 +96,7 @@ import java.util.concurrent.TimeUnit; ...@@ -95,6 +96,7 @@ import java.util.concurrent.TimeUnit;
*/ */
@LargeTest @LargeTest
@RunWith(AwJUnit4ClassRunner.class) @RunWith(AwJUnit4ClassRunner.class)
@Batch(Batch.PER_CLASS)
public class CrashesListFragmentTest { public class CrashesListFragmentTest {
private static final String FAKE_APP_PACKAGE_NAME = "com.test.some_package"; private static final String FAKE_APP_PACKAGE_NAME = "com.test.some_package";
private static final String CRASH_REPORT_BUTTON_TEXT = "File bug report"; private static final String CRASH_REPORT_BUTTON_TEXT = "File bug report";
......
...@@ -45,6 +45,7 @@ import org.junit.runner.RunWith; ...@@ -45,6 +45,7 @@ import org.junit.runner.RunWith;
import org.chromium.android_webview.devui.MainActivity; import org.chromium.android_webview.devui.MainActivity;
import org.chromium.android_webview.devui.R; import org.chromium.android_webview.devui.R;
import org.chromium.android_webview.test.AwJUnit4ClassRunner; import org.chromium.android_webview.test.AwJUnit4ClassRunner;
import org.chromium.base.test.util.Batch;
import org.chromium.base.test.util.Feature; import org.chromium.base.test.util.Feature;
/** /**
...@@ -52,6 +53,7 @@ import org.chromium.base.test.util.Feature; ...@@ -52,6 +53,7 @@ import org.chromium.base.test.util.Feature;
* have their own test class. * have their own test class.
*/ */
@RunWith(AwJUnit4ClassRunner.class) @RunWith(AwJUnit4ClassRunner.class)
@Batch(Batch.PER_CLASS)
public class DeveloperUiTest { public class DeveloperUiTest {
// The package name of the test shell. This is acting both as the client app and the WebView // The package name of the test shell. This is acting both as the client app and the WebView
// provider. // provider.
......
...@@ -45,6 +45,7 @@ import org.chromium.android_webview.devui.FlagsFragment; ...@@ -45,6 +45,7 @@ import org.chromium.android_webview.devui.FlagsFragment;
import org.chromium.android_webview.devui.MainActivity; import org.chromium.android_webview.devui.MainActivity;
import org.chromium.android_webview.devui.R; import org.chromium.android_webview.devui.R;
import org.chromium.android_webview.test.AwJUnit4ClassRunner; import org.chromium.android_webview.test.AwJUnit4ClassRunner;
import org.chromium.base.test.util.Batch;
import org.chromium.base.test.util.CallbackHelper; import org.chromium.base.test.util.CallbackHelper;
import org.chromium.base.test.util.Feature; import org.chromium.base.test.util.Feature;
import org.chromium.content_public.browser.test.util.TestThreadUtils; import org.chromium.content_public.browser.test.util.TestThreadUtils;
...@@ -53,6 +54,7 @@ import org.chromium.content_public.browser.test.util.TestThreadUtils; ...@@ -53,6 +54,7 @@ import org.chromium.content_public.browser.test.util.TestThreadUtils;
* UI tests for {@link FlagsFragment}. * UI tests for {@link FlagsFragment}.
*/ */
@RunWith(AwJUnit4ClassRunner.class) @RunWith(AwJUnit4ClassRunner.class)
@Batch(Batch.PER_CLASS)
public class FlagsFragmentTest { public class FlagsFragmentTest {
@Rule @Rule
public ActivityTestRule mRule = public ActivityTestRule mRule =
......
...@@ -49,6 +49,7 @@ import org.chromium.android_webview.devui.R; ...@@ -49,6 +49,7 @@ import org.chromium.android_webview.devui.R;
import org.chromium.android_webview.devui.WebViewPackageError; import org.chromium.android_webview.devui.WebViewPackageError;
import org.chromium.android_webview.devui.util.WebViewPackageHelper; import org.chromium.android_webview.devui.util.WebViewPackageHelper;
import org.chromium.android_webview.test.AwJUnit4ClassRunner; import org.chromium.android_webview.test.AwJUnit4ClassRunner;
import org.chromium.base.test.util.Batch;
import org.chromium.base.test.util.Feature; import org.chromium.base.test.util.Feature;
import java.util.Locale; import java.util.Locale;
...@@ -57,6 +58,7 @@ import java.util.Locale; ...@@ -57,6 +58,7 @@ import java.util.Locale;
* UI tests for the developer UI's HomeFragment. * UI tests for the developer UI's HomeFragment.
*/ */
@RunWith(AwJUnit4ClassRunner.class) @RunWith(AwJUnit4ClassRunner.class)
@Batch(Batch.PER_CLASS)
public class HomeFragmentTest { public class HomeFragmentTest {
public static final PackageInfo FAKE_WEBVIEW_PACKAGE = new PackageInfo(); public static final PackageInfo FAKE_WEBVIEW_PACKAGE = new PackageInfo();
static { static {
......
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