Merge branch 'master-4.0' into merge-c02607-to-master-4.0

Conflicts:
	dependencies.list

Author: cmelchior

CHANGELOG.md

@@ -1,3 +1,31 @@
+## 4.0.0-BETA2 (2017-07-27)
+
+### Bug Fixes
+
+* [ObjectServer] Realm no longer throws a native “unsupported instruction” exception in some cases when opening a synced Realm asynchronously (https://github.com/realm/realm-object-store/issues/502).
+
+## 4.0.0-BETA1 (2017-07-13)
+
+### Breaking Changes
+
+* [ObjectServer] Updated protocol version to 19 which is only compatible with ROS > 2.0.0.
+
+### Deprecated
+
+### Enhancements
+
+* Added `static RealmObject.getRealm(RealmModel)`, `RealmObject.getRealm()` and `DynamicRealmObject.getDynamicRealm()` (#4720).
+
+### Bug Fixes
+
+### Internal
+
+* Upgraded to Realm Sync 2.0.0-rc12.
+* Upgraded to Realm Core 3.0.0-rc3.
+
+### Credits
+
+
 ## 3.6.0 (YYYY-MM-DD)
 
 ### Breaking Changes

dependencies.list

@@ -1,13 +1,13 @@
 # Realm Sync Core release used by Realm Java
 # https://github.com/realm/realm-sync/releases
-REALM_SYNC_VERSION=1.10.5
-REALM_SYNC_SHA256=c93caa9b0ff1391550ce6b68ab3822fea7e6ae921498a3ebf3a5e6b17c56fa9b
+REALM_SYNC_VERSION=2.0.0-rc12
+REALM_SYNC_SHA256=5f111903159ee2d74c5418560c72977e91a10e291e23e6a7d9999aa856858ca4
 
 # Object Server Release used by Integration tests
-# `realm` is stable releases, `realm-testing` is developer builds.
-# https://packagecloud.io/realm/realm?filter=debs
-# https://packagecloud.io/realm/realm-testing?filter=debs
+# Stable releases:  https://packagecloud.io/realm/realm?filter=debs
+# Beta releases:    https://packagecloud.io/realm/realm-beta?filter=debs
+# Developer builds: https://packagecloud.io/realm/realm-testing?filter=debs
 # /tools/sync_test_server/Dockerfile specify which repo (apt) we should
-# install/use between 'realm' and 'realm-testing', the version below should
+# install/use between 'realm', 'realm-beta' and 'realm-testing', the version below should
 # correspond to an existing version on the *specified* repo.
-REALM_OBJECT_SERVER_DE_VERSION=1.8.3-83
+REALM_OBJECT_SERVER_DE_VERSION=2.0.0-rc2-285

realm/realm-annotations-processor/src/test/resources/some/test/ConflictingFieldName.java

@@ -29,11 +29,11 @@ public class ConflictingFieldName extends RealmObject {
     private String isCompleted;
     private String currentTableVersion;
 
-    public String getRealm() {
+    public String getRealmString() {
         return realm;
     }
 
-    public void setRealm(String realm) {
+    public void setRealmString(String realm) {
         this.realm = realm;
     }
 

realm/realm-library/src/androidTest/java/io/realm/DynamicRealmObjectTests.java

@@ -18,6 +18,7 @@
 
 import android.support.test.runner.AndroidJUnit4;
 
+import org.hamcrest.Matchers;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -56,6 +57,8 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -1158,7 +1161,11 @@ public void getFieldNames() {
                 AllJavaTypes.FIELD_DOUBLE, AllJavaTypes.FIELD_BOOLEAN, AllJavaTypes.FIELD_DATE,
                 AllJavaTypes.FIELD_BINARY, AllJavaTypes.FIELD_OBJECT, AllJavaTypes.FIELD_LIST};
         String[] keys = dObjTyped.getFieldNames();
-        assertArrayEquals(expectedKeys, keys);
+        // After the stable ID support, primary key field will be inserted first before others. So even FIELD_STRING is
+        // the first defined field in the class, it will be inserted after FIELD_ID.
+        // See ObjectStore::add_initial_columns #if REALM_HAVE_SYNC_STABLE_IDS branch.
+        assertEquals(expectedKeys.length, keys.length);
+        assertThat(Arrays.asList(expectedKeys), Matchers.hasItems(keys));
     }
 
     @Test
@@ -1259,4 +1266,102 @@ public void testExceptionMessage() {
             assertEquals("Illegal Argument: Field not found: nonExisting", e.getMessage());
         }
     }
+
+    @Test
+    public void getDynamicRealm() {
+        realm.beginTransaction();
+        realm.createObject(AllTypes.class);
+        realm.commitTransaction();
+
+        dynamicRealm.refresh();
+        final DynamicRealmObject object = dynamicRealm.where(AllTypes.CLASS_NAME).findFirst();
+
+        assertSame(dynamicRealm, object.getDynamicRealm());
+    }
+
+    @Test
+    public void getRealm() {
+        realm.beginTransaction();
+        realm.createObject(AllTypes.class);
+        realm.commitTransaction();
+
+        dynamicRealm.refresh();
+        final DynamicRealmObject object = dynamicRealm.where(AllTypes.CLASS_NAME).findFirst();
+
+        thrown.expect(IllegalStateException.class);
+        object.getRealm();
+    }
+
+    @Test
+    public void getRealm_closedObjectThrows() {
+        realm.beginTransaction();
+        realm.createObject(AllTypes.class);
+        realm.commitTransaction();
+
+        dynamicRealm.refresh();
+        final DynamicRealmObject object = dynamicRealm.where(AllTypes.CLASS_NAME).findFirst();
+        dynamicRealm.close();
+        dynamicRealm = null;
+
+        try {
+            object.getDynamicRealm();
+            fail();
+        } catch (IllegalStateException e) {
+            assertEquals(BaseRealm.CLOSED_REALM_MESSAGE, e.getMessage());
+        }
+    }
+
+    @Test
+    public void getRealmConfiguration_deletedObjectThrows() {
+        realm.beginTransaction();
+        realm.createObject(AllTypes.class);
+        realm.commitTransaction();
+
+        dynamicRealm.refresh();
+        final DynamicRealmObject object = dynamicRealm.where(AllTypes.CLASS_NAME).findFirst();
+        dynamicRealm.beginTransaction();
+        object.deleteFromRealm();
+        dynamicRealm.commitTransaction();
+
+        try {
+            object.getDynamicRealm();
+            fail();
+        } catch (IllegalStateException e) {
+            assertEquals(RealmObject.MSG_DELETED_OBJECT, e.getMessage());
+        }
+    }
+
+    @Test
+    public void getRealm_illegalThreadThrows() throws Throwable {
+        realm.beginTransaction();
+        realm.createObject(AllTypes.class);
+        realm.commitTransaction();
+
+        dynamicRealm.refresh();
+        final DynamicRealmObject object = dynamicRealm.where(AllTypes.CLASS_NAME).findFirst();
+
+        final CountDownLatch threadFinished = new CountDownLatch(1);
+        final AtomicReference<Throwable> throwable = new AtomicReference<>();
+        final Thread thread = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    object.getDynamicRealm();
+                    fail();
+                } catch (Throwable t) {
+                    throwable.set(t);
+                } finally {
+                    threadFinished.countDown();
+                }
+            }
+        });
+        thread.start();
+        TestHelper.awaitOrFail(threadFinished);
+
+        final Throwable thrownInTheThread = throwable.get();
+        if (!(thrownInTheThread instanceof IllegalStateException)) {
+            throw thrownInTheThread;
+        }
+        assertEquals(BaseRealm.INCORRECT_THREAD_MESSAGE, thrownInTheThread.getMessage());
+    }
 }