Merge pull request #45 from tgodzik/add-test-compile

improvement: Add testCompile to test actual compilation
build-server-protocol · Apr 12, 2024 · 3462993 · 3462993
2 parents a53e52e + 57fac63
commit 3462993
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/bsp-testkit/client/MockClient.kt b/bsp-testkit/client/MockClient.kt
@@ -42,6 +42,9 @@ open class MockClient : BuildClient {
   val didChangeBuildTargetNotifications: List<DidChangeBuildTarget>
     get() = didChangeBuildTarget
 
+  fun clearDiagnostics() {
+    publishDiagnostics.clear()
+  }
   override fun onBuildShowMessage(params: ShowMessageParams) {
     showMessage.add(params)
   }

diff --git a/bsp-testkit/client/TestClient.kt b/bsp-testkit/client/TestClient.kt
@@ -3,6 +3,8 @@ package org.jetbrains.bsp.testkit.client
 import ch.epfl.scala.bsp4j.BuildClient
 import ch.epfl.scala.bsp4j.BuildServer
 import ch.epfl.scala.bsp4j.BuildServerCapabilities
+import ch.epfl.scala.bsp4j.CompileParams
+import ch.epfl.scala.bsp4j.CompileResult
 import ch.epfl.scala.bsp4j.CppOptionsParams
 import ch.epfl.scala.bsp4j.CppOptionsResult
 import ch.epfl.scala.bsp4j.DependencyModulesParams
@@ -20,6 +22,7 @@ import ch.epfl.scala.bsp4j.JvmRunEnvironmentParams
 import ch.epfl.scala.bsp4j.JvmRunEnvironmentResult
 import ch.epfl.scala.bsp4j.JvmTestEnvironmentParams
 import ch.epfl.scala.bsp4j.JvmTestEnvironmentResult
+import ch.epfl.scala.bsp4j.PublishDiagnosticsParams
 import ch.epfl.scala.bsp4j.PythonOptionsParams
 import ch.epfl.scala.bsp4j.PythonOptionsResult
 import ch.epfl.scala.bsp4j.ResourcesParams
@@ -42,6 +45,7 @@ import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.future.await
 import kotlinx.coroutines.test.runTest
 import org.jetbrains.bsp.testkit.JsonComparator
+import org.junit.jupiter.api.Assertions.assertIterableEquals
 import java.nio.file.Path
 import kotlin.time.Duration
 
@@ -147,6 +151,16 @@ class TestClient(
     }
   }
 
+  fun testCompile(timeout: Duration, params: CompileParams, expectedResult: CompileResult, expectedDiagnostics: List<PublishDiagnosticsParams>) {
+    val transformedParams = applyJsonTransform(params)
+    test(timeout) { session, _ ->
+      session.client.clearDiagnostics()
+      val result = session.server.buildTargetCompile(transformedParams).await()
+      assertIterableEquals(expectedDiagnostics, session.client.publishDiagnosticsNotifications)
+      assertJsonEquals(expectedResult, result)
+    }
+  }
+
   fun testWorkspaceTargets(timeout: Duration, expectedResult: WorkspaceBuildTargetsResult) {
     test(timeout) { session, _ ->
       val result = session.server.workspaceBuildTargets().await()