update unit test code

Author: Hideki Itakura

src/androidTest/java/com/couchbase/lite/DocumentTest.java

@@ -458,7 +458,7 @@ public void disabledTestNonsensicalConflictExceptionOnUnsavedRevision() throws C
         testNonsensicalConflict.setMap(new Mapper() {
             @Override
             public void map(Map<String, Object> document, Emitter emitter) {
-                emitter.emit(null,null);
+                emitter.emit(null, null);
             }
         }, "");
         Query query = testNonsensicalConflict.createQuery();
@@ -468,7 +468,7 @@ public void map(Map<String, Object> document, Emitter emitter) {
             @Override
             public void changed(LiveQuery.ChangeEvent event) {
                 QueryEnumerator rows = event.getRows();
-                while(rows.hasNext()){
+                while (rows.hasNext()) {
                     QueryRow next = rows.next();
                     next.getDocument();
                 }
@@ -531,7 +531,7 @@ public void changed(Document.ChangeEvent event) {
     /**
      * https://github.com/couchbase/couchbase-lite-android/issues/563
      * Updating a document in a transaction block twice using Document.DocumentUpdater results in an infinite loop
-     *
+     * <p/>
      * NOTE: Use Document.update()
      */
     public void testMultipleUpdatesInTransactionWithUpdate() throws CouchbaseLiteException {
@@ -548,7 +548,7 @@ public boolean run() {
                             doc.update(new Document.DocumentUpdater() {
                                 @Override
                                 public boolean update(UnsavedRevision newRevision) {
-                                    Log.e("updateDocumentInTransactionTest", "Trying to update key to value 2");
+                                    Log.e(TAG, "Trying to update key to value 2");
                                     Map<String, Object> properties = newRevision.getUserProperties();
                                     properties.put("key", "value2");
                                     newRevision.setUserProperties(properties);
@@ -558,15 +558,16 @@ public boolean update(UnsavedRevision newRevision) {
                             doc.update(new Document.DocumentUpdater() {
                                 @Override
                                 public boolean update(UnsavedRevision newRevision) {
-                                    Log.e("updateDocumentInTransactionTest", "Trying to update key to value 3");
+                                    Log.e(TAG, "Trying to update key to value 3");
                                     Map<String, Object> properties = newRevision.getUserProperties();
                                     properties.put("key", "value3");
                                     newRevision.setUserProperties(properties);
                                     return true;
                                 }
                             });
                         } catch (CouchbaseLiteException e) {
-                            Log.e("updateDocumentInTransactionTest", "Trying to update key to value 2");
+                            Log.e(TAG, "Trying to update key to value 2 or 3");
+                            fail("Trying to update key to value 2 or 3, but failed.");
                             return false;
                         }
                         return true;
@@ -578,7 +579,7 @@ public boolean update(UnsavedRevision newRevision) {
     }
 
     /**
-     * Note: Document.putProperties()
+     * NOTE: This is variation of testMultipleUpdatesInTransactionWithUpdate() test with using Document.putProperties()
      */
     public void testMultipleUpdatesInTransactionWithPutProperties() throws CouchbaseLiteException {
         Log.e(TAG, "testMultipleUpdatesInTransactionWithPutProperties() START");
@@ -594,18 +595,26 @@ public boolean run() {
                             Map<String, Object> properties2 = new HashMap<String, Object>(doc.getProperties());
                             properties2.put("key", "value2");
                             doc.putProperties(properties2);
+                        } catch (CouchbaseLiteException e) {
+                            Log.e(TAG, "Trying to update key to value 2");
+                            fail("Trying to update key to value 2, but failed.");
+                            return false;
+                        }
+                        try {
                             Map<String, Object> properties3 = new HashMap<String, Object>(doc.getProperties());
                             properties3.put("key", "value3");
                             doc.putProperties(properties3);
                         } catch (CouchbaseLiteException e) {
-                            Log.e("updateDocumentInTransactionTest", "Trying to update key to value 2");
+                            Log.e(TAG, "Trying to update key to value 3");
+                            fail("Trying to update key to value 3, but failed.");
                             return false;
                         }
                         return true;
                     }
                 });
         Map<String, Object> properties4 = doc.getProperties();
-        Log.e(TAG, "properties4 = "+properties4);
+        Log.e(TAG, "properties4 = " + properties4);
+        assertEquals("value3", properties4.get("key"));
         Log.e(TAG, "testMultipleUpdatesInTransactionWithPutProperties() END");
     }
 }