* Suggestion of fix for parse-community#827

* Improved test for parse-community#827 :
- Generalize to any server error that is different to CONNECTION_FAILED (not only INVALID_SESSION_TOKEN)
- Added isDirty() checks
- fixed test tearDown

Author: cjosepha

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

@@ -319,6 +319,8 @@ public Void then(Task<Void> task) throws Exception {
   }
 
   static void destroy() {
+    ParseObject.unregisterParseSubclasses();
+
     ParseEventuallyQueue queue;
     synchronized (MUTEX) {
       queue = eventuallyQueue;
@@ -330,6 +332,8 @@ static void destroy() {
 
     ParseCorePlugins.getInstance().reset();
     ParsePlugins.reset();
+
+    setLocalDatastore(null);
   }
 
   /**

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

@@ -1420,6 +1420,20 @@ private ParseRESTObjectCommand currentSaveEventuallyCommand(
       final ParseObject.State result, final ParseOperationSet operationsBeforeSave) {
     Task<Void> task = Task.forResult(null);
 
+    /*
+     * If this object is in the offline store, then we need to make sure that we pull in any dirty
+     * changes it may have before merging the server data into it.
+     */
+    final OfflineStore store = Parse.getLocalDatastore();
+    if (store != null) {
+      task = task.onSuccessTask(new Continuation<Void, Task<Void>>() {
+        @Override
+        public Task<Void> then(Task<Void> task) throws Exception {
+          return store.fetchLocallyAsync(ParseObject.this).makeVoid();
+        }
+      });
+    }
+
     final boolean success = result != null;
     synchronized (mutex) {
       // Find operationsBeforeSave in the queue so that we can remove it and move to the next
@@ -1433,24 +1447,18 @@ private ParseRESTObjectCommand currentSaveEventuallyCommand(
         // Merge the data from the failed save into the next save.
         ParseOperationSet nextOperation = opIterator.next();
         nextOperation.mergeFrom(operationsBeforeSave);
+        if (store != null) {
+          task = task.onSuccessTask(new Continuation<Void, Task<Void>>() {
+            @Override
+            public Task<Void> then(Task<Void> task) throws Exception {
+              return store.updateDataForObjectAsync(ParseObject.this);
+            }
+          });
+        }
         return task;
       }
     }
 
-    /*
-     * If this object is in the offline store, then we need to make sure that we pull in any dirty
-     * changes it may have before merging the server data into it.
-     */
-    final OfflineStore store = Parse.getLocalDatastore();
-    if (store != null) {
-      task = task.onSuccessTask(new Continuation<Void, Task<Void>>() {
-        @Override
-        public Task<Void> then(Task<Void> task) throws Exception {
-          return store.fetchLocallyAsync(ParseObject.this).makeVoid();
-        }
-      });
-    }
-
     // fetchLocallyAsync will return an error if this object isn't in the LDS yet and that's ok
     task = task.continueWith(new Continuation<Void, Void>() {
       @Override

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

@@ -24,9 +24,7 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
 
-import java.net.URL;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
@@ -77,9 +75,19 @@ public void setUp() throws Exception {
   @After
   public void tearDown() throws Exception {
     super.tearDown();
-    ParseObject.unregisterSubclass(ParseUser.class);
-    ParseObject.unregisterSubclass(ParseSession.class);
-    Parse.disableLocalDatastore();
+    if (ParsePlugins.get() != null) {
+      ParseCurrentInstallationController installationController =
+              ParseCorePlugins.getInstance().getCurrentInstallationController();
+      if (installationController != null) {
+        installationController.clearFromDisk();
+      }
+      ParseCurrentUserController userController =
+              ParseCorePlugins.getInstance().getCurrentUserController();
+      if (userController != null) {
+        userController.clearFromDisk();
+      }
+    }
+    Parse.destroy();
   }
 
   @Test
@@ -1551,10 +1559,10 @@ private static void setLazy(ParseUser user) {
     user.putAuthData(ParseAnonymousUtils.AUTH_TYPE, anonymousAuthData);
   }
 
-  //region testSaveEventuallyWhenSessionIsInvalid
+  //region testSaveEventuallyWhenServerError
 
   @Test
-  public void testSaveEventuallyWhenSessionIsInvalid() throws Exception {
+  public void testSaveEventuallyWhenServerError() throws Exception {
     Shadows.shadowOf(RuntimeEnvironment.application)
             .grantPermissions(Manifest.permission.ACCESS_NETWORK_STATE);
     Parse.Configuration configuration =
@@ -1578,7 +1586,10 @@ public void testSaveEventuallyWhenSessionIsInvalid() throws Exception {
     Parse.initialize(configuration, plugins);
 
     ParseUser user = ParseUser.logIn("username", "password");
+    assertFalse(user.isDirty());
+
     user.put("field", "data");
+    assertTrue(user.isDirty());
 
     mockResponse = new JSONObject();
     mockResponse.put("updatedAt", ParseDateFormat.getInstance().format(new Date(3000)));
@@ -1597,12 +1608,14 @@ public Void then(Task<Void> task) throws Exception {
     });
     assertTrue(saveCountDown1.await(5, TimeUnit.SECONDS));
     assertNull(exceptionCapture.get());
+    assertFalse(user.isDirty());
 
     user.put("field", "other data");
+    assertTrue(user.isDirty());
 
     mockResponse = new JSONObject();
-    mockResponse.put("error", "invalid session token");
-    mockResponse.put("code", 209);
+    mockResponse.put("error", "Save is not allowed");
+    mockResponse.put("code", 141);
     ParseTestUtils.updateMockParseHttpClientWithResponse(
             restClient, mockResponse, 400, "Bad Request");
 
@@ -1617,14 +1630,17 @@ public Void then(Task<Void> task) throws Exception {
     });
     assertTrue(saveEventuallyCountDown.await(5, TimeUnit.SECONDS));
     assertTrue(exceptionCapture.get() instanceof ParseException);
-    assertEquals(ParseException.INVALID_SESSION_TOKEN, ((ParseException)exceptionCapture.get()).getCode());
-    assertEquals("invalid session token", exceptionCapture.get().getMessage());
+    assertEquals(ParseException.SCRIPT_ERROR, ((ParseException)exceptionCapture.get()).getCode());
+    assertEquals("Save is not allowed", exceptionCapture.get().getMessage());
+    assertTrue(user.isDirty());
 
     // Simulate reboot
     Parse.destroy();
     Parse.initialize(configuration, plugins);
 
     user = ParseUser.getCurrentUser();
+    assertTrue(user.isDirty());
+
     assertEquals("other data", user.get("field"));
     user.put("field", "another data");
 
@@ -1642,12 +1658,10 @@ public Void then(Task<Void> task) throws Exception {
         return null;
       }
     });
+
     assertTrue(saveCountDown2.await(5, TimeUnit.SECONDS));
     assertNull(exceptionCapture.get());
-
-    ParseCorePlugins.getInstance().getCurrentUserController().clearFromDisk();
-    ParseCorePlugins.getInstance().getCurrentInstallationController().clearFromDisk();
-    Parse.destroy();
+    assertFalse(user.isDirty());
   }
 
   //endregion