azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor: better name for generated test

Browse Source
This commit is contained in:
Pavel V. Talanov
2018-04-26 17:43:24 +02:00
committed by Pavel V. Talanov
parent 91b86d7fba
commit 4279dc9c05
7 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+2 -2
View File
@@ -51,8 +51,8 @@ import org.jetbrains.kotlin.idea.AbstractSmartSelectionTest
import org.jetbrains.kotlin.idea.actions.AbstractGotoTestOrCodeActionTest
import org.jetbrains.kotlin.idea.caches.resolve.AbstractIdeCompiledLightClassTest
import org.jetbrains.kotlin.idea.caches.resolve.AbstractIdeLightClassTest
import org.jetbrains.kotlin.idea.caches.resolve.AbstractMultiModuleHighlightingTest
import org.jetbrains.kotlin.idea.caches.resolve.AbstractMultiModuleLineMarkerTest
import org.jetbrains.kotlin.idea.caches.resolve.AbstractMultiPlatformHighlightingTest
import org.jetbrains.kotlin.idea.codeInsight.*
import org.jetbrains.kotlin.idea.codeInsight.generate.AbstractCodeInsightActionTest
import org.jetbrains.kotlin.idea.codeInsight.generate.AbstractGenerateHashCodeAndEqualsActionTest
@@ -643,7 +643,7 @@ fun main(args: Array<String>) {
model("multiFileHighlighting", recursive = false)
}
testClass<AbstractMultiModuleHighlightingTest> {
testClass<AbstractMultiPlatformHighlightingTest> {
model("multiModuleHighlighting/multiplatform/", recursive = false, extension = null)
}
generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.172
+2 -2
View File
@@ -51,8 +51,8 @@ import org.jetbrains.kotlin.idea.AbstractSmartSelectionTest
import org.jetbrains.kotlin.idea.actions.AbstractGotoTestOrCodeActionTest
import org.jetbrains.kotlin.idea.caches.resolve.AbstractIdeCompiledLightClassTest
import org.jetbrains.kotlin.idea.caches.resolve.AbstractIdeLightClassTest
import org.jetbrains.kotlin.idea.caches.resolve.AbstractMultiModuleHighlightingTest
import org.jetbrains.kotlin.idea.caches.resolve.AbstractMultiModuleLineMarkerTest
import org.jetbrains.kotlin.idea.caches.resolve.AbstractMultiPlatformHighlightingTest
import org.jetbrains.kotlin.idea.codeInsight.*
import org.jetbrains.kotlin.idea.codeInsight.generate.AbstractCodeInsightActionTest
import org.jetbrains.kotlin.idea.codeInsight.generate.AbstractGenerateHashCodeAndEqualsActionTest
@@ -641,7 +641,7 @@ fun main(args: Array<String>) {
model("multiFileHighlighting", recursive = false)
}
testClass<AbstractMultiModuleHighlightingTest> {
testClass<AbstractMultiPlatformHighlightingTest> {
model("multiModuleHighlighting/multiplatform/", recursive = false, extension = null)
}
generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as31
+2 -2
View File
@@ -50,8 +50,8 @@ import org.jetbrains.kotlin.idea.AbstractSmartSelectionTest
import org.jetbrains.kotlin.idea.actions.AbstractGotoTestOrCodeActionTest
import org.jetbrains.kotlin.idea.caches.resolve.AbstractIdeCompiledLightClassTest
import org.jetbrains.kotlin.idea.caches.resolve.AbstractIdeLightClassTest
import org.jetbrains.kotlin.idea.caches.resolve.AbstractMultiModuleHighlightingTest
import org.jetbrains.kotlin.idea.caches.resolve.AbstractMultiModuleLineMarkerTest
import org.jetbrains.kotlin.idea.caches.resolve.AbstractMultiPlatformHighlightingTest
import org.jetbrains.kotlin.idea.codeInsight.*
import org.jetbrains.kotlin.idea.codeInsight.generate.AbstractCodeInsightActionTest
import org.jetbrains.kotlin.idea.codeInsight.generate.AbstractGenerateHashCodeAndEqualsActionTest
@@ -640,7 +640,7 @@ fun main(args: Array<String>) {
model("multiFileHighlighting", recursive = false)
}
testClass<AbstractMultiModuleHighlightingTest> {
testClass<AbstractMultiPlatformHighlightingTest> {
model("multiModuleHighlighting/multiplatform/", recursive = false, extension = null)
}
generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as32
+2 -2
View File
@@ -50,8 +50,8 @@ import org.jetbrains.kotlin.idea.AbstractSmartSelectionTest
import org.jetbrains.kotlin.idea.actions.AbstractGotoTestOrCodeActionTest
import org.jetbrains.kotlin.idea.caches.resolve.AbstractIdeCompiledLightClassTest
import org.jetbrains.kotlin.idea.caches.resolve.AbstractIdeLightClassTest
import org.jetbrains.kotlin.idea.caches.resolve.AbstractMultiModuleHighlightingTest
import org.jetbrains.kotlin.idea.caches.resolve.AbstractMultiModuleLineMarkerTest
import org.jetbrains.kotlin.idea.caches.resolve.AbstractMultiPlatformHighlightingTest
import org.jetbrains.kotlin.idea.codeInsight.*
import org.jetbrains.kotlin.idea.codeInsight.generate.AbstractCodeInsightActionTest
import org.jetbrains.kotlin.idea.codeInsight.generate.AbstractGenerateHashCodeAndEqualsActionTest
@@ -640,7 +640,7 @@ fun main(args: Array<String>) {
model("multiFileHighlighting", recursive = false)
}
testClass<AbstractMultiModuleHighlightingTest> {
testClass<AbstractMultiPlatformHighlightingTest> {
model("multiModuleHighlighting/multiplatform/", recursive = false, extension = null)
}
idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractMultiModuleHighlightingTest.kt
+4 -1
View File
@@ -30,6 +30,9 @@ abstract class AbstractMultiModuleHighlightingTest : AbstractMultiHighlightingTe
checkHighlighting(myEditor, true, false)
}
}
}
abstract class AbstractMultiPlatformHighlightingTest : AbstractMultiModuleHighlightingTest() {
protected open fun doTest(path: String) {
setupMppProjectFromDirStructure(File(path))
@@ -37,4 +40,4 @@ abstract class AbstractMultiModuleHighlightingTest : AbstractMultiHighlightingTe
}
override fun getTestDataPath() = "${PluginTestCaseBase.getTestDataPathBase()}/multiModuleHighlighting/multiplatform/"
}
}
idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractMultiModuleLineMarkerTest.kt
+1 -1
View File
@@ -30,7 +30,7 @@ abstract class AbstractMultiModuleLineMarkerTest : AbstractMultiModuleHighlighti
override fun doTestLineMarkers() = true
override fun doTest(path: String) {
protected fun doTest(path: String) {
setupMppProjectFromDirStructure(File(path))
checkHighlightingInAllFiles()
}
idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleHighlightingTestGenerated.java → idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiPlatformHighlightingTestGenerated.java
Generated
+1 -1
View File
@@ -20,7 +20,7 @@ import java.util.regex.Pattern;
@TestMetadata("idea/testData/multiModuleHighlighting/multiplatform")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public class MultiModuleHighlightingTestGenerated extends AbstractMultiModuleHighlightingTest {
public class MultiPlatformHighlightingTestGenerated extends AbstractMultiPlatformHighlightingTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
}