Remove the testWithNeovim task

Now you can just run `gradlew test -Dnvim`
JetBrains · Feb 8, 2024 · cc838f6 · cc838f6
1 parent ae62a9f
commit cc838f6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/.teamcity/_Self/buildTypes/Nvim.kt b/.teamcity/_Self/buildTypes/Nvim.kt
@@ -39,7 +39,7 @@ object Nvim : IdeaVimBuildType({
               """.trimIndent()
     }
     gradle {
-      tasks = "clean testWithNeovim"
+      tasks = "clean test -Dnvim"
       buildFile = ""
       enableStacktrace = true
     }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -157,14 +157,6 @@ configurations {
   }
 }
 
-// --- Compilation
-// This can be moved to other test registration when issue with tests in gradle will be fixed
-tasks.register<Test>("testWithNeovim") {
-  group = "verification"
-  systemProperty("ideavim.nvim.test", "true")
-  useJUnitPlatform()
-}
-
 tasks {
   test {
     // Set teamcity env variable locally to run additional tests for leaks.
@@ -174,6 +166,8 @@ tasks {
       println("Set env TEAMCITY_VERSION to X to enable project leak checks from the platform")
       environment("TEAMCITY_VERSION" to "X")
     }
+
+    systemProperty("ideavim.nvim.test", System.getProperty("nvim") ?: false)
   }
 
   compileJava {

diff --git a/src/testFixtures/kotlin/org/jetbrains/plugins/ideavim/NeovimTesting.kt b/src/testFixtures/kotlin/org/jetbrains/plugins/ideavim/NeovimTesting.kt
@@ -88,7 +88,8 @@ object NeovimTesting {
     val noBehaviourDiffers = !method.isAnnotationPresent(VimBehaviorDiffers::class.java)
     val noTestingWithoutNeovim = !method.isAnnotationPresent(TestWithoutNeovim::class.java) &&
       !test.javaClass.isAnnotationPresent(TestWithoutNeovim::class.java)
-    val neovimTestingEnabled = System.getProperty("ideavim.nvim.test", "false")!!.toBoolean()
+    val property = System.getProperty("ideavim.nvim.test", "false")
+    val neovimTestingEnabled = if (property.isBlank()) true else property.toBoolean()
     val notParserTest = "org.jetbrains.plugins.ideavim.ex.parser" !in test.javaClass.packageName
     val notScriptImplementation = "org.jetbrains.plugins.ideavim.ex.implementation" !in test.javaClass.packageName
     val notExtension = "org.jetbrains.plugins.ideavim.extension" !in test.javaClass.packageName