Commit 14cf9cb1 authored by Alice Wang's avatar Alice Wang Committed by Commit Bot

[Android][Test] Batch confirm sync data machine tests

This CL batches confirm sync data machine tests.

Bug: 1120258
Change-Id: I7c85b3997fb2a2754aac030ce210ef19682ab09f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2367718
Auto-Submit: Alice Wang <aliceywang@chromium.org>
Commit-Queue: Michael Thiessen <mthiesse@chromium.org>
Reviewed-by: default avatarMichael Thiessen <mthiesse@chromium.org>
Cr-Commit-Position: refs/heads/master@{#800580}
parent 0c984247
...@@ -16,6 +16,7 @@ import org.junit.Test; ...@@ -16,6 +16,7 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.chromium.base.test.util.Batch;
import org.chromium.base.test.util.CommandLineFlags; import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.chrome.browser.flags.ChromeSwitches; import org.chromium.chrome.browser.flags.ChromeSwitches;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner; import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
...@@ -28,6 +29,7 @@ import org.chromium.ui.test.util.DummyUiActivityTestCase; ...@@ -28,6 +29,7 @@ import org.chromium.ui.test.util.DummyUiActivityTestCase;
*/ */
@RunWith(ChromeJUnit4ClassRunner.class) @RunWith(ChromeJUnit4ClassRunner.class)
@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE}) @CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE})
@Batch(ConfirmSyncDataIntegrationTest.CONFIRM_SYNC_DATA_BATCH_NAME)
public class ConfirmManagedSyncDataDialogIntegrationTest extends DummyUiActivityTestCase { public class ConfirmManagedSyncDataDialogIntegrationTest extends DummyUiActivityTestCase {
private static final String TEST_DOMAIN = "test.domain.example.com"; private static final String TEST_DOMAIN = "test.domain.example.com";
......
...@@ -31,6 +31,7 @@ import org.junit.runner.RunWith; ...@@ -31,6 +31,7 @@ import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.chromium.base.Callback; import org.chromium.base.Callback;
import org.chromium.base.test.util.Batch;
import org.chromium.base.test.util.CommandLineFlags; import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.base.test.util.JniMocker; import org.chromium.base.test.util.JniMocker;
import org.chromium.chrome.R; import org.chromium.chrome.R;
...@@ -52,7 +53,10 @@ import org.chromium.ui.test.util.DummyUiActivityTestCase; ...@@ -52,7 +53,10 @@ import org.chromium.ui.test.util.DummyUiActivityTestCase;
*/ */
@RunWith(ChromeJUnit4ClassRunner.class) @RunWith(ChromeJUnit4ClassRunner.class)
@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE}) @CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE})
@Batch(ConfirmSyncDataIntegrationTest.CONFIRM_SYNC_DATA_BATCH_NAME)
public class ConfirmSyncDataIntegrationTest extends DummyUiActivityTestCase { public class ConfirmSyncDataIntegrationTest extends DummyUiActivityTestCase {
public static final String CONFIRM_SYNC_DATA_BATCH_NAME = "confirm_sync_data";
private static final String OLD_ACCOUNT_NAME = "test.account.old@gmail.com"; private static final String OLD_ACCOUNT_NAME = "test.account.old@gmail.com";
private static final String NEW_ACCOUNT_NAME = "test.account.new@gmail.com"; private static final String NEW_ACCOUNT_NAME = "test.account.new@gmail.com";
private static final String MANAGED_DOMAIN = "managed-domain.com"; private static final String MANAGED_DOMAIN = "managed-domain.com";
......
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