chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadTest.java - Issue 2772853002: Fix an issue that OMA download is not intercepted on Android

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadTest.java

Issue 2772853002: Fix an issue that OMA download is not intercepted on Android (Closed)

Patch Set: Created 3 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/download/DownloadManagerService.java ('k') | chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 3a368bfd8cc927a21a733f12c203988a572b1e75..78830002dbb160bd03a04f90a01e68b10c48e1f5 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

@@ -6,13 +6,16 @@ package org.chromium.chrome.browser.download;

import android.os.Environment;

import android.support.test.filters.MediumTest;

+import android.util.Pair;

import android.view.View;

import org.chromium.base.Log;

+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.chrome.R;

import org.chromium.chrome.browser.compositor.CompositorViewHolder;

import org.chromium.chrome.browser.compositor.layouts.LayoutManager;

@@ -23,10 +26,14 @@ import org.chromium.chrome.browser.tabmodel.TabModelUtils;

import org.chromium.chrome.test.util.InfoBarUtil;

import org.chromium.content.browser.test.util.Criteria;

import org.chromium.content.browser.test.util.CriteriaHelper;

+import org.chromium.content.browser.test.util.DOMUtils;

import org.chromium.content.browser.test.util.TouchCommon;

import org.chromium.net.test.EmbeddedTestServer;

+import org.chromium.net.test.util.TestWebServer;

import java.io.File;

+import java.util.ArrayList;

+import java.util.List;

import java.util.concurrent.Callable;

/**

@@ -53,6 +60,17 @@ public class DownloadTest extends DownloadTestBase {

FILENAME_GZIP

};

+ static class DownloadManagerRequestInterceptorForTest

+ implements DownloadManagerService.DownloadManagerRequestInterceptor {

+ public DownloadItem mDownloadItem;

+ @Override

+ public void interceptDownloadRequest(DownloadItem item, boolean notifyComplete) {

+ mDownloadItem = item;

+ assertTrue(notifyComplete);

+ }

@Override

protected void setUp() throws Exception {

super.setUp();

@@ -374,6 +392,43 @@ public class DownloadTest extends DownloadTestBase {

assertTrue(hasDownload(FILENAME_WALLPAPER, null));

}

+ @MediumTest

+ @Feature({"Navigation"})

+ public void testOMADownloadInterception() throws Exception {

+ TestWebServer webServer = TestWebServer.start();

+ try {

+ final DownloadManagerRequestInterceptorForTest interceptor =

+ new DownloadManagerRequestInterceptorForTest();

+ ThreadUtils.runOnUiThreadBlocking(new Runnable() {

+ @Override

+ public void run() {

+ DownloadManagerService

+ .getDownloadManagerService(getInstrumentation().getContext())

+ .setDownloadManagerRequestInterceptor(interceptor);

+ }

+ });

+ List<Pair<String, String>> headers = new ArrayList<Pair<String, String>>();

+ headers.add(Pair.create("Content-Type", "application/vnd.oma.drm.message"));

+ final String url = webServer.setResponse("/test.dm", "testdata", headers);

+ loadUrl(UrlUtils.encodeHtmlDataUri("<script>"

+ + " function download() {"

+ + " window.open( '" + url + "')"

+ + " }"

+ + "</script>"

+ + "<body id='body' onclick='download()'></body>"));

+ DOMUtils.clickNode(getActivity().getCurrentContentViewCore(), "body");

+ CriteriaHelper.pollUiThread(new Criteria() {

+ @Override

+ public boolean isSatisfied() {

+ return interceptor.mDownloadItem != null

+ && url.equals(interceptor.mDownloadItem.getDownloadInfo().getUrl());

+ }

+ });

+ } finally {

+ webServer.shutdown();

+ }

private void waitForFocus() {

View currentView = getActivity().getActivityTab().getView();

if (!currentView.hasFocus()) {