Migrating and enabling sync session integration test

realm/realm-library/build.gradle

@@ -104,7 +104,10 @@ android {
             java.srcDirs += ['src/androidTest/kotlin', 'src/testUtils/java', 'src/testUtils/kotlin']
         }
         androidTestObjectServer {
-            java.srcDirs += [/* FIXME 'src/syncIntegrationTest/java', */ 'src/androidTestObjectServer/kotlin', 'src/syncTestUtils/java', 'src/syncTestUtils/kotlin']
+            java.srcDirs += [/* FIXME 'src/syncIntegrationTest/java', */
+                             'src/syncIntegrationTest/kotlin',
+                             'src/androidTestObjectServer/kotlin', 'src/syncTestUtils/java'
+            , 'src/syncTestUtils/kotlin']
             assets.srcDirs += ['src/syncIntegrationTest/assets/']
         }
     }

realm/realm-library/src/androidTestObjectServer/kotlin/io/realm/entities/DefaultSyncSchema.kt

@@ -22,6 +22,6 @@ const val defaultPartitionValue = "default"
 /**
  * The set of classes initially supported by MongoDB Realm.
  */
-@RealmModule(classes = [SyncDog::class, SyncPerson::class])
+@RealmModule(classes = [SyncDog::class, SyncPerson::class, SyncSupportedTypes::class])
 class DefaultSyncSchema {
-}
+}

realm/realm-library/src/androidTestObjectServer/kotlin/io/realm/entities/SyncAllTypes.kt

@@ -0,0 +1,99 @@
+/*
+ * Copyright 2020 Realm Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.realm.entities
+
+import io.realm.MutableRealmInteger
+import io.realm.RealmList
+import io.realm.RealmObject
+import io.realm.TestHelper
+import io.realm.annotations.PrimaryKey
+import io.realm.annotations.RealmField
+import io.realm.annotations.Required
+import org.bson.types.Decimal128
+import org.bson.types.ObjectId
+import java.math.BigDecimal
+import java.util.*
+
+open class SyncAllTypes : RealmObject() {
+
+    companion object {
+        const val CLASS_NAME = "AllTypes"
+        const val FIELD_STRING = "columnString"
+        const val FIELD_LONG = "columnLong"
+        const val FIELD_FLOAT = "columnFloat"
+        const val FIELD_DOUBLE = "columnDouble"
+        const val FIELD_BOOLEAN = "columnBoolean"
+        const val FIELD_DATE = "columnDate"
+        const val FIELD_BINARY = "columnBinary"
+        const val FIELD_MUTABLEREALMINTEGER = "columnMutableRealmInteger"
+        const val FIELD_DECIMAL128 = "columnDecimal128"
+        const val FIELD_OBJECT_ID = "columnObjectId"
+        const val FIELD_REALMOBJECT = "columnRealmObject"
+        const val FIELD_REALMLIST = "columnRealmList"
+        const val FIELD_STRING_LIST = "columnStringList"
+        const val FIELD_BINARY_LIST = "columnBinaryList"
+        const val FIELD_BOOLEAN_LIST = "columnBooleanList"
+        const val FIELD_LONG_LIST = "columnLongList"
+        const val FIELD_DOUBLE_LIST = "columnDoubleList"
+        const val FIELD_FLOAT_LIST = "columnFloatList"
+        const val FIELD_DATE_LIST = "columnDateList"
+        val INVALID_TYPES_FIELDS_FOR_DISTINCT = arrayOf(FIELD_REALMOBJECT, FIELD_REALMLIST, FIELD_DOUBLE, FIELD_FLOAT,
+                FIELD_STRING_LIST, FIELD_BINARY_LIST, FIELD_BOOLEAN_LIST, FIELD_LONG_LIST,
+                FIELD_DOUBLE_LIST, FIELD_FLOAT_LIST, FIELD_DATE_LIST)
+    }
+
+    @PrimaryKey
+    @RealmField(name = "_id")
+    var id = ObjectId()
+
+    @Required
+    var columnString = ""
+    var columnLong: Long = 0
+    var columnFloat = 0f
+    var columnDouble = 0.0
+    var isColumnBoolean = false
+
+    @Required
+    var columnDate = Date(0)
+
+    @Required
+    var columnBinary = ByteArray(0)
+
+    @Required
+    var columnDecimal128 = Decimal128(BigDecimal.ZERO)
+
+    @Required
+    var columnObjectId = ObjectId(TestHelper.randomObjectIdHexString())
+    val columnRealmInteger = MutableRealmInteger.ofNull()
+    var columnRealmObject: SyncDog? = null
+    var columnRealmList: RealmList<SyncDog>? = null
+    var columnStringList: RealmList<String>? = null
+    var columnBinaryList: RealmList<ByteArray>? = null
+    var columnBooleanList: RealmList<Boolean>? = null
+    var columnLongList: RealmList<Long>? = null
+    var columnDoubleList: RealmList<Double>? = null
+    var columnFloatList: RealmList<Float>? = null
+    var columnDateList: RealmList<Date>? = null
+    var columnDecimal128List: RealmList<Decimal128>? = null
+
+    var columnObjectIdList: RealmList<ObjectId>? = null
+
+    fun setColumnMutableRealmInteger(value: Int) {
+        columnRealmInteger.set(value.toLong())
+    }
+
+}

realm/realm-library/src/androidTestObjectServer/kotlin/io/realm/entities/SyncAllTypesSchema.kt

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2020 Realm Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Copyright 2020 Realm Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.realm.entities
+
+import io.realm.annotations.RealmModule
+
+/**
+ * The set of classes initially supported by MongoDB Realm.
+ */
+@RealmModule(classes = [SyncDog::class, SyncPerson::class, SyncAllTypes::class])
+class SyncAllTypesSchema {
+}

realm/realm-library/src/androidTestObjectServer/kotlin/io/realm/entities/SyncStringOnly.kt

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2020 Realm Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.realm.entities
+
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+import io.realm.annotations.RealmField
+import org.bson.types.ObjectId
+
+open class SyncStringOnly : RealmObject() {
+
+    companion object {
+        const val CLASS_NAME = "StringOnly"
+        const val FIELD_CHARS = "chars"
+    }
+
+    @PrimaryKey
+    @RealmField(name = "_id")
+    var id = ObjectId()
+
+    var chars: String? = null
+
+}

realm/realm-library/src/androidTestObjectServer/kotlin/io/realm/entities/SyncStringOnlyModule.kt

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2020 Realm Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.realm.entities
+
+import io.realm.annotations.RealmModule
+
+@RealmModule(classes = [SyncStringOnly::class])
+class SyncStringOnlyModule

realm/realm-library/src/androidTestObjectServer/kotlin/io/realm/entities/SyncSupportedTypes.kt

@@ -0,0 +1,102 @@
+/*
+ * Copyright 2020 Realm Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.realm.entities
+
+import io.realm.MutableRealmInteger
+import io.realm.RealmList
+import io.realm.RealmObject
+import io.realm.TestHelper
+import io.realm.annotations.PrimaryKey
+import io.realm.annotations.RealmField
+import io.realm.annotations.Required
+import org.bson.types.Decimal128
+import org.bson.types.ObjectId
+import java.math.BigDecimal
+import java.util.*
+
+open class SyncSupportedTypes : RealmObject() {
+
+    companion object {
+        const val CLASS_NAME = "AllTypes"
+        const val FIELD_STRING = "columnString"
+        const val FIELD_LONG = "columnLong"
+        const val FIELD_FLOAT = "columnFloat"
+        const val FIELD_DOUBLE = "columnDouble"
+        const val FIELD_BOOLEAN = "columnBoolean"
+        const val FIELD_DATE = "columnDate"
+        const val FIELD_BINARY = "columnBinary"
+        const val FIELD_MUTABLEREALMINTEGER = "columnMutableRealmInteger"
+        const val FIELD_DECIMAL128 = "columnDecimal128"
+        const val FIELD_OBJECT_ID = "columnObjectId"
+        const val FIELD_REALMOBJECT = "columnRealmObject"
+        const val FIELD_REALMLIST = "columnRealmList"
+        const val FIELD_STRING_LIST = "columnStringList"
+        const val FIELD_BINARY_LIST = "columnBinaryList"
+        const val FIELD_BOOLEAN_LIST = "columnBooleanList"
+        const val FIELD_LONG_LIST = "columnLongList"
+        const val FIELD_DOUBLE_LIST = "columnDoubleList"
+        const val FIELD_FLOAT_LIST = "columnFloatList"
+        const val FIELD_DATE_LIST = "columnDateList"
+        val INVALID_TYPES_FIELDS_FOR_DISTINCT = arrayOf(FIELD_REALMOBJECT, FIELD_REALMLIST, FIELD_DOUBLE, FIELD_FLOAT,
+                FIELD_STRING_LIST, FIELD_BINARY_LIST, FIELD_BOOLEAN_LIST, FIELD_LONG_LIST,
+                FIELD_DOUBLE_LIST, FIELD_FLOAT_LIST, FIELD_DATE_LIST)
+    }
+
+    @PrimaryKey
+    @RealmField(name = "_id")
+    var id = ObjectId()
+
+    @Required
+    var columnString = ""
+    var columnLong: Long = 0
+    var columnFloat = 0f
+    var isColumnBoolean = false
+
+    @Required
+    var columnDate = Date(0)
+
+    @Required
+    var columnBinary = ByteArray(0)
+
+    @Required
+    var columnDecimal128 = Decimal128(BigDecimal.ZERO)
+
+    @Required
+    var columnObjectId = ObjectId(TestHelper.randomObjectIdHexString())
+    val columnRealmInteger = MutableRealmInteger.ofNull()
+    var columnRealmObject: SyncDog? = null
+    var columnRealmList: RealmList<SyncDog>? = null
+
+    // FIXME These are the fields needed to be removed from SyncAllTypes for sync to work when
+    //  updating the partitionValue
+//    var columnDouble = 0.0
+//    var columnStringList: RealmList<String>? = null
+//    var columnBinaryList: RealmList<ByteArray>? = null
+//    var columnBooleanList: RealmList<Boolean>? = null
+//    var columnLongList: RealmList<Long>? = null
+//    var columnDoubleList: RealmList<Double>? = null
+//    var columnFloatList: RealmList<Float> = RealmList()
+//    var columnDateList: RealmList<Date>? = null
+//    var columnDecimal128List: RealmList<Decimal128>? = null
+
+//    var columnObjectIdList: RealmList<ObjectId>? = null
+
+    fun setColumnMutableRealmInteger(value: Int) {
+        columnRealmInteger.set(value.toLong())
+    }
+
+}

realm/realm-library/src/androidTestObjectServer/kotlin/io/realm/mongodb/sync/SyncConfigurationTests.kt

@@ -97,6 +97,7 @@ class SyncConfigurationTests {
     }
 
     @Test
+    // FIXME Tests are not exhaustive
     fun equals_not() {
         val user1: User = createTestUser(app)
         val user2: User = createTestUser(app)

realm/realm-library/src/androidTestObjectServer/kotlin/io/realm/mongodb/sync/SyncExt.kt

@@ -20,3 +20,7 @@ package io.realm.mongodb.sync
 fun Sync.testReset() {
     this.reset()
 }
+
+fun Sync.simulateClientReset(session: SyncSession) {
+    this.simulateClientReset(session)
+}

realm/realm-library/src/androidTestObjectServer/kotlin/io/realm/mongodb/sync/SyncSessionExt.kt

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2020 Realm Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.realm.mongodb.sync
+
+// Helper to expose package protected methods for testing purpose
+fun SyncSession.testClose() {
+    this.close()
+}

realm/realm-library/src/androidTestObjectServer/kotlin/io/realm/util/KotlinTestUtils.kt

@@ -61,6 +61,7 @@ class ResourceContainer : Closeable {
     @Synchronized
     override fun close() {
         resources.map { it.close() }
+        resources.clear()
     }
 
     @Synchronized

realm/realm-library/src/main/cpp/io_realm_internal_OsRealmConfig.cpp

@@ -26,6 +26,7 @@
 #endif
 
 #include <linux/errno.h>
+#include <jni_util/bson_util.hpp>
 
 #include "java_accessor.hpp"
 #include "util.hpp"
@@ -332,8 +333,13 @@ JNIEXPORT jstring JNICALL Java_io_realm_internal_OsRealmConfig_nativeCreateAndSe
         SyncSessionStopPolicy session_stop_policy = static_cast<SyncSessionStopPolicy>(j_session_stop_policy);
 
         JStringAccessor realm_url(env, j_sync_realm_url);
-        JStringAccessor partion_key_value(env, j_partion_key_value);
-        config.sync_config = std::make_shared<SyncConfig>(SyncConfig{user, partion_key_value});
+        // TODO Simplify. Java serialization only allows writing full documents, so the partition
+        //  key is embedded in a document with key 'value'. To get is as string were we parse it
+        //  and reformat with C++ bson serialization as it supports serializing single values.
+        Bson bson(JniBsonProtocol::jstring_to_bson(env, j_partion_key_value));
+        std::stringstream buffer;
+        buffer << bson;
+        config.sync_config = std::make_shared<SyncConfig>(SyncConfig{user, buffer.str()});
         config.sync_config->stop_policy = session_stop_policy;
         config.sync_config->error_handler = std::move(error_handler);
         switch (j_client_reset_mode) {