Fix commenter unit tests

Author: DenWav

build.gradle.kts

@@ -74,7 +74,7 @@ val gradleToolingExtension = sourceSets.create("gradle-tooling-extension") {
         extendsFrom(configurations["gradle-tooling-extension"])
     }
 }
-val gradleToolingExtensionJar = tasks.register<Jar>(gradleToolingExtension.jarTaskName) {
+val gradleToolingExtensionJar = tasks.register<Jar>(gradleToolingExtension.jarTaskName) { 
     from(gradleToolingExtension.output)
     classifier = "gradle-tooling-extension"
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -28,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

gradlew

@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

gradlew.bat

@@ -27,7 +27,7 @@ import java.lang.ref.WeakReference
  * Like most things in this project at this point, taken from the intellij-rust folks
  * https://github.com/intellij-rust/intellij-rust/blob/master/src/test/kotlin/org/rust/ProjectBuilder.kt
  */
-class ProjectBuilder(fixture: JavaCodeInsightTestFixture) {
+class ProjectBuilder(fixture: JavaCodeInsightTestFixture, private val root: VirtualFile) {
     private val fixtureRef = WeakReference(fixture)
 
     private val fixture: JavaCodeInsightTestFixture
@@ -40,8 +40,6 @@ class ProjectBuilder(fixture: JavaCodeInsightTestFixture) {
         }
     private val project
         get() = fixture.project
-    private val root
-        get() = fixture.project.baseDirPath
 
     var intermediatePath = ""
 

src/test/kotlin/com/demonwav/mcdev/framework/ProjectBuilder.kt

@@ -13,11 +13,13 @@ package com.demonwav.mcdev.framework
 import com.intellij.openapi.project.rootManager
 import com.intellij.openapi.roots.ModuleRootModificationUtil
 import com.intellij.openapi.vfs.VfsUtil
+import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
 
 abstract class ProjectBuilderTest : LightCodeInsightFixtureTestCase() {
 
-    protected fun buildProject(builder: ProjectBuilder.() -> Unit) = ProjectBuilder(myFixture).build(builder)
+    protected fun buildProject(root: VirtualFile = myFixture.project.baseDirPath, builder: ProjectBuilder.() -> Unit) =
+            ProjectBuilder(myFixture, root).build(builder)
 
     fun ProjectBuilder.src(block: ProjectBuilder.() -> Unit) {
         val srcFolder = VfsUtil.createDirectoryIfMissing(project.baseDirPath, "src")

src/test/kotlin/com/demonwav/mcdev/framework/ProjectBuilderTest.kt

@@ -13,17 +13,25 @@ package com.demonwav.mcdev.i18n
 import com.demonwav.mcdev.framework.BaseMinecraftTest
 import com.demonwav.mcdev.platform.PlatformType
 import com.intellij.openapi.actionSystem.IdeActions
+import com.intellij.openapi.vfs.VfsUtil
+import com.intellij.util.io.delete
 import org.intellij.lang.annotations.Language
+import java.nio.file.Files
+import java.nio.file.Path
 
 class I18nCommenterTest : BaseMinecraftTest(PlatformType.MCP) {
+
     private val fileName: String
         get() = getTestName(true)
 
-    // Dirty hack :(
-    override fun getTestDataPath() = project.basePath!!
+    private val testDataPath: Path by lazy {
+        Files.createTempDirectory("mcdev")
+    }
+
+    override fun getTestDataPath() = testDataPath.toString()
 
     private fun doTest(actionId: String, @Language("I18n") before: String, @Language("I18n") after: String) {
-        buildProject {
+        buildProject(VfsUtil.findFile(testDataPath, true)!!) {
             i18n("$fileName.lang", before, configure = true)
             i18n("${fileName}_after.lang", after, configure = false)
         }
@@ -32,6 +40,11 @@ class I18nCommenterTest : BaseMinecraftTest(PlatformType.MCP) {
         myFixture.checkResultByFile("${fileName}_after.lang", true)
     }
 
+    override fun tearDown() {
+        testDataPath.delete()
+        super.tearDown()
+    }
+
     fun testSingleLineComment() = doTest(IdeActions.ACTION_COMMENT_LINE, """
         test.<caret>key1=value1
         test.key2=value2

src/test/kotlin/com/demonwav/mcdev/i18n/I18nCommenterTest.kt

@@ -13,18 +13,25 @@ package com.demonwav.mcdev.platform.mcp.at
 import com.demonwav.mcdev.framework.BaseMinecraftTest
 import com.demonwav.mcdev.platform.PlatformType
 import com.intellij.openapi.actionSystem.IdeActions
+import com.intellij.openapi.vfs.VfsUtil
+import com.intellij.util.io.delete
 import org.intellij.lang.annotations.Language
+import java.nio.file.Files
+import java.nio.file.Path
 
 class AtCommenterTest : BaseMinecraftTest(PlatformType.MCP) {
 
     private val fileName: String
         get() = getTestName(true)
 
-    // Dirty hack :(
-    override fun getTestDataPath() = project.basePath!!
+    private val testDataPath: Path by lazy {
+        Files.createTempDirectory("mcdev")
+    }
+
+    override fun getTestDataPath() = testDataPath.toString()
 
     private fun doTest(actionId: String, @Language("Access Transformers") before: String, @Language("Access Transformers") after: String) {
-        buildProject {
+        buildProject(VfsUtil.findFile(testDataPath, true)!!) {
             at("${fileName}_at.cfg", before, configure = true)
             at("${fileName}_after_at.cfg", after, configure = false)
         }
@@ -33,6 +40,11 @@ class AtCommenterTest : BaseMinecraftTest(PlatformType.MCP) {
         myFixture.checkResultByFile("${fileName}_after_at.cfg", true)
     }
 
+    override fun tearDown() {
+        testDataPath.delete()
+        super.tearDown()
+    }
+
     fun testSingleLineComment() = doTest(IdeActions.ACTION_COMMENT_LINE, """
         public net.mine<caret>craft.entity.Entity field_190534_ay # fire
         public net.minecraft.entity.Entity field_70152_a # nextEntityID