chore(model-server): reduce compiler warnings for tests

Author: languitar

model-server/src/main/kotlin/org/modelix/model/server/handlers/DeprecatedLightModelServer.kt

@@ -259,7 +259,7 @@ class DeprecatedLightModelServer(val client: LocalModelClient) {
             }
         }
 
-        val operationsAndTree = branch.operationsAndTree
+        val operationsAndTree = branch.getPendingChanges()
         val newVersion = CLVersion.createRegularVersion(
             client.idGenerator.generate(),
             Date().toString(),

model-server/src/test/kotlin/org/modelix/model/server/JsonAPITest.kt

@@ -157,23 +157,20 @@ class JsonAPITest {
             put("name", "EntityA")
         }
         val v1 = v1json.getString("versionHash")
-        val queryAndAssert: suspend (String, String?) -> Unit = { role, expectedValue ->
-            val merged = getCurrentVersion()
-            val entity = getFirstEntity(merged)
-            assertEquals(expectedValue, entity.getJSONObject("properties").getString(role))
-        }
-        val v2a = createNode(v1, nodeId, "properties", null) {
+        // v2 A
+        createNode(v1, nodeId, "properties", null) {
             put("name", "propertyA1")
         }
-        val v2b = createNode(v1, nodeId, "properties", null) {
+        // v2 B
+        createNode(v1, nodeId, "properties", null) {
             put("name", "propertyA2")
         }
         val v3 = getCurrentVersion()
         assertEquals(2, getFirstEntity(v3).getJSONObject("children").getJSONArray("properties").length())
     }
 
     private suspend fun ApplicationTestBuilder.changeNode(versionHash: String, id: Long, role: String, value: String) {
-        val response = client.post("/json/$repoId/$versionHash/update") {
+        client.post("/json/$repoId/$versionHash/update") {
             contentType(ContentType.Application.Json)
             setBody(
                 buildJSONArray(

model-server/src/test/kotlin/org/modelix/model/server/ModelClientV2Test.kt

@@ -63,7 +63,7 @@ class ModelClientV2Test {
         branch.runWriteT { t ->
             t.addNewChild(ITree.ROOT_ID, "role", -1, null as IConceptReference?)
         }
-        val (ops, newTree) = branch.operationsAndTree
+        val (ops, newTree) = branch.getPendingChanges()
         val newVersion = CLVersion.createRegularVersion(
             client.getIdGenerator().generate(),
             null,

model-server/src/test/kotlin/org/modelix/model/server/ReplicatedRepositoryTest.kt

@@ -207,7 +207,7 @@ class ReplicatedRepositoryTest {
      * Makes it easier to test and fix performance issues.
      */
     @RepeatedTest(value = 10)
-    fun deterministicConcurrentWrite(repetitionInfo: RepetitionInfo) = runTest { scope ->
+    fun deterministicConcurrentWrite(repetitionInfo: RepetitionInfo) = runTest {
         val url = "http://localhost/v2"
         val clients = (1..3).map {
             ModelClientV2.builder().url(url).client(client).build().also { it.init() }
@@ -441,7 +441,7 @@ class ReplicatedRepositoryTest {
 
         (1..100).forEach {
             val baseVersion = versions[rand.nextInt(versions.size)]
-            val branch = OTBranch(PBranch(baseVersion.tree, idGenerator), idGenerator, initialTree.store)
+            val branch = OTBranch(PBranch(baseVersion.getTree(), idGenerator), idGenerator, initialTree.store)
             branch.runWriteT { t ->
                 createdNodes += t.addNewChild(ITree.ROOT_ID, "role", -1, null as IConceptReference?).toString(16)
             }

model-server/src/test/kotlin/org/modelix/model/server/handlers/ModelReplicationServerTest.kt

@@ -171,7 +171,7 @@ class ModelReplicationServerTest {
 
     @Test
     fun `responds with 400 when deleting from an invalid repository ID`() {
-        runWithTestModelServer { _, fixture ->
+        runWithTestModelServer { _, _ ->
             val response = client.delete {
                 url {
                     appendPathSegments("v2", "repositories", "invalid with spaces", "branches", "master")