Fix more tests

realm · Aug 24, 2023 · 1fbfc7b · 1fbfc7b
1 parent 1dcfc72
commit 1fbfc7b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/...ges/cinterop/src/commonMain/kotlin/io/realm/kotlin/internal/interop/CoreErrorConverter.kt b/...ges/cinterop/src/commonMain/kotlin/io/realm/kotlin/internal/interop/CoreErrorConverter.kt
@@ -38,8 +38,11 @@ object CoreErrorConverter {
         return userError ?: when {
             ErrorCode.RLM_ERR_INDEX_OUT_OF_BOUNDS == errorCode ->
                 IndexOutOfBoundsException(message)
-            ErrorCategory.RLM_ERR_CAT_INVALID_ARG in categories ->
+            ErrorCategory.RLM_ERR_CAT_INVALID_ARG in categories && ErrorCategory.RLM_ERR_CAT_SYNC_ERROR !in categories -> {
+                // Some sync errors flagged as both logical and illegal. In our case, we consider those
+                // IllegalState, so discard them them here and let them fall through to the bottom case
                 IllegalArgumentException(message)
+            }
             ErrorCategory.RLM_ERR_CAT_LOGIC in categories || ErrorCategory.RLM_ERR_CAT_RUNTIME in categories ->
                 IllegalStateException(message)
             else -> Error(message) // This can happen when propagating user level exceptions.

diff --git a/packages/external/core b/packages/external/core
diff --git a/...s/test-sync/src/commonTest/kotlin/io/realm/kotlin/test/mongodb/common/SyncedRealmTests.kt b/...s/test-sync/src/commonTest/kotlin/io/realm/kotlin/test/mongodb/common/SyncedRealmTests.kt
@@ -386,15 +386,9 @@ class SyncedRealmTests {
             exception.message.let { errorMessage ->
                 assertNotNull(errorMessage)
                 // Some race on JVM in particular mean that different errors can be reported.
-                if (errorMessage.contains("[Client]")) {
-                    assertTrue(errorMessage.contains("[BadChangeset(112)]"), errorMessage)
-                    assertTrue(errorMessage.contains("Bad changeset (DOWNLOAD)"), errorMessage)
-                } else if (errorMessage.contains("[Session]")) {
-                    assertTrue(errorMessage.contains("InvalidSchemaChange(225)"), errorMessage)
-                    assertTrue(
-                        errorMessage.contains("Invalid schema change (UPLOAD)"),
-                        errorMessage
-                    )
+                if (errorMessage.contains("[Sync]")) {
+                    assertTrue(errorMessage.contains("[BadChangeset(1015)]"), errorMessage)
+                    assertTrue(errorMessage.contains("Schema mismatch"), errorMessage)
                 } else {
                     fail("Unexpected error message: $errorMessage")
                 }