Chromium Code Reviews| Index: content/public/android/javatests/src/org/chromium/content/browser/ContentViewCoreSelectionTest.java |
| diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewCoreSelectionTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewCoreSelectionTest.java |
| index 863805586e4e4ebf9c8ba99df0771d54cd9b0cc7..9bf9cbbadfeed05291af6fb62d14d70f9eed29b8 100644 |
| --- a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewCoreSelectionTest.java |
| +++ b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewCoreSelectionTest.java |
| @@ -12,9 +12,8 @@ import android.test.suitebuilder.annotation.SmallTest; |
| import android.text.TextUtils; |
| import org.chromium.base.ThreadUtils; |
| +import org.chromium.base.test.util.DisabledTest; |
| import org.chromium.base.test.util.Feature; |
| -import org.chromium.base.test.util.FlakyTest; |
| -import org.chromium.base.test.util.RetryOnFailure; |
| import org.chromium.base.test.util.UrlUtils; |
| import org.chromium.content.browser.input.ChromiumBaseInputConnection; |
| import org.chromium.content.browser.input.ImeTestUtils; |
| @@ -57,7 +56,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase { |
| @SmallTest |
| @Feature({"TextSelection"}) |
| - @RetryOnFailure |
| + @DisabledTest(message = "crbug.com/592428") |
| public void testSelectionClearedAfterLossOfFocus() throws Throwable { |
| requestFocusOnUiThread(true); |
| @@ -75,7 +74,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase { |
| @SmallTest |
| @Feature({"TextSelection"}) |
| - @RetryOnFailure |
| + @DisabledTest(message = "crbug.com/592428") |
| public void testSelectionPreservedAfterLossOfFocusIfRequested() throws Throwable { |
| requestFocusOnUiThread(true); |
| @@ -100,7 +99,6 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase { |
| @SmallTest |
| @Feature({"TextSelection"}) |
| - @RetryOnFailure |
|
mfomitchev
2016/09/23 16:25:48
Alex, did you mean to disable this one as well?
|
| public void testSelectionPreservedAfterReshown() throws Throwable { |
| DOMUtils.longPressNode(this, mContentViewCore, "textarea"); |
| waitForSelectActionBarVisible(true); |
| @@ -117,7 +115,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase { |
| @SmallTest |
| @Feature({"TextSelection"}) |
| - @RetryOnFailure |
| + @DisabledTest(message = "crbug.com/592428") |
| public void testSelectionPreservedAfterReattached() throws Throwable { |
| DOMUtils.longPressNode(this, mContentViewCore, "textarea"); |
| waitForSelectActionBarVisible(true); |
| @@ -136,7 +134,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase { |
| @SmallTest |
| @Feature({"TextInput"}) |
| */ |
| - @FlakyTest(message = "https://crbug.com/592428") |
| + @DisabledTest(message = "https://crbug.com/592428") |
| public void testPastePopupNotShownOnLongPressingNonEmptyInput() throws Throwable { |
| copyStringToClipboard("SampleTextToCopy"); |
| DOMUtils.longPressNode(this, mContentViewCore, "empty_input_text"); |
| @@ -150,7 +148,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase { |
| @SmallTest |
| @Feature({"TextInput"}) |
| */ |
| - @FlakyTest(message = "https://crbug.com/592428") |
| + @DisabledTest(message = "https://crbug.com/592428") |
| public void testPastePopupClearedOnTappingEmptyInput() throws Throwable { |
| copyStringToClipboard("SampleTextToCopy"); |
| DOMUtils.longPressNode(this, mContentViewCore, "empty_input_text"); |
| @@ -163,7 +161,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase { |
| @SmallTest |
| @Feature({"TextInput"}) |
| */ |
| - @FlakyTest(message = "https://crbug.com/592428") |
| + @DisabledTest(message = "https://crbug.com/592428") |
| public void testPastePopupClearedOnTappingNonEmptyInput() throws Throwable { |
| copyStringToClipboard("SampleTextToCopy"); |
| DOMUtils.longPressNode(this, mContentViewCore, "empty_input_text"); |
| @@ -176,7 +174,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase { |
| @SmallTest |
| @Feature({"TextInput"}) |
| */ |
| - @FlakyTest(message = "https://crbug.com/592428") |
| + @DisabledTest(message = "https://crbug.com/592428") |
| public void testPastePopupClearedOnTappingOutsideInput() throws Throwable { |
| copyStringToClipboard("SampleTextToCopy"); |
| DOMUtils.longPressNode(this, mContentViewCore, "empty_input_text"); |
| @@ -189,7 +187,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase { |
| @SmallTest |
| @Feature({"TextInput"}) |
| */ |
| - @FlakyTest(message = "https://crbug.com/592428") |
| + @DisabledTest(message = "https://crbug.com/592428") |
| public void testPastePopupClearedOnLongPressingOutsideInput() throws Throwable { |
| copyStringToClipboard("SampleTextToCopy"); |
| DOMUtils.longPressNode(this, mContentViewCore, "empty_input_text"); |
| @@ -202,7 +200,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase { |
| @SmallTest |
| @Feature({"TextInput"}) |
| */ |
| - @FlakyTest(message = "https://crbug.com/592428") |
| + @DisabledTest(message = "https://crbug.com/592428") |
| public void testPastePopupNotShownOnLongPressingDisabledInput() throws Throwable { |
| copyStringToClipboard("SampleTextToCopy"); |
| DOMUtils.longPressNode(this, mContentViewCore, "empty_input_text"); |
| @@ -217,7 +215,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase { |
| @SmallTest |
| @Feature({"TextInput"}) |
| */ |
| - @FlakyTest(message = "https://crbug.com/592428") |
| + @DisabledTest(message = "https://crbug.com/592428") |
| public void testPastePopupDismissedOnDestroy() throws Throwable { |
| copyStringToClipboard("SampleTextToCopy"); |
| DOMUtils.longPressNode(this, mContentViewCore, "empty_input_text"); |
| @@ -233,7 +231,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase { |
| @SmallTest |
| @Feature({"TextInput"}) |
| - @RetryOnFailure |
| + @DisabledTest(message = "crbug.com/592428") |
| public void testActionBarConfiguredCorrectlyForInput() throws Throwable { |
| DOMUtils.longPressNode(this, mContentViewCore, "input_text"); |
| waitForSelectActionBarVisible(true); |
| @@ -245,7 +243,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase { |
| @SmallTest |
| @Feature({"TextInput"}) |
| - @RetryOnFailure |
| + @DisabledTest(message = "crbug.com/592428") |
| public void testActionBarConfiguredCorrectlyForPassword() throws Throwable { |
| DOMUtils.longPressNode(this, mContentViewCore, "password"); |
| waitForSelectActionBarVisible(true); |
| @@ -257,7 +255,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase { |
| @SmallTest |
| @Feature({"TextInput"}) |
| - @RetryOnFailure |
| + @DisabledTest(message = "crbug.com/592428") |
| public void testActionBarConfiguredCorrectlyForPlainText() throws Throwable { |
| DOMUtils.longPressNode(this, mContentViewCore, "plain_text_1"); |
| waitForSelectActionBarVisible(true); |
| @@ -269,7 +267,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase { |
| @SmallTest |
| @Feature({"TextInput"}) |
| - @RetryOnFailure |
| + @DisabledTest(message = "crbug.com/592428") |
| public void testActionBarConfiguredCorrectlyForTextArea() throws Throwable { |
| DOMUtils.longPressNode(this, mContentViewCore, "textarea"); |
| waitForSelectActionBarVisible(true); |
| @@ -281,7 +279,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase { |
| @SmallTest |
| @Feature({"TextInput"}) |
| - @RetryOnFailure |
| + @DisabledTest(message = "crbug.com/592428") |
| public void testSelectActionBarPlainTextCopy() throws Exception { |
| DOMUtils.longPressNode(this, mContentViewCore, "plain_text_1"); |
| waitForSelectActionBarVisible(true); |
| @@ -293,7 +291,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase { |
| @SmallTest |
| @Feature({"TextInput"}) |
| - @RetryOnFailure |
| + @DisabledTest(message = "crbug.com/592428") |
| public void testSelectActionBarInputCopy() throws Exception { |
| DOMUtils.longPressNode(this, mContentViewCore, "input_text"); |
| waitForSelectActionBarVisible(true); |
| @@ -305,7 +303,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase { |
| @SmallTest |
| @Feature({"TextInput"}) |
| - @RetryOnFailure |
| + @DisabledTest(message = "crbug.com/592428") |
| public void testSelectActionBarPasswordCopy() throws Exception { |
| DOMUtils.longPressNode(this, mContentViewCore, "plain_text_1"); |
| waitForSelectActionBarVisible(true); |
| @@ -325,7 +323,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase { |
| @SmallTest |
| @Feature({"TextInput"}) |
| - @RetryOnFailure |
| + @DisabledTest(message = "crbug.com/592428") |
| public void testSelectActionBarTextAreaCopy() throws Exception { |
| DOMUtils.longPressNode(this, mContentViewCore, "textarea"); |
| waitForSelectActionBarVisible(true); |
| @@ -337,7 +335,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase { |
| @SmallTest |
| @Feature({"TextSelection"}) |
| - @RetryOnFailure |
| + @DisabledTest(message = "crbug.com/592428") |
| public void testSelectActionBarPlainTextCut() throws Exception { |
| copyStringToClipboard("SampleTextToCopy"); |
| DOMUtils.longPressNode(this, mContentViewCore, "plain_text_1"); |
| @@ -355,7 +353,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase { |
| @SmallTest |
| @Feature({"TextInput"}) |
| - @RetryOnFailure |
| + @DisabledTest(message = "crbug.com/592428") |
| public void testSelectActionBarInputCut() throws Exception { |
| DOMUtils.longPressNode(this, mContentViewCore, "input_text"); |
| waitForSelectActionBarVisible(true); |
| @@ -371,7 +369,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase { |
| @SmallTest |
| @Feature({"TextInput"}) |
| - @RetryOnFailure |
| + @DisabledTest(message = "crbug.com/592428") |
| public void testSelectActionBarPasswordCut() throws Exception { |
| copyStringToClipboard("SampleTextToCopy"); |
| DOMUtils.longPressNode(this, mContentViewCore, "password"); |
| @@ -388,7 +386,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase { |
| @SmallTest |
| @Feature({"TextInput"}) |
| - @RetryOnFailure |
| + @DisabledTest(message = "crbug.com/592428") |
| public void testSelectActionBarTextAreaCut() throws Exception { |
| DOMUtils.longPressNode(this, mContentViewCore, "textarea"); |
| waitForSelectActionBarVisible(true); |
| @@ -404,7 +402,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase { |
| @SmallTest |
| @Feature({"TextSelection"}) |
| - @RetryOnFailure |
| + @DisabledTest(message = "crbug.com/592428") |
| public void testSelectActionBarPlainTextSelectAll() throws Exception { |
| DOMUtils.longPressNode(this, mContentViewCore, "plain_text_1"); |
| waitForSelectActionBarVisible(true); |
| @@ -417,7 +415,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase { |
| @SmallTest |
| @Feature({"TextInput"}) |
| - @RetryOnFailure |
| + @DisabledTest(message = "crbug.com/592428") |
| public void testSelectActionBarInputSelectAll() throws Exception { |
| DOMUtils.longPressNode(this, mContentViewCore, "input_text"); |
| waitForSelectActionBarVisible(true); |
| @@ -431,7 +429,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase { |
| @SmallTest |
| @Feature({"TextInput"}) |
| - @RetryOnFailure |
| + @DisabledTest(message = "crbug.com/592428") |
| public void testSelectActionBarPasswordSelectAll() throws Exception { |
| DOMUtils.longPressNode(this, mContentViewCore, "password"); |
| waitForSelectActionBarVisible(true); |
| @@ -444,7 +442,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase { |
| @SmallTest |
| @Feature({"TextInput"}) |
| - @RetryOnFailure |
| + @DisabledTest(message = "crbug.com/592428") |
| public void testSelectActionBarTextAreaSelectAll() throws Exception { |
| DOMUtils.longPressNode(this, mContentViewCore, "textarea"); |
| waitForSelectActionBarVisible(true); |
| @@ -472,7 +470,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase { |
| * @SmallTest |
| * @Feature({"TextSelection", "TextInput"}) |
| */ |
| - @FlakyTest(message = "http://crbug.com/606942") |
| + @DisabledTest(message = "http://crbug.com/606942") |
| public void testCursorPositionAfterHidingActionMode() throws Exception { |
| DOMUtils.longPressNode(this, mContentViewCore, "textarea"); |
| waitForSelectActionBarVisible(true); |
| @@ -495,7 +493,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase { |
| @SmallTest |
| @Feature({"TextSelection"}) |
| - @RetryOnFailure |
| + @DisabledTest(message = "crbug.com/592428") |
| public void testSelectActionBarPlainTextPaste() throws Exception { |
| copyStringToClipboard("SampleTextToCopy"); |
| DOMUtils.longPressNode(this, mContentViewCore, "plain_text_1"); |
| @@ -513,7 +511,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase { |
| @SmallTest |
| @Feature({"TextInput"}) |
| - @RetryOnFailure |
| + @DisabledTest(message = "crbug.com/592428") |
| public void testSelectActionBarInputPaste() throws Exception { |
| copyStringToClipboard("SampleTextToCopy"); |
| @@ -539,7 +537,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase { |
| @SmallTest |
| @Feature({"TextInput"}) |
| */ |
| - @FlakyTest(message = "https://crbug.com/592428") |
| + @DisabledTest(message = "https://crbug.com/592428") |
| public void testSelectActionBarPasswordPaste() throws Exception { |
| copyStringToClipboard("SamplePassword2"); |
| @@ -567,7 +565,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase { |
| @SmallTest |
| @Feature({"TextInput"}) |
| - @RetryOnFailure |
| + @DisabledTest(message = "crbug.com/592428") |
| public void testSelectActionBarTextAreaPaste() throws Exception { |
| copyStringToClipboard("SampleTextToCopy"); |
| DOMUtils.longPressNode(this, mContentViewCore, "textarea"); |
| @@ -584,7 +582,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase { |
| @SmallTest |
| @Feature({"TextInput"}) |
| - @RetryOnFailure |
| + @DisabledTest(message = "crbug.com/592428") |
| public void testSelectActionBarSearchAndShareLaunchesNewTask() throws Exception { |
| DOMUtils.longPressNode(this, mContentViewCore, "textarea"); |
| waitForSelectActionBarVisible(true); |