From fc2afcf093122e213ea1cda2e2d6a3d966ca318b Mon Sep 17 00:00:00 2001
From: Akash Yadav <itsaky01@gmail.com>
Date: Thu, 5 Oct 2023 21:16:48 +0530
Subject: [PATCH] tests(lsp/java): run Java LSP tests with Robolectric

---
 .../java/providers/JavaCompletionProviderTest.kt    |  6 +++++-
 .../lsp/java/providers/JavaSelectionProviderTest.kt | 13 +++++++++----
 .../internal/versions/DefaultApiVersionsRegistry.kt |  4 ++--
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/lsp/java/src/test/java/com/itsaky/androidide/lsp/java/providers/JavaCompletionProviderTest.kt b/lsp/java/src/test/java/com/itsaky/androidide/lsp/java/providers/JavaCompletionProviderTest.kt
index 138536a2e..8ee14480c 100644
--- a/lsp/java/src/test/java/com/itsaky/androidide/lsp/java/providers/JavaCompletionProviderTest.kt
+++ b/lsp/java/src/test/java/com/itsaky/androidide/lsp/java/providers/JavaCompletionProviderTest.kt
@@ -22,8 +22,11 @@ import com.itsaky.androidide.lsp.models.CompletionParams
 import com.itsaky.androidide.progress.ICancelChecker
 import org.junit.Before
 import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
 
 /** @author Akash Yadav */
+@RunWith(RobolectricTestRunner::class)
 class JavaCompletionProviderTest {
 
   @Before
@@ -82,7 +85,8 @@ class JavaCompletionProviderTest {
 
   private fun completionTitles(pos: com.itsaky.androidide.models.Position): List<CharSequence> {
     return JavaLSPTest.server
-      .complete(CompletionParams(pos, JavaLSPTest.file!!).apply { prefix = "" }, ICancelChecker.Default())
+      .complete(CompletionParams(pos, JavaLSPTest.file!!).apply { prefix = "" },
+        ICancelChecker.Default())
       .items
       .map { it.label }
   }
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 3511d06f4..cb891d9f1 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
@@ -27,22 +27,27 @@ import io.github.rosemoe.sora.text.Content
 import kotlinx.coroutines.runBlocking
 import org.junit.Before
 import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
 
 /** @author Akash Yadav */
+@RunWith(RobolectricTestRunner::class)
 class JavaSelectionProviderTest {
 
   @Before
   fun setup() {
     JavaLSPTest.setup()
   }
-  
+
   @Test
   fun testSimpleSelectionExpansion() {
     JavaLSPTest.apply {
       openFile("selection/SimpleSelectionExpansionTest")
       cursor = requireCursor()
       deleteCursorText()
-      dispatchEvent(DocumentChangeEvent(file!!, contents.toString(), contents.toString(),1, NEW_TEXT, 0, Range.NONE))
+      dispatchEvent(
+        DocumentChangeEvent(file!!, contents.toString(), contents.toString(), 1, NEW_TEXT, 0,
+          Range.NONE))
 
       val range = findRange()
       val expanded = runBlocking { server.expandSelection(ExpandSelectionParams(file!!, range)) }
@@ -75,7 +80,7 @@ class JavaSelectionProviderTest {
       val end = Position(8, 9)
       val range = Range(start, end)
 
-      val expanded = runBlocking{ server.expandSelection(ExpandSelectionParams(file!!, range)) }
+      val expanded = runBlocking { server.expandSelection(ExpandSelectionParams(file!!, range)) }
       assertThat(expanded).isEqualTo(Range(Position(4, 8), Position(10, 9)))
     }
   }
@@ -90,7 +95,7 @@ class JavaSelectionProviderTest {
       val end = Position(10, 9)
       val range = Range(start, end)
 
-      val expanded = runBlocking{ 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/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultApiVersionsRegistry.kt b/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultApiVersionsRegistry.kt
index fe25cc91a..a532f25df 100644
--- a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultApiVersionsRegistry.kt
+++ b/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultApiVersionsRegistry.kt
@@ -196,7 +196,7 @@ class DefaultApiVersionsRegistry : ApiVersionsRegistry {
 
   private fun XmlPullParser.readInt(name: String, default: Int = -1): Int {
     return read(this, name) {
-      if (it == null || it.isBlank()) {
+      if (it.isNullOrBlank()) {
         return@read default
       }
 
@@ -206,7 +206,7 @@ class DefaultApiVersionsRegistry : ApiVersionsRegistry {
 
   private fun XmlPullParser.readString(name: String, default: String = ""): String {
     return read(this, name) {
-      if (it == null || it.isBlank()) {
+      if (it.isNullOrBlank()) {
         return@read default
       }