From 1d54a3ff4d850b823d2be9e4fa5983e0a814e6ce Mon Sep 17 00:00:00 2001 From: Akash Yadav Date: Mon, 2 Oct 2023 12:25:57 +0530 Subject: [PATCH] tests: fix compilation issues --- .../java/com/itsaky/androidide/lsp/java/JavaLSPTest.kt | 4 ++-- .../itsaky/androidide/lsp/java/actions/AddImportTest.kt | 7 +++++-- .../lsp/java/providers/JavaSelectionProviderTest.kt | 9 +++++---- .../java/com/itsaky/androidide/lsp/xml/XMLLSPTest.kt | 2 +- .../tooling/impl/MultiModuleAndroidProjectTest.kt | 4 +--- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/lsp/java/src/test/java/com/itsaky/androidide/lsp/java/JavaLSPTest.kt b/lsp/java/src/test/java/com/itsaky/androidide/lsp/java/JavaLSPTest.kt index 58d8f7408..3e5fb5be4 100644 --- a/lsp/java/src/test/java/com/itsaky/androidide/lsp/java/JavaLSPTest.kt +++ b/lsp/java/src/test/java/com/itsaky/androidide/lsp/java/JavaLSPTest.kt @@ -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()!!) diff --git a/lsp/java/src/test/java/com/itsaky/androidide/lsp/java/actions/AddImportTest.kt b/lsp/java/src/test/java/com/itsaky/androidide/lsp/java/actions/AddImportTest.kt index 64f854231..4a3d0bfb7 100644 --- a/lsp/java/src/test/java/com/itsaky/androidide/lsp/java/actions/AddImportTest.kt +++ b/lsp/java/src/test/java/com/itsaky/androidide/lsp/java/actions/AddImportTest.kt @@ -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() diff --git a/lsp/java/src/test/java/com/itsaky/androidide/lsp/java/providers/JavaSelectionProviderTest.kt b/lsp/java/src/test/java/com/itsaky/androidide/lsp/java/providers/JavaSelectionProviderTest.kt index a2a10b910..3511d06f4 100644 --- a/lsp/java/src/test/java/com/itsaky/androidide/lsp/java/providers/JavaSelectionProviderTest.kt +++ b/lsp/java/src/test/java/com/itsaky/androidide/lsp/java/providers/JavaSelectionProviderTest.kt @@ -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))) } } diff --git a/lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/XMLLSPTest.kt b/lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/XMLLSPTest.kt index 1ad06910c..89ef6b248 100644 --- a/lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/XMLLSPTest.kt +++ b/lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/XMLLSPTest.kt @@ -79,7 +79,7 @@ object XMLLSPTest : LSPTest() { } override fun getServerId(): String { - return XMLLanguageServer.serverId + return XMLLanguageServer.SERVER_ID } override fun test() {} diff --git a/subprojects/tooling-api-impl/src/test/java/com/itsaky/androidide/tooling/impl/MultiModuleAndroidProjectTest.kt b/subprojects/tooling-api-impl/src/test/java/com/itsaky/androidide/tooling/impl/MultiModuleAndroidProjectTest.kt index 63da1f48d..8166a6db1 100644 --- a/subprojects/tooling-api-impl/src/test/java/com/itsaky/androidide/tooling/impl/MultiModuleAndroidProjectTest.kt +++ b/subprojects/tooling-api-impl/src/test/java/com/itsaky/androidide/tooling/impl/MultiModuleAndroidProjectTest.kt @@ -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) {