From c7318b3880ab714f23007a72a5171ba17077ca66 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 6 Jun 2014 14:08:31 +0400 Subject: [PATCH] Added slashes in generated tests when they are invoked on directory. This makes it easier to find directory for test using IDEA's go to file/search everywhere features. --- ...opLevelMembersInvocationTestGenerated.java | 14 +- .../BlackBoxInlineCodegenTestGenerated.java | 110 +++++++------- ...BlackBoxMultiFileCodegenTestGenerated.java | 22 +-- ...otlinAgainstInlineKotlinTestGenerated.java | 110 +++++++------- .../generator/SimpleTestMethodModel.java | 3 +- ...tiFileJvmBasicCompletionTestGenerated.java | 32 ++-- ...ureProjectByChangingFileTestGenerated.java | 8 +- .../hierarchy/HierarchyTestGenerated.java | 142 +++++++++--------- .../imports/OptimizeImportsTestGenerated.java | 42 +++--- .../libraries/AbstractDecompiledTextTest.kt | 3 +- .../DecompiledTextTestGenerated.java | 14 +- 11 files changed, 251 insertions(+), 249 deletions(-) diff --git a/compiler/tests/org/jetbrains/jet/codegen/TopLevelMembersInvocationTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/TopLevelMembersInvocationTestGenerated.java index 51880c201c3..270a4e8b39d 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/TopLevelMembersInvocationTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/TopLevelMembersInvocationTestGenerated.java @@ -38,37 +38,37 @@ public class TopLevelMembersInvocationTestGenerated extends AbstractTopLevelMemb @TestMetadata("extensionFunction") public void testExtensionFunction() throws Exception { - doTest("compiler/testData/codegen/topLevelMemberInvocation/extensionFunction"); + doTest("compiler/testData/codegen/topLevelMemberInvocation/extensionFunction/"); } @TestMetadata("functionDifferentPackage") public void testFunctionDifferentPackage() throws Exception { - doTest("compiler/testData/codegen/topLevelMemberInvocation/functionDifferentPackage"); + doTest("compiler/testData/codegen/topLevelMemberInvocation/functionDifferentPackage/"); } @TestMetadata("functionInMultiFilePackage") public void testFunctionInMultiFilePackage() throws Exception { - doTest("compiler/testData/codegen/topLevelMemberInvocation/functionInMultiFilePackage"); + doTest("compiler/testData/codegen/topLevelMemberInvocation/functionInMultiFilePackage/"); } @TestMetadata("functionSamePackage") public void testFunctionSamePackage() throws Exception { - doTest("compiler/testData/codegen/topLevelMemberInvocation/functionSamePackage"); + doTest("compiler/testData/codegen/topLevelMemberInvocation/functionSamePackage/"); } @TestMetadata("property") public void testProperty() throws Exception { - doTest("compiler/testData/codegen/topLevelMemberInvocation/property"); + doTest("compiler/testData/codegen/topLevelMemberInvocation/property/"); } @TestMetadata("propertyWithGetter") public void testPropertyWithGetter() throws Exception { - doTest("compiler/testData/codegen/topLevelMemberInvocation/propertyWithGetter"); + doTest("compiler/testData/codegen/topLevelMemberInvocation/propertyWithGetter/"); } @TestMetadata("twoModules") public void testTwoModules() throws Exception { - doTest("compiler/testData/codegen/topLevelMemberInvocation/twoModules"); + doTest("compiler/testData/codegen/topLevelMemberInvocation/twoModules/"); } } diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxInlineCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxInlineCodegenTestGenerated.java index 76896bf630e..d5d93814696 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxInlineCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxInlineCodegenTestGenerated.java @@ -38,277 +38,277 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT @TestMetadata("anonymousObjectOnCallSite") public void testAnonymousObjectOnCallSite() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObjectOnCallSite"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObjectOnCallSite/"); } @TestMetadata("anonymousObjectOnCallSiteSuperParams") public void testAnonymousObjectOnCallSiteSuperParams() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObjectOnCallSiteSuperParams"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObjectOnCallSiteSuperParams/"); } @TestMetadata("anonymousObjectOnDeclarationSite") public void testAnonymousObjectOnDeclarationSite() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObjectOnDeclarationSite"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObjectOnDeclarationSite/"); } @TestMetadata("anonymousObjectOnDeclarationSiteSuperParams") public void testAnonymousObjectOnDeclarationSiteSuperParams() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObjectOnDeclarationSiteSuperParams"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObjectOnDeclarationSiteSuperParams/"); } @TestMetadata("builders") public void testBuilders() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/builders"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/builders/"); } @TestMetadata("buildersAndLambdaCapturing") public void testBuildersAndLambdaCapturing() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/buildersAndLambdaCapturing"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/buildersAndLambdaCapturing/"); } @TestMetadata("captureInlinable") public void testCaptureInlinable() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/captureInlinable"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/captureInlinable/"); } @TestMetadata("captureInlinableAndOther") public void testCaptureInlinableAndOther() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/captureInlinableAndOther"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/captureInlinableAndOther/"); } @TestMetadata("captureThisAndReceiver") public void testCaptureThisAndReceiver() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/captureThisAndReceiver"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/captureThisAndReceiver/"); } @TestMetadata("classObject") public void testClassObject() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/classObject"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/classObject/"); } @TestMetadata("closureChain") public void testClosureChain() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/closureChain"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/closureChain/"); } @TestMetadata("defaultMethod") public void testDefaultMethod() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/defaultMethod"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/defaultMethod/"); } @TestMetadata("extension") public void testExtension() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/extension"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/extension/"); } @TestMetadata("forEachLine") public void testForEachLine() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/forEachLine"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/forEachLine/"); } @TestMetadata("generics") public void testGenerics() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/generics"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/generics/"); } @TestMetadata("identityCheck") public void testIdentityCheck() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/identityCheck"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/identityCheck/"); } @TestMetadata("ifBranches") public void testIfBranches() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/ifBranches"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/ifBranches/"); } @TestMetadata("iinc") public void testIinc() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/iinc"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/iinc/"); } @TestMetadata("inlineChain") public void testInlineChain() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/inlineChain"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/inlineChain/"); } @TestMetadata("inlineInDefaultParameter") public void testInlineInDefaultParameter() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/inlineInDefaultParameter"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/inlineInDefaultParameter/"); } @TestMetadata("lambdaClassClash") public void testLambdaClassClash() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaClassClash"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaClassClash/"); } @TestMetadata("lambdaCloning") public void testLambdaCloning() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaCloning"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaCloning/"); } @TestMetadata("lambdaInLambda") public void testLambdaInLambda() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaInLambda"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaInLambda/"); } @TestMetadata("lambdaInLambda2") public void testLambdaInLambda2() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaInLambda2"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaInLambda2/"); } @TestMetadata("lambdaInLambdaNoInline") public void testLambdaInLambdaNoInline() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaInLambdaNoInline"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaInLambdaNoInline/"); } @TestMetadata("localFunInLambda") public void testLocalFunInLambda() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/localFunInLambda"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/localFunInLambda/"); } @TestMetadata("noInline") public void testNoInline() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/noInline"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/noInline/"); } @TestMetadata("noInlineLambdaChain") public void testNoInlineLambdaChain() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/noInlineLambdaChain"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/noInlineLambdaChain/"); } @TestMetadata("noInlineLambdaChainWithCapturedInline") public void testNoInlineLambdaChainWithCapturedInline() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/noInlineLambdaChainWithCapturedInline"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/noInlineLambdaChainWithCapturedInline/"); } @TestMetadata("noInlineLambdaX2") public void testNoInlineLambdaX2() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/noInlineLambdaX2"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/noInlineLambdaX2/"); } @TestMetadata("params") public void testParams() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/params"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/params/"); } @TestMetadata("plusAssign") public void testPlusAssign() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/plusAssign"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/plusAssign/"); } @TestMetadata("regeneratedLambdaName") public void testRegeneratedLambdaName() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/regeneratedLambdaName"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/regeneratedLambdaName/"); } @TestMetadata("rootConstructor") public void testRootConstructor() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/rootConstructor"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/rootConstructor/"); } @TestMetadata("sameCaptured") public void testSameCaptured() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/sameCaptured"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/sameCaptured/"); } @TestMetadata("severalClosures") public void testSeveralClosures() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/severalClosures"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/severalClosures/"); } @TestMetadata("severalUsage") public void testSeveralUsage() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/severalUsage"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/severalUsage/"); } @TestMetadata("simpleCapturingInClass") public void testSimpleCapturingInClass() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simpleCapturingInClass"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simpleCapturingInClass/"); } @TestMetadata("simpleCapturingInPackage") public void testSimpleCapturingInPackage() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simpleCapturingInPackage"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simpleCapturingInPackage/"); } @TestMetadata("simpleDefaultMethod") public void testSimpleDefaultMethod() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simpleDefaultMethod"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simpleDefaultMethod/"); } @TestMetadata("simpleDouble") public void testSimpleDouble() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simpleDouble"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simpleDouble/"); } @TestMetadata("simpleEnum") public void testSimpleEnum() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simpleEnum"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simpleEnum/"); } @TestMetadata("simpleGenerics") public void testSimpleGenerics() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simpleGenerics"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simpleGenerics/"); } @TestMetadata("simpleInt") public void testSimpleInt() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simpleInt"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simpleInt/"); } @TestMetadata("simpleLambda") public void testSimpleLambda() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simpleLambda"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simpleLambda/"); } @TestMetadata("simpleObject") public void testSimpleObject() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simpleObject"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simpleObject/"); } @TestMetadata("stackHeightBug") public void testStackHeightBug() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/stackHeightBug"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/stackHeightBug/"); } @TestMetadata("trait") public void testTrait() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/trait"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/trait/"); } @TestMetadata("tryCatch") public void testTryCatch() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/tryCatch"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/tryCatch/"); } @TestMetadata("tryCatch2") public void testTryCatch2() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/tryCatch2"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/tryCatch2/"); } @TestMetadata("tryCatchFinally") public void testTryCatchFinally() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/tryCatchFinally"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/tryCatchFinally/"); } @TestMetadata("use") public void testUse() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/use"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/use/"); } @TestMetadata("vararg") public void testVararg() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/vararg"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/vararg/"); } @TestMetadata("with") public void testWith() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/with"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/with/"); } @TestMetadata("withoutInline") public void testWithoutInline() throws Exception { - doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/withoutInline"); + doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/withoutInline/"); } } diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java index 595e74e5ad0..47a6c5335d2 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java @@ -34,7 +34,7 @@ import org.jetbrains.jet.codegen.generated.AbstractBlackBoxCodegenTest; public class BlackBoxMultiFileCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("accessorForProtected") public void testAccessorForProtected() throws Exception { - doTestMultiFile("compiler/testData/codegen/boxMultiFile/accessorForProtected"); + doTestMultiFile("compiler/testData/codegen/boxMultiFile/accessorForProtected/"); } public void testAllFilesPresentInBoxMultiFile() throws Exception { @@ -43,52 +43,52 @@ public class BlackBoxMultiFileCodegenTestGenerated extends AbstractBlackBoxCodeg @TestMetadata("internalVisibility") public void testInternalVisibility() throws Exception { - doTestMultiFile("compiler/testData/codegen/boxMultiFile/internalVisibility"); + doTestMultiFile("compiler/testData/codegen/boxMultiFile/internalVisibility/"); } @TestMetadata("kt1515") public void testKt1515() throws Exception { - doTestMultiFile("compiler/testData/codegen/boxMultiFile/kt1515"); + doTestMultiFile("compiler/testData/codegen/boxMultiFile/kt1515/"); } @TestMetadata("kt1528") public void testKt1528() throws Exception { - doTestMultiFile("compiler/testData/codegen/boxMultiFile/kt1528"); + doTestMultiFile("compiler/testData/codegen/boxMultiFile/kt1528/"); } @TestMetadata("kt1845") public void testKt1845() throws Exception { - doTestMultiFile("compiler/testData/codegen/boxMultiFile/kt1845"); + doTestMultiFile("compiler/testData/codegen/boxMultiFile/kt1845/"); } @TestMetadata("kt2060") public void testKt2060() throws Exception { - doTestMultiFile("compiler/testData/codegen/boxMultiFile/kt2060"); + doTestMultiFile("compiler/testData/codegen/boxMultiFile/kt2060/"); } @TestMetadata("kt2257") public void testKt2257() throws Exception { - doTestMultiFile("compiler/testData/codegen/boxMultiFile/kt2257"); + doTestMultiFile("compiler/testData/codegen/boxMultiFile/kt2257/"); } @TestMetadata("nestedPackages") public void testNestedPackages() throws Exception { - doTestMultiFile("compiler/testData/codegen/boxMultiFile/nestedPackages"); + doTestMultiFile("compiler/testData/codegen/boxMultiFile/nestedPackages/"); } @TestMetadata("samWrappersDifferentFiles") public void testSamWrappersDifferentFiles() throws Exception { - doTestMultiFile("compiler/testData/codegen/boxMultiFile/samWrappersDifferentFiles"); + doTestMultiFile("compiler/testData/codegen/boxMultiFile/samWrappersDifferentFiles/"); } @TestMetadata("sameFileName") public void testSameFileName() throws Exception { - doTestMultiFile("compiler/testData/codegen/boxMultiFile/sameFileName"); + doTestMultiFile("compiler/testData/codegen/boxMultiFile/sameFileName/"); } @TestMetadata("simple") public void testSimple() throws Exception { - doTestMultiFile("compiler/testData/codegen/boxMultiFile/simple"); + doTestMultiFile("compiler/testData/codegen/boxMultiFile/simple/"); } } diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java index 0cd9769af20..42804fa6125 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java @@ -38,277 +38,277 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @TestMetadata("anonymousObjectOnCallSite") public void testAnonymousObjectOnCallSite() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObjectOnCallSite"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObjectOnCallSite/"); } @TestMetadata("anonymousObjectOnCallSiteSuperParams") public void testAnonymousObjectOnCallSiteSuperParams() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObjectOnCallSiteSuperParams"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObjectOnCallSiteSuperParams/"); } @TestMetadata("anonymousObjectOnDeclarationSite") public void testAnonymousObjectOnDeclarationSite() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObjectOnDeclarationSite"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObjectOnDeclarationSite/"); } @TestMetadata("anonymousObjectOnDeclarationSiteSuperParams") public void testAnonymousObjectOnDeclarationSiteSuperParams() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObjectOnDeclarationSiteSuperParams"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObjectOnDeclarationSiteSuperParams/"); } @TestMetadata("builders") public void testBuilders() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/builders"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/builders/"); } @TestMetadata("buildersAndLambdaCapturing") public void testBuildersAndLambdaCapturing() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/buildersAndLambdaCapturing"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/buildersAndLambdaCapturing/"); } @TestMetadata("captureInlinable") public void testCaptureInlinable() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/captureInlinable"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/captureInlinable/"); } @TestMetadata("captureInlinableAndOther") public void testCaptureInlinableAndOther() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/captureInlinableAndOther"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/captureInlinableAndOther/"); } @TestMetadata("captureThisAndReceiver") public void testCaptureThisAndReceiver() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/captureThisAndReceiver"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/captureThisAndReceiver/"); } @TestMetadata("classObject") public void testClassObject() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/classObject"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/classObject/"); } @TestMetadata("closureChain") public void testClosureChain() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/closureChain"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/closureChain/"); } @TestMetadata("defaultMethod") public void testDefaultMethod() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/defaultMethod"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/defaultMethod/"); } @TestMetadata("extension") public void testExtension() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/extension"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/extension/"); } @TestMetadata("forEachLine") public void testForEachLine() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/forEachLine"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/forEachLine/"); } @TestMetadata("generics") public void testGenerics() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/generics"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/generics/"); } @TestMetadata("identityCheck") public void testIdentityCheck() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/identityCheck"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/identityCheck/"); } @TestMetadata("ifBranches") public void testIfBranches() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/ifBranches"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/ifBranches/"); } @TestMetadata("iinc") public void testIinc() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/iinc"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/iinc/"); } @TestMetadata("inlineChain") public void testInlineChain() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/inlineChain"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/inlineChain/"); } @TestMetadata("inlineInDefaultParameter") public void testInlineInDefaultParameter() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/inlineInDefaultParameter"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/inlineInDefaultParameter/"); } @TestMetadata("lambdaClassClash") public void testLambdaClassClash() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaClassClash"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaClassClash/"); } @TestMetadata("lambdaCloning") public void testLambdaCloning() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaCloning"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaCloning/"); } @TestMetadata("lambdaInLambda") public void testLambdaInLambda() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaInLambda"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaInLambda/"); } @TestMetadata("lambdaInLambda2") public void testLambdaInLambda2() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaInLambda2"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaInLambda2/"); } @TestMetadata("lambdaInLambdaNoInline") public void testLambdaInLambdaNoInline() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaInLambdaNoInline"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaInLambdaNoInline/"); } @TestMetadata("localFunInLambda") public void testLocalFunInLambda() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/localFunInLambda"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/localFunInLambda/"); } @TestMetadata("noInline") public void testNoInline() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/noInline"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/noInline/"); } @TestMetadata("noInlineLambdaChain") public void testNoInlineLambdaChain() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/noInlineLambdaChain"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/noInlineLambdaChain/"); } @TestMetadata("noInlineLambdaChainWithCapturedInline") public void testNoInlineLambdaChainWithCapturedInline() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/noInlineLambdaChainWithCapturedInline"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/noInlineLambdaChainWithCapturedInline/"); } @TestMetadata("noInlineLambdaX2") public void testNoInlineLambdaX2() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/noInlineLambdaX2"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/noInlineLambdaX2/"); } @TestMetadata("params") public void testParams() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/params"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/params/"); } @TestMetadata("plusAssign") public void testPlusAssign() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/plusAssign"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/plusAssign/"); } @TestMetadata("regeneratedLambdaName") public void testRegeneratedLambdaName() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/regeneratedLambdaName"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/regeneratedLambdaName/"); } @TestMetadata("rootConstructor") public void testRootConstructor() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/rootConstructor"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/rootConstructor/"); } @TestMetadata("sameCaptured") public void testSameCaptured() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/sameCaptured"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/sameCaptured/"); } @TestMetadata("severalClosures") public void testSeveralClosures() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/severalClosures"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/severalClosures/"); } @TestMetadata("severalUsage") public void testSeveralUsage() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/severalUsage"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/severalUsage/"); } @TestMetadata("simpleCapturingInClass") public void testSimpleCapturingInClass() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simpleCapturingInClass"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simpleCapturingInClass/"); } @TestMetadata("simpleCapturingInPackage") public void testSimpleCapturingInPackage() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simpleCapturingInPackage"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simpleCapturingInPackage/"); } @TestMetadata("simpleDefaultMethod") public void testSimpleDefaultMethod() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simpleDefaultMethod"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simpleDefaultMethod/"); } @TestMetadata("simpleDouble") public void testSimpleDouble() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simpleDouble"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simpleDouble/"); } @TestMetadata("simpleEnum") public void testSimpleEnum() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simpleEnum"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simpleEnum/"); } @TestMetadata("simpleGenerics") public void testSimpleGenerics() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simpleGenerics"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simpleGenerics/"); } @TestMetadata("simpleInt") public void testSimpleInt() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simpleInt"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simpleInt/"); } @TestMetadata("simpleLambda") public void testSimpleLambda() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simpleLambda"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simpleLambda/"); } @TestMetadata("simpleObject") public void testSimpleObject() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simpleObject"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simpleObject/"); } @TestMetadata("stackHeightBug") public void testStackHeightBug() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/stackHeightBug"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/stackHeightBug/"); } @TestMetadata("trait") public void testTrait() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/trait"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/trait/"); } @TestMetadata("tryCatch") public void testTryCatch() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/tryCatch"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/tryCatch/"); } @TestMetadata("tryCatch2") public void testTryCatch2() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/tryCatch2"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/tryCatch2/"); } @TestMetadata("tryCatchFinally") public void testTryCatchFinally() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/tryCatchFinally"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/tryCatchFinally/"); } @TestMetadata("use") public void testUse() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/use"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/use/"); } @TestMetadata("vararg") public void testVararg() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/vararg"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/vararg/"); } @TestMetadata("with") public void testWith() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/with"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/with/"); } @TestMetadata("withoutInline") public void testWithoutInline() throws Exception { - doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/withoutInline"); + doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/withoutInline/"); } } diff --git a/generators/src/org/jetbrains/jet/generators/tests/generator/SimpleTestMethodModel.java b/generators/src/org/jetbrains/jet/generators/tests/generator/SimpleTestMethodModel.java index dab86a0fc67..ef82585c137 100644 --- a/generators/src/org/jetbrains/jet/generators/tests/generator/SimpleTestMethodModel.java +++ b/generators/src/org/jetbrains/jet/generators/tests/generator/SimpleTestMethodModel.java @@ -41,7 +41,8 @@ public class SimpleTestMethodModel implements TestMethodModel { @Override public void generateBody(@NotNull Printer p, @NotNull String generatorClassFqName) { - p.println(doTestMethodName, "(\"", JetTestUtils.getFilePath(file), "\");"); + String filePath = JetTestUtils.getFilePath(file) + (file.isDirectory() ? "/" : ""); + p.println(doTestMethodName, "(\"", filePath, "\");"); } @Override diff --git a/idea/tests/org/jetbrains/jet/completion/MultiFileJvmBasicCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/MultiFileJvmBasicCompletionTestGenerated.java index 686d2291fcf..e157e569940 100644 --- a/idea/tests/org/jetbrains/jet/completion/MultiFileJvmBasicCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/completion/MultiFileJvmBasicCompletionTestGenerated.java @@ -38,82 +38,82 @@ public class MultiFileJvmBasicCompletionTestGenerated extends AbstractMultiFileJ @TestMetadata("CompleteFunctionWithNoSpecifiedType") public void testCompleteFunctionWithNoSpecifiedType() throws Exception { - doTest("idea/testData/completion/basic/multifile/CompleteFunctionWithNoSpecifiedType"); + doTest("idea/testData/completion/basic/multifile/CompleteFunctionWithNoSpecifiedType/"); } @TestMetadata("CompleteImportedFunction") public void testCompleteImportedFunction() throws Exception { - doTest("idea/testData/completion/basic/multifile/CompleteImportedFunction"); + doTest("idea/testData/completion/basic/multifile/CompleteImportedFunction/"); } @TestMetadata("CompletionOnImportedFunction") public void testCompletionOnImportedFunction() throws Exception { - doTest("idea/testData/completion/basic/multifile/CompletionOnImportedFunction"); + doTest("idea/testData/completion/basic/multifile/CompletionOnImportedFunction/"); } @TestMetadata("DoNotCompleteWithConstraints") public void testDoNotCompleteWithConstraints() throws Exception { - doTest("idea/testData/completion/basic/multifile/DoNotCompleteWithConstraints"); + doTest("idea/testData/completion/basic/multifile/DoNotCompleteWithConstraints/"); } @TestMetadata("EnumEntry") public void testEnumEntry() throws Exception { - doTest("idea/testData/completion/basic/multifile/EnumEntry"); + doTest("idea/testData/completion/basic/multifile/EnumEntry/"); } @TestMetadata("ExtensionFunction") public void testExtensionFunction() throws Exception { - doTest("idea/testData/completion/basic/multifile/ExtensionFunction"); + doTest("idea/testData/completion/basic/multifile/ExtensionFunction/"); } @TestMetadata("ExtensionFunctionOnImportedFunction") public void testExtensionFunctionOnImportedFunction() throws Exception { - doTest("idea/testData/completion/basic/multifile/ExtensionFunctionOnImportedFunction"); + doTest("idea/testData/completion/basic/multifile/ExtensionFunctionOnImportedFunction/"); } @TestMetadata("ExtensionOnNullable") public void testExtensionOnNullable() throws Exception { - doTest("idea/testData/completion/basic/multifile/ExtensionOnNullable"); + doTest("idea/testData/completion/basic/multifile/ExtensionOnNullable/"); } @TestMetadata("GroovyClassNameCompletionFromDefaultPackage") public void testGroovyClassNameCompletionFromDefaultPackage() throws Exception { - doTest("idea/testData/completion/basic/multifile/GroovyClassNameCompletionFromDefaultPackage"); + doTest("idea/testData/completion/basic/multifile/GroovyClassNameCompletionFromDefaultPackage/"); } @TestMetadata("GroovyClassNameCompletionFromNonDefaultPackage") public void testGroovyClassNameCompletionFromNonDefaultPackage() throws Exception { - doTest("idea/testData/completion/basic/multifile/GroovyClassNameCompletionFromNonDefaultPackage"); + doTest("idea/testData/completion/basic/multifile/GroovyClassNameCompletionFromNonDefaultPackage/"); } @TestMetadata("InImportedFunctionLiteralParameter") public void testInImportedFunctionLiteralParameter() throws Exception { - doTest("idea/testData/completion/basic/multifile/InImportedFunctionLiteralParameter"); + doTest("idea/testData/completion/basic/multifile/InImportedFunctionLiteralParameter/"); } @TestMetadata("JavaInnerClasses") public void testJavaInnerClasses() throws Exception { - doTest("idea/testData/completion/basic/multifile/JavaInnerClasses"); + doTest("idea/testData/completion/basic/multifile/JavaInnerClasses/"); } @TestMetadata("NotImportedExtensionFunction") public void testNotImportedExtensionFunction() throws Exception { - doTest("idea/testData/completion/basic/multifile/NotImportedExtensionFunction"); + doTest("idea/testData/completion/basic/multifile/NotImportedExtensionFunction/"); } @TestMetadata("NotImportedJavaClass") public void testNotImportedJavaClass() throws Exception { - doTest("idea/testData/completion/basic/multifile/NotImportedJavaClass"); + doTest("idea/testData/completion/basic/multifile/NotImportedJavaClass/"); } @TestMetadata("NotImportedObject") public void testNotImportedObject() throws Exception { - doTest("idea/testData/completion/basic/multifile/NotImportedObject"); + doTest("idea/testData/completion/basic/multifile/NotImportedObject/"); } @TestMetadata("TopLevelFunction") public void testTopLevelFunction() throws Exception { - doTest("idea/testData/completion/basic/multifile/TopLevelFunction"); + doTest("idea/testData/completion/basic/multifile/TopLevelFunction/"); } } diff --git a/idea/tests/org/jetbrains/jet/plugin/configuration/ConfigureProjectByChangingFileTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/configuration/ConfigureProjectByChangingFileTestGenerated.java index 35df93db9b2..f71f84efa2a 100644 --- a/idea/tests/org/jetbrains/jet/plugin/configuration/ConfigureProjectByChangingFileTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/configuration/ConfigureProjectByChangingFileTestGenerated.java @@ -181,22 +181,22 @@ public class ConfigureProjectByChangingFileTestGenerated extends AbstractConfigu @TestMetadata("libraryMissed") public void testLibraryMissed() throws Exception { - doTestWithMaven("idea/testData/configuration/maven/libraryMissed"); + doTestWithMaven("idea/testData/configuration/maven/libraryMissed/"); } @TestMetadata("pluginMissed") public void testPluginMissed() throws Exception { - doTestWithMaven("idea/testData/configuration/maven/pluginMissed"); + doTestWithMaven("idea/testData/configuration/maven/pluginMissed/"); } @TestMetadata("simpleProject") public void testSimpleProject() throws Exception { - doTestWithMaven("idea/testData/configuration/maven/simpleProject"); + doTestWithMaven("idea/testData/configuration/maven/simpleProject/"); } @TestMetadata("simpleProjectSnapshot") public void testSimpleProjectSnapshot() throws Exception { - doTestWithMaven("idea/testData/configuration/maven/simpleProjectSnapshot"); + doTestWithMaven("idea/testData/configuration/maven/simpleProjectSnapshot/"); } } diff --git a/idea/tests/org/jetbrains/jet/plugin/hierarchy/HierarchyTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/hierarchy/HierarchyTestGenerated.java index b37c3b996b2..c0cc62fa6d3 100644 --- a/idea/tests/org/jetbrains/jet/plugin/hierarchy/HierarchyTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/hierarchy/HierarchyTestGenerated.java @@ -40,137 +40,137 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest { @TestMetadata("CaretAtAnnotation") public void testCaretAtAnnotation() throws Exception { - doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/CaretAtAnnotation"); + doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/CaretAtAnnotation/"); } @TestMetadata("CaretAtConstructor") public void testCaretAtConstructor() throws Exception { - doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/CaretAtConstructor"); + doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/CaretAtConstructor/"); } @TestMetadata("CaretAtFabricMethod") public void testCaretAtFabricMethod() throws Exception { - doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/CaretAtFabricMethod"); + doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/CaretAtFabricMethod/"); } @TestMetadata("CaretAtImport") public void testCaretAtImport() throws Exception { - doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/CaretAtImport"); + doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/CaretAtImport/"); } @TestMetadata("CaretAtJavaType") public void testCaretAtJavaType() throws Exception { - doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/CaretAtJavaType"); + doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/CaretAtJavaType/"); } @TestMetadata("CaretAtModifierList") public void testCaretAtModifierList() throws Exception { - doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/CaretAtModifierList"); + doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/CaretAtModifierList/"); } @TestMetadata("CaretAtReceiverExtFun") public void testCaretAtReceiverExtFun() throws Exception { - doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/CaretAtReceiverExtFun"); + doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/CaretAtReceiverExtFun/"); } @TestMetadata("CaretAtSuperCall") public void testCaretAtSuperCall() throws Exception { - doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/CaretAtSuperCall"); + doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/CaretAtSuperCall/"); } @TestMetadata("CaretAtSupertypesList") public void testCaretAtSupertypesList() throws Exception { - doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/CaretAtSupertypesList"); + doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/CaretAtSupertypesList/"); } @TestMetadata("CaretAtTypeReference") public void testCaretAtTypeReference() throws Exception { - doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/CaretAtTypeReference"); + doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/CaretAtTypeReference/"); } @TestMetadata("CaretInClassBody") public void testCaretInClassBody() throws Exception { - doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/CaretInClassBody"); + doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/CaretInClassBody/"); } @TestMetadata("ClassFromClass") public void testClassFromClass() throws Exception { - doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/ClassFromClass"); + doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/ClassFromClass/"); } @TestMetadata("ClassFromObject") public void testClassFromObject() throws Exception { - doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/ClassFromObject"); + doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/ClassFromObject/"); } @TestMetadata("ClassInClassObject") public void testClassInClassObject() throws Exception { - doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/ClassInClassObject"); + doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/ClassInClassObject/"); } @TestMetadata("ClassInPackage") public void testClassInPackage() throws Exception { - doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/ClassInPackage"); + doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/ClassInPackage/"); } @TestMetadata("InnerClass") public void testInnerClass() throws Exception { - doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/InnerClass"); + doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/InnerClass/"); } @TestMetadata("JKJHierarchy") public void testJKJHierarchy() throws Exception { - doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/JKJHierarchy"); + doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/JKJHierarchy/"); } @TestMetadata("JavaFromKotlin") public void testJavaFromKotlin() throws Exception { - doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/JavaFromKotlin"); + doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/JavaFromKotlin/"); } @TestMetadata("JavaFromKotlinByRef") public void testJavaFromKotlinByRef() throws Exception { - doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/JavaFromKotlinByRef"); + doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/JavaFromKotlinByRef/"); } @TestMetadata("JavaFromKotlinForKotlinClass") public void testJavaFromKotlinForKotlinClass() throws Exception { - doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/JavaFromKotlinForKotlinClass"); + doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/JavaFromKotlinForKotlinClass/"); } @TestMetadata("JetInt") public void testJetInt() throws Exception { - doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/JetInt"); + doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/JetInt/"); } @TestMetadata("KJKHierarchy") public void testKJKHierarchy() throws Exception { - doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/KJKHierarchy"); + doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/KJKHierarchy/"); } @TestMetadata("KotlinFromJava") public void testKotlinFromJava() throws Exception { - doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/KotlinFromJava"); + doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/KotlinFromJava/"); } @TestMetadata("KotlinFromJavaByRef") public void testKotlinFromJavaByRef() throws Exception { - doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/KotlinFromJavaByRef"); + doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/KotlinFromJavaByRef/"); } @TestMetadata("KotlinFromKotlinByRef") public void testKotlinFromKotlinByRef() throws Exception { - doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/KotlinFromKotlinByRef"); + doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/KotlinFromKotlinByRef/"); } @TestMetadata("Object") public void testObject() throws Exception { - doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/Object"); + doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/Object/"); } @TestMetadata("TwoChildren") public void testTwoChildren() throws Exception { - doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/TwoChildren"); + doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/TwoChildren/"); } } @@ -183,12 +183,12 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest { @TestMetadata("JetList") public void testJetList() throws Exception { - doSuperClassHierarchyTest("idea/testData/hierarchy/class/super/JetList"); + doSuperClassHierarchyTest("idea/testData/hierarchy/class/super/JetList/"); } @TestMetadata("TwoTraits") public void testTwoTraits() throws Exception { - doSuperClassHierarchyTest("idea/testData/hierarchy/class/super/TwoTraits"); + doSuperClassHierarchyTest("idea/testData/hierarchy/class/super/TwoTraits/"); } } @@ -201,42 +201,42 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest { @TestMetadata("AllFromClass") public void testAllFromClass() throws Exception { - doSubClassHierarchyTest("idea/testData/hierarchy/class/sub/AllFromClass"); + doSubClassHierarchyTest("idea/testData/hierarchy/class/sub/AllFromClass/"); } @TestMetadata("AllFromTrait") public void testAllFromTrait() throws Exception { - doSubClassHierarchyTest("idea/testData/hierarchy/class/sub/AllFromTrait"); + doSubClassHierarchyTest("idea/testData/hierarchy/class/sub/AllFromTrait/"); } @TestMetadata("ClassFromClass") public void testClassFromClass() throws Exception { - doSubClassHierarchyTest("idea/testData/hierarchy/class/sub/ClassFromClass"); + doSubClassHierarchyTest("idea/testData/hierarchy/class/sub/ClassFromClass/"); } @TestMetadata("ClassFromTrait") public void testClassFromTrait() throws Exception { - doSubClassHierarchyTest("idea/testData/hierarchy/class/sub/ClassFromTrait"); + doSubClassHierarchyTest("idea/testData/hierarchy/class/sub/ClassFromTrait/"); } @TestMetadata("ObjectFromClass") public void testObjectFromClass() throws Exception { - doSubClassHierarchyTest("idea/testData/hierarchy/class/sub/ObjectFromClass"); + doSubClassHierarchyTest("idea/testData/hierarchy/class/sub/ObjectFromClass/"); } @TestMetadata("ObjectFromTrait") public void testObjectFromTrait() throws Exception { - doSubClassHierarchyTest("idea/testData/hierarchy/class/sub/ObjectFromTrait"); + doSubClassHierarchyTest("idea/testData/hierarchy/class/sub/ObjectFromTrait/"); } @TestMetadata("TraitFromClass") public void testTraitFromClass() throws Exception { - doSubClassHierarchyTest("idea/testData/hierarchy/class/sub/TraitFromClass"); + doSubClassHierarchyTest("idea/testData/hierarchy/class/sub/TraitFromClass/"); } @TestMetadata("TraitFromTrait") public void testTraitFromTrait() throws Exception { - doSubClassHierarchyTest("idea/testData/hierarchy/class/sub/TraitFromTrait"); + doSubClassHierarchyTest("idea/testData/hierarchy/class/sub/TraitFromTrait/"); } } @@ -249,72 +249,72 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest { @TestMetadata("javaConstructor") public void testJavaConstructor() throws Exception { - doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/javaConstructor"); + doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/javaConstructor/"); } @TestMetadata("javaMethod") public void testJavaMethod() throws Exception { - doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/javaMethod"); + doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/javaMethod/"); } @TestMetadata("kotlinClass") public void testKotlinClass() throws Exception { - doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinClass"); + doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinClass/"); } @TestMetadata("kotlinFunction") public void testKotlinFunction() throws Exception { - doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinFunction"); + doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinFunction/"); } @TestMetadata("kotlinLocalClass") public void testKotlinLocalClass() throws Exception { - doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinLocalClass"); + doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinLocalClass/"); } @TestMetadata("kotlinLocalFunction") public void testKotlinLocalFunction() throws Exception { - doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinLocalFunction"); + doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinLocalFunction/"); } @TestMetadata("kotlinNestedClass") public void testKotlinNestedClass() throws Exception { - doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinNestedClass"); + doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinNestedClass/"); } @TestMetadata("kotlinNestedInnerClass") public void testKotlinNestedInnerClass() throws Exception { - doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinNestedInnerClass"); + doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinNestedInnerClass/"); } @TestMetadata("kotlinPackageFunction") public void testKotlinPackageFunction() throws Exception { - doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinPackageFunction"); + doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinPackageFunction/"); } @TestMetadata("kotlinPackageProperty") public void testKotlinPackageProperty() throws Exception { - doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinPackageProperty"); + doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinPackageProperty/"); } @TestMetadata("kotlinPrivateClass") public void testKotlinPrivateClass() throws Exception { - doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinPrivateClass"); + doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinPrivateClass/"); } @TestMetadata("kotlinPrivateFunction") public void testKotlinPrivateFunction() throws Exception { - doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinPrivateFunction"); + doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinPrivateFunction/"); } @TestMetadata("kotlinPrivateProperty") public void testKotlinPrivateProperty() throws Exception { - doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinPrivateProperty"); + doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinPrivateProperty/"); } @TestMetadata("kotlinProperty") public void testKotlinProperty() throws Exception { - doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinProperty"); + doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinProperty/"); } } @@ -327,72 +327,72 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest { @TestMetadata("javaConstructor") public void testJavaConstructor() throws Exception { - doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/javaConstructor"); + doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/javaConstructor/"); } @TestMetadata("javaMethod") public void testJavaMethod() throws Exception { - doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/javaMethod"); + doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/javaMethod/"); } @TestMetadata("kotlinAnonymousObject") public void testKotlinAnonymousObject() throws Exception { - doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinAnonymousObject"); + doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinAnonymousObject/"); } @TestMetadata("kotlinClass") public void testKotlinClass() throws Exception { - doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinClass"); + doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinClass/"); } @TestMetadata("kotlinClassObject") public void testKotlinClassObject() throws Exception { - doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinClassObject"); + doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinClassObject/"); } @TestMetadata("kotlinEnumClass") public void testKotlinEnumClass() throws Exception { - doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinEnumClass"); + doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinEnumClass/"); } @TestMetadata("kotlinFunction") public void testKotlinFunction() throws Exception { - doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinFunction"); + doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinFunction/"); } @TestMetadata("kotlinLocalClass") public void testKotlinLocalClass() throws Exception { - doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinLocalClass"); + doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinLocalClass/"); } @TestMetadata("kotlinLocalFunction") public void testKotlinLocalFunction() throws Exception { - doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinLocalFunction"); + doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinLocalFunction/"); } @TestMetadata("kotlinNestedClass") public void testKotlinNestedClass() throws Exception { - doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinNestedClass"); + doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinNestedClass/"); } @TestMetadata("kotlinObject") public void testKotlinObject() throws Exception { - doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinObject"); + doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinObject/"); } @TestMetadata("kotlinPackageFunction") public void testKotlinPackageFunction() throws Exception { - doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinPackageFunction"); + doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinPackageFunction/"); } @TestMetadata("kotlinPackageProperty") public void testKotlinPackageProperty() throws Exception { - doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinPackageProperty"); + doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinPackageProperty/"); } @TestMetadata("kotlinProperty") public void testKotlinProperty() throws Exception { - doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinProperty"); + doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinProperty/"); } } @@ -405,32 +405,32 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest { @TestMetadata("javaMethodInClass") public void testJavaMethodInClass() throws Exception { - doOverrideHierarchyTest("idea/testData/hierarchy/overrides/javaMethodInClass"); + doOverrideHierarchyTest("idea/testData/hierarchy/overrides/javaMethodInClass/"); } @TestMetadata("javaMethodInInterface") public void testJavaMethodInInterface() throws Exception { - doOverrideHierarchyTest("idea/testData/hierarchy/overrides/javaMethodInInterface"); + doOverrideHierarchyTest("idea/testData/hierarchy/overrides/javaMethodInInterface/"); } @TestMetadata("kotlinFunctionInClass") public void testKotlinFunctionInClass() throws Exception { - doOverrideHierarchyTest("idea/testData/hierarchy/overrides/kotlinFunctionInClass"); + doOverrideHierarchyTest("idea/testData/hierarchy/overrides/kotlinFunctionInClass/"); } @TestMetadata("kotlinFunctionInTrait") public void testKotlinFunctionInTrait() throws Exception { - doOverrideHierarchyTest("idea/testData/hierarchy/overrides/kotlinFunctionInTrait"); + doOverrideHierarchyTest("idea/testData/hierarchy/overrides/kotlinFunctionInTrait/"); } @TestMetadata("kotlinPropertyInClass") public void testKotlinPropertyInClass() throws Exception { - doOverrideHierarchyTest("idea/testData/hierarchy/overrides/kotlinPropertyInClass"); + doOverrideHierarchyTest("idea/testData/hierarchy/overrides/kotlinPropertyInClass/"); } @TestMetadata("kotlinPropertyInTrait") public void testKotlinPropertyInTrait() throws Exception { - doOverrideHierarchyTest("idea/testData/hierarchy/overrides/kotlinPropertyInTrait"); + doOverrideHierarchyTest("idea/testData/hierarchy/overrides/kotlinPropertyInTrait/"); } } diff --git a/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsTestGenerated.java index a45f9e35f8e..08ff59c41d6 100644 --- a/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsTestGenerated.java @@ -38,107 +38,107 @@ public class OptimizeImportsTestGenerated extends AbstractOptimizeImportsTest { @TestMetadata("AlreadyOptimized") public void testAlreadyOptimized() throws Exception { - doTest("idea/testData/editor/optimizeImports/AlreadyOptimized"); + doTest("idea/testData/editor/optimizeImports/AlreadyOptimized/"); } @TestMetadata("ArrayAccessExpression") public void testArrayAccessExpression() throws Exception { - doTest("idea/testData/editor/optimizeImports/ArrayAccessExpression"); + doTest("idea/testData/editor/optimizeImports/ArrayAccessExpression/"); } @TestMetadata("ClassMemberImported") public void testClassMemberImported() throws Exception { - doTest("idea/testData/editor/optimizeImports/ClassMemberImported"); + doTest("idea/testData/editor/optimizeImports/ClassMemberImported/"); } @TestMetadata("ComponentFunction") public void testComponentFunction() throws Exception { - doTest("idea/testData/editor/optimizeImports/ComponentFunction"); + doTest("idea/testData/editor/optimizeImports/ComponentFunction/"); } @TestMetadata("DefaultJsImports") public void testDefaultJsImports() throws Exception { - doTest("idea/testData/editor/optimizeImports/DefaultJsImports"); + doTest("idea/testData/editor/optimizeImports/DefaultJsImports/"); } @TestMetadata("DuplicatedImports") public void testDuplicatedImports() throws Exception { - doTest("idea/testData/editor/optimizeImports/DuplicatedImports"); + doTest("idea/testData/editor/optimizeImports/DuplicatedImports/"); } @TestMetadata("Enums") public void testEnums() throws Exception { - doTest("idea/testData/editor/optimizeImports/Enums"); + doTest("idea/testData/editor/optimizeImports/Enums/"); } @TestMetadata("InvokeFunction") public void testInvokeFunction() throws Exception { - doTest("idea/testData/editor/optimizeImports/InvokeFunction"); + doTest("idea/testData/editor/optimizeImports/InvokeFunction/"); } @TestMetadata("IteratorFunction") public void testIteratorFunction() throws Exception { - doTest("idea/testData/editor/optimizeImports/IteratorFunction"); + doTest("idea/testData/editor/optimizeImports/IteratorFunction/"); } @TestMetadata("JavaStaticField") public void testJavaStaticField() throws Exception { - doTest("idea/testData/editor/optimizeImports/JavaStaticField"); + doTest("idea/testData/editor/optimizeImports/JavaStaticField/"); } @TestMetadata("KotlinPackage") public void testKotlinPackage() throws Exception { - doTest("idea/testData/editor/optimizeImports/KotlinPackage"); + doTest("idea/testData/editor/optimizeImports/KotlinPackage/"); } @TestMetadata("Kt1850FullQualified") public void testKt1850FullQualified() throws Exception { - doTest("idea/testData/editor/optimizeImports/Kt1850FullQualified"); + doTest("idea/testData/editor/optimizeImports/Kt1850FullQualified/"); } @TestMetadata("Kt1850InnerClass") public void testKt1850InnerClass() throws Exception { - doTest("idea/testData/editor/optimizeImports/Kt1850InnerClass"); + doTest("idea/testData/editor/optimizeImports/Kt1850InnerClass/"); } @TestMetadata("Kt2488EnumEntry") public void testKt2488EnumEntry() throws Exception { - doTest("idea/testData/editor/optimizeImports/Kt2488EnumEntry"); + doTest("idea/testData/editor/optimizeImports/Kt2488EnumEntry/"); } @TestMetadata("Kt2709") public void testKt2709() throws Exception { - doTest("idea/testData/editor/optimizeImports/Kt2709"); + doTest("idea/testData/editor/optimizeImports/Kt2709/"); } @TestMetadata("PartiallyQualified") public void testPartiallyQualified() throws Exception { - doTest("idea/testData/editor/optimizeImports/PartiallyQualified"); + doTest("idea/testData/editor/optimizeImports/PartiallyQualified/"); } @TestMetadata("RemoveImportsIfGeneral") public void testRemoveImportsIfGeneral() throws Exception { - doTest("idea/testData/editor/optimizeImports/RemoveImportsIfGeneral"); + doTest("idea/testData/editor/optimizeImports/RemoveImportsIfGeneral/"); } @TestMetadata("RemoveImportsIfGeneralBefore") public void testRemoveImportsIfGeneralBefore() throws Exception { - doTest("idea/testData/editor/optimizeImports/RemoveImportsIfGeneralBefore"); + doTest("idea/testData/editor/optimizeImports/RemoveImportsIfGeneralBefore/"); } @TestMetadata("SamConstructor") public void testSamConstructor() throws Exception { - doTest("idea/testData/editor/optimizeImports/SamConstructor"); + doTest("idea/testData/editor/optimizeImports/SamConstructor/"); } @TestMetadata("UnusedImports") public void testUnusedImports() throws Exception { - doTest("idea/testData/editor/optimizeImports/UnusedImports"); + doTest("idea/testData/editor/optimizeImports/UnusedImports/"); } @TestMetadata("WithAliases") public void testWithAliases() throws Exception { - doTest("idea/testData/editor/optimizeImports/WithAliases"); + doTest("idea/testData/editor/optimizeImports/WithAliases/"); } } diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/AbstractDecompiledTextTest.kt b/idea/tests/org/jetbrains/jet/plugin/libraries/AbstractDecompiledTextTest.kt index 1b53753df28..90337f75581 100644 --- a/idea/tests/org/jetbrains/jet/plugin/libraries/AbstractDecompiledTextTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/libraries/AbstractDecompiledTextTest.kt @@ -25,6 +25,7 @@ import com.intellij.testFramework.UsefulTestCase.* import junit.framework.Assert.* import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase import org.jetbrains.jet.plugin.JetLightProjectDescriptor +import com.intellij.openapi.util.text.StringUtil public abstract class AbstractDecompiledTextTest() : JetLightCodeInsightFixtureTestCase() { @@ -37,7 +38,7 @@ public abstract class AbstractDecompiledTextTest() : JetLightCodeInsightFixtureT assertTrue("Expecting java class file, was: " + clsFileForClassFile!!.getClass(), clsFileForClassFile is ClsFileImpl) val decompiledPsiFile = (clsFileForClassFile as ClsFileImpl).getDecompiledPsiFile() assertNotNull(decompiledPsiFile) - assertSameLinesWithFile(path + ".expected.kt", decompiledPsiFile!!.getText()) + assertSameLinesWithFile(path.substring(0, path.length - 1) + ".expected.kt", decompiledPsiFile!!.getText()) } override fun getProjectDescriptor(): LightProjectDescriptor { diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/DecompiledTextTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/libraries/DecompiledTextTestGenerated.java index cf7fe938db2..4ecc67473b2 100644 --- a/idea/tests/org/jetbrains/jet/plugin/libraries/DecompiledTextTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/libraries/DecompiledTextTestGenerated.java @@ -39,37 +39,37 @@ public class DecompiledTextTestGenerated extends AbstractDecompiledTextTest { @TestMetadata("Annotations") public void testAnnotations() throws Exception { - doTest("idea/testData/libraries/decompiledText/Annotations"); + doTest("idea/testData/libraries/decompiledText/Annotations/"); } @TestMetadata("ClassWithClassObject") public void testClassWithClassObject() throws Exception { - doTest("idea/testData/libraries/decompiledText/ClassWithClassObject"); + doTest("idea/testData/libraries/decompiledText/ClassWithClassObject/"); } @TestMetadata("Enum") public void testEnum() throws Exception { - doTest("idea/testData/libraries/decompiledText/Enum"); + doTest("idea/testData/libraries/decompiledText/Enum/"); } @TestMetadata("NestedClasses") public void testNestedClasses() throws Exception { - doTest("idea/testData/libraries/decompiledText/NestedClasses"); + doTest("idea/testData/libraries/decompiledText/NestedClasses/"); } @TestMetadata("Object") public void testObject() throws Exception { - doTest("idea/testData/libraries/decompiledText/Object"); + doTest("idea/testData/libraries/decompiledText/Object/"); } @TestMetadata("SimpleClass") public void testSimpleClass() throws Exception { - doTest("idea/testData/libraries/decompiledText/SimpleClass"); + doTest("idea/testData/libraries/decompiledText/SimpleClass/"); } @TestMetadata("TestPackage") public void testTestPackage() throws Exception { - doTest("idea/testData/libraries/decompiledText/TestPackage"); + doTest("idea/testData/libraries/decompiledText/TestPackage/"); } public static Test suite() {