Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1990)

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java

Issue 2256373002: Adds request queue removal capability to OfflinePageBridge. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@query-queue
Patch Set: Add a comment. Created 4 years, 4 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
Download patch
Index: chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java
index c0a6eba8b111c23f3d54eab1f2a0c2229da96917..bfab87aeccba48c3f245431967546fa23c44eb19 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java
@@ -253,6 +253,32 @@ public class OfflinePageBridgeTest extends ChromeActivityTestCaseBase<ChromeActi
assertEquals(null, mOfflinePageBridge);
}
+ @SmallTest
+ public void testRemoveRequestsFromQueue() throws Exception {
+ String url = "https://www.google.com/";
+ String namespace = "custom_tabs";
+ savePageLater(url, namespace);
+
+ String url2 = "https://mail.google.com/";
+ String namespace2 = "last_n";
+ savePageLater(url2, namespace2);
+
+ SavePageRequest[] requests = getRequestsInQueue();
+ assertEquals(2, requests.length);
+
+ List<SavePageRequest> requestsToRemove = new ArrayList<>();
+ requestsToRemove.add(requests[1]);
+
+ SavePageRequest[] removed = clearRequestsFromQueue(requestsToRemove);
+ assertEquals(requests[1].getRequestId(), removed[0].getRequestId());
+
+ SavePageRequest[] remaining = getRequestsInQueue();
+ assertEquals(1, remaining.length);
+
+ assertEquals(requests[0].getRequestId(), remaining[0].getRequestId());
+ assertEquals(requests[0].getUrl(), remaining[0].getUrl());
+ }
+
private void savePage(final int expectedResult, final String expectedUrl)
throws InterruptedException {
final Semaphore semaphore = new Semaphore(0);
@@ -403,4 +429,25 @@ public class OfflinePageBridgeTest extends ChromeActivityTestCaseBase<ChromeActi
assertTrue(semaphore.tryAcquire(TIMEOUT_MS, TimeUnit.MILLISECONDS));
return ref.get();
}
+
+ private SavePageRequest[] clearRequestsFromQueue(final List<SavePageRequest> requestsToRemove)
+ throws InterruptedException {
+ final AtomicReference<SavePageRequest[]> ref = new AtomicReference<>();
+ final Semaphore semaphore = new Semaphore(0);
+ ThreadUtils.runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mOfflinePageBridge.clearRequestsFromQueue(
+ requestsToRemove, new Callback<SavePageRequest[]>() {
+ @Override
+ public void onResult(SavePageRequest[] removedRequests) {
+ ref.set(removedRequests);
+ semaphore.release();
+ }
+ });
+ }
+ });
+ assertTrue(semaphore.tryAcquire(TIMEOUT_MS, TimeUnit.MILLISECONDS));
+ return ref.get();
+ }
}

Powered by Google App Engine
This is Rietveld 408576698