MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin] apply .k2.kt.after postfix for inspection tests

Browse Source 
GitOrigin-RevId: 12097426763100bef908255bbc2cde2794c99857
This commit is contained in:
Vladislav.Koshkin
2023-11-13 19:49:56 +00:00
committed by intellij-monorepo-bot
parent 6913216c6a
commit 2517f9319b
20 changed files with 20 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin/code-insight/inspections-k2/tests/test/org/jetbrains/kotlin/idea/k2/inspections/tests/AbstractK2LocalInspectionTest.kt
+11
View File
@@ -10,6 +10,9 @@ import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor
import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
import org.jetbrains.kotlin.test.utils.IgnoreTests
import java.io.File
import java.nio.file.Path
import kotlin.io.path.div
import kotlin.io.path.exists
abstract class AbstractK2LocalInspectionTest : AbstractLocalInspectionTest() {
override fun isFirPlugin() = true
@@ -29,6 +32,14 @@ abstract class AbstractK2LocalInspectionTest : AbstractLocalInspectionTest() {
)
}
override fun getAfterTestDataAbsolutePath(mainFileName: String): Path {
val k2FileName = mainFileName.removeSuffix(".kt") + ".k2.kt.after"
val k2FilePath = testDataDirectory.toPath() / k2FileName
if (k2FilePath.exists()) return k2FilePath
return super.getAfterTestDataAbsolutePath(mainFileName)
}
override fun doTestFor(mainFile: File, inspection: LocalInspectionTool, fileText: String) {
IgnoreTests.runTestIfNotDisabledByFileDirective(mainFile.toPath(), IgnoreTests.DIRECTIVES.IGNORE_K2, "after") {
doTestForInternal(mainFile, inspection, fileText)
plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/inspections/AbstractLocalInspectionTest.kt
+9 -15
View File
@@ -38,6 +38,8 @@ abstract class AbstractLocalInspectionTest : KotlinLightCodeInsightFixtureTestCa
protected open val inspectionFileName: String
get() = ".inspection"
private val afterFileNameSuffix: String = ".after"
private val expectedProblemDirectiveName: String = "PROBLEM"
protected val expectedProblemHighlightType: String = "HIGHLIGHT"
@@ -265,6 +267,9 @@ abstract class AbstractLocalInspectionTest : KotlinLightCodeInsightFixtureTestCa
}
}
protected open fun getAfterTestDataAbsolutePath(mainFileName: String) =
testDataDirectory.toPath() / (mainFileName + afterFileNameSuffix)
protected fun doTestForInternal(mainFile: File, inspection: LocalInspectionTool, fileText: String) {
val mainFileName = mainFile.name
val expectedProblemString = InTextDirectivesUtils.findStringWithPrefixes(
@@ -278,9 +283,7 @@ abstract class AbstractLocalInspectionTest : KotlinLightCodeInsightFixtureTestCa
)
val inspectionSettings = loadInspectionSettings(mainFile)
val afterFileName = mainFileName +
if (isDifferentExpectedDataForK2(inspection, fileText)) ".after.k2" else ".after"
val afterFileAbsolutePath = testDataDirectory.toPath() / afterFileName
val afterFileAbsolutePath = getAfterTestDataAbsolutePath(mainFileName)
if (!runInspectionWithFixesAndCheck(
inspection,
@@ -290,17 +293,17 @@ abstract class AbstractLocalInspectionTest : KotlinLightCodeInsightFixtureTestCa
inspectionSettings
)
) {
assertFalse("$afterFileName should not exist as no action could be applied", Files.exists(afterFileAbsolutePath))
assertFalse("${afterFileAbsolutePath.fileName} should not exist as no action could be applied", Files.exists(afterFileAbsolutePath))
return
}
createAfterFileIfItDoesNotExist(afterFileAbsolutePath)
dispatchAllEventsInIdeEventQueue()
try {
myFixture.checkResultByFile(afterFileName)
myFixture.checkResultByFile("${afterFileAbsolutePath.fileName}")
} catch (e: ComparisonFailure) {
KotlinTestUtils.assertEqualsToFile(
File(testDataDirectory, afterFileName),
File(testDataDirectory, "${afterFileAbsolutePath.fileName}"),
editor.document.text
)
}
@@ -308,15 +311,6 @@ abstract class AbstractLocalInspectionTest : KotlinLightCodeInsightFixtureTestCa
checkForUnexpectedErrors()
}
private fun isDifferentExpectedDataForK2(inspection: LocalInspectionTool, fileText: String): Boolean {
val withK2Data = InTextDirectivesUtils.isDirectiveDefined(
fileText, "// WITH_DIFFERENT_DATA_FOR_K2"
)
return inspection.javaClass.`package`.name == "org.jetbrains.kotlin.idea.k2.codeinsight.inspections"
&& withK2Data
}
private fun createAfterFileIfItDoesNotExist(path: Path) {
if (!Files.exists(path)) {
path.createFile().write(editor.document.text)
plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/CommentInBlock.kt.after.k2 → plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/CommentInBlock.k2.kt.after
-1
View File
@@ -1,4 +1,3 @@
// WITH_DIFFERENT_DATA_FOR_K2
fun foo(p: List<String?>): Int {
val v = p[0] ?: // return -1 if null
return -1
plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/CommentInBlock.kt
-1
View File
@@ -1,4 +1,3 @@
// WITH_DIFFERENT_DATA_FOR_K2
fun foo(p: List<String?>): Int {
val v = p[0]
<caret>if (v == null) {
plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/CommentInBlock.kt.after
-1
View File
@@ -1,4 +1,3 @@
// WITH_DIFFERENT_DATA_FOR_K2
fun foo(p: List<String?>): Int {
val v = p[0]
?: // return -1 if null
plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/Comments2.kt.after.k2 → plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/Comments2.k2.kt.after
-1
View File
@@ -1,4 +1,3 @@
// WITH_DIFFERENT_DATA_FOR_K2
fun foo(p: List<String?>): Int {
val v = p[0] ?: // v is null
// we should do something with it
plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/Comments2.kt
-1
View File
@@ -1,4 +1,3 @@
// WITH_DIFFERENT_DATA_FOR_K2
fun foo(p: List<String?>): Int {
val v = p[0]
<caret>if (v == null) { // v is null
plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/Comments2.kt.after
-1
View File
@@ -1,4 +1,3 @@
// WITH_DIFFERENT_DATA_FOR_K2
fun foo(p: List<String?>): Int {
val v = p[0]
?: // v is null
plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName.kt.after.k2 → plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName.k2.kt.after
-1
View File
@@ -1,4 +1,3 @@
// WITH_DIFFERENT_DATA_FOR_K2
fun foo(): Any {
val yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy = 7
val xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx =
plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName.kt
-1
View File
@@ -1,4 +1,3 @@
// WITH_DIFFERENT_DATA_FOR_K2
fun foo(): Any {
val yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy = 7
val xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx = 24
plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName.kt.after
-1
View File
@@ -1,4 +1,3 @@
// WITH_DIFFERENT_DATA_FOR_K2
fun foo(): Any {
val yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy = 7
val xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx = 24
plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName2.kt.after.k2 → plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName2.k2.kt.after
-1
View File
@@ -1,4 +1,3 @@
// WITH_DIFFERENT_DATA_FOR_K2
fun foo(): Any {
val yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy = 7
val xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx =
plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName2.kt
-1
View File
@@ -1,4 +1,3 @@
// WITH_DIFFERENT_DATA_FOR_K2
fun foo(): Any {
val yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy = 7
val xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName2.kt.after
-1
View File
@@ -1,4 +1,3 @@
// WITH_DIFFERENT_DATA_FOR_K2
fun foo(): Any {
val yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy = 7
val xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable.kt.after.k2 → plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable.k2.kt.after
-1
View File
@@ -1,5 +1,4 @@
// IGNORE_FE10_BINDING_BY_FIR
// WITH_DIFFERENT_DATA_FOR_K2
fun test(foo: Int?, bar: Int): Int? {
var i = foo ?: return bar
return i
plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable.kt
-1
View File
@@ -1,5 +1,4 @@
// IGNORE_FE10_BINDING_BY_FIR
// WITH_DIFFERENT_DATA_FOR_K2
fun test(foo: Int?, bar: Int): Int? {
var i = foo
<caret>if (i == null) {
plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable.kt.after
-1
View File
@@ -1,5 +1,4 @@
// IGNORE_FE10_BINDING_BY_FIR
// WITH_DIFFERENT_DATA_FOR_K2
fun test(foo: Int?, bar: Int): Int? {
var i: Int? = foo ?: return bar
return i
plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable2.kt.after.k2 → plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable2.k2.kt.after
-1
View File
@@ -1,5 +1,4 @@
// IGNORE_FE10_BINDING_BY_FIR
// WITH_DIFFERENT_DATA_FOR_K2
fun test(foo: Int?, bar: Int): Int {
var i = foo ?: return bar
return baz(i)
plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable2.kt
-1
View File
@@ -1,5 +1,4 @@
// IGNORE_FE10_BINDING_BY_FIR
// WITH_DIFFERENT_DATA_FOR_K2
fun test(foo: Int?, bar: Int): Int {
var i = foo
<caret>if (i == null) {
plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable2.kt.after
-1
View File
@@ -1,5 +1,4 @@
// IGNORE_FE10_BINDING_BY_FIR
// WITH_DIFFERENT_DATA_FOR_K2
fun test(foo: Int?, bar: Int): Int {
var i: Int? = foo ?: return bar
return baz(i)