chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadNotificationServiceTest.java - Issue 2230603003: [Offline pages] Downloads UI: Extening DownloadSharedPreferenceEntry to include offline page

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

Issue 2230603003: [Offline pages] Downloads UI: Extening DownloadSharedPreferenceEntry to include offline page (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Adding OWNERS file to the tests 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

« no previous file with comments | « chrome/android/java_sources.gni ('k') | chrome/android/junit/src/org/chromium/chrome/browser/download/DownloadSharedPreferenceEntryTest.java » ('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/DownloadNotificationServiceTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadNotificationServiceTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadNotificationServiceTest.java

index b38a2d08fdd648558e8690d9baf24e4f0559443e..01bf5655cc6e8f106a4feb9d8329143354b43ae9 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadNotificationServiceTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadNotificationServiceTest.java

@@ -140,8 +140,10 @@ public class DownloadNotificationServiceTest extends

DownloadResumptionScheduler.setDownloadResumptionScheduler(scheduler);

setupService();

Set<String> notifications = new HashSet<String>();

- notifications.add(new DownloadSharedPreferenceEntry(1, false, true,

- UUID.randomUUID().toString(), "test1").getSharedPreferenceString());

+ notifications.add(

+ new DownloadSharedPreferenceEntry(1, false, true, UUID.randomUUID().toString(),

+ "test1", DownloadSharedPreferenceEntry.ITEM_TYPE_DOWNLOAD)

+ .getSharedPreferenceString());

SharedPreferences sharedPrefs = ContextUtils.getAppSharedPreferences();

SharedPreferences.Editor editor = sharedPrefs.edit();

editor.putStringSet(

@@ -183,10 +185,14 @@ public class DownloadNotificationServiceTest extends

Context mockContext = new AdvancedMockContext(getSystemContext());

getService().setContext(mockContext);

Set<String> notifications = new HashSet<String>();

- notifications.add(new DownloadSharedPreferenceEntry(1, false, true,

- UUID.randomUUID().toString(), "test1").getSharedPreferenceString());

- notifications.add(new DownloadSharedPreferenceEntry(2, false, true,

- UUID.randomUUID().toString(), "test2").getSharedPreferenceString());

+ notifications.add(

+ new DownloadSharedPreferenceEntry(1, false, true, UUID.randomUUID().toString(),

+ "test1", DownloadSharedPreferenceEntry.ITEM_TYPE_DOWNLOAD)

+ .getSharedPreferenceString());

+ notifications.add(

+ new DownloadSharedPreferenceEntry(2, false, true, UUID.randomUUID().toString(),

+ "test2", DownloadSharedPreferenceEntry.ITEM_TYPE_DOWNLOAD)

+ .getSharedPreferenceString());

SharedPreferences sharedPrefs =

ContextUtils.getAppSharedPreferences();

SharedPreferences.Editor editor = sharedPrefs.edit();

@@ -213,11 +219,13 @@ public class DownloadNotificationServiceTest extends

getService().setContext(mockContext);

Set<String> notifications = new HashSet<String>();

String guid1 = UUID.randomUUID().toString();

- notifications.add(new DownloadSharedPreferenceEntry(3, false, true, guid1, "success")

- .getSharedPreferenceString());

+ notifications.add(new DownloadSharedPreferenceEntry(3, false, true, guid1, "success",

+ DownloadSharedPreferenceEntry.ITEM_TYPE_DOWNLOAD)

+ .getSharedPreferenceString());

String guid2 = UUID.randomUUID().toString();

- notifications.add(new DownloadSharedPreferenceEntry(4, false, true, guid2, "failed")

- .getSharedPreferenceString());

+ notifications.add(new DownloadSharedPreferenceEntry(4, false, true, guid2, "failed",

+ DownloadSharedPreferenceEntry.ITEM_TYPE_DOWNLOAD)

+ .getSharedPreferenceString());

SharedPreferences sharedPrefs = ContextUtils.getAppSharedPreferences();

SharedPreferences.Editor editor = sharedPrefs.edit();

editor.putStringSet(

@@ -277,11 +285,13 @@ public class DownloadNotificationServiceTest extends

getService().setContext(mockContext);

Set<String> notifications = new HashSet<String>();

String guid1 = UUID.randomUUID().toString();

- notifications.add(new DownloadSharedPreferenceEntry(3, false, false, guid1, "success")

- .getSharedPreferenceString());

+ notifications.add(new DownloadSharedPreferenceEntry(3, false, false, guid1, "success",

+ DownloadSharedPreferenceEntry.ITEM_TYPE_DOWNLOAD)

+ .getSharedPreferenceString());

String guid2 = UUID.randomUUID().toString();

- notifications.add(new DownloadSharedPreferenceEntry(4, false, true, guid2, "failed")

- .getSharedPreferenceString());

+ notifications.add(new DownloadSharedPreferenceEntry(4, false, true, guid2, "failed",

+ DownloadSharedPreferenceEntry.ITEM_TYPE_DOWNLOAD)

+ .getSharedPreferenceString());

SharedPreferences sharedPrefs = ContextUtils.getAppSharedPreferences();

SharedPreferences.Editor editor = sharedPrefs.edit();

editor.putStringSet(

@@ -322,8 +332,9 @@ public class DownloadNotificationServiceTest extends

getService().setContext(mockContext);

Set<String> notifications = new HashSet<String>();

String uuid = UUID.randomUUID().toString();

- notifications.add(new DownloadSharedPreferenceEntry(1, true, true, uuid, "test1")

- .getSharedPreferenceString());

+ notifications.add(new DownloadSharedPreferenceEntry(1, true, true, uuid, "test1",

+ DownloadSharedPreferenceEntry.ITEM_TYPE_DOWNLOAD)

+ .getSharedPreferenceString());

SharedPreferences sharedPrefs =

ContextUtils.getAppSharedPreferences();

SharedPreferences.Editor editor = sharedPrefs.edit();

@@ -339,31 +350,6 @@ public class DownloadNotificationServiceTest extends

@SmallTest

@Feature({"Download"})

- public void testParseDownloadNotifications() {

- String uuid = UUID.randomUUID().toString();

- String notification =

- DownloadSharedPreferenceEntry.VERSION + ",1,0,1," + uuid + ",test.pdf";

- DownloadSharedPreferenceEntry entry =

- DownloadSharedPreferenceEntry.parseFromString(notification);

- assertEquals(1, entry.notificationId);

- assertEquals("test.pdf", entry.fileName);

- assertFalse(entry.isOffTheRecord);

- assertEquals(uuid, entry.downloadGuid);

- notification = DownloadSharedPreferenceEntry.VERSION + ",2,1,1," + uuid + ",test,2.pdf";

- entry = DownloadSharedPreferenceEntry.parseFromString(notification);

- assertEquals(2, entry.notificationId);

- assertEquals("test,2.pdf", entry.fileName);

- assertTrue(entry.isOffTheRecord);

- assertEquals(uuid, entry.downloadGuid);

- notification = "1,2,1,1," + uuid + ",test,2.pdf";

- entry = DownloadSharedPreferenceEntry.parseFromString(notification);

- assertFalse(entry.isOffTheRecord);

- }

- @SmallTest

- @Feature({"Download"})

public void testFormatRemainingTime() {

Context context = getSystemContext().getApplicationContext();

assertEquals("0 secs left", DownloadNotificationService.formatRemainingTime(context, 0));