User: rednesto
Date: 04 Sep 24 18:07
Revision: fe8ae39ae0a273fccb796f44924b9b4ac999ebeb
Summary:
Convert TOML tests to JUnit 5


TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=9644&personal=false

Index: src/test/kotlin/platform/forge/ModsTomlCompletionTest.kt
===================================================================
--- src/test/kotlin/platform/forge/ModsTomlCompletionTest.kt	(revision 5fa4f4eccc0a293abae706332f9aa1e09687d237)
+++ src/test/kotlin/platform/forge/ModsTomlCompletionTest.kt	(revision fe8ae39ae0a273fccb796f44924b9b4ac999ebeb)
@@ -20,33 +20,23 @@
 
 package com.demonwav.mcdev.platform.forge
 
-import com.intellij.testFramework.fixtures.BasePlatformTestCase
-import org.junit.jupiter.api.AfterEach
-import org.junit.jupiter.api.BeforeEach
+import com.demonwav.mcdev.framework.BaseMinecraftTest
+import com.intellij.testFramework.TestDataPath
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test
 
+private const val TEST_DATA_PATH = "platform/forge/modsTomlCompletion"
+
+@TestDataPath(TEST_DATA_PATH)
 @DisplayName("Mods Toml Completion Tests")
-class ModsTomlCompletionTest : BasePlatformTestCase() {
+class ModsTomlCompletionTest : BaseMinecraftTest() {
 
-    override fun getTestDataPath(): String {
-        return "src/test/resources/com/demonwav/mcdev/platform/forge/modsTomlCompletion"
-    }
+    override val testPath: String = TEST_DATA_PATH
 
-    @BeforeEach
-    override fun setUp() {
-        super.setUp()
-    }
-
-    @AfterEach
-    override fun tearDown() {
-        super.tearDown()
-    }
-
     @Test
     @DisplayName("Root Keys")
     fun rootKeys() {
-        myFixture.testCompletionVariants(
+        fixture.testCompletionVariants(
             "rootKeys/mods.toml",
             "modLoader",
             "loaderVersion",
@@ -60,7 +50,7 @@
     @Test
     @DisplayName("Mods Keys")
     fun modsKeys() {
-        myFixture.testCompletionVariants(
+        fixture.testCompletionVariants(
             "modsKeys/mods.toml",
             "modId",
             "version",
@@ -79,7 +69,7 @@
     @Test
     @DisplayName("Dependencies Keys")
     fun dependenciesKeys() {
-        myFixture.testCompletionVariants(
+        fixture.testCompletionVariants(
             "dependenciesKeys/mods.toml",
             "modId",
             "mandatory",
@@ -92,19 +82,19 @@
     @Test
     @DisplayName("Mod Dependency Key")
     fun modDependencyKey() {
-        myFixture.testCompletionVariants("modDependencyKey/mods.toml", "declared_mod_1", "declared_mod_2")
+        fixture.testCompletionVariants("modDependencyKey/mods.toml", "declared_mod_1", "declared_mod_2")
     }
 
     @Test
     @DisplayName("Boolean Value")
     fun booleanValue() {
-        myFixture.testCompletionVariants("boolean/mods.toml", "true", "false")
+        fixture.testCompletionVariants("boolean/mods.toml", "true", "false")
     }
 
     @Test
     @DisplayName("Display Test Value")
     fun displayTestValue() {
-        myFixture.testCompletionVariants(
+        fixture.testCompletionVariants(
             "displayTestValue/mods.toml",
             "MATCH_VERSION",
             "IGNORE_SERVER_VERSION",
@@ -116,19 +106,19 @@
     @Test
     @DisplayName("Dependency Ordering Value")
     fun orderingValue() {
-        myFixture.testCompletionVariants("dependencyOrderingValue/mods.toml", "NONE", "BEFORE", "AFTER")
+        fixture.testCompletionVariants("dependencyOrderingValue/mods.toml", "NONE", "BEFORE", "AFTER")
     }
 
     @Test
     @DisplayName("Dependency Side Value")
     fun sideValue() {
-        myFixture.testCompletionVariants("dependencySideValue/mods.toml", "BOTH", "CLIENT", "SERVER")
+        fixture.testCompletionVariants("dependencySideValue/mods.toml", "BOTH", "CLIENT", "SERVER")
     }
 
     @Test
     @DisplayName("String Completion From Nothing")
     fun stringCompletionFromNothing() {
-        myFixture.testCompletion(
+        fixture.testCompletion(
             "stringCompletionFromNothing/mods.toml",
             "stringCompletionFromNothing/mods.toml.after",
         )
@@ -137,7 +127,7 @@
     @Test
     @DisplayName("String Completion")
     fun stringCompletion() {
-        myFixture.testCompletion(
+        fixture.testCompletion(
             "stringCompletion/mods.toml",
             "stringCompletion/mods.toml.after",
         )
Index: src/test/kotlin/platform/forge/ModsTomlDocumentationTest.kt
===================================================================
--- src/test/kotlin/platform/forge/ModsTomlDocumentationTest.kt	(revision 5fa4f4eccc0a293abae706332f9aa1e09687d237)
+++ src/test/kotlin/platform/forge/ModsTomlDocumentationTest.kt	(revision fe8ae39ae0a273fccb796f44924b9b4ac999ebeb)
@@ -20,42 +20,32 @@
 
 package com.demonwav.mcdev.platform.forge
 
+import com.demonwav.mcdev.framework.BaseMinecraftTest
 import com.demonwav.mcdev.toml.platform.forge.ModsTomlDocumentationProvider
-import com.intellij.testFramework.fixtures.BasePlatformTestCase
+import com.intellij.testFramework.UsefulTestCase.assertSameLines
 import com.intellij.util.application
 import org.intellij.lang.annotations.Language
-import org.junit.jupiter.api.AfterEach
-import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Assertions.assertNotNull
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test
 
 @DisplayName("Mods Toml Documentation Tests")
-class ModsTomlDocumentationTest : BasePlatformTestCase() {
+class ModsTomlDocumentationTest : BaseMinecraftTest() {
 
-    @BeforeEach
-    override fun setUp() {
-        super.setUp()
-    }
-
-    @AfterEach
-    override fun tearDown() {
-        super.tearDown()
-    }
-
     private fun doTestDoc(
         @Language("TOML") modsToml: String,
         expectedDoc: String
     ) {
-        myFixture.configureByText("mods.toml", modsToml)
+        fixture.configureByText("mods.toml", modsToml)
 
         application.runReadAction {
-            val originalElement = myFixture.elementAtCaret
+            val originalElement = fixture.elementAtCaret
             val provider = ModsTomlDocumentationProvider()
             val element = provider.getCustomDocumentationElement(
-                myFixture.editor,
-                myFixture.file,
+                fixture.editor,
+                fixture.file,
                 originalElement,
-                myFixture.caretOffset
+                fixture.caretOffset
             ) ?: originalElement
 
             val doc = provider.generateDoc(element, originalElement)
@@ -69,9 +59,9 @@
         lookupString: String,
         expectedDoc: String
     ) {
-        myFixture.configureByText("mods.toml", modsToml)
+        fixture.configureByText("mods.toml", modsToml)
 
-        val lookupElements = myFixture.completeBasic()
+        val lookupElements = fixture.completeBasic()
         val licenseElement = lookupElements.find { it.lookupString == lookupString }
         assertNotNull(licenseElement)
 
@@ -79,7 +69,7 @@
         assertNotNull(obj)
 
         val documentationProvider = ModsTomlDocumentationProvider()
-        val docElement = documentationProvider.getDocumentationElementForLookupItem(psiManager, obj, null)
+        val docElement = documentationProvider.getDocumentationElementForLookupItem(fixture.psiManager, obj, null)
         assertNotNull(docElement)
 
         val doc = documentationProvider.generateDoc(docElement!!, null)
Index: src/test/kotlin/platform/forge/ModsTomlValidationInspectionTest.kt
===================================================================
--- src/test/kotlin/platform/forge/ModsTomlValidationInspectionTest.kt	(revision 5fa4f4eccc0a293abae706332f9aa1e09687d237)
+++ src/test/kotlin/platform/forge/ModsTomlValidationInspectionTest.kt	(revision fe8ae39ae0a273fccb796f44924b9b4ac999ebeb)
@@ -20,31 +20,19 @@
 
 package com.demonwav.mcdev.platform.forge
 
+import com.demonwav.mcdev.framework.BaseMinecraftTest
 import com.demonwav.mcdev.toml.platform.forge.inspections.ModsTomlValidationInspection
-import com.intellij.testFramework.fixtures.BasePlatformTestCase
 import org.intellij.lang.annotations.Language
-import org.junit.jupiter.api.AfterEach
-import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test
 
 @DisplayName("Mods Toml Validation Inspection Tests")
-class ModsTomlValidationInspectionTest : BasePlatformTestCase() {
+class ModsTomlValidationInspectionTest : BaseMinecraftTest() {
 
-    @BeforeEach
-    override fun setUp() {
-        super.setUp()
-    }
-
-    @AfterEach
-    override fun tearDown() {
-        super.tearDown()
-    }
-
     private fun doTest(@Language("TOML") text: String) {
-        myFixture.configureByText("mods.toml", text)
-        myFixture.enableInspections(ModsTomlValidationInspection::class.java)
-        myFixture.checkHighlighting()
+        fixture.configureByText("mods.toml", text)
+        fixture.enableInspections(ModsTomlValidationInspection::class.java)
+        fixture.checkHighlighting()
     }
 
     @Test