Chromium Code Reviews| Index: chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillKeyboardAccessoryTest.java |
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillKeyboardAccessoryTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillKeyboardAccessoryTest.java |
| index b8313e57918732ca8ea8682faf0e283b6f9c5298..817163dd896db1dba5f58b157aac0ac8eb93a665 100644 |
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillKeyboardAccessoryTest.java |
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillKeyboardAccessoryTest.java |
| @@ -18,7 +18,6 @@ import org.junit.runner.RunWith; |
| import org.chromium.base.ThreadUtils; |
| import org.chromium.base.test.util.CommandLineFlags; |
| import org.chromium.base.test.util.Feature; |
| -import org.chromium.base.test.util.FlakyTest; |
| import org.chromium.base.test.util.MinAndroidSdkLevel; |
| import org.chromium.base.test.util.RetryOnFailure; |
| import org.chromium.base.test.util.UrlUtils; |
| @@ -44,10 +43,13 @@ import java.util.concurrent.atomic.AtomicReference; |
| */ |
| @RunWith(ChromeJUnit4ClassRunner.class) |
| @RetryOnFailure |
| -@CommandLineFlags.Add({ChromeSwitches.ENABLE_AUTOFILL_KEYBOARD_ACCESSORY, |
| +@CommandLineFlags.Add({AutofillKeyboardAccessoryTest.ENABLE_AUTOFILL_KEYBOARD_ACCESSORY, |
|
please use gerrit instead
2017/05/15 14:37:29
This constant is not used anywhere else, so it's O
csashi
2017/05/15 20:07:26
Done.
|
| ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE, |
| ChromeActivityTestRule.DISABLE_NETWORK_PREDICTION_FLAG}) |
| public class AutofillKeyboardAccessoryTest { |
| + public static final String ENABLE_AUTOFILL_KEYBOARD_ACCESSORY = |
| + "enable-features=AutofillKeyboardAccessory"; |
| + |
| @Rule |
| public ChromeActivityTestRule<ChromeActivity> mActivityTestRule = |
| new ChromeActivityTestRule<>(ChromeActivity.class); |
| @@ -112,8 +114,8 @@ public class AutofillKeyboardAccessoryTest { |
| @Test |
| @MediumTest |
| @Feature({"keyboard-accessory"}) |
| - public void testAutofocusedFieldDoesNotShowKeyboardAccessory() |
| - throws InterruptedException, ExecutionException, TimeoutException { |
| + public void testAutofocusedFieldDoesNotShowKeyboardAccessory() throws ExecutionException, |
| + InterruptedException, TimeoutException { |
| loadTestPage(false); |
| Assert.assertTrue("Keyboard accessory should be hidden.", |
| ThreadUtils |
| @@ -132,8 +134,8 @@ public class AutofillKeyboardAccessoryTest { |
| @Test |
| @MediumTest |
| @Feature({"keyboard-accessory"}) |
| - public void testTapInputFieldShowsKeyboardAccessory() |
| - throws ExecutionException, InterruptedException, TimeoutException { |
| + public void testTapInputFieldShowsKeyboardAccessory() throws ExecutionException, |
| + InterruptedException, TimeoutException { |
| loadTestPage(false); |
| DOMUtils.clickNode(mViewCoreRef.get(), "fn"); |
| CriteriaHelper.pollUiThread(new Criteria("Keyboard should be showing.") { |
| @@ -157,14 +159,11 @@ public class AutofillKeyboardAccessoryTest { |
| /** |
| * Switching fields should re-scroll the keyboard accessory to the left. |
| */ |
| - /* |
| + @Test |
| @MediumTest |
| @Feature({"keyboard-accessory"}) |
| - */ |
| - @Test |
| - @FlakyTest(message = "https://crbug.com/563640") |
| - public void testSwitchFieldsRescrollsKeyboardAccessory() |
| - throws ExecutionException, InterruptedException, TimeoutException { |
| + public void testSwitchFieldsRescrollsKeyboardAccessory() throws ExecutionException, |
| + InterruptedException, TimeoutException { |
| loadTestPage(false); |
| DOMUtils.clickNode(mViewCoreRef.get(), "fn"); |
| CriteriaHelper.pollUiThread(new Criteria("Keyboard should be showing.") { |
| @@ -216,8 +215,8 @@ public class AutofillKeyboardAccessoryTest { |
| @MediumTest |
| @Feature({"keyboard-accessory"}) |
| @MinAndroidSdkLevel(Build.VERSION_CODES.JELLY_BEAN_MR1) |
| - public void testSwitchFieldsRescrollsKeyboardAccessoryRtl() |
| - throws ExecutionException, InterruptedException, TimeoutException { |
| + public void testSwitchFieldsRescrollsKeyboardAccessoryRtl() throws ExecutionException, |
| + InterruptedException, TimeoutException { |
| loadTestPage(true); |
| DOMUtils.clickNode(mViewCoreRef.get(), "fn"); |
| CriteriaHelper.pollUiThread(new Criteria("Keyboard should be showing.") { |
| @@ -271,8 +270,8 @@ public class AutofillKeyboardAccessoryTest { |
| @Test |
| @MediumTest |
| @Feature({"keyboard-accessory"}) |
| - public void testSelectSuggestionHidesKeyboardAccessory() |
| - throws ExecutionException, InterruptedException, TimeoutException { |
| + public void testSelectSuggestionHidesKeyboardAccessory() throws ExecutionException, |
| + InterruptedException, TimeoutException { |
| loadTestPage(false); |
| DOMUtils.clickNode(mViewCoreRef.get(), "fn"); |
| CriteriaHelper.pollUiThread(new Criteria("Keyboard should be showing.") { |