fix test failures

yorkie-team · Aug 23, 2023 · 627fd00 · 627fd00
1 parent fd794f6
commit 627fd00
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 48 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -93,7 +93,9 @@ jobs:
           ram-size: 4096M
           emulator-boot-timeout: 12000
           disable-animations: true
-          script: ./gradlew yorkie:connectedCheck --no-build-cache --no-daemon --stacktrace
+          script: |
+            ./gradlew yorkie:connectedCheck -Pandroid.testInstrumentationRunnerArguments.notAnnotation=androidx.test.filters.LargeTest --no-build-cache --no-daemon --stacktrace
+            ./gradlew yorkie:connectedCheck -Pandroid.testInstrumentationRunnerArguments.annotation=androidx.test.filters.LargeTest --no-build-cache --no-daemon --stacktrace
       - if: ${{ matrix.api-level == 30 }}
         run: ./gradlew yorkie:jacocoDebugTestReport
       - if: ${{ matrix.api-level == 30 }}

diff --git a/yorkie/src/androidTest/kotlin/dev/yorkie/document/json/JsonTreeTest.kt b/yorkie/src/androidTest/kotlin/dev/yorkie/document/json/JsonTreeTest.kt
@@ -1,6 +1,7 @@
 package dev.yorkie.document.json
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
 import dev.yorkie.core.Client
 import dev.yorkie.core.Presence
 import dev.yorkie.core.withTwoClientsAndDocuments
@@ -12,6 +13,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import kotlin.test.assertEquals
 
+@LargeTest
 @RunWith(AndroidJUnit4::class)
 class JsonTreeTest {
 

diff --git a/yorkie/src/main/kotlin/dev/yorkie/document/json/JsonObject.kt b/yorkie/src/main/kotlin/dev/yorkie/document/json/JsonObject.kt
@@ -113,7 +113,7 @@ public class JsonObject internal constructor(
         val ticket = context.issueTimeTicket()
         val tree = CrdtTree(JsonTree.buildRoot(initialRoot, context), ticket)
         setAndRegister(key, tree)
-        return JsonTree(context, tree)
+        return tree.toJsonElement(context)
     }
 
     private fun setAndRegister(key: String, element: CrdtElement) {

diff --git a/yorkie/src/test/kotlin/dev/yorkie/document/json/JsonTreeTest.kt b/yorkie/src/test/kotlin/dev/yorkie/document/json/JsonTreeTest.kt
@@ -532,57 +532,62 @@ class JsonTreeTest {
                     }
                 },
             )
-        }.await()
-        assertEquals("<doc><tc><p><tn>ab</tn></p></tc></doc>", document.getRoot().tree().toXml())
+            assertEquals(
+                "<doc><tc><p><tn>ab</tn></p></tc></doc>",
+                document.getRoot().tree().toXml(),
+            )
 
-        document.getRoot().tree().editByPath(
-            listOf(0, 0, 0, 1),
-            listOf(0, 0, 0, 1),
-            text { "X" },
-            text { "X" },
-        )
-        assertEquals("<doc><tc><p><tn>aXXb</tn></p></tc></doc>", document.getRoot().tree().toXml())
+            root.tree().editByPath(
+                listOf(0, 0, 0, 1),
+                listOf(0, 0, 0, 1),
+                text { "X" },
+                text { "X" },
+            )
+            assertEquals(
+                "<doc><tc><p><tn>aXXb</tn></p></tc></doc>",
+                document.getRoot().tree().toXml(),
+            )
 
-        document.getRoot().tree().editByPath(
-            listOf(0, 1),
-            listOf(0, 1),
-            element("p") {
-                element("tn") {
-                    text { "te" }
-                    text { "st" }
-                }
-            },
-            element("p") {
+            root.tree().editByPath(
+                listOf(0, 1),
+                listOf(0, 1),
+                element("p") {
+                    element("tn") {
+                        text { "te" }
+                        text { "st" }
+                    }
+                },
+                element("p") {
+                    element("tn") {
+                        text { "te" }
+                        text { "xt" }
+                    }
+                },
+            )
+            assertEquals(
+                "<doc><tc><p><tn>aXXb</tn></p><p><tn>test</tn></p><p><tn>text</tn></p></tc></doc>",
+                document.getRoot().tree().toXml(),
+            )
+
+            root.tree().editByPath(
+                listOf(0, 3),
+                listOf(0, 3),
+                element("p") {
+                    element("tn") {
+                        text { "te" }
+                        text { "st" }
+                    }
+                },
                 element("tn") {
                     text { "te" }
                     text { "xt" }
-                }
-            },
-        )
-        assertEquals(
-            "<doc><tc><p><tn>aXXb</tn></p><p><tn>test</tn></p><p><tn>text</tn></p></tc></doc>",
-            document.getRoot().tree().toXml(),
-        )
-
-        // TODO(7hong13): the test should be passed when text contents values are "test" and "text"
-        document.getRoot().tree().editByPath(
-            listOf(0, 3),
-            listOf(0, 3),
-            element("p") {
-                element("tn") {
-                    text { "12" }
-                    text { "34" }
-                }
-            },
-            element("tn") {
-                text { "56" }
-                text { "78" }
-            },
-        )
-        assertEquals(
-            "<doc><tc><p><tn>aXXb</tn></p><p><tn>test</tn></p><p><tn>text</tn></p><p><tn>1234</tn></p><tn>5678</tn></tc></doc>",
-            document.getRoot().tree().toXml(),
-        )
+                },
+            )
+            assertEquals(
+                "<doc><tc><p><tn>aXXb</tn></p><p><tn>test</tn></p><p><tn>text</tn></p><p><tn>test</tn></p><tn>text</tn></tc></doc>",
+                document.getRoot().tree().toXml(),
+            )
+        }.await()
     }
 
     @Test