From 85e9f2207e7d820cb76954e7c50ebbba7b64a828 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 1 Apr 2015 22:59:56 +0300 Subject: [PATCH] Minor. Moved test data to subdirectory. --- .../BadCodeNoExceptions.kt | 0 .../{ => overrideImplement}/Class.kt | 0 .../ClassObjectInStaticNestedClass.kt | 0 .../{ => overrideImplement}/DelegatedFun.kt | 0 .../DelegatedProperty.kt | 0 .../FakeOverrideForClasses.kt | 0 .../FakeOverrideFun.kt | 0 ...errideFunWithMostRelevantImplementation.kt | 0 .../FakeOverrideProperty.kt | 0 .../FakeOverrideToStringInTrait.kt | 0 .../FakeOverridesForTraitFunWithImpl.kt | 0 .../NavigateToSeveralSuperElements.kt | 0 .../NoOverridingMarkerOnDefaultTraitImpl.kt | 0 .../{ => overrideImplement}/Overloads.kt | 0 .../OverrideFunction.kt | 0 .../OverrideIconForOverloadMethodBug.kt | 0 .../OverrideMemberOfAbstractClass.kt | 0 .../OverridenTraitDeclarations.kt | 0 .../OverridingTooltipOnDefaultTraitImpl.kt | 0 .../PropertyOverride.kt | 0 .../ToStringInTrait.kt | 0 .../{ => overrideImplement}/Trait.kt | 0 .../codeInsight/AbstractLineMarkersTest.java | 10 +- .../codeInsight/LineMarkersTestGenerated.java | 230 +++++++++--------- 24 files changed, 130 insertions(+), 110 deletions(-) rename idea/testData/codeInsight/lineMarker/{ => overrideImplement}/BadCodeNoExceptions.kt (100%) rename idea/testData/codeInsight/lineMarker/{ => overrideImplement}/Class.kt (100%) rename idea/testData/codeInsight/lineMarker/{ => overrideImplement}/ClassObjectInStaticNestedClass.kt (100%) rename idea/testData/codeInsight/lineMarker/{ => overrideImplement}/DelegatedFun.kt (100%) rename idea/testData/codeInsight/lineMarker/{ => overrideImplement}/DelegatedProperty.kt (100%) rename idea/testData/codeInsight/lineMarker/{ => overrideImplement}/FakeOverrideForClasses.kt (100%) rename idea/testData/codeInsight/lineMarker/{ => overrideImplement}/FakeOverrideFun.kt (100%) rename idea/testData/codeInsight/lineMarker/{ => overrideImplement}/FakeOverrideFunWithMostRelevantImplementation.kt (100%) rename idea/testData/codeInsight/lineMarker/{ => overrideImplement}/FakeOverrideProperty.kt (100%) rename idea/testData/codeInsight/lineMarker/{ => overrideImplement}/FakeOverrideToStringInTrait.kt (100%) rename idea/testData/codeInsight/lineMarker/{ => overrideImplement}/FakeOverridesForTraitFunWithImpl.kt (100%) rename idea/testData/codeInsight/lineMarker/{ => overrideImplement}/NavigateToSeveralSuperElements.kt (100%) rename idea/testData/codeInsight/lineMarker/{ => overrideImplement}/NoOverridingMarkerOnDefaultTraitImpl.kt (100%) rename idea/testData/codeInsight/lineMarker/{ => overrideImplement}/Overloads.kt (100%) rename idea/testData/codeInsight/lineMarker/{ => overrideImplement}/OverrideFunction.kt (100%) rename idea/testData/codeInsight/lineMarker/{ => overrideImplement}/OverrideIconForOverloadMethodBug.kt (100%) rename idea/testData/codeInsight/lineMarker/{ => overrideImplement}/OverrideMemberOfAbstractClass.kt (100%) rename idea/testData/codeInsight/lineMarker/{ => overrideImplement}/OverridenTraitDeclarations.kt (100%) rename idea/testData/codeInsight/lineMarker/{ => overrideImplement}/OverridingTooltipOnDefaultTraitImpl.kt (100%) rename idea/testData/codeInsight/lineMarker/{ => overrideImplement}/PropertyOverride.kt (100%) rename idea/testData/codeInsight/lineMarker/{ => overrideImplement}/ToStringInTrait.kt (100%) rename idea/testData/codeInsight/lineMarker/{ => overrideImplement}/Trait.kt (100%) diff --git a/idea/testData/codeInsight/lineMarker/BadCodeNoExceptions.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/BadCodeNoExceptions.kt similarity index 100% rename from idea/testData/codeInsight/lineMarker/BadCodeNoExceptions.kt rename to idea/testData/codeInsight/lineMarker/overrideImplement/BadCodeNoExceptions.kt diff --git a/idea/testData/codeInsight/lineMarker/Class.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/Class.kt similarity index 100% rename from idea/testData/codeInsight/lineMarker/Class.kt rename to idea/testData/codeInsight/lineMarker/overrideImplement/Class.kt diff --git a/idea/testData/codeInsight/lineMarker/ClassObjectInStaticNestedClass.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/ClassObjectInStaticNestedClass.kt similarity index 100% rename from idea/testData/codeInsight/lineMarker/ClassObjectInStaticNestedClass.kt rename to idea/testData/codeInsight/lineMarker/overrideImplement/ClassObjectInStaticNestedClass.kt diff --git a/idea/testData/codeInsight/lineMarker/DelegatedFun.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/DelegatedFun.kt similarity index 100% rename from idea/testData/codeInsight/lineMarker/DelegatedFun.kt rename to idea/testData/codeInsight/lineMarker/overrideImplement/DelegatedFun.kt diff --git a/idea/testData/codeInsight/lineMarker/DelegatedProperty.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/DelegatedProperty.kt similarity index 100% rename from idea/testData/codeInsight/lineMarker/DelegatedProperty.kt rename to idea/testData/codeInsight/lineMarker/overrideImplement/DelegatedProperty.kt diff --git a/idea/testData/codeInsight/lineMarker/FakeOverrideForClasses.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideForClasses.kt similarity index 100% rename from idea/testData/codeInsight/lineMarker/FakeOverrideForClasses.kt rename to idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideForClasses.kt diff --git a/idea/testData/codeInsight/lineMarker/FakeOverrideFun.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideFun.kt similarity index 100% rename from idea/testData/codeInsight/lineMarker/FakeOverrideFun.kt rename to idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideFun.kt diff --git a/idea/testData/codeInsight/lineMarker/FakeOverrideFunWithMostRelevantImplementation.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideFunWithMostRelevantImplementation.kt similarity index 100% rename from idea/testData/codeInsight/lineMarker/FakeOverrideFunWithMostRelevantImplementation.kt rename to idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideFunWithMostRelevantImplementation.kt diff --git a/idea/testData/codeInsight/lineMarker/FakeOverrideProperty.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideProperty.kt similarity index 100% rename from idea/testData/codeInsight/lineMarker/FakeOverrideProperty.kt rename to idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideProperty.kt diff --git a/idea/testData/codeInsight/lineMarker/FakeOverrideToStringInTrait.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideToStringInTrait.kt similarity index 100% rename from idea/testData/codeInsight/lineMarker/FakeOverrideToStringInTrait.kt rename to idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideToStringInTrait.kt diff --git a/idea/testData/codeInsight/lineMarker/FakeOverridesForTraitFunWithImpl.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverridesForTraitFunWithImpl.kt similarity index 100% rename from idea/testData/codeInsight/lineMarker/FakeOverridesForTraitFunWithImpl.kt rename to idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverridesForTraitFunWithImpl.kt diff --git a/idea/testData/codeInsight/lineMarker/NavigateToSeveralSuperElements.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/NavigateToSeveralSuperElements.kt similarity index 100% rename from idea/testData/codeInsight/lineMarker/NavigateToSeveralSuperElements.kt rename to idea/testData/codeInsight/lineMarker/overrideImplement/NavigateToSeveralSuperElements.kt diff --git a/idea/testData/codeInsight/lineMarker/NoOverridingMarkerOnDefaultTraitImpl.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/NoOverridingMarkerOnDefaultTraitImpl.kt similarity index 100% rename from idea/testData/codeInsight/lineMarker/NoOverridingMarkerOnDefaultTraitImpl.kt rename to idea/testData/codeInsight/lineMarker/overrideImplement/NoOverridingMarkerOnDefaultTraitImpl.kt diff --git a/idea/testData/codeInsight/lineMarker/Overloads.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/Overloads.kt similarity index 100% rename from idea/testData/codeInsight/lineMarker/Overloads.kt rename to idea/testData/codeInsight/lineMarker/overrideImplement/Overloads.kt diff --git a/idea/testData/codeInsight/lineMarker/OverrideFunction.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/OverrideFunction.kt similarity index 100% rename from idea/testData/codeInsight/lineMarker/OverrideFunction.kt rename to idea/testData/codeInsight/lineMarker/overrideImplement/OverrideFunction.kt diff --git a/idea/testData/codeInsight/lineMarker/OverrideIconForOverloadMethodBug.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/OverrideIconForOverloadMethodBug.kt similarity index 100% rename from idea/testData/codeInsight/lineMarker/OverrideIconForOverloadMethodBug.kt rename to idea/testData/codeInsight/lineMarker/overrideImplement/OverrideIconForOverloadMethodBug.kt diff --git a/idea/testData/codeInsight/lineMarker/OverrideMemberOfAbstractClass.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/OverrideMemberOfAbstractClass.kt similarity index 100% rename from idea/testData/codeInsight/lineMarker/OverrideMemberOfAbstractClass.kt rename to idea/testData/codeInsight/lineMarker/overrideImplement/OverrideMemberOfAbstractClass.kt diff --git a/idea/testData/codeInsight/lineMarker/OverridenTraitDeclarations.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/OverridenTraitDeclarations.kt similarity index 100% rename from idea/testData/codeInsight/lineMarker/OverridenTraitDeclarations.kt rename to idea/testData/codeInsight/lineMarker/overrideImplement/OverridenTraitDeclarations.kt diff --git a/idea/testData/codeInsight/lineMarker/OverridingTooltipOnDefaultTraitImpl.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/OverridingTooltipOnDefaultTraitImpl.kt similarity index 100% rename from idea/testData/codeInsight/lineMarker/OverridingTooltipOnDefaultTraitImpl.kt rename to idea/testData/codeInsight/lineMarker/overrideImplement/OverridingTooltipOnDefaultTraitImpl.kt diff --git a/idea/testData/codeInsight/lineMarker/PropertyOverride.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/PropertyOverride.kt similarity index 100% rename from idea/testData/codeInsight/lineMarker/PropertyOverride.kt rename to idea/testData/codeInsight/lineMarker/overrideImplement/PropertyOverride.kt diff --git a/idea/testData/codeInsight/lineMarker/ToStringInTrait.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/ToStringInTrait.kt similarity index 100% rename from idea/testData/codeInsight/lineMarker/ToStringInTrait.kt rename to idea/testData/codeInsight/lineMarker/overrideImplement/ToStringInTrait.kt diff --git a/idea/testData/codeInsight/lineMarker/Trait.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/Trait.kt similarity index 100% rename from idea/testData/codeInsight/lineMarker/Trait.kt rename to idea/testData/codeInsight/lineMarker/overrideImplement/Trait.kt diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractLineMarkersTest.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractLineMarkersTest.java index 6d976bc5950..d459044cea0 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractLineMarkersTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractLineMarkersTest.java @@ -27,9 +27,11 @@ import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiElement; import com.intellij.rt.execution.junit.FileComparisonFailure; import com.intellij.testFramework.ExpectedHighlightingData; +import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor; import org.jetbrains.kotlin.idea.PluginTestCaseBase; import org.jetbrains.kotlin.idea.highlighter.markers.SuperDeclarationMarkerNavigationHandler; import org.jetbrains.kotlin.idea.navigation.NavigationTestUtils; @@ -54,6 +56,12 @@ public abstract class AbstractLineMarkersTest extends JetLightCodeInsightFixture return PluginTestCaseBase.TEST_DATA_PROJECT_RELATIVE + "/codeInsight/lineMarker"; } + @NotNull + @Override + protected LightProjectDescriptor getProjectDescriptor() { + return JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE; + } + public void doTest(String path) { try { myFixture.configureByFile(path); @@ -76,7 +84,7 @@ public abstract class AbstractLineMarkersTest extends JetLightCodeInsightFixture catch (AssertionError error) { try { String actualTextWithTestData = TagsTestDataUtil.insertInfoTags(markers, true, myFixture.getFile().getText()); - JetTestUtils.assertEqualsToFile(new File(getTestDataPath(), fileName()), actualTextWithTestData); + JetTestUtils.assertEqualsToFile(new File(path), actualTextWithTestData); } catch (FileComparisonFailure failure) { throw new FileComparisonFailure(error.getMessage() + "\n" + failure.getMessage(), diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LineMarkersTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LineMarkersTestGenerated.java index c2d7aa8b2e0..c0cd0a1b856 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LineMarkersTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LineMarkersTestGenerated.java @@ -30,141 +30,153 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/codeInsight/lineMarker") @TestDataPath("$PROJECT_ROOT") +@InnerTestClasses({ + LineMarkersTestGenerated.OverrideImplement.class, +}) @RunWith(JUnit3RunnerWithInners.class) public class LineMarkersTestGenerated extends AbstractLineMarkersTest { public void testAllFilesPresentInLineMarker() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/lineMarker"), Pattern.compile("^(.+)\\.kt$"), true); } - @TestMetadata("BadCodeNoExceptions.kt") - public void testBadCodeNoExceptions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/BadCodeNoExceptions.kt"); - doTest(fileName); - } + @TestMetadata("idea/testData/codeInsight/lineMarker/overrideImplement") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class OverrideImplement extends AbstractLineMarkersTest { + public void testAllFilesPresentInOverrideImplement() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/lineMarker/overrideImplement"), Pattern.compile("^(.+)\\.kt$"), true); + } - @TestMetadata("Class.kt") - public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/Class.kt"); - doTest(fileName); - } + @TestMetadata("BadCodeNoExceptions.kt") + public void testBadCodeNoExceptions() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/BadCodeNoExceptions.kt"); + doTest(fileName); + } - @TestMetadata("ClassObjectInStaticNestedClass.kt") - public void testClassObjectInStaticNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/ClassObjectInStaticNestedClass.kt"); - doTest(fileName); - } + @TestMetadata("Class.kt") + public void testClass() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/Class.kt"); + doTest(fileName); + } - @TestMetadata("DelegatedFun.kt") - public void testDelegatedFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/DelegatedFun.kt"); - doTest(fileName); - } + @TestMetadata("ClassObjectInStaticNestedClass.kt") + public void testClassObjectInStaticNestedClass() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/ClassObjectInStaticNestedClass.kt"); + doTest(fileName); + } - @TestMetadata("DelegatedProperty.kt") - public void testDelegatedProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/DelegatedProperty.kt"); - doTest(fileName); - } + @TestMetadata("DelegatedFun.kt") + public void testDelegatedFun() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/DelegatedFun.kt"); + doTest(fileName); + } - @TestMetadata("FakeOverrideForClasses.kt") - public void testFakeOverrideForClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/FakeOverrideForClasses.kt"); - doTest(fileName); - } + @TestMetadata("DelegatedProperty.kt") + public void testDelegatedProperty() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/DelegatedProperty.kt"); + doTest(fileName); + } - @TestMetadata("FakeOverrideFun.kt") - public void testFakeOverrideFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/FakeOverrideFun.kt"); - doTest(fileName); - } + @TestMetadata("FakeOverrideForClasses.kt") + public void testFakeOverrideForClasses() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideForClasses.kt"); + doTest(fileName); + } - @TestMetadata("FakeOverrideFunWithMostRelevantImplementation.kt") - public void testFakeOverrideFunWithMostRelevantImplementation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/FakeOverrideFunWithMostRelevantImplementation.kt"); - doTest(fileName); - } + @TestMetadata("FakeOverrideFun.kt") + public void testFakeOverrideFun() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideFun.kt"); + doTest(fileName); + } - @TestMetadata("FakeOverrideProperty.kt") - public void testFakeOverrideProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/FakeOverrideProperty.kt"); - doTest(fileName); - } + @TestMetadata("FakeOverrideFunWithMostRelevantImplementation.kt") + public void testFakeOverrideFunWithMostRelevantImplementation() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideFunWithMostRelevantImplementation.kt"); + doTest(fileName); + } - @TestMetadata("FakeOverrideToStringInTrait.kt") - public void testFakeOverrideToStringInTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/FakeOverrideToStringInTrait.kt"); - doTest(fileName); - } + @TestMetadata("FakeOverrideProperty.kt") + public void testFakeOverrideProperty() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideProperty.kt"); + doTest(fileName); + } - @TestMetadata("FakeOverridesForTraitFunWithImpl.kt") - public void testFakeOverridesForTraitFunWithImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/FakeOverridesForTraitFunWithImpl.kt"); - doTest(fileName); - } + @TestMetadata("FakeOverrideToStringInTrait.kt") + public void testFakeOverrideToStringInTrait() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideToStringInTrait.kt"); + doTest(fileName); + } - @TestMetadata("NavigateToSeveralSuperElements.kt") - public void testNavigateToSeveralSuperElements() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/NavigateToSeveralSuperElements.kt"); - doTest(fileName); - } + @TestMetadata("FakeOverridesForTraitFunWithImpl.kt") + public void testFakeOverridesForTraitFunWithImpl() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverridesForTraitFunWithImpl.kt"); + doTest(fileName); + } - @TestMetadata("NoOverridingMarkerOnDefaultTraitImpl.kt") - public void testNoOverridingMarkerOnDefaultTraitImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/NoOverridingMarkerOnDefaultTraitImpl.kt"); - doTest(fileName); - } + @TestMetadata("NavigateToSeveralSuperElements.kt") + public void testNavigateToSeveralSuperElements() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/NavigateToSeveralSuperElements.kt"); + doTest(fileName); + } - @TestMetadata("Overloads.kt") - public void testOverloads() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/Overloads.kt"); - doTest(fileName); - } + @TestMetadata("NoOverridingMarkerOnDefaultTraitImpl.kt") + public void testNoOverridingMarkerOnDefaultTraitImpl() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/NoOverridingMarkerOnDefaultTraitImpl.kt"); + doTest(fileName); + } - @TestMetadata("OverrideFunction.kt") - public void testOverrideFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/OverrideFunction.kt"); - doTest(fileName); - } + @TestMetadata("Overloads.kt") + public void testOverloads() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/Overloads.kt"); + doTest(fileName); + } - @TestMetadata("OverrideIconForOverloadMethodBug.kt") - public void testOverrideIconForOverloadMethodBug() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/OverrideIconForOverloadMethodBug.kt"); - doTest(fileName); - } + @TestMetadata("OverrideFunction.kt") + public void testOverrideFunction() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/OverrideFunction.kt"); + doTest(fileName); + } - @TestMetadata("OverrideMemberOfAbstractClass.kt") - public void testOverrideMemberOfAbstractClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/OverrideMemberOfAbstractClass.kt"); - doTest(fileName); - } + @TestMetadata("OverrideIconForOverloadMethodBug.kt") + public void testOverrideIconForOverloadMethodBug() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/OverrideIconForOverloadMethodBug.kt"); + doTest(fileName); + } - @TestMetadata("OverridenTraitDeclarations.kt") - public void testOverridenTraitDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/OverridenTraitDeclarations.kt"); - doTest(fileName); - } + @TestMetadata("OverrideMemberOfAbstractClass.kt") + public void testOverrideMemberOfAbstractClass() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/OverrideMemberOfAbstractClass.kt"); + doTest(fileName); + } - @TestMetadata("OverridingTooltipOnDefaultTraitImpl.kt") - public void testOverridingTooltipOnDefaultTraitImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/OverridingTooltipOnDefaultTraitImpl.kt"); - doTest(fileName); - } + @TestMetadata("OverridenTraitDeclarations.kt") + public void testOverridenTraitDeclarations() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/OverridenTraitDeclarations.kt"); + doTest(fileName); + } - @TestMetadata("PropertyOverride.kt") - public void testPropertyOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/PropertyOverride.kt"); - doTest(fileName); - } + @TestMetadata("OverridingTooltipOnDefaultTraitImpl.kt") + public void testOverridingTooltipOnDefaultTraitImpl() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/OverridingTooltipOnDefaultTraitImpl.kt"); + doTest(fileName); + } - @TestMetadata("ToStringInTrait.kt") - public void testToStringInTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/ToStringInTrait.kt"); - doTest(fileName); - } + @TestMetadata("PropertyOverride.kt") + public void testPropertyOverride() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/PropertyOverride.kt"); + doTest(fileName); + } - @TestMetadata("Trait.kt") - public void testTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/Trait.kt"); - doTest(fileName); + @TestMetadata("ToStringInTrait.kt") + public void testToStringInTrait() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/ToStringInTrait.kt"); + doTest(fileName); + } + + @TestMetadata("Trait.kt") + public void testTrait() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/Trait.kt"); + doTest(fileName); + } } }