tests: fix compilation issues

This commit is contained in:
Akash Yadav
2023-10-02 12:25:57 +05:30
parent 7a01b2f449
commit 1d54a3ff4d
5 changed files with 14 additions and 12 deletions
@@ -29,7 +29,7 @@ import org.junit.Ignore
object JavaLSPTest : LSPTest() {
val server by lazy {
ILanguageServerRegistry.getDefault().getServer(JavaLanguageServer.serverId)
ILanguageServerRegistry.getDefault().getServer(JavaLanguageServer.SERVER_ID)
as JavaLanguageServer
}
@@ -43,7 +43,7 @@ object JavaLSPTest : LSPTest() {
ILanguageServerRegistry.getDefault().register(JavaLanguageServer())
}
override fun getServerId() = JavaLanguageServer.serverId
override fun getServerId() = JavaLanguageServer.SERVER_ID
fun getCompiler(): JavaCompilerService {
return JavaCompilerProvider.get(findAppModule()!!)
@@ -20,6 +20,7 @@ package com.itsaky.androidide.lsp.java.actions
import com.google.common.truth.Truth.assertThat
import com.itsaky.androidide.lsp.java.JavaLSPTest
import com.itsaky.androidide.lsp.java.actions.diagnostics.AddImportAction
import kotlinx.coroutines.runBlocking
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
@@ -42,8 +43,10 @@ class AddImportTest {
JavaLSPTest.apply {
openFile("actions/AddImportAction")
val diagnostic =
server.analyze(file!!).diagnostics.firstOrNull {
it.code == "compiler.err.cant.resolve.location"
runBlocking {
server.analyze(file!!).diagnostics.firstOrNull {
it.code == "compiler.err.cant.resolve.location"
}
}
assertThat(diagnostic).isNotNull()
@@ -24,6 +24,7 @@ import com.itsaky.androidide.lsp.models.ExpandSelectionParams
import com.itsaky.androidide.models.Position
import com.itsaky.androidide.models.Range
import io.github.rosemoe.sora.text.Content
import kotlinx.coroutines.runBlocking
import org.junit.Before
import org.junit.Test
@@ -44,7 +45,7 @@ class JavaSelectionProviderTest {
dispatchEvent(DocumentChangeEvent(file!!, contents.toString(), contents.toString(),1, NEW_TEXT, 0, Range.NONE))
val range = findRange()
val expanded = server.expandSelection(ExpandSelectionParams(file!!, range))
val expanded = runBlocking { server.expandSelection(ExpandSelectionParams(file!!, range)) }
assertThat(expanded).isEqualTo(Range(Position(4, 27), Position(4, 41)))
}
@@ -59,7 +60,7 @@ class JavaSelectionProviderTest {
val end = Position(5, 5)
val range = Range(start, end)
val expanded = server.expandSelection(ExpandSelectionParams(file!!, range))
val expanded = runBlocking { server.expandSelection(ExpandSelectionParams(file!!, range)) }
assertThat(expanded).isEqualTo(Range(Position(3, 4), end))
}
}
@@ -74,7 +75,7 @@ class JavaSelectionProviderTest {
val end = Position(8, 9)
val range = Range(start, end)
val expanded = server.expandSelection(ExpandSelectionParams(file!!, range))
val expanded = runBlocking{ server.expandSelection(ExpandSelectionParams(file!!, range)) }
assertThat(expanded).isEqualTo(Range(Position(4, 8), Position(10, 9)))
}
}
@@ -89,7 +90,7 @@ class JavaSelectionProviderTest {
val end = Position(10, 9)
val range = Range(start, end)
val expanded = server.expandSelection(ExpandSelectionParams(file!!, range))
val expanded = runBlocking{ server.expandSelection(ExpandSelectionParams(file!!, range)) }
assertThat(expanded).isEqualTo(Range(Position(4, 8), Position(10, 9)))
}
}
@@ -79,7 +79,7 @@ object XMLLSPTest : LSPTest() {
}
override fun getServerId(): String {
return XMLLanguageServer.serverId
return XMLLanguageServer.SERVER_ID
}
override fun test() {}
@@ -83,9 +83,7 @@ class MultiModuleAndroidProjectTest {
taskPaths.clear()
val (isSuccessful, failure) = server.executeTasks(TaskExecutionMessage(
projectPath = ":android-library",
tasks = listOf("assembleDebug"),
gradleDistribution = client.gradleDistParams
tasks = listOf("assembleDebug")
)).get()
if (failure != null) {