MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-21 22:11:40 +07:00
Code Issues Packages Projects Releases Wiki Activity

[jvm] Make suite converter not use companion object

Browse Source 
GitOrigin-RevId: efdf4448fc7c7ca8270706b28787fa95d31459e5
This commit is contained in:
Bart van Helvert
2022-11-23 21:17:00 +01:00
committed by intellij-monorepo-bot
parent bcf1185e29
commit 76d7276ef0
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
jvm/jvm-analysis-impl/src/com/intellij/codeInspection/test/junit/JUnit4ConverterQuickfix.kt
View File

@@ -18,6 +18,7 @@ import com.intellij.psi.CommonClassNames.JAVA_LANG_CLASS
import com.intellij.psi.PsiClass
import com.intellij.psi.PsiElement
import com.intellij.psi.SmartPointerManager
import com.intellij.psi.util.InheritanceUtil
import com.intellij.refactoring.BaseRefactoringProcessor.ConflictsInTestsException
import com.intellij.refactoring.ui.ConflictsDialog
import com.intellij.refactoring.util.CommonRefactoringUtil
@@ -245,7 +246,13 @@ class JUnit4ConverterQuickfix : LocalQuickFix {
val qualified = node.valueArguments.first().asSafely<UQualifiedReferenceExpression>()
if(qualified?.selector?.asSafely<UCallExpression>()?.isSuite() == false) return false // don't show conflict in preview
val receiver = qualified?.receiver.asSafely<UReferenceExpression>() ?: return false
classLiterals.add(receiver.getQualifiedName() ?: return false)
val suiteClass = receiver.resolve().toUElementOfType<UClass>()?.javaPsi
val suiteFqn = if (InheritanceUtil.isInheritor(suiteClass, JUNIT_FRAMEWORK_TEST_CASE)) {
suiteClass?.qualifiedName
} else {
suiteClass?.containingClass?.qualifiedName // receiver was companion object
}
classLiterals.add(suiteFqn ?: return false)
}
addTestSuiteMatcher.uCallMatches(node) -> {
val type = node.valueArguments

2
jvm/jvm-analysis-kotlin-tests/testSrc/com/intellij/codeInspection/tests/kotlin/test/junit/KotlinJUnit4ConverterInspectionTest.kt
View File

@@ -238,7 +238,7 @@ class KotlinJUnit4ConverterInspectionTest : JUnit4ConverterInspectionTestBase()
class Bar : TestCase() { }
@RunWith(Suite::class)
@Suite.SuiteClasses(Foo.Companion::class)
@Suite.SuiteClasses(Foo::class)
class JUnit3Test {
companion object {
}