@@ -12,14 +12,15 @@ import org.modelix.model.ModelFacade
12
12
import org.modelix.model.api.ConceptReference
13
13
import org.modelix.model.api.getDescendants
14
14
import org.modelix.model.api.getRootNode
15
+ import org.modelix.model.client2.IModelClientV2
15
16
import org.modelix.model.client2.ModelClientV2PlatformSpecificBuilder
16
- import org.modelix.model.client2.ReplicatedModel
17
17
import org.modelix.model.client2.getReplicatedModel
18
+ import org.modelix.model.client2.runWrite
18
19
import org.modelix.model.data.ModelData
19
20
import org.modelix.model.data.NodeData
21
+ import org.modelix.model.lazy.BranchReference
20
22
import org.modelix.model.lazy.RepositoryId
21
23
import org.modelix.model.server.Main
22
- import org.modelix.model.sleep
23
24
import org.modelix.model.sync.bulk.asExported
24
25
import java.io.File
25
26
import kotlin.test.assertContentEquals
@@ -49,24 +50,24 @@ class PushTest {
49
50
branch.runRead {
50
51
assertContentEquals(inputModel.root.children, branch.getRootNode().allChildren.map { it.asExported() })
51
52
}
53
+ replicatedModel.dispose()
52
54
53
- applyChangesForPullTest(replicatedModel )
55
+ applyChangesForPullTest(client, branchRef )
54
56
}
55
57
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()
64
66
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
+ }
68
71
}
69
- sleep(5000 ) // changes are pushed asynchronously to the server. wait for the propagation
70
- replicatedModel.dispose()
71
72
}
72
73
}
0 commit comments