sync/android/javatests/src/org/chromium/sync/notifier/InvalidationServiceTest.java - Issue 493293002: Enable invalidations for supervised user settings on Android.

Unified Diff: sync/android/javatests/src/org/chromium/sync/notifier/InvalidationServiceTest.java

Issue 493293002: Enable invalidations for supervised user settings on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 'nother compile fix Created 6 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

« sync/android/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java ('K') | « sync/android/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: sync/android/javatests/src/org/chromium/sync/notifier/InvalidationServiceTest.java

diff --git a/sync/android/javatests/src/org/chromium/sync/notifier/InvalidationServiceTest.java b/sync/android/javatests/src/org/chromium/sync/notifier/InvalidationServiceTest.java

index 6a84da65b96eeff9f8ef12f299473776e3744136..258c7b65c32bc9873a6e1e2cccb06d8aff5f55c5 100644

--- a/sync/android/javatests/src/org/chromium/sync/notifier/InvalidationServiceTest.java

+++ b/sync/android/javatests/src/org/chromium/sync/notifier/InvalidationServiceTest.java

@@ -529,7 +529,7 @@ public class InvalidationServiceTest extends ServiceTestCase<TestableInvalidatio

assertTrue(InvalidationService.getIsClientStartedForTest());

InvalidationPreferences invPrefs = new InvalidationPreferences(getContext());

assertEquals(account, invPrefs.getSavedSyncedAccount());

- assertEquals(ModelType.modelTypesToSyncTypes(desiredRegistrations),

+ assertEquals(ModelType.modelTypesToSyncTypesForTest(desiredRegistrations),

invPrefs.getSavedSyncedTypes());

assertNull(invPrefs.getSavedObjectIds());

assertEquals(1, mStartServiceIntents.size());

@@ -566,7 +566,7 @@ public class InvalidationServiceTest extends ServiceTestCase<TestableInvalidatio

private boolean expectedObjectIdsRegistered(Set<ModelType> expectedTypes,

Set<ObjectId> expectedObjectIds, boolean isReady) {

// Get synced types saved to preferences.

- Set<String> expectedSyncTypes = ModelType.modelTypesToSyncTypes(expectedTypes);

+ Set<String> expectedSyncTypes = ModelType.modelTypesToSyncTypesForTest(expectedTypes);

InvalidationPreferences invPrefs = new InvalidationPreferences(getContext());

Set<String> actualSyncTypes = invPrefs.getSavedSyncedTypes();

if (actualSyncTypes == null) {

@@ -749,7 +749,7 @@ public class InvalidationServiceTest extends ServiceTestCase<TestableInvalidatio

assertFalse(InvalidationService.getIsClientStartedForTest());

InvalidationPreferences invPrefs = new InvalidationPreferences(getContext());

assertEquals(account, invPrefs.getSavedSyncedAccount());

- assertEquals(ModelType.modelTypesToSyncTypes(desiredRegistrations),

+ assertEquals(ModelType.modelTypesToSyncTypesForTest(desiredRegistrations),

invPrefs.getSavedSyncedTypes());

assertEquals(0, mStartServiceIntents.size());

}

@@ -777,7 +777,7 @@ public class InvalidationServiceTest extends ServiceTestCase<TestableInvalidatio

assertEquals(1, mStartServiceIntents.size());

assertTrue(isAndroidListenerStartIntent(mStartServiceIntents.get(0)));

InvalidationPreferences invPrefs = new InvalidationPreferences(getContext());

- assertEquals(ModelType.modelTypesToSyncTypes(desiredRegistrations),

+ assertEquals(ModelType.modelTypesToSyncTypesForTest(desiredRegistrations),

invPrefs.getSavedSyncedTypes());

assertEquals(desiredObjectIds, getService().readRegistrationsFromPrefs());