offline_items_collection : Added helper class to determine progress

chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadNotificationServiceTest.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.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.IBinder;
 import android.support.test.filters.SmallTest;
 import android.test.ServiceTestCase;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.AdvancedMockContext;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.components.offline_items_collection.ContentId;
 import org.chromium.components.offline_items_collection.LegacyHelpers;
+import org.chromium.components.offline_items_collection.OfflineItem.Progress;
+import org.chromium.components.offline_items_collection.OfflineItemProgressUnit;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 
 /**
  * Tests of {@link DownloadNotificationService}.
  */
@@ skipping 256 matching lines @@
             public void run() {
                 getService().updateNotificationsForShutdown();
             }
         });
         assertEquals(2, getService().getNotificationIds().size());
         assertTrue(getService().getNotificationIds().contains(3));
         assertTrue(getService().getNotificationIds().contains(4));
 
         DownloadNotificationService service = bindNotificationService();
         ContentId id3 = LegacyHelpers.buildLegacyContentId(false, UUID.randomUUID().toString());
-        service.notifyDownloadProgress(id3, "test", 1, 100L, 1L, 1L, true, true, false, null);
+        service.notifyDownloadProgress(id3, "test",
+                new Progress(1, 100L, OfflineItemProgressUnit.PERCENTAGE), 100L, 1L, 1L, true, true,
+                false, null);
         assertEquals(3, getService().getNotificationIds().size());
         int lastNotificationId = getService().getLastAddedNotificationId();
         Set<String> entries = DownloadManagerService.getStoredDownloadInfo(
                 sharedPrefs, DownloadSharedPreferenceHelper.KEY_PENDING_DOWNLOAD_NOTIFICATIONS);
         assertEquals(3, entries.size());
 
         ContentId id1 = LegacyHelpers.buildLegacyContentId(false, guid1);
         service.notifyDownloadSuccessful(
                 id1, "/path/to/success", "success", 100L, false, false, true, null);
         entries = DownloadManagerService.getStoredDownloadInfo(
@@ skipping 111 matching lines @@
             }
         });
 
         assertTrue(getService().isPaused());
         assertFalse(sharedPrefs.contains(
                 DownloadSharedPreferenceHelper.KEY_PENDING_DOWNLOAD_NOTIFICATIONS));
     }
 
     @SmallTest
     @Feature({"Download"})
     public void testFormatRemainingTime() {

[David Trainor- moved to gerrit, 2017/05/09 05:36:01]

Should we add a test validating the new DownloadUtils method too?  If you added
one later ignore this :).

[shaktisahu, 2017/05/09 19:04:32]

Done.

         Context context = getSystemContext().getApplicationContext();
-        assertEquals("0 secs left", DownloadNotificationService.formatRemainingTime(context, 0));
-        assertEquals("1 sec left", DownloadNotificationService.formatRemainingTime(
-                context, MILLIS_PER_SECOND));
-        assertEquals("1 min left", DownloadNotificationService.formatRemainingTime(context,
-                DownloadNotificationService.SECONDS_PER_MINUTE * MILLIS_PER_SECOND));
-        assertEquals("2 mins left", DownloadNotificationService.formatRemainingTime(context,
-                149 * MILLIS_PER_SECOND));
-        assertEquals("3 mins left", DownloadNotificationService.formatRemainingTime(context,
-                150 * MILLIS_PER_SECOND));
-        assertEquals("1 hour left", DownloadNotificationService.formatRemainingTime(context,
-                DownloadNotificationService.SECONDS_PER_HOUR * MILLIS_PER_SECOND));
-        assertEquals("2 hours left", DownloadNotificationService.formatRemainingTime(context,
-                149 * DownloadNotificationService.SECONDS_PER_MINUTE * MILLIS_PER_SECOND));
-        assertEquals("3 hours left", DownloadNotificationService.formatRemainingTime(context,
-                150 * DownloadNotificationService.SECONDS_PER_MINUTE * MILLIS_PER_SECOND));
-        assertEquals("1 day left", DownloadNotificationService.formatRemainingTime(context,
-                DownloadNotificationService.SECONDS_PER_DAY * MILLIS_PER_SECOND));
-        assertEquals("2 days left", DownloadNotificationService.formatRemainingTime(context,
-                59 * DownloadNotificationService.SECONDS_PER_HOUR * MILLIS_PER_SECOND));
-        assertEquals("3 days left", DownloadNotificationService.formatRemainingTime(context,
-                60 * DownloadNotificationService.SECONDS_PER_HOUR * MILLIS_PER_SECOND));
+        assertEquals("0 secs left", DownloadUtils.formatRemainingTime(context, 0));
+        assertEquals("1 sec left", DownloadUtils.formatRemainingTime(context, MILLIS_PER_SECOND));
+        assertEquals("1 min left",
+                DownloadUtils.formatRemainingTime(
+                        context, DownloadUtils.SECONDS_PER_MINUTE * MILLIS_PER_SECOND));
+        assertEquals(
+                "2 mins left", DownloadUtils.formatRemainingTime(context, 149 * MILLIS_PER_SECOND));
+        assertEquals(
+                "3 mins left", DownloadUtils.formatRemainingTime(context, 150 * MILLIS_PER_SECOND));
+        assertEquals("1 hour left",
+                DownloadUtils.formatRemainingTime(
+                        context, DownloadUtils.SECONDS_PER_HOUR * MILLIS_PER_SECOND));
+        assertEquals("2 hours left",
+                DownloadUtils.formatRemainingTime(
+                        context, 149 * DownloadUtils.SECONDS_PER_MINUTE * MILLIS_PER_SECOND));
+        assertEquals("3 hours left",
+                DownloadUtils.formatRemainingTime(
+                        context, 150 * DownloadUtils.SECONDS_PER_MINUTE * MILLIS_PER_SECOND));
+        assertEquals("1 day left",
+                DownloadUtils.formatRemainingTime(
+                        context, DownloadUtils.SECONDS_PER_DAY * MILLIS_PER_SECOND));
+        assertEquals("2 days left",
+                DownloadUtils.formatRemainingTime(
+                        context, 59 * DownloadUtils.SECONDS_PER_HOUR * MILLIS_PER_SECOND));
+        assertEquals("3 days left",
+                DownloadUtils.formatRemainingTime(
+                        context, 60 * DownloadUtils.SECONDS_PER_HOUR * MILLIS_PER_SECOND));
     }
 
     // Tests that the downloaded bytes on the notification is correct.
     @SmallTest
     @Feature({"Download"})
     public void testFormatBytesReceived() {
         Context context = getSystemContext().getApplicationContext();
         assertEquals("Downloaded 0.0 KB", DownloadUtils.getStringForBytes(
                 context, DownloadUtils.BYTES_DOWNLOADED_STRINGS, 0));
         assertEquals("Downloaded 0.5 KB", DownloadUtils.getStringForBytes(
                 context, DownloadUtils.BYTES_DOWNLOADED_STRINGS, 512));
         assertEquals("Downloaded 1.0 KB", DownloadUtils.getStringForBytes(
                 context, DownloadUtils.BYTES_DOWNLOADED_STRINGS, 1024));
         assertEquals("Downloaded 1.0 MB", DownloadUtils.getStringForBytes(
                 context, DownloadUtils.BYTES_DOWNLOADED_STRINGS, 1024 * 1024));
         assertEquals("Downloaded 1.0 GB", DownloadUtils.getStringForBytes(
                 context, DownloadUtils.BYTES_DOWNLOADED_STRINGS, 1024 * 1024 * 1024));
     }
 }