chore: add simple REST completion retrieval extension function

S-furi · S-furi · commit 3fe2529f263c · 2025-10-16T12:29:11.000+02:00
diff --git a/completions/src/test/kotlin/CompletionTest.kt b/completions/src/test/kotlin/CompletionTest.kt
@@ -9,7 +9,7 @@ interface CompletionTest : BaseCompletionTest {
             code = "fun main() {\n    val alex = 1\n    val alex1 = 1 + a\n}",
             line = 2,
             character = 21,
-            completions = listOf(
+            expected = listOf(
                 "alex"
             )
         )
@@ -21,7 +21,7 @@ interface CompletionTest : BaseCompletionTest {
             code = "fun main() {\n    val alex = 1\n    val alex1 = 1 + a\n}",
             line = 2,
             character = 21,
-            completions = listOf(
+            expected = listOf(
                 "alex"
             ),
             isJs = true
@@ -34,7 +34,7 @@ interface CompletionTest : BaseCompletionTest {
             code = "fun main() {\n    3.0.toIn\n}",
             line = 1,
             character = 12,
-            completions = listOf(
+            expected = listOf(
                 "toInt()"
             )
         )
@@ -46,7 +46,7 @@ interface CompletionTest : BaseCompletionTest {
             code = "fun main() {\n    3.0.toIn\n}",
             line = 1,
             character = 12,
-            completions = listOf(
+            expected = listOf(
                 "toInt()"
             ),
             isJs = true
@@ -60,7 +60,7 @@ interface CompletionTest : BaseCompletionTest {
             code = "fun main() {\n    list\n}",
             line = 1,
             character = 8,
-            completions = listOf(
+            expected = listOf(
                 "listOf()",
                 "listOf(element: T)",
                 "listOfNotNull(element: T?)",
@@ -76,7 +76,7 @@ interface CompletionTest : BaseCompletionTest {
             code = "fun main() {\n    list\n}",
             line = 1,
             character = 8,
-            completions = listOf(
+            expected = listOf(
                 "listOf()",
                 "listOf(element: T)",
                 "listOfNotNull(element: T?)",
diff --git a/completions/src/test/kotlin/ConcurrencyCompletionRunnerTest.kt b/completions/src/test/kotlin/ConcurrencyCompletionRunnerTest.kt
@@ -1,9 +1,12 @@
 import base.BaseCompletionTest
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.Test
+import org.junit.platform.commons.logging.LoggerFactory
 import kotlin.test.Ignore
+import kotlin.time.Duration.Companion.milliseconds
 
 abstract class ConcurrencyCompletionRunnerTest : BaseCompletionTest {
     // TODO(Dmitrii Krasnov): this test is disabled until KTL-2807 is fixed
@@ -15,7 +18,7 @@ abstract class ConcurrencyCompletionRunnerTest : BaseCompletionTest {
                 code = "fun main() {\n    val alex = 1\n    val alex1 = 1 + a\n}",
                 line = 2,
                 character = 21,
-                completions = listOf(
+                expected = listOf(
                     "alex"
                 )
             )
@@ -31,7 +34,7 @@ abstract class ConcurrencyCompletionRunnerTest : BaseCompletionTest {
                 code = "fun main() {\n    val alex = 1\n    val alex1 = 1 + a\n}",
                 line = 2,
                 character = 21,
-                completions = listOf(
+                expected = listOf(
                     "alex"
                 ),
                 isJs = true
diff --git a/completions/src/test/kotlin/ImportTest.kt b/completions/src/test/kotlin/ImportTest.kt
@@ -14,7 +14,7 @@ interface ImportTest : BaseCompletionTest {
             code = "fun main() {\n    val rand = Random\n}",
             line = 1,
             character = 21,
-            completions = listOf(
+            expected = listOf(
                 "Random  (kotlin.random.Random)"
             )
         )
@@ -69,7 +69,7 @@ interface ImportTest : BaseCompletionTest {
       """.trimMargin(),
             line = 1,
             character = 20,
-            completions = listOf(
+            expected = listOf(
                 "Random  (kotlin.random.Random)"
             )
         )
@@ -83,7 +83,7 @@ interface ImportTest : BaseCompletionTest {
                     "}",
             line = 1,
             character = 15,
-            completions = listOf(
+            expected = listOf(
                 "sin(x: Double)  (kotlin.math.sin)",
                 "sin(x: Float)  (kotlin.math.sin)"
             )
@@ -134,7 +134,7 @@ interface ImportTest : BaseCompletionTest {
             code = "fun main() {\n    val rand = Random\n}",
             line = 1,
             character = 21,
-            completions = listOf(
+            expected = listOf(
                 "Random  (kotlin.random.Random)"
             ),
             isJs = true
@@ -174,7 +174,7 @@ interface ImportTest : BaseCompletionTest {
       """.trimMargin(),
             line = 1,
             character = 20,
-            completions = listOf(
+            expected = listOf(
                 "Random  (kotlin.random.Random)"
             ),
             isJs = true
@@ -189,7 +189,7 @@ interface ImportTest : BaseCompletionTest {
                     "}",
             line = 1,
             character = 15,
-            completions = listOf(
+            expected = listOf(
                 "sin(x: Double)  (kotlin.math.sin)",
                 "sin(x: Float)  (kotlin.math.sin)"
             ),
diff --git a/completions/src/test/kotlin/base/BaseCompletionTest.kt b/completions/src/test/kotlin/base/BaseCompletionTest.kt
@@ -1,11 +1,40 @@
 package base
 
+import completions.model.Project
+import completions.model.ProjectFile
+import model.Completion
+import org.springframework.test.web.reactive.server.WebTestClient
+import java.time.Duration
+import kotlin.time.Duration.Companion.minutes
+import kotlin.time.toJavaDuration
+
 interface BaseCompletionTest {
     fun performCompletionChecks(
         code: String,
         line: Int,
         character: Int,
-        completions: List<String>,
+        expected: List<String>,
         isJs: Boolean = false
     )
+
+    companion object {
+        fun WebTestClient.retrieveCompletions(url: String, code: String): List<Completion> {
+            val project = Project(files = listOf(ProjectFile(text = code, name = "file.kt")))
+            return withTimeout {
+                post()
+                    .uri(url)
+                    .bodyValue(project)
+                    .exchange()
+                    .expectStatus().isOk
+                    .expectBodyList(Completion::class.java)
+                    .returnResult()
+                    .responseBody
+            } ?: emptyList()
+        }
+
+        private fun <T> WebTestClient.withTimeout(
+            duration: Duration = 2.minutes.toJavaDuration(),
+            body: WebTestClient.() -> T?
+        ): T? = with(mutate().responseTimeout(duration).build()) { body() }
+    }
 }
diff --git a/completions/src/test/kotlin/lsp/LspClientTest.kt b/completions/src/test/kotlin/lsp/LspClientTest.kt
@@ -59,7 +59,7 @@ class LspClientTest : CompletionTest {
         code: String,
         line: Int,
         character: Int,
-        completions: List<String>,
+        expected: List<String>,
         isJs: Boolean
     ) = runBlocking {
         if (isJs) return@runBlocking
@@ -69,7 +69,7 @@ class LspClientTest : CompletionTest {
         val received = client.getCompletion(uri, caret).await()
 
         val labels = received.mapNotNull { it.toCompletion()?.displayText }
-        assertAll(completions.map { exp ->
+        assertAll(expected.map { exp ->
             { assertTrue(labels.any { it.contains(exp) }, "Expected completion $exp but got $labels") }
         })
     }
diff --git a/completions/src/test/kotlin/lsp/LspCompletionProviderTest.kt b/completions/src/test/kotlin/lsp/LspCompletionProviderTest.kt
@@ -1,11 +1,10 @@
 package lsp
 
 import CompletionTest
+import base.BaseCompletionTest.Companion.retrieveCompletions
 import lsp.utils.CARET_MARKER
 import lsp.utils.KotlinLspComposeExtension
 import lsp.utils.extractCaret
-import completions.model.Project
-import completions.model.ProjectFile
 import model.Completion
 import model.Icon
 import org.eclipse.lsp4j.Position
@@ -17,11 +16,8 @@ import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.boot.test.web.server.LocalServerPort
 import org.springframework.test.web.reactive.server.WebTestClient
-import java.time.Duration
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
-import kotlin.time.Duration.Companion.minutes
-import kotlin.time.toJavaDuration
 
 @SpringBootTest(
     webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
@@ -94,34 +90,18 @@ class LspCompletionProviderTest : CompletionTest {
         code: String,
         line: Int,
         character: Int,
-        completions: List<String>,
+        expected: List<String>,
         isJs: Boolean
     ) {
         val caret = Position(line, character)
         val completions = retrieveCompletionsFromEndpoint(code, caret).map { it.displayText }
-        assertAll(executables = completions.map { exp ->
+        assertAll(expected.map { exp ->
             { assertTrue(completions.any { it.contains(exp) }, "Expected completion $exp but got $completions") }
         })
     }
 
     private fun retrieveCompletionsFromEndpoint(code: String, position: Position): List<Completion>  {
-        val project = Project(files = listOf(ProjectFile(text = code, name = "file.kt")))
         val url = "http://localhost:$port/api/complete/lsp?line=${position.line}&ch=${position.character}"
-        return withTimeout {
-            post()
-                .uri(url)
-                .bodyValue(project)
-                .exchange()
-                .expectStatus().isOk
-                .expectBodyList(Completion::class.java)
-                .returnResult()
-                .responseBody
-        } ?: emptyList()
-
+        return webTestClient.retrieveCompletions(url, code)
     }
-
-    private fun <T> withTimeout(
-        duration: Duration = 2.minutes.toJavaDuration(),
-        body: WebTestClient.() -> T?
-    ): T? = with(webTestClient.mutate().responseTimeout(duration).build()) { body() }
 }
diff --git a/completions/src/test/kotlin/lsp/ws/KotlinLspProxyWSTest.kt b/completions/src/test/kotlin/lsp/ws/KotlinLspProxyWSTest.kt
@@ -57,7 +57,7 @@ class KotlinLspProxyWSTest : CompletionTest {
         code: String,
         line: Int,
         character: Int,
-        completions: List<String>,
+        expected: List<String>,
         isJs: Boolean
     ) {
         if (isJs) return // silently ignore JS completions for now
@@ -74,7 +74,7 @@ class KotlinLspProxyWSTest : CompletionTest {
         StepVerifier.create(completionsMono)
             .assertNext { received ->
                 val labels = received.map { it.displayText }
-                assertAll(completions.map { exp ->
+                assertAll(expected.map { exp ->
                     { assertTrue(labels.any { it.contains(exp) }, "Expected completion $exp but got $labels") }
                 })
             }
