| Index: chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadTest.java
|
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadTest.java
|
| index 0654af65b9b64106045d380f6ccc52427143e090..15496a076e6554f04497629239f384002d70b207 100644
|
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadTest.java
|
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadTest.java
|
| @@ -5,7 +5,6 @@
|
| package org.chromium.chrome.browser.download;
|
|
|
| import android.os.Environment;
|
| -import android.test.FlakyTest;
|
| import android.test.suitebuilder.annotation.MediumTest;
|
| import android.view.View;
|
|
|
| @@ -13,6 +12,7 @@ import org.chromium.base.Log;
|
| import org.chromium.base.test.util.CommandLineFlags;
|
| import org.chromium.base.test.util.DisabledTest;
|
| import org.chromium.base.test.util.Feature;
|
| +import org.chromium.base.test.util.FlakyTest;
|
| import org.chromium.chrome.R;
|
| import org.chromium.chrome.browser.ChromeSwitches;
|
| import org.chromium.chrome.browser.compositor.CompositorViewHolder;
|
| @@ -104,12 +104,9 @@ public class DownloadTest extends DownloadTestBase {
|
| assertTrue(hasDownload("superbo.txt", SUPERBO_CONTENTS));
|
| }
|
|
|
| - /**
|
| - * Bug http://crbug/286315
|
| - * @MediumTest
|
| - * @Feature({"Downloads"})
|
| - */
|
| - @DisabledTest
|
| + @MediumTest
|
| + @Feature({"Downloads"})
|
| + @DisabledTest(message = "crbug.com/286315")
|
| public void testCloseEmptyDownloadTab() throws Exception {
|
| loadUrl(mTestServer.getURL("/chrome/test/data/android/download/get.html"));
|
| waitForFocus();
|
| @@ -165,12 +162,9 @@ public class DownloadTest extends DownloadTestBase {
|
| hasDownload("superbo (1).txt", SUPERBO_CONTENTS));
|
| }
|
|
|
| - /**
|
| - * Bug http://crbug/597230
|
| - * @MediumTest
|
| - * @Feature({"Downloads"})
|
| - */
|
| - @DisabledTest
|
| + @MediumTest
|
| + @Feature({"Downloads"})
|
| + @DisabledTest(message = "crbug.com/597230")
|
| public void testDuplicateHttpPostDownload_CreateNew() throws Exception {
|
| // Download a file.
|
| loadUrl(mTestServer.getURL("/chrome/test/data/android/download/post.html"));
|
| @@ -198,12 +192,9 @@ public class DownloadTest extends DownloadTestBase {
|
| hasDownload("superbo (1).txt", SUPERBO_CONTENTS));
|
| }
|
|
|
| - /*
|
| - Bug http://crbug/415711
|
| - */
|
| @MediumTest
|
| @Feature({"Downloads"})
|
| - @FlakyTest
|
| + @FlakyTest(message = "crbug.com/415711")
|
| public void testDuplicateHttpPostDownload_Dismiss() throws Exception {
|
| // Download a file.
|
| loadUrl(mTestServer.getURL("/chrome/test/data/android/download/post.html"));
|
| @@ -231,12 +222,9 @@ public class DownloadTest extends DownloadTestBase {
|
| hasDownload("superbo (1).txt", SUPERBO_CONTENTS));
|
| }
|
|
|
| - /**
|
| - * Bug http://crbug/597230
|
| - * @MediumTest
|
| - * @Feature({"Downloads"})
|
| - */
|
| - @DisabledTest
|
| + @MediumTest
|
| + @Feature({"Downloads"})
|
| + @DisabledTest(message = "crbug.com/597230")
|
| public void testDuplicateHttpPostDownload_AllowMultipleInfoBars() throws Exception {
|
| assertFalse(hasDownload("superbo.txt", SUPERBO_CONTENTS));
|
| // Download a file.
|
| @@ -330,6 +318,7 @@ public class DownloadTest extends DownloadTestBase {
|
| }
|
|
|
| @CommandLineFlags.Add(ChromeSwitches.DISABLE_DOCUMENT_MODE)
|
| + @DisabledTest(message = "crbug.com/606798")
|
| @MediumTest
|
| @Feature({"Downloads"})
|
| public void testDuplicateHttpPostDownload_OpenNewTabAndReplace() throws Exception {
|
|
|