diff --git a/java/java-tests/testSrc/com/siyeh/ig/migration/ForCanBeForeachInspectionTest.java b/java/java-tests/testSrc/com/siyeh/ig/migration/ForCanBeForeachInspectionTest.java index 7b5da6ea7ca1..bc599956a972 100644 --- a/java/java-tests/testSrc/com/siyeh/ig/migration/ForCanBeForeachInspectionTest.java +++ b/java/java-tests/testSrc/com/siyeh/ig/migration/ForCanBeForeachInspectionTest.java @@ -44,7 +44,7 @@ public class ForCanBeForeachInspectionTest { } @Test - void forCanBeForEach() { + void testForCanBeForEach() { fixture.get().testHighlighting(testName.get() + ".java"); } } diff --git a/java/java-tests/testSrc/com/siyeh/ig/migration/TryFinallyCanBeTryWithResourcesInspectionTest.kt b/java/java-tests/testSrc/com/siyeh/ig/migration/TryFinallyCanBeTryWithResourcesInspectionTest.kt index 34f56b63c62f..9f790f70bc10 100644 --- a/java/java-tests/testSrc/com/siyeh/ig/migration/TryFinallyCanBeTryWithResourcesInspectionTest.kt +++ b/java/java-tests/testSrc/com/siyeh/ig/migration/TryFinallyCanBeTryWithResourcesInspectionTest.kt @@ -41,7 +41,7 @@ class TryFinallyCanBeTryWithResourcesInspectionTest { } @Test - fun tryFinallyCanBeTryWithResources() { + fun testTryFinallyCanBeTryWithResources() { fixture.testHighlighting("$testName.java") } } \ No newline at end of file diff --git a/platform/testFramework/junit5/codeInsight/src/fixture/codeInsightFixture.kt b/platform/testFramework/junit5/codeInsight/src/fixture/codeInsightFixture.kt index 29b3e0977e73..cf15ef76f861 100644 --- a/platform/testFramework/junit5/codeInsight/src/fixture/codeInsightFixture.kt +++ b/platform/testFramework/junit5/codeInsight/src/fixture/codeInsightFixture.kt @@ -58,7 +58,7 @@ fun codeInsightFixture( fun codeInsightFixture( projectFixture: TestFixture, tempDirFixture: TestFixture, - fixtureConstructor: (IdeaProjectTestFixture, TempDirTestFixture) -> T, + createFixture: (IdeaProjectTestFixture, TempDirTestFixture) -> T, ): TestFixture = testFixture { context -> val project = projectFixture.init() val tempDir = tempDirFixture.init() @@ -89,7 +89,7 @@ fun codeInsightFixture( override fun deleteOnTearDown(): Boolean = false } - val codeInsightFixture = fixtureConstructor(projectFixture, tempDirFixture) + val codeInsightFixture = createFixture(projectFixture, tempDirFixture) codeInsightFixture.testDataPath = getTestDataPathString(context) diff --git a/platform/testFramework/junit5/src/fixture/TestContextImpl.kt b/platform/testFramework/junit5/src/fixture/TestContextImpl.kt index 670ee33270f8..d86ab6451eb6 100644 --- a/platform/testFramework/junit5/src/fixture/TestContextImpl.kt +++ b/platform/testFramework/junit5/src/fixture/TestContextImpl.kt @@ -17,7 +17,6 @@ internal class TestContextImpl(private val context: ExtensionContext, override v if (name.startsWith("test") && name.length > 4) name.removePrefix("test").trimStart() else name } - .replaceFirstChar { it.lowercaseChar() } override fun findAnnotation(clazz: Class): T? { var extContext: ExtensionContext? = context diff --git a/platform/testFramework/junit5/src/fixture/fixtures.kt b/platform/testFramework/junit5/src/fixture/fixtures.kt index 1210afffa26a..66a677284a27 100644 --- a/platform/testFramework/junit5/src/fixture/fixtures.kt +++ b/platform/testFramework/junit5/src/fixture/fixtures.kt @@ -51,8 +51,10 @@ import kotlin.io.path.exists @JvmOverloads @TestOnly fun testNameFixture(lowerCaseFirstLetter: Boolean = true): TestFixture = testFixture { - val testName = it.testName.replaceFirstChar { - chr -> if (lowerCaseFirstLetter) chr.lowercaseChar() else chr.uppercaseChar() + val testName = if (lowerCaseFirstLetter) { + it.testName.replaceFirstChar { chr -> chr.lowercaseChar() } + } else { + it.testName } initialized(testName) {}