Enable invalidations for arbitrary objects on Android.

sync/android/javatests/src/org/chromium/sync/notifier/InvalidationControllerTest.java

 // Copyright (c) 2013 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.sync.notifier;
 
 import android.accounts.Account;
 import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 
+import com.google.ipc.invalidation.external.client.types.ObjectId;
+
 import org.chromium.base.ActivityStatus;
 import org.chromium.base.CollectionUtil;
 import org.chromium.base.test.util.AdvancedMockContext;
 import org.chromium.base.test.util.Feature;
 import org.chromium.sync.internal_api.pub.base.ModelType;
 import org.chromium.sync.notifier.InvalidationController.IntentProtocol;
 import org.chromium.sync.signin.AccountManagerHelper;
 import org.chromium.sync.signin.ChromeSigninController;
 import org.chromium.sync.test.util.MockSyncContentResolverDelegate;
 
@@ skipping 138 matching lines @@
         // Validate account.
         Account intentAccount = intent.getParcelableExtra(IntentProtocol.EXTRA_ACCOUNT);
         assertEquals(account, intentAccount);
 
         // Validate registered types.
         Set<String> expectedTypes = CollectionUtil.newHashSet(ModelType.BOOKMARK.name(),
                 ModelType.SESSION.name());
         Set<String> actualTypes = new HashSet<String>();
         actualTypes.addAll(intent.getStringArrayListExtra(IntentProtocol.EXTRA_REGISTERED_TYPES));
         assertEquals(expectedTypes, actualTypes);
+        assertNull(IntentProtocol.getRegisteredObjectIds(intent));
     }
 
     @SmallTest
     @Feature({"Sync"})
     public void testRegisterForAllTypes() {
         Account account = new Account("test@example.com", "bogus");
         mController.setRegisteredTypes(account, true,
                 CollectionUtil.newHashSet(ModelType.BOOKMARK, ModelType.SESSION));
         assertEquals(1, mContext.getNumStartedIntents());
 
         // Validate destination.
         Intent intent = mContext.getStartedIntent(0);
         validateIntentComponent(intent);
         assertEquals(IntentProtocol.ACTION_REGISTER, intent.getAction());
 
         // Validate account.
         Account intentAccount = intent.getParcelableExtra(IntentProtocol.EXTRA_ACCOUNT);
         assertEquals(account, intentAccount);
 
         // Validate registered types.
         Set<String> expectedTypes = CollectionUtil.newHashSet(ModelType.ALL_TYPES_TYPE);
         Set<String> actualTypes = new HashSet<String>();
         actualTypes.addAll(intent.getStringArrayListExtra(IntentProtocol.EXTRA_REGISTERED_TYPES));
         assertEquals(expectedTypes, actualTypes);
+        assertNull(IntentProtocol.getRegisteredObjectIds(intent));
     }
 
     @SmallTest
     @Feature({"Sync"})
     public void testRefreshShouldReadValuesFromDiskWithSpecificTypes() {
         // Store some preferences for ModelTypes and account. We are using the helper class
         // for this, so we don't have to deal with low-level details such as preference keys.
         InvalidationPreferences invalidationPreferences = new InvalidationPreferences(mContext);
         InvalidationPreferences.EditContext edit = invalidationPreferences.edit();
         Set<String> storedModelTypes = new HashSet<String>();
@@ skipping 62 matching lines @@
         };
 
         // Execute the test.
         controller.refreshRegisteredTypes(new HashSet<ModelType>());
 
         // Validate the values.
         assertEquals(storedAccount, resultAccount.get());
         assertEquals(true, resultAllTypes.get());
     }
 
+    @SmallTest
+    @Feature({"Sync"})
+    public void testSetRegisteredObjectIds() {
+        InvalidationController controller = new InvalidationController(mContext);
+        controller.setRegisteredObjectIds(new int[] {1, 2}, new String[] {"a", "b"});
+        assertEquals(1, mContext.getNumStartedIntents());
+
+        // Validate destination.
+        Intent intent = mContext.getStartedIntent(0);
+        validateIntentComponent(intent);
+        assertEquals(IntentProtocol.ACTION_REGISTER, intent.getAction());
+
+        // Validate registered object ids.
+        assertNull(intent.getStringArrayListExtra(IntentProtocol.EXTRA_REGISTERED_TYPES));
+        Set<ObjectId> objectIds = IntentProtocol.getRegisteredObjectIds(intent);
+        assertEquals(2, objectIds.size());
+        assertTrue(objectIds.contains(ObjectId.newInstance(1, "a".getBytes())));
+        assertTrue(objectIds.contains(ObjectId.newInstance(2, "b".getBytes())));
+    }
+
     /**
      * Asserts that {@code intent} is destined for the correct component.
      */
     private static void validateIntentComponent(Intent intent) {
         assertNotNull(intent.getComponent());
         assertEquals(InvalidationService.class.getName(),
                 intent.getComponent().getClassName());
     }
 
     /**
@@ skipping 19 matching lines @@
         Intent getStartedIntent(int idx) {
             return startedIntents.get(idx);
         }
 
         @Override
         public PackageManager getPackageManager() {
             return getBaseContext().getPackageManager();
         }
     }
 }