minor fixes & update test

Author: hermanliang

Parse/src/main/java/com/parse/ParseInstallation.java

@@ -30,6 +30,7 @@
 public class ParseInstallation extends ParseObject {
   private static final String TAG = "com.parse.ParseInstallation";
 
+  private static final String KEY_OBJECT_ID = "objectId";
   private static final String KEY_INSTALLATION_ID = "installationId";
   private static final String KEY_DEVICE_TYPE = "deviceType";
   private static final String KEY_APP_NAME = "appName";
@@ -45,7 +46,7 @@ public class ParseInstallation extends ParseObject {
   private static final List<String> READ_ONLY_FIELDS = Collections.unmodifiableList(
       Arrays.asList(KEY_DEVICE_TYPE, KEY_INSTALLATION_ID, KEY_DEVICE_TOKEN, KEY_PUSH_TYPE,
           KEY_TIME_ZONE, KEY_LOCALE, KEY_APP_VERSION, KEY_APP_NAME, KEY_PARSE_VERSION,
-          KEY_APP_IDENTIFIER));
+          KEY_APP_IDENTIFIER, KEY_OBJECT_ID));
 
   // TODO(mengyan): Inject into ParseInstallationInstanceController
   /* package */ static ParseCurrentInstallationController getCurrentInstallationController() {

Parse/src/test/java/com/parse/ParseInstallationTest.java

@@ -106,6 +106,20 @@ public void testImmutableKeys() {
     }
   }
 
+  @Test (expected = RuntimeException.class)
+  public void testInstallationObjectIdCannotBeChanged() throws Exception {
+    boolean hasException = false;
+    ParseInstallation installation = new ParseInstallation();
+    try {
+      installation.put("objectId", "abc");
+    } catch (IllegalArgumentException e) {
+      assertTrue(e.getMessage().contains("Cannot modify"));
+      hasException = true;
+    }
+    assertTrue(hasException);
+    installation.setObjectId("abc");
+  }
+
   @Test
   public void testSaveAsync() throws Exception {
     String sessionToken = "sessionToken";
@@ -319,19 +333,7 @@ public void testLocaleIdentifierSpecialCases() throws Exception {
     assertEquals("en", installation.getString(KEY_LOCALE_IDENTIFIER));
   }
 
-  @Test(expected = RuntimeException.class)
-  public void testSetObjectId() throws Exception {
-    ParseCurrentInstallationController controller =
-        mock(ParseCurrentInstallationController.class);
-    ParseInstallation currentInstallation = new ParseInstallation();
-    when(controller.getAsync()).thenReturn(Task.forResult(currentInstallation));
-    ParseCorePlugins.getInstance().registerCurrentInstallationController(controller);
 
-    ParseInstallation installation = ParseInstallation.getCurrentInstallation();
-    assertNotNull(installation);
-    verify(controller, times(1)).getAsync();
-    installation.setObjectId(null);
-  }
 
   // TODO(mengyan): Add testFetchAsync, right now we can not test super methods inside
   // testFetchAsync