Skip to content

Commit 08870b3

Browse files
committed
Fix semanticdb tests after update
1 parent 7da1fc4 commit 08870b3

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

frontend/src/test/scala/bloop/BuildLoaderSpec.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import bloop.task.Task
1515
import bloop.testing.BaseSuite
1616
import bloop.tracing.TraceProperties
1717
import bloop.util.TestUtil
18-
import bloop.internal.build.BuildTestInfo
1918

2019
object BuildLoaderSpec extends BaseSuite {
2120
val semanticdbVersion = "4.8.4"

frontend/src/test/scala/bloop/bsp/BspCompileSpec.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ import bloop.util.TestProject
2020
import bloop.util.TestUtil
2121
import scala.tools.nsc.Properties
2222

23-
import coursierapi.Fetch
24-
2523
object TcpBspCompileSpec extends BspCompileSpec(BspProtocol.Tcp)
2624
object LocalBspCompileSpec extends BspCompileSpec(BspProtocol.Local)
2725

frontend/src/test/scala/bloop/bsp/BspMetalsClientSpec.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ import java.nio.file.Paths
55
import scala.concurrent.duration.FiniteDuration
66
import scala.util.Random
77

8-
import ch.epfl.scala.bsp.endpoints.BuildTarget.scalacOptions
9-
108
import bloop.bsp.BloopBspDefinitions.BloopExtraBuildParams
119
import bloop.cli.BspProtocol
1210
import bloop.cli.ExitStatus
@@ -21,7 +19,6 @@ import bloop.logging.RecordingLogger
2119
import bloop.task.Task
2220
import bloop.util.TestProject
2321
import bloop.util.TestUtil
24-
import bloop.internal.build.BuildTestInfo
2522

2623
object LocalBspMetalsClientSpec extends BspMetalsClientSpec(BspProtocol.Local)
2724
object TcpBspMetalsClientSpec extends BspMetalsClientSpec(BspProtocol.Tcp)
@@ -173,7 +170,7 @@ class BspMetalsClientSpec(
173170

174171
val scalacOptions = state.scalaOptions(`A`)._2.items.head.options
175172
val expectedScalacOptions = correctSourceRootOption :: List(
176-
"-Xplugin:path-to-plugin/semanticdb-scalac_2.12.18-4.7.8.jar",
173+
s"-Xplugin:path-to-plugin/semanticdb-scalac_2.12.18-$semanticdbVersion.jar",
177174
"-Yrangepos",
178175
"-P:semanticdb:failures:warning",
179176
"-P:semanticdb:synthetics:on",
@@ -552,6 +549,9 @@ class BspMetalsClientSpec(
552549
)
553550

554551
val compiledState = build.state.compile(project)
552+
if (compiledState.status != ExitStatus.Ok) {
553+
logger.dump()
554+
}
555555
assert(compiledState.status == ExitStatus.Ok)
556556

557557
assertSemanticdbFileForProject(

0 commit comments

Comments
 (0)