offline_items_collection : Added helper class to determine progress

chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadManagerServiceTest.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.download;
 
 import android.app.DownloadManager;
 import android.content.Context;
 import android.os.Handler;
 import android.os.HandlerThread;
@@ skipping 14 matching lines @@
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.test.BaseJUnit4ClassRunner;
 import org.chromium.base.test.util.AdvancedMockContext;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.chrome.browser.download.DownloadInfo.Builder;
 import org.chromium.chrome.browser.download.DownloadManagerServiceTest.MockDownloadNotifier.MethodID;
 import org.chromium.components.offline_items_collection.ContentId;
+import org.chromium.components.offline_items_collection.OfflineItem.Progress;
+import org.chromium.components.offline_items_collection.OfflineItemProgressUnit;
 import org.chromium.content.browser.test.NativeLibraryTestRule;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.net.ConnectionType;
 import org.chromium.net.test.EmbeddedTestServer;
 
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Queue;
 import java.util.Random;
@@ skipping 323 matching lines @@
         MockDownloadNotifier notifier = new MockDownloadNotifier(getTestContext());
         DownloadManagerServiceForTest dService = new DownloadManagerServiceForTest(
                 getTestContext(), notifier, UPDATE_DELAY_FOR_TEST);
         DownloadInfo downloadInfo = getDownloadInfo();
 
         notifier.expect(MethodID.DOWNLOAD_PROGRESS, downloadInfo);
         dService.onDownloadUpdated(downloadInfo);
         notifier.waitTillExpectedCallsComplete();
 
         // Now post multiple download updated calls and make sure all are received.
-        DownloadInfo update1 = Builder.fromDownloadInfo(downloadInfo)
-                .setPercentCompleted(10).build();
-        DownloadInfo update2 = Builder.fromDownloadInfo(downloadInfo)
-                .setPercentCompleted(30).build();
-        DownloadInfo update3 = Builder.fromDownloadInfo(downloadInfo)
-                .setPercentCompleted(30).build();
+        DownloadInfo update1 =
+                Builder.fromDownloadInfo(downloadInfo)
+                        .setProgress(new Progress(10, 100L, OfflineItemProgressUnit.PERCENTAGE))
+                        .build();
+        DownloadInfo update2 =
+                Builder.fromDownloadInfo(downloadInfo)
+                        .setProgress(new Progress(30, 100L, OfflineItemProgressUnit.PERCENTAGE))
+                        .build();
+        DownloadInfo update3 =
+                Builder.fromDownloadInfo(downloadInfo)
+                        .setProgress(new Progress(30, 100L, OfflineItemProgressUnit.PERCENTAGE))
+                        .build();
         notifier.expect(MethodID.DOWNLOAD_PROGRESS, update1)
                 .andThen(MethodID.DOWNLOAD_PROGRESS, update2)
                 .andThen(MethodID.DOWNLOAD_PROGRESS, update3);
 
         dService.onDownloadUpdated(update1);
         Thread.sleep(DELAY_BETWEEN_CALLS);
         dService.onDownloadUpdated(update2);
         Thread.sleep(DELAY_BETWEEN_CALLS);
         dService.onDownloadUpdated(update3);
         notifier.waitTillExpectedCallsComplete();
     }
 
     @Test
     @MediumTest
     @Feature({"Download"})
     public void testOnlyTwoProgressForFastUpdates() throws InterruptedException {
         MockDownloadNotifier notifier = new MockDownloadNotifier(getTestContext());
         DownloadManagerServiceForTest dService = new DownloadManagerServiceForTest(
                 getTestContext(), notifier, LONG_UPDATE_DELAY_FOR_TEST);
         DownloadInfo downloadInfo = getDownloadInfo();
-        DownloadInfo update1 = Builder.fromDownloadInfo(downloadInfo)
-                .setPercentCompleted(10).build();
-        DownloadInfo update2 = Builder.fromDownloadInfo(downloadInfo)
-                .setPercentCompleted(20).build();
-        DownloadInfo update3 = Builder.fromDownloadInfo(downloadInfo)
-                .setPercentCompleted(30).build();
+        DownloadInfo update1 =
+                Builder.fromDownloadInfo(downloadInfo)
+                        .setProgress(new Progress(10, 100L, OfflineItemProgressUnit.PERCENTAGE))
+                        .build();
+        DownloadInfo update2 =
+                Builder.fromDownloadInfo(downloadInfo)
+                        .setProgress(new Progress(10, 100L, OfflineItemProgressUnit.PERCENTAGE))
+                        .build();
+        DownloadInfo update3 =
+                Builder.fromDownloadInfo(downloadInfo)
+                        .setProgress(new Progress(10, 100L, OfflineItemProgressUnit.PERCENTAGE))
+                        .build();
 
         // Should get 2 update calls, the first and the last. The 2nd update will be merged into
         // the last one.
         notifier.expect(MethodID.DOWNLOAD_PROGRESS, update1)
                 .andThen(MethodID.DOWNLOAD_PROGRESS, update3);
         dService.onDownloadUpdated(update1);
         Thread.sleep(DELAY_BETWEEN_CALLS);
         dService.onDownloadUpdated(update2);
         Thread.sleep(DELAY_BETWEEN_CALLS);
         dService.onDownloadUpdated(update3);
@@ skipping 268 matching lines @@
                         .setHasUserGesture(false)
                         .build()));
         Assert.assertFalse(DownloadManagerService.shouldOpenAfterDownload(
                 new DownloadInfo.Builder()
                         .setContentDisposition("filename=test.pdf")
                         .setMimeType("application/pdf")
                         .setHasUserGesture(false)
                         .build()));
     }
 }