Skip to content

Commit 1226788

Browse files
committed
Fix tests
1 parent 5fb5825 commit 1226788

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

server/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ dependencies {
6666

6767
// See https://github.com/JetBrains/kotlin/blob/65b0a5f90328f4b9addd3a10c6f24f3037482276/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts#L8
6868
compileOnly 'org.jetbrains.kotlin:kotlin-scripting-jvm-host'
69+
testCompileOnly 'org.jetbrains.kotlin:kotlin-scripting-jvm-host'
6970

7071
annotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.20'
7172
}

server/src/test/kotlin/org/javacs/kt/OneFilePerformance.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import org.jetbrains.kotlin.config.CompilerConfiguration
1717
import org.jetbrains.kotlin.container.ComponentProvider
1818
import org.jetbrains.kotlin.container.ValueDescriptor
1919
import org.jetbrains.kotlin.descriptors.CallableDescriptor
20-
import org.jetbrains.kotlin.load.java.JvmAbi
20+
import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmProtoBufUtil
2121
import org.jetbrains.kotlin.psi.KtElement
2222
import org.jetbrains.kotlin.psi.KtFile
2323
import org.jetbrains.kotlin.psi.KtPsiFactory
@@ -48,7 +48,7 @@ class OneFilePerformance {
4848
class ReusableParts : Closeable {
4949
internal var config = CompilerConfiguration()
5050
init {
51-
config.put(CommonConfigurationKeys.MODULE_NAME, JvmAbi.DEFAULT_MODULE_NAME)
51+
config.put(CommonConfigurationKeys.MODULE_NAME, JvmProtoBufUtil.DEFAULT_MODULE_NAME)
5252
config.put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, LoggingMessageCollector)
5353
}
5454
internal val disposable = Disposer.newDisposable()

server/src/test/kotlin/org/javacs/kt/SimpleScriptTest.kt

+2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ private class SnippetRunner {
3232
}
3333

3434
class SimpleScriptTest {
35+
// TODO: Test a script using the language server instead
36+
// of just experimenting with the API
3537
@Test
3638
fun basicScript() {
3739
val runner = SnippetRunner()

0 commit comments

Comments
 (0)