Some refacto of BuildServerTest

Generate BSP ids automatically
This commit is contained in:
Adrien Piquerez 2023-01-27 10:22:23 +01:00
parent 9b4d5a5a5a
commit 799adcda2b
1 changed files with 85 additions and 77 deletions

View File

@ -18,6 +18,7 @@ import sjsonnew.support.scalajson.unsafe.{ CompactPrinter, Converter }
import java.io.File import java.io.File
import java.net.URI import java.net.URI
import java.nio.file.Paths import java.nio.file.Paths
import java.util.concurrent.atomic.AtomicInteger
import scala.concurrent.duration._ import scala.concurrent.duration._
// starts svr using server-test/buildserver and perform custom server tests // starts svr using server-test/buildserver and perform custom server tests
@ -27,10 +28,14 @@ object BuildServerTest extends AbstractServerTest {
override val testDirectory: String = "buildserver" override val testDirectory: String = "buildserver"
private val idGen: AtomicInteger = new AtomicInteger(0)
private def nextId(): Int = idGen.getAndIncrement()
test("build/initialize") { _ => test("build/initialize") { _ =>
initializeRequest() val id = nextId()
initializeRequest(id)
assert(svr.waitForString(10.seconds) { s => assert(svr.waitForString(10.seconds) { s =>
(s contains """"id":"8"""") && (s contains s""""id":"${id}"""") &&
(s contains """"resourcesProvider":true""") && (s contains """"resourcesProvider":true""") &&
(s contains """"outputPathsProvider":true""") (s contains """"outputPathsProvider":true""")
}) })
@ -38,7 +43,7 @@ object BuildServerTest extends AbstractServerTest {
test("workspace/buildTargets") { _ => test("workspace/buildTargets") { _ =>
svr.sendJsonRpc( svr.sendJsonRpc(
"""{ "jsonrpc": "2.0", "id": "16", "method": "workspace/buildTargets", "params": {} }""" s"""{ "jsonrpc": "2.0", "id": "${nextId()}", "method": "workspace/buildTargets", "params": {} }"""
) )
assert(processing("workspace/buildTargets")) assert(processing("workspace/buildTargets"))
val result = svr.waitFor[WorkspaceBuildTargetsResult](10.seconds) val result = svr.waitFor[WorkspaceBuildTargetsResult](10.seconds)
@ -53,7 +58,7 @@ object BuildServerTest extends AbstractServerTest {
test("buildTarget/sources") { _ => test("buildTarget/sources") { _ =>
val buildTarget = buildTargetUri("util", "Compile") val buildTarget = buildTargetUri("util", "Compile")
val badBuildTarget = buildTargetUri("badBuildTarget", "Compile") val badBuildTarget = buildTargetUri("badBuildTarget", "Compile")
svr.sendJsonRpc(buildTargetSources(24, Seq(buildTarget, badBuildTarget))) svr.sendJsonRpc(buildTargetSources(Seq(buildTarget, badBuildTarget)))
assert(processing("buildTarget/sources")) assert(processing("buildTarget/sources"))
val s = svr.waitFor[SourcesResult](10.seconds) val s = svr.waitFor[SourcesResult](10.seconds)
val sources = s.items.head.sources.map(_.uri) val sources = s.items.head.sources.map(_.uri)
@ -61,7 +66,7 @@ object BuildServerTest extends AbstractServerTest {
} }
test("buildTarget/sources: base sources") { _ => test("buildTarget/sources: base sources") { _ =>
val buildTarget = buildTargetUri("buildserver", "Compile") val buildTarget = buildTargetUri("buildserver", "Compile")
svr.sendJsonRpc(buildTargetSources(25, Seq(buildTarget))) svr.sendJsonRpc(buildTargetSources(Seq(buildTarget)))
assert(processing("buildTarget/sources")) assert(processing("buildTarget/sources"))
val s = svr.waitFor[SourcesResult](10.seconds) val s = svr.waitFor[SourcesResult](10.seconds)
val sources = s.items.head.sources val sources = s.items.head.sources
@ -75,7 +80,7 @@ object BuildServerTest extends AbstractServerTest {
test("buildTarget/sources: sbt") { _ => test("buildTarget/sources: sbt") { _ =>
val x = new URI(s"${svr.baseDirectory.getAbsoluteFile.toURI}#buildserver-build") val x = new URI(s"${svr.baseDirectory.getAbsoluteFile.toURI}#buildserver-build")
svr.sendJsonRpc(buildTargetSources(26, Seq(x))) svr.sendJsonRpc(buildTargetSources(Seq(x)))
assert(processing("buildTarget/sources")) assert(processing("buildTarget/sources"))
val s = svr.waitFor[SourcesResult](10.seconds) val s = svr.waitFor[SourcesResult](10.seconds)
val sources = s.items.head.sources.map(_.uri).sorted val sources = s.items.head.sources.map(_.uri).sorted
@ -95,7 +100,7 @@ object BuildServerTest extends AbstractServerTest {
test("buildTarget/compile") { _ => test("buildTarget/compile") { _ =>
val buildTarget = buildTargetUri("util", "Compile") val buildTarget = buildTargetUri("util", "Compile")
compile(buildTarget, id = 32) compile(buildTarget, id = nextId())
assert(processing("buildTarget/compile")) assert(processing("buildTarget/compile"))
val res = svr.waitFor[BspCompileResult](10.seconds) val res = svr.waitFor[BspCompileResult](10.seconds)
@ -105,7 +110,7 @@ object BuildServerTest extends AbstractServerTest {
test("buildTarget/compile - reports compilation progress") { _ => test("buildTarget/compile - reports compilation progress") { _ =>
val buildTarget = buildTargetUri("runAndTest", "Compile") val buildTarget = buildTargetUri("runAndTest", "Compile")
compile(buildTarget, id = 33) compile(buildTarget)
// This doesn't always come back in 10s on CI. // This doesn't always come back in 10s on CI.
assert(svr.waitForString(60.seconds) { s => assert(svr.waitForString(60.seconds) { s =>
@ -124,7 +129,7 @@ object BuildServerTest extends AbstractServerTest {
}) })
assert(svr.waitForString(60.seconds) { s => assert(svr.waitForString(60.seconds) { s =>
s.contains("build/publishDiagnostics") s.contains("build/publishDiagnostics") &&
s.contains(""""diagnostics":[]""") s.contains(""""diagnostics":[]""")
}) })
@ -140,7 +145,7 @@ object BuildServerTest extends AbstractServerTest {
val buildTarget = buildTargetUri("diagnostics", "Compile") val buildTarget = buildTargetUri("diagnostics", "Compile")
val mainFile = new File(svr.baseDirectory, "diagnostics/src/main/scala/Diagnostics.scala") val mainFile = new File(svr.baseDirectory, "diagnostics/src/main/scala/Diagnostics.scala")
compile(buildTarget, id = 33) compile(buildTarget)
assert(svr.waitForString(30.seconds) { s => assert(svr.waitForString(30.seconds) { s =>
s.contains("build/taskFinish") && s.contains("build/taskFinish") &&
@ -155,8 +160,8 @@ object BuildServerTest extends AbstractServerTest {
|}""".stripMargin |}""".stripMargin
) )
reloadWorkspace(id = 55) reloadWorkspace()
compile(buildTarget, id = 66) compile(buildTarget)
assert( assert(
svr.waitForString(30.seconds) { s => svr.waitForString(30.seconds) { s =>
@ -175,8 +180,8 @@ object BuildServerTest extends AbstractServerTest {
|}""".stripMargin |}""".stripMargin
) )
reloadWorkspace(id = 77) reloadWorkspace()
compile(buildTarget, id = 88) compile(buildTarget)
assert( assert(
svr.waitForString(30.seconds) { s => svr.waitForString(30.seconds) { s =>
@ -188,7 +193,7 @@ object BuildServerTest extends AbstractServerTest {
) )
// trigger no-op compilation // trigger no-op compilation
compile(buildTarget, id = 99) compile(buildTarget)
assert( assert(
!svr.waitForString(20.seconds) { s => !svr.waitForString(20.seconds) { s =>
@ -203,7 +208,7 @@ object BuildServerTest extends AbstractServerTest {
val buildTarget = buildTargetUri("diagnostics", "Compile") val buildTarget = buildTargetUri("diagnostics", "Compile")
val testFile = new File(svr.baseDirectory, s"diagnostics/src/main/scala/PatternMatch.scala") val testFile = new File(svr.baseDirectory, s"diagnostics/src/main/scala/PatternMatch.scala")
compile(buildTarget, id = 33) compile(buildTarget)
assert( assert(
svr.waitForString(30.seconds) { s => svr.waitForString(30.seconds) { s =>
@ -226,8 +231,8 @@ object BuildServerTest extends AbstractServerTest {
|""".stripMargin |""".stripMargin
) )
reloadWorkspace(id = 55) reloadWorkspace()
compile(buildTarget, id = 66) compile(buildTarget)
assert( assert(
svr.waitForString(30.seconds) { s => svr.waitForString(30.seconds) { s =>
@ -243,14 +248,15 @@ object BuildServerTest extends AbstractServerTest {
test("buildTarget/scalacOptions") { _ => test("buildTarget/scalacOptions") { _ =>
val buildTarget = buildTargetUri("util", "Compile") val buildTarget = buildTargetUri("util", "Compile")
val badBuildTarget = buildTargetUri("badBuildTarget", "Compile") val badBuildTarget = buildTargetUri("badBuildTarget", "Compile")
val id = nextId()
svr.sendJsonRpc( svr.sendJsonRpc(
s"""{ "jsonrpc": "2.0", "id": "40", "method": "buildTarget/scalacOptions", "params": { s"""{ "jsonrpc": "2.0", "id": "$id", "method": "buildTarget/scalacOptions", "params": {
| "targets": [{ "uri": "$buildTarget" }, { "uri": "$badBuildTarget" }] | "targets": [{ "uri": "$buildTarget" }, { "uri": "$badBuildTarget" }]
|} }""".stripMargin |} }""".stripMargin
) )
assert(processing("buildTarget/scalacOptions")) assert(processing("buildTarget/scalacOptions"))
assert(svr.waitForString(10.seconds) { s => assert(svr.waitForString(10.seconds) { s =>
(s contains """"id":"40"""") && (s contains s""""id":"$id"""") &&
(s contains "scala-library-2.13.8.jar") (s contains "scala-library-2.13.8.jar")
}) })
} }
@ -265,12 +271,12 @@ object BuildServerTest extends AbstractServerTest {
.toFile .toFile
val buildTarget = buildTargetUri("runAndTest", "Compile") val buildTarget = buildTargetUri("runAndTest", "Compile")
compile(buildTarget, id = 43) compile(buildTarget)
svr.waitFor[BspCompileResult](10.seconds) svr.waitFor[BspCompileResult](10.seconds)
assert(targetDir.list().contains("Main.class")) assert(targetDir.list().contains("Main.class"))
svr.sendJsonRpc( svr.sendJsonRpc(
s"""{ "jsonrpc": "2.0", "id": "44", "method": "buildTarget/cleanCache", "params": { s"""{ "jsonrpc": "2.0", "id": "${nextId()}", "method": "buildTarget/cleanCache", "params": {
| "targets": [{ "uri": "$buildTarget" }] | "targets": [{ "uri": "$buildTarget" }]
|} }""".stripMargin |} }""".stripMargin
) )
@ -282,14 +288,14 @@ object BuildServerTest extends AbstractServerTest {
test("buildTarget/cleanCache: rebuild project") { _ => test("buildTarget/cleanCache: rebuild project") { _ =>
svr.sendJsonRpc( svr.sendJsonRpc(
"""{ "jsonrpc": "2.0", "id": "45", "method": "workspace/buildTargets", "params": {} }""" s"""{ "jsonrpc": "2.0", "id": "${nextId()}", "method": "workspace/buildTargets", "params": {} }"""
) )
assert(processing("workspace/buildTargets")) assert(processing("workspace/buildTargets"))
val result = svr.waitFor[WorkspaceBuildTargetsResult](10.seconds) val result = svr.waitFor[WorkspaceBuildTargetsResult](10.seconds)
val allTargets = result.targets.map(_.id.uri) val allTargets = result.targets.map(_.id.uri)
svr.sendJsonRpc( svr.sendJsonRpc(
s"""{ "jsonrpc": "2.0", "id": "46", "method": "buildTarget/cleanCache", "params": { s"""{ "jsonrpc": "2.0", "id": "${nextId()}", "method": "buildTarget/cleanCache", "params": {
| "targets": [ | "targets": [
| ${allTargets.map(uri => s"""{ "uri": "$uri" }""").mkString(",\n")} | ${allTargets.map(uri => s"""{ "uri": "$uri" }""").mkString(",\n")}
| ] | ]
@ -301,12 +307,13 @@ object BuildServerTest extends AbstractServerTest {
} }
test("workspace/reload") { _ => test("workspace/reload") { _ =>
val id = nextId()
svr.sendJsonRpc( svr.sendJsonRpc(
"""{ "jsonrpc": "2.0", "id": "48", "method": "workspace/reload"}""" s"""{ "jsonrpc": "2.0", "id": "$id", "method": "workspace/reload"}"""
) )
assert(processing("workspace/reload")) assert(processing("workspace/reload"))
assert(svr.waitForString(10.seconds) { s => assert(svr.waitForString(10.seconds) { s =>
(s contains """"id":"48"""") && (s contains s""""id":"$id"""") &&
(s contains """"result":null""") (s contains """"result":null""")
}) })
} }
@ -322,8 +329,9 @@ object BuildServerTest extends AbstractServerTest {
|) |)
|""".stripMargin |""".stripMargin
) )
val id = nextId()
// reload // reload
reloadWorkspace(id = 52) reloadWorkspace(id)
assert( assert(
svr.waitForString(10.seconds) { s => svr.waitForString(10.seconds) { s =>
s.contains(s""""buildTarget":{"uri":"$metaBuildTarget"}""") && s.contains(s""""buildTarget":{"uri":"$metaBuildTarget"}""") &&
@ -334,7 +342,7 @@ object BuildServerTest extends AbstractServerTest {
) )
assert( assert(
svr.waitForString(10.seconds) { s => svr.waitForString(10.seconds) { s =>
s.contains(""""id":"52"""") && s.contains(s""""id":"$id"""") &&
s.contains(""""error"""") && s.contains(""""error"""") &&
s.contains(s""""code":${ErrorCodes.InternalError}""") && s.contains(s""""code":${ErrorCodes.InternalError}""") &&
s.contains("Type error in expression") s.contains("Type error in expression")
@ -349,7 +357,7 @@ object BuildServerTest extends AbstractServerTest {
|) |)
|""".stripMargin |""".stripMargin
) )
reloadWorkspace(id = 52) reloadWorkspace()
// assert received an empty diagnostic // assert received an empty diagnostic
assert( assert(
svr.waitForString(10.seconds) { s => svr.waitForString(10.seconds) { s =>
@ -365,22 +373,24 @@ object BuildServerTest extends AbstractServerTest {
test("buildTarget/scalaMainClasses") { _ => test("buildTarget/scalaMainClasses") { _ =>
val buildTarget = buildTargetUri("runAndTest", "Compile") val buildTarget = buildTargetUri("runAndTest", "Compile")
val badBuildTarget = buildTargetUri("badBuildTarget", "Compile") val badBuildTarget = buildTargetUri("badBuildTarget", "Compile")
val id = nextId()
svr.sendJsonRpc( svr.sendJsonRpc(
s"""{ "jsonrpc": "2.0", "id": "56", "method": "buildTarget/scalaMainClasses", "params": { s"""{ "jsonrpc": "2.0", "id": "$id", "method": "buildTarget/scalaMainClasses", "params": {
| "targets": [{ "uri": "$buildTarget" }, { "uri": "$badBuildTarget" }] | "targets": [{ "uri": "$buildTarget" }, { "uri": "$badBuildTarget" }]
|} }""".stripMargin |} }""".stripMargin
) )
assert(processing("buildTarget/scalaMainClasses")) assert(processing("buildTarget/scalaMainClasses"))
assert(svr.waitForString(30.seconds) { s => assert(svr.waitForString(30.seconds) { s =>
(s contains """"id":"56"""") && (s contains s""""id":"$id"""") &&
(s contains """"class":"main.Main"""") (s contains """"class":"main.Main"""")
}) })
} }
test("buildTarget/run") { _ => test("buildTarget/run") { _ =>
val buildTarget = buildTargetUri("runAndTest", "Compile") val buildTarget = buildTargetUri("runAndTest", "Compile")
val id = nextId()
svr.sendJsonRpc( svr.sendJsonRpc(
s"""{ "jsonrpc": "2.0", "id": "64", "method": "buildTarget/run", "params": { s"""{ "jsonrpc": "2.0", "id": "$id", "method": "buildTarget/run", "params": {
| "target": { "uri": "$buildTarget" }, | "target": { "uri": "$buildTarget" },
| "dataKind": "scala-main-class", | "dataKind": "scala-main-class",
| "data": { "class": "main.Main" } | "data": { "class": "main.Main" }
@ -392,16 +402,17 @@ object BuildServerTest extends AbstractServerTest {
(s contains """"message":"Hello World!"""") (s contains """"message":"Hello World!"""")
}) })
assert(svr.waitForString(10.seconds) { s => assert(svr.waitForString(10.seconds) { s =>
(s contains """"id":"64"""") && (s contains s""""id":"$id"""") &&
(s contains """"statusCode":1""") (s contains """"statusCode":1""")
}) })
} }
test("buildTarget/jvmRunEnvironment") { _ => test("buildTarget/jvmRunEnvironment") { _ =>
val buildTarget = buildTargetUri("runAndTest", "Compile") val buildTarget = buildTargetUri("runAndTest", "Compile")
val id = nextId()
svr.sendJsonRpc( svr.sendJsonRpc(
s"""|{ "jsonrpc": "2.0", s"""|{ "jsonrpc": "2.0",
| "id": "97", | "id": "$id",
| "method": "buildTarget/jvmRunEnvironment", | "method": "buildTarget/jvmRunEnvironment",
| "params": { "targets": [{ "uri": "$buildTarget" }] } | "params": { "targets": [{ "uri": "$buildTarget" }] }
|}""".stripMargin |}""".stripMargin
@ -409,7 +420,7 @@ object BuildServerTest extends AbstractServerTest {
assert(processing("buildTarget/jvmRunEnvironment")) assert(processing("buildTarget/jvmRunEnvironment"))
assert { assert {
svr.waitForString(10.seconds) { s => svr.waitForString(10.seconds) { s =>
(s contains """"id":"97"""") && (s contains s""""id":"$id"""") &&
(s contains "jsoniter-scala-core_2.13-2.13.11.jar") && // compile dependency (s contains "jsoniter-scala-core_2.13-2.13.11.jar") && // compile dependency
(s contains "\"jvmOptions\":[\"Xmx256M\"]") && (s contains "\"jvmOptions\":[\"Xmx256M\"]") &&
(s contains "\"environmentVariables\":{\"KEY\":\"VALUE\"}") && (s contains "\"environmentVariables\":{\"KEY\":\"VALUE\"}") &&
@ -420,9 +431,10 @@ object BuildServerTest extends AbstractServerTest {
test("buildTarget/jvmTestEnvironment") { _ => test("buildTarget/jvmTestEnvironment") { _ =>
val buildTarget = buildTargetUri("runAndTest", "Test") val buildTarget = buildTargetUri("runAndTest", "Test")
val id = nextId()
svr.sendJsonRpc( svr.sendJsonRpc(
s"""|{ "jsonrpc": "2.0", s"""|{ "jsonrpc": "2.0",
| "id": "98", | "id": "$id",
| "method": "buildTarget/jvmTestEnvironment", | "method": "buildTarget/jvmTestEnvironment",
| "params": { "targets": [{ "uri": "$buildTarget" }] } | "params": { "targets": [{ "uri": "$buildTarget" }] }
|}""".stripMargin |}""".stripMargin
@ -430,7 +442,7 @@ object BuildServerTest extends AbstractServerTest {
assert(processing("buildTarget/jvmTestEnvironment")) assert(processing("buildTarget/jvmTestEnvironment"))
assert { assert {
svr.waitForString(10.seconds) { s => svr.waitForString(10.seconds) { s =>
(s contains """"id":"98"""") && (s contains s""""id":"$id"""") &&
// test depends on compile so it has dependencies from both // test depends on compile so it has dependencies from both
(s contains "jsoniter-scala-core_2.13-2.13.11.jar") && // compile dependency (s contains "jsoniter-scala-core_2.13-2.13.11.jar") && // compile dependency
(s contains "scalatest_2.13-3.0.8.jar") && // test dependency (s contains "scalatest_2.13-3.0.8.jar") && // test dependency
@ -443,14 +455,15 @@ object BuildServerTest extends AbstractServerTest {
test("buildTarget/scalaTestClasses") { _ => test("buildTarget/scalaTestClasses") { _ =>
val buildTarget = buildTargetUri("runAndTest", "Test") val buildTarget = buildTargetUri("runAndTest", "Test")
val badBuildTarget = buildTargetUri("badBuildTarget", "Test") val badBuildTarget = buildTargetUri("badBuildTarget", "Test")
val id = nextId()
svr.sendJsonRpc( svr.sendJsonRpc(
s"""{ "jsonrpc": "2.0", "id": "72", "method": "buildTarget/scalaTestClasses", "params": { s"""{ "jsonrpc": "2.0", "id": "$id", "method": "buildTarget/scalaTestClasses", "params": {
| "targets": [{ "uri": "$buildTarget" }, { "uri": "$badBuildTarget" }] | "targets": [{ "uri": "$buildTarget" }, { "uri": "$badBuildTarget" }]
|} }""".stripMargin |} }""".stripMargin
) )
assert(processing("buildTarget/scalaTestClasses")) assert(processing("buildTarget/scalaTestClasses"))
assert(svr.waitForString(10.seconds) { s => assert(svr.waitForString(10.seconds) { s =>
(s contains """"id":"72"""") && (s contains s""""id":"$id"""") &&
(s contains """"tests.FailingTest"""") && (s contains """"tests.FailingTest"""") &&
(s contains """"tests.PassingTest"""") && (s contains """"tests.PassingTest"""") &&
(s contains """"framework":"ScalaTest"""") (s contains """"framework":"ScalaTest"""")
@ -459,22 +472,24 @@ object BuildServerTest extends AbstractServerTest {
test("buildTarget/test: run all tests") { _ => test("buildTarget/test: run all tests") { _ =>
val buildTarget = buildTargetUri("runAndTest", "Test") val buildTarget = buildTargetUri("runAndTest", "Test")
val id = nextId()
svr.sendJsonRpc( svr.sendJsonRpc(
s"""{ "jsonrpc": "2.0", "id": "80", "method": "buildTarget/test", "params": { s"""{ "jsonrpc": "2.0", "id": "$id", "method": "buildTarget/test", "params": {
| "targets": [{ "uri": "$buildTarget" }] | "targets": [{ "uri": "$buildTarget" }]
|} }""".stripMargin |} }""".stripMargin
) )
assert(processing("buildTarget/test")) assert(processing("buildTarget/test"))
assert(svr.waitForString(10.seconds) { s => assert(svr.waitForString(10.seconds) { s =>
(s contains """"id":"80"""") && (s contains s""""id":"$id"""") &&
(s contains """"statusCode":2""") (s contains """"statusCode":2""")
}) })
} }
test("buildTarget/test: run one test class") { _ => test("buildTarget/test: run one test class") { _ =>
val buildTarget = buildTargetUri("runAndTest", "Test") val buildTarget = buildTargetUri("runAndTest", "Test")
val id = nextId()
svr.sendJsonRpc( svr.sendJsonRpc(
s"""{ "jsonrpc": "2.0", "id": "84", "method": "buildTarget/test", "params": { s"""{ "jsonrpc": "2.0", "id": "$id", "method": "buildTarget/test", "params": {
| "targets": [{ "uri": "$buildTarget" }], | "targets": [{ "uri": "$buildTarget" }],
| "dataKind": "scala-test", | "dataKind": "scala-test",
| "data": { | "data": {
@ -489,14 +504,14 @@ object BuildServerTest extends AbstractServerTest {
) )
assert(processing("buildTarget/test")) assert(processing("buildTarget/test"))
assert(svr.waitForString(10.seconds) { s => assert(svr.waitForString(10.seconds) { s =>
(s contains """"id":"84"""") && (s contains s""""id":"$id"""") &&
(s contains """"statusCode":1""") (s contains """"statusCode":1""")
}) })
} }
test("buildTarget/compile: report error") { _ => test("buildTarget/compile: report error") { _ =>
val buildTarget = buildTargetUri("reportError", "Compile") val buildTarget = buildTargetUri("reportError", "Compile")
compile(buildTarget, id = 88) compile(buildTarget)
assert(svr.waitForString(10.seconds) { s => assert(svr.waitForString(10.seconds) { s =>
(s contains s""""buildTarget":{"uri":"$buildTarget"}""") && (s contains s""""buildTarget":{"uri":"$buildTarget"}""") &&
(s contains """"severity":1""") && (s contains """"severity":1""") &&
@ -506,7 +521,7 @@ object BuildServerTest extends AbstractServerTest {
test("buildTarget/compile: report warning") { _ => test("buildTarget/compile: report warning") { _ =>
val buildTarget = buildTargetUri("reportWarning", "Compile") val buildTarget = buildTargetUri("reportWarning", "Compile")
compile(buildTarget, id = 90) compile(buildTarget)
assert(svr.waitForString(10.seconds) { s => assert(svr.waitForString(10.seconds) { s =>
(s contains s""""buildTarget":{"uri":"$buildTarget"}""") && (s contains s""""buildTarget":{"uri":"$buildTarget"}""") &&
(s contains """"severity":2""") && (s contains """"severity":2""") &&
@ -516,9 +531,10 @@ object BuildServerTest extends AbstractServerTest {
test("buildTarget/compile: respond error") { _ => test("buildTarget/compile: respond error") { _ =>
val buildTarget = buildTargetUri("respondError", "Compile") val buildTarget = buildTargetUri("respondError", "Compile")
compile(buildTarget, id = 92) val id = nextId()
compile(buildTarget, id)
assert(svr.waitForString(10.seconds) { s => assert(svr.waitForString(10.seconds) { s =>
s.contains(""""id":"92"""") && s.contains(s""""id":"$id"""") &&
s.contains(""""error"""") && s.contains(""""error"""") &&
s.contains(s""""code":${ErrorCodes.InternalError}""") && s.contains(s""""code":${ErrorCodes.InternalError}""") &&
s.contains("custom message") s.contains("custom message")
@ -528,14 +544,15 @@ object BuildServerTest extends AbstractServerTest {
test("buildTarget/resources") { _ => test("buildTarget/resources") { _ =>
val buildTarget = buildTargetUri("util", "Compile") val buildTarget = buildTargetUri("util", "Compile")
val badBuildTarget = buildTargetUri("badBuildTarget", "Compile") val badBuildTarget = buildTargetUri("badBuildTarget", "Compile")
val id = nextId()
svr.sendJsonRpc( svr.sendJsonRpc(
s"""{ "jsonrpc": "2.0", "id": "96", "method": "buildTarget/resources", "params": { s"""{ "jsonrpc": "2.0", "id": "$id", "method": "buildTarget/resources", "params": {
| "targets": [{ "uri": "$buildTarget" }, { "uri": "$badBuildTarget" }] | "targets": [{ "uri": "$buildTarget" }, { "uri": "$badBuildTarget" }]
|} }""".stripMargin |} }""".stripMargin
) )
assert(processing("buildTarget/resources")) assert(processing("buildTarget/resources"))
assert(svr.waitForString(10.seconds) { s => assert(svr.waitForString(10.seconds) { s =>
(s contains """"id":"96"""") && (s contains "util/src/main/resources/") (s contains s""""id":"$id"""") && (s contains "util/src/main/resources/")
}) })
} }
@ -543,7 +560,7 @@ object BuildServerTest extends AbstractServerTest {
val buildTarget = buildTargetUri("util", "Compile") val buildTarget = buildTargetUri("util", "Compile")
val badBuildTarget = buildTargetUri("badBuildTarget", "Compile") val badBuildTarget = buildTargetUri("badBuildTarget", "Compile")
svr.sendJsonRpc( svr.sendJsonRpc(
s"""{ "jsonrpc": "2.0", "id": "97", "method": "buildTarget/outputPaths", "params": { s"""{ "jsonrpc": "2.0", "id": "${nextId()}", "method": "buildTarget/outputPaths", "params": {
| "targets": [{ "uri": "$buildTarget" }, { "uri": "$badBuildTarget" }] | "targets": [{ "uri": "$buildTarget" }, { "uri": "$badBuildTarget" }]
|} }""".stripMargin |} }""".stripMargin
) )
@ -565,18 +582,16 @@ object BuildServerTest extends AbstractServerTest {
assert(actualResult == expectedResult) assert(actualResult == expectedResult)
} }
private def initializeRequest(): Unit = { private def initializeRequest(id: Int): Unit = {
svr.sendJsonRpc( val params = InitializeBuildParams(
"""{ "jsonrpc": "2.0", "id": "8", "method": "build/initialize", "test client",
| "params": { "1.0.0",
| "displayName": "test client", "2.1.0-M1",
| "version": "1.0.0", new URI("file://root/"),
| "bspVersion": "2.1.0-M1", BuildClientCapabilities(Vector("scala")),
| "rootUri": "file://root/", None
| "capabilities": { "languageIds": ["scala"] }
| }
|}""".stripMargin
) )
svr.sendJsonRpc(request(id, "build/initialize", params))
} }
private def processing(method: String, debug: Boolean = false): Boolean = { private def processing(method: String, debug: Boolean = false): Boolean = {
@ -587,22 +602,16 @@ object BuildServerTest extends AbstractServerTest {
} }
} }
private def reloadWorkspace(id: Int): Unit = private def reloadWorkspace(id: Int = nextId()): Unit =
svr.sendJsonRpc( svr.sendJsonRpc(s"""{ "jsonrpc": "2.0", "id": "$id", "method": "workspace/reload"}""")
s"""{ "jsonrpc": "2.0", "id": "$id", "method": "workspace/reload"}"""
)
private def compile(buildTarget: URI, id: Int): Unit = private def compile(buildTarget: URI, id: Int = nextId()): Unit = {
compile(buildTarget.toString, id) val params =
CompileParams(targets = Vector(BuildTargetIdentifier(buildTarget)), None, Vector.empty)
svr.sendJsonRpc(request(id, "buildTarget/compile", params))
}
private def compile(buildTarget: String, id: Int): Unit = private def buildTargetSources(buildTargets: Seq[URI], id: Int = nextId()): String = {
svr.sendJsonRpc(
s"""{ "jsonrpc": "2.0", "id": "$id", "method": "buildTarget/compile", "params": {
| "targets": [{ "uri": "$buildTarget" }]
|} }""".stripMargin
)
private def buildTargetSources(id: Int, buildTargets: Seq[URI]): String = {
val targets = buildTargets.map(BuildTargetIdentifier.apply).toVector val targets = buildTargets.map(BuildTargetIdentifier.apply).toVector
request(id, "buildTarget/sources", SourcesParams(targets)) request(id, "buildTarget/sources", SourcesParams(targets))
} }
@ -613,9 +622,8 @@ object BuildServerTest extends AbstractServerTest {
CompactPrinter(json) CompactPrinter(json)
} }
private def buildTargetUri(project: String, config: String): URI = { private def buildTargetUri(project: String, config: String): URI =
new URI(s"${svr.baseDirectory.getAbsoluteFile.toURI}#$project/$config") new URI(s"${svr.baseDirectory.getAbsoluteFile.toURI}#$project/$config")
}
private def metaBuildTarget: String = private def metaBuildTarget: String =
s"${svr.baseDirectory.getAbsoluteFile.toURI}project/#buildserver-build/Compile" s"${svr.baseDirectory.getAbsoluteFile.toURI}project/#buildserver-build/Compile"