Skip to content

Commit 4c0ad5a

Browse files
committed
test(bulk-model-sync-gradle): do not use ReplicatedModel for applying changes
1 parent 43254d6 commit 4c0ad5a

File tree

1 file changed

+17
-16
lines changed
  • bulk-model-sync-gradle-test/src/test/kotlin/org/modelix/model/sync/bulk/gradle/test

1 file changed

+17
-16
lines changed

bulk-model-sync-gradle-test/src/test/kotlin/org/modelix/model/sync/bulk/gradle/test/PushTest.kt

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,15 @@ import org.modelix.model.ModelFacade
1212
import org.modelix.model.api.ConceptReference
1313
import org.modelix.model.api.getDescendants
1414
import org.modelix.model.api.getRootNode
15+
import org.modelix.model.client2.IModelClientV2
1516
import org.modelix.model.client2.ModelClientV2PlatformSpecificBuilder
16-
import org.modelix.model.client2.ReplicatedModel
1717
import org.modelix.model.client2.getReplicatedModel
18+
import org.modelix.model.client2.runWrite
1819
import org.modelix.model.data.ModelData
1920
import org.modelix.model.data.NodeData
21+
import org.modelix.model.lazy.BranchReference
2022
import org.modelix.model.lazy.RepositoryId
2123
import org.modelix.model.server.Main
22-
import org.modelix.model.sleep
2324
import org.modelix.model.sync.bulk.asExported
2425
import java.io.File
2526
import kotlin.test.assertContentEquals
@@ -49,24 +50,24 @@ class PushTest {
4950
branch.runRead {
5051
assertContentEquals(inputModel.root.children, branch.getRootNode().allChildren.map { it.asExported() })
5152
}
53+
replicatedModel.dispose()
5254

53-
applyChangesForPullTest(replicatedModel)
55+
applyChangesForPullTest(client, branchRef)
5456
}
5557

56-
private fun applyChangesForPullTest(replicatedModel: ReplicatedModel) {
57-
val branch = replicatedModel.getBranch()
58-
branch.runWrite {
59-
val graphNodes = branch.getRootNode()
60-
.getDescendants(false)
61-
.filter { it.getConceptReference() == ConceptReference(_C_UntypedImpl_Node.getUID()) }
62-
.map { it.typed<N_Node>() }
63-
.toList()
58+
private fun applyChangesForPullTest(client: IModelClientV2, branchRef: BranchReference) {
59+
runBlocking {
60+
client.runWrite(branchRef) { rootNode ->
61+
val graphNodes = rootNode
62+
.getDescendants(false)
63+
.filter { it.getConceptReference() == ConceptReference(_C_UntypedImpl_Node.getUID()) }
64+
.map { it.typed<N_Node>() }
65+
.toList()
6466

65-
graphNodes[0].name = "X"
66-
graphNodes[1].name = "Y"
67-
graphNodes[2].name = "Z"
67+
graphNodes[0].name = "X"
68+
graphNodes[1].name = "Y"
69+
graphNodes[2].name = "Z"
70+
}
6871
}
69-
sleep(5000) // changes are pushed asynchronously to the server. wait for the propagation
70-
replicatedModel.dispose()
7172
}
7273
}

0 commit comments

Comments
 (0)