| Index: trunk/src/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuTest.java
|
| ===================================================================
|
| --- trunk/src/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuTest.java (revision 243146)
|
| +++ trunk/src/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuTest.java (working copy)
|
| @@ -8,6 +8,7 @@
|
| import android.content.ClipboardManager;
|
| import android.content.Context;
|
| import android.os.Build;
|
| +import android.test.FlakyTest;
|
| import android.test.suitebuilder.annotation.LargeTest;
|
| import android.view.ContextMenu;
|
|
|
| @@ -40,7 +41,9 @@
|
| assertWaitForPageScaleFactorMatch(0.5f);
|
| }
|
|
|
| - @LargeTest
|
| + // http://crbug.com/326769
|
| + @FlakyTest
|
| + // @LargeTest
|
| @Feature({"Browser", "Main"})
|
| public void testCopyLinkURL() throws InterruptedException, TimeoutException {
|
| TabBase tab = getActivity().getActiveTab();
|
| @@ -51,7 +54,9 @@
|
| assertStringContains("test_link.html", getClipboardText());
|
| }
|
|
|
| - @LargeTest
|
| + // http://crbug.com/326769
|
| + @FlakyTest
|
| + // @LargeTest
|
| @Feature({"Browser"})
|
| public void testCopyImageLinkCopiesLinkURL() throws InterruptedException, TimeoutException {
|
| TabBase tab = getActivity().getActiveTab();
|
| @@ -62,7 +67,9 @@
|
| assertStringContains("test_link.html", getClipboardText());
|
| }
|
|
|
| - @LargeTest
|
| + // http://crbug.com/326769
|
| + @FlakyTest
|
| + // @LargeTest
|
| @Feature({"Browser"})
|
| public void testCopyLinkTextSimple() throws InterruptedException, TimeoutException {
|
| TabBase tab = getActivity().getActiveTab();
|
| @@ -74,7 +81,9 @@
|
| getClipboardText());
|
| }
|
|
|
| - @LargeTest
|
| + // http://crbug.com/326769
|
| + @FlakyTest
|
| + // @LargeTest
|
| @Feature({"Browser"})
|
| public void testCopyLinkTextComplex() throws InterruptedException, TimeoutException {
|
| TabBase tab = getActivity().getActiveTab();
|
| @@ -86,7 +95,9 @@
|
| "This is pretty extreme \n(newline). ", getClipboardText());
|
| }
|
|
|
| - @LargeTest
|
| + // http://crbug.com/326769
|
| + @FlakyTest
|
| + // @LargeTest
|
| @Feature({"Browser"})
|
| public void testCopyImageToClipboard() throws InterruptedException, TimeoutException {
|
| if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) return;
|
| @@ -102,7 +113,9 @@
|
| assertEquals("Clipboard text is not correct", expectedUrl, getClipboardText());
|
| }
|
|
|
| - @LargeTest
|
| + // http://crbug.com/326769
|
| + @FlakyTest
|
| + // @LargeTest
|
| @Feature({"Browser"})
|
| public void testLongPressOnImage() throws InterruptedException, TimeoutException {
|
| final TabBase tab = getActivity().getActiveTab();
|
| @@ -132,7 +145,9 @@
|
| assertEquals("Failed to navigate to the image", expectedUrl, actualUrl.get());
|
| }
|
|
|
| - @LargeTest
|
| + // http://crbug.com/326769
|
| + @FlakyTest
|
| + // @LargeTest
|
| @Feature({"Browser"})
|
| public void testLongPressOnImageLink() throws InterruptedException, TimeoutException {
|
| final TabBase tab = getActivity().getActiveTab();
|
| @@ -159,7 +174,9 @@
|
| assertTrue("Navigated to the wrong page.", actualTitle.get().startsWith("test_image.png"));
|
| }
|
|
|
| - @LargeTest
|
| + // http://crbug.com/326769
|
| + @FlakyTest
|
| + // @LargeTest
|
| @Feature({"Browser"})
|
| public void testDismissContextMenuOnBack() throws InterruptedException, TimeoutException {
|
| TabBase tab = getActivity().getActiveTab();
|
| @@ -179,7 +196,9 @@
|
| }));
|
| }
|
|
|
| - @LargeTest
|
| + // http://crbug.com/326769
|
| + @FlakyTest
|
| + // @LargeTest
|
| @Feature({"Browser"})
|
| public void testDismissContextMenuOnClick() throws InterruptedException, TimeoutException {
|
| TabBase tab = getActivity().getActiveTab();
|
|
|