From 5fb4f4103038c2a67919459612d9c0ab3ea17a5e Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Fri, 31 Oct 2014 18:12:19 +0300 Subject: [PATCH] Rename test data folder: libraries -> decompiler --- .../jet/generators/tests/GenerateTests.kt | 2 +- .../decompiledText/Annotations.expected.kt | 0 .../decompiledText/Annotations/Annotations.kt | 0 .../decompiledText/Annotations/Dependency.kt | 0 .../ClassWithClassObject.expected.kt | 0 .../ClassWithClassObject.kt | 0 .../DependencyOnNestedClasses.expected.kt | 0 .../DependencyOnNestedClasses/Dependency.kt | 0 .../DependencyOnNestedClasses.kt | 0 .../decompiledText/Enum.expected.kt | 0 .../decompiledText/Enum/Dependency.kt | 0 .../decompiledText/Enum/Enum.kt | 0 .../decompiledText/FlexibleTypes.expected.kt | 0 .../FlexibleTypes/FlexibleTypes.kt | 0 .../decompiledText/FlexibleTypes/ft.kt | 0 .../decompiledText/FunctionTypes.expected.kt | 0 .../FunctionTypes/FunctionTypes.kt | 0 .../decompiledText/NestedClasses.expected.kt | 0 .../NestedClasses/NestedClasses.kt | 0 .../decompiledText/Object.expected.kt | 0 .../decompiledText/Object/Object.kt | 0 .../decompiledText/SimpleClass.expected.kt | 0 .../decompiledText/SimpleClass/Dependency.kt | 0 .../decompiledText/SimpleClass/SimpleClass.kt | 0 .../decompiledText/TestPackage.expected.kt | 0 .../decompiledText/TestPackage/TestPackage.kt | 0 .../internalClasses/InternalClasses.kt | 0 .../navigation/decompiled/AbstractClass.kt | 0 .../ClassWithAbstractAndOpenMembers.kt | 0 .../decompiled/ClassWithConstructor.kt | 0 .../navigation/decompiled/Color.kt | 0 .../navigation/decompiled/LibrariesPackage.kt | 0 .../navigation/decompiled/NamedObject.kt | 0 .../navigation/decompiled/SimpleClass.kt | 0 .../navigation/decompiled/SimpleTrait.kt | 0 .../navigation/decompiled/SimpleTraitImpl.kt | 0 .../decompiled/WithInnerAndObject.kt | 0 .../decompiled/WithTraitClassObject.kt | 0 .../navigation/fromLibSource/Foo.kt | 0 .../navigation/fromLibSource/usage.kt | 0 .../navigation/library/extra.kt | 0 .../navigation/library/main.kt | 0 .../navigation/usercode/ClassObject.kt | 0 .../navigation/usercode/Constructor.kt | 0 .../navigation/usercode/Enum.kt | 0 .../navigation/usercode/ExtensionFunction.kt | 0 .../navigation/usercode/ExtensionProperty.kt | 0 ...tionWithExplicitlyDeclaredTypeArguments.kt | 0 ...enericFunctionWithInferredTypeArguments.kt | 0 .../navigation/usercode/GlobalFunction.kt | 0 .../navigation/usercode/GlobalProperty.kt | 0 .../navigation/usercode/NamedObject.kt | 0 .../usercode/OverloadedFunWithTypeParam.kt | 0 .../navigation/usercode/Property.kt | 0 .../usercode/SameNameInDifferentSources.kt | 0 .../usercode/TypeWithSameShortName.kt | 0 .../decompiler/InternalCompiledClassesTest.kt | 2 +- .../AbstractNavigateToLibraryTest.java | 2 +- .../NavigateFromLibrarySourcesTest.kt | 2 +- .../textBuilder/AbstractDecompiledTextTest.kt | 2 +- .../DecompiledTextTestGenerated.java | 24 +++++++++---------- 61 files changed, 17 insertions(+), 17 deletions(-) rename idea/testData/{libraries => decompiler}/decompiledText/Annotations.expected.kt (100%) rename idea/testData/{libraries => decompiler}/decompiledText/Annotations/Annotations.kt (100%) rename idea/testData/{libraries => decompiler}/decompiledText/Annotations/Dependency.kt (100%) rename idea/testData/{libraries => decompiler}/decompiledText/ClassWithClassObject.expected.kt (100%) rename idea/testData/{libraries => decompiler}/decompiledText/ClassWithClassObject/ClassWithClassObject.kt (100%) rename idea/testData/{libraries => decompiler}/decompiledText/DependencyOnNestedClasses.expected.kt (100%) rename idea/testData/{libraries => decompiler}/decompiledText/DependencyOnNestedClasses/Dependency.kt (100%) rename idea/testData/{libraries => decompiler}/decompiledText/DependencyOnNestedClasses/DependencyOnNestedClasses.kt (100%) rename idea/testData/{libraries => decompiler}/decompiledText/Enum.expected.kt (100%) rename idea/testData/{libraries => decompiler}/decompiledText/Enum/Dependency.kt (100%) rename idea/testData/{libraries => decompiler}/decompiledText/Enum/Enum.kt (100%) rename idea/testData/{libraries => decompiler}/decompiledText/FlexibleTypes.expected.kt (100%) rename idea/testData/{libraries => decompiler}/decompiledText/FlexibleTypes/FlexibleTypes.kt (100%) rename idea/testData/{libraries => decompiler}/decompiledText/FlexibleTypes/ft.kt (100%) rename idea/testData/{libraries => decompiler}/decompiledText/FunctionTypes.expected.kt (100%) rename idea/testData/{libraries => decompiler}/decompiledText/FunctionTypes/FunctionTypes.kt (100%) rename idea/testData/{libraries => decompiler}/decompiledText/NestedClasses.expected.kt (100%) rename idea/testData/{libraries => decompiler}/decompiledText/NestedClasses/NestedClasses.kt (100%) rename idea/testData/{libraries => decompiler}/decompiledText/Object.expected.kt (100%) rename idea/testData/{libraries => decompiler}/decompiledText/Object/Object.kt (100%) rename idea/testData/{libraries => decompiler}/decompiledText/SimpleClass.expected.kt (100%) rename idea/testData/{libraries => decompiler}/decompiledText/SimpleClass/Dependency.kt (100%) rename idea/testData/{libraries => decompiler}/decompiledText/SimpleClass/SimpleClass.kt (100%) rename idea/testData/{libraries => decompiler}/decompiledText/TestPackage.expected.kt (100%) rename idea/testData/{libraries => decompiler}/decompiledText/TestPackage/TestPackage.kt (100%) rename idea/testData/{libraries => decompiler}/internalClasses/InternalClasses.kt (100%) rename idea/testData/{libraries => decompiler}/navigation/decompiled/AbstractClass.kt (100%) rename idea/testData/{libraries => decompiler}/navigation/decompiled/ClassWithAbstractAndOpenMembers.kt (100%) rename idea/testData/{libraries => decompiler}/navigation/decompiled/ClassWithConstructor.kt (100%) rename idea/testData/{libraries => decompiler}/navigation/decompiled/Color.kt (100%) rename idea/testData/{libraries => decompiler}/navigation/decompiled/LibrariesPackage.kt (100%) rename idea/testData/{libraries => decompiler}/navigation/decompiled/NamedObject.kt (100%) rename idea/testData/{libraries => decompiler}/navigation/decompiled/SimpleClass.kt (100%) rename idea/testData/{libraries => decompiler}/navigation/decompiled/SimpleTrait.kt (100%) rename idea/testData/{libraries => decompiler}/navigation/decompiled/SimpleTraitImpl.kt (100%) rename idea/testData/{libraries => decompiler}/navigation/decompiled/WithInnerAndObject.kt (100%) rename idea/testData/{libraries => decompiler}/navigation/decompiled/WithTraitClassObject.kt (100%) rename idea/testData/{libraries => decompiler}/navigation/fromLibSource/Foo.kt (100%) rename idea/testData/{libraries => decompiler}/navigation/fromLibSource/usage.kt (100%) rename idea/testData/{libraries => decompiler}/navigation/library/extra.kt (100%) rename idea/testData/{libraries => decompiler}/navigation/library/main.kt (100%) rename idea/testData/{libraries => decompiler}/navigation/usercode/ClassObject.kt (100%) rename idea/testData/{libraries => decompiler}/navigation/usercode/Constructor.kt (100%) rename idea/testData/{libraries => decompiler}/navigation/usercode/Enum.kt (100%) rename idea/testData/{libraries => decompiler}/navigation/usercode/ExtensionFunction.kt (100%) rename idea/testData/{libraries => decompiler}/navigation/usercode/ExtensionProperty.kt (100%) rename idea/testData/{libraries => decompiler}/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt (100%) rename idea/testData/{libraries => decompiler}/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt (100%) rename idea/testData/{libraries => decompiler}/navigation/usercode/GlobalFunction.kt (100%) rename idea/testData/{libraries => decompiler}/navigation/usercode/GlobalProperty.kt (100%) rename idea/testData/{libraries => decompiler}/navigation/usercode/NamedObject.kt (100%) rename idea/testData/{libraries => decompiler}/navigation/usercode/OverloadedFunWithTypeParam.kt (100%) rename idea/testData/{libraries => decompiler}/navigation/usercode/Property.kt (100%) rename idea/testData/{libraries => decompiler}/navigation/usercode/SameNameInDifferentSources.kt (100%) rename idea/testData/{libraries => decompiler}/navigation/usercode/TypeWithSameShortName.kt (100%) diff --git a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt index 99e4fb44133..dff9f220b7f 100644 --- a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt @@ -573,7 +573,7 @@ fun main(args: Array) { } testClass(javaClass()) { - model("libraries/decompiledText", pattern = """^([^\.]+)$""") + model("decompiler/decompiledText", pattern = """^([^\.]+)$""") } testClass(javaClass()) { diff --git a/idea/testData/libraries/decompiledText/Annotations.expected.kt b/idea/testData/decompiler/decompiledText/Annotations.expected.kt similarity index 100% rename from idea/testData/libraries/decompiledText/Annotations.expected.kt rename to idea/testData/decompiler/decompiledText/Annotations.expected.kt diff --git a/idea/testData/libraries/decompiledText/Annotations/Annotations.kt b/idea/testData/decompiler/decompiledText/Annotations/Annotations.kt similarity index 100% rename from idea/testData/libraries/decompiledText/Annotations/Annotations.kt rename to idea/testData/decompiler/decompiledText/Annotations/Annotations.kt diff --git a/idea/testData/libraries/decompiledText/Annotations/Dependency.kt b/idea/testData/decompiler/decompiledText/Annotations/Dependency.kt similarity index 100% rename from idea/testData/libraries/decompiledText/Annotations/Dependency.kt rename to idea/testData/decompiler/decompiledText/Annotations/Dependency.kt diff --git a/idea/testData/libraries/decompiledText/ClassWithClassObject.expected.kt b/idea/testData/decompiler/decompiledText/ClassWithClassObject.expected.kt similarity index 100% rename from idea/testData/libraries/decompiledText/ClassWithClassObject.expected.kt rename to idea/testData/decompiler/decompiledText/ClassWithClassObject.expected.kt diff --git a/idea/testData/libraries/decompiledText/ClassWithClassObject/ClassWithClassObject.kt b/idea/testData/decompiler/decompiledText/ClassWithClassObject/ClassWithClassObject.kt similarity index 100% rename from idea/testData/libraries/decompiledText/ClassWithClassObject/ClassWithClassObject.kt rename to idea/testData/decompiler/decompiledText/ClassWithClassObject/ClassWithClassObject.kt diff --git a/idea/testData/libraries/decompiledText/DependencyOnNestedClasses.expected.kt b/idea/testData/decompiler/decompiledText/DependencyOnNestedClasses.expected.kt similarity index 100% rename from idea/testData/libraries/decompiledText/DependencyOnNestedClasses.expected.kt rename to idea/testData/decompiler/decompiledText/DependencyOnNestedClasses.expected.kt diff --git a/idea/testData/libraries/decompiledText/DependencyOnNestedClasses/Dependency.kt b/idea/testData/decompiler/decompiledText/DependencyOnNestedClasses/Dependency.kt similarity index 100% rename from idea/testData/libraries/decompiledText/DependencyOnNestedClasses/Dependency.kt rename to idea/testData/decompiler/decompiledText/DependencyOnNestedClasses/Dependency.kt diff --git a/idea/testData/libraries/decompiledText/DependencyOnNestedClasses/DependencyOnNestedClasses.kt b/idea/testData/decompiler/decompiledText/DependencyOnNestedClasses/DependencyOnNestedClasses.kt similarity index 100% rename from idea/testData/libraries/decompiledText/DependencyOnNestedClasses/DependencyOnNestedClasses.kt rename to idea/testData/decompiler/decompiledText/DependencyOnNestedClasses/DependencyOnNestedClasses.kt diff --git a/idea/testData/libraries/decompiledText/Enum.expected.kt b/idea/testData/decompiler/decompiledText/Enum.expected.kt similarity index 100% rename from idea/testData/libraries/decompiledText/Enum.expected.kt rename to idea/testData/decompiler/decompiledText/Enum.expected.kt diff --git a/idea/testData/libraries/decompiledText/Enum/Dependency.kt b/idea/testData/decompiler/decompiledText/Enum/Dependency.kt similarity index 100% rename from idea/testData/libraries/decompiledText/Enum/Dependency.kt rename to idea/testData/decompiler/decompiledText/Enum/Dependency.kt diff --git a/idea/testData/libraries/decompiledText/Enum/Enum.kt b/idea/testData/decompiler/decompiledText/Enum/Enum.kt similarity index 100% rename from idea/testData/libraries/decompiledText/Enum/Enum.kt rename to idea/testData/decompiler/decompiledText/Enum/Enum.kt diff --git a/idea/testData/libraries/decompiledText/FlexibleTypes.expected.kt b/idea/testData/decompiler/decompiledText/FlexibleTypes.expected.kt similarity index 100% rename from idea/testData/libraries/decompiledText/FlexibleTypes.expected.kt rename to idea/testData/decompiler/decompiledText/FlexibleTypes.expected.kt diff --git a/idea/testData/libraries/decompiledText/FlexibleTypes/FlexibleTypes.kt b/idea/testData/decompiler/decompiledText/FlexibleTypes/FlexibleTypes.kt similarity index 100% rename from idea/testData/libraries/decompiledText/FlexibleTypes/FlexibleTypes.kt rename to idea/testData/decompiler/decompiledText/FlexibleTypes/FlexibleTypes.kt diff --git a/idea/testData/libraries/decompiledText/FlexibleTypes/ft.kt b/idea/testData/decompiler/decompiledText/FlexibleTypes/ft.kt similarity index 100% rename from idea/testData/libraries/decompiledText/FlexibleTypes/ft.kt rename to idea/testData/decompiler/decompiledText/FlexibleTypes/ft.kt diff --git a/idea/testData/libraries/decompiledText/FunctionTypes.expected.kt b/idea/testData/decompiler/decompiledText/FunctionTypes.expected.kt similarity index 100% rename from idea/testData/libraries/decompiledText/FunctionTypes.expected.kt rename to idea/testData/decompiler/decompiledText/FunctionTypes.expected.kt diff --git a/idea/testData/libraries/decompiledText/FunctionTypes/FunctionTypes.kt b/idea/testData/decompiler/decompiledText/FunctionTypes/FunctionTypes.kt similarity index 100% rename from idea/testData/libraries/decompiledText/FunctionTypes/FunctionTypes.kt rename to idea/testData/decompiler/decompiledText/FunctionTypes/FunctionTypes.kt diff --git a/idea/testData/libraries/decompiledText/NestedClasses.expected.kt b/idea/testData/decompiler/decompiledText/NestedClasses.expected.kt similarity index 100% rename from idea/testData/libraries/decompiledText/NestedClasses.expected.kt rename to idea/testData/decompiler/decompiledText/NestedClasses.expected.kt diff --git a/idea/testData/libraries/decompiledText/NestedClasses/NestedClasses.kt b/idea/testData/decompiler/decompiledText/NestedClasses/NestedClasses.kt similarity index 100% rename from idea/testData/libraries/decompiledText/NestedClasses/NestedClasses.kt rename to idea/testData/decompiler/decompiledText/NestedClasses/NestedClasses.kt diff --git a/idea/testData/libraries/decompiledText/Object.expected.kt b/idea/testData/decompiler/decompiledText/Object.expected.kt similarity index 100% rename from idea/testData/libraries/decompiledText/Object.expected.kt rename to idea/testData/decompiler/decompiledText/Object.expected.kt diff --git a/idea/testData/libraries/decompiledText/Object/Object.kt b/idea/testData/decompiler/decompiledText/Object/Object.kt similarity index 100% rename from idea/testData/libraries/decompiledText/Object/Object.kt rename to idea/testData/decompiler/decompiledText/Object/Object.kt diff --git a/idea/testData/libraries/decompiledText/SimpleClass.expected.kt b/idea/testData/decompiler/decompiledText/SimpleClass.expected.kt similarity index 100% rename from idea/testData/libraries/decompiledText/SimpleClass.expected.kt rename to idea/testData/decompiler/decompiledText/SimpleClass.expected.kt diff --git a/idea/testData/libraries/decompiledText/SimpleClass/Dependency.kt b/idea/testData/decompiler/decompiledText/SimpleClass/Dependency.kt similarity index 100% rename from idea/testData/libraries/decompiledText/SimpleClass/Dependency.kt rename to idea/testData/decompiler/decompiledText/SimpleClass/Dependency.kt diff --git a/idea/testData/libraries/decompiledText/SimpleClass/SimpleClass.kt b/idea/testData/decompiler/decompiledText/SimpleClass/SimpleClass.kt similarity index 100% rename from idea/testData/libraries/decompiledText/SimpleClass/SimpleClass.kt rename to idea/testData/decompiler/decompiledText/SimpleClass/SimpleClass.kt diff --git a/idea/testData/libraries/decompiledText/TestPackage.expected.kt b/idea/testData/decompiler/decompiledText/TestPackage.expected.kt similarity index 100% rename from idea/testData/libraries/decompiledText/TestPackage.expected.kt rename to idea/testData/decompiler/decompiledText/TestPackage.expected.kt diff --git a/idea/testData/libraries/decompiledText/TestPackage/TestPackage.kt b/idea/testData/decompiler/decompiledText/TestPackage/TestPackage.kt similarity index 100% rename from idea/testData/libraries/decompiledText/TestPackage/TestPackage.kt rename to idea/testData/decompiler/decompiledText/TestPackage/TestPackage.kt diff --git a/idea/testData/libraries/internalClasses/InternalClasses.kt b/idea/testData/decompiler/internalClasses/InternalClasses.kt similarity index 100% rename from idea/testData/libraries/internalClasses/InternalClasses.kt rename to idea/testData/decompiler/internalClasses/InternalClasses.kt diff --git a/idea/testData/libraries/navigation/decompiled/AbstractClass.kt b/idea/testData/decompiler/navigation/decompiled/AbstractClass.kt similarity index 100% rename from idea/testData/libraries/navigation/decompiled/AbstractClass.kt rename to idea/testData/decompiler/navigation/decompiled/AbstractClass.kt diff --git a/idea/testData/libraries/navigation/decompiled/ClassWithAbstractAndOpenMembers.kt b/idea/testData/decompiler/navigation/decompiled/ClassWithAbstractAndOpenMembers.kt similarity index 100% rename from idea/testData/libraries/navigation/decompiled/ClassWithAbstractAndOpenMembers.kt rename to idea/testData/decompiler/navigation/decompiled/ClassWithAbstractAndOpenMembers.kt diff --git a/idea/testData/libraries/navigation/decompiled/ClassWithConstructor.kt b/idea/testData/decompiler/navigation/decompiled/ClassWithConstructor.kt similarity index 100% rename from idea/testData/libraries/navigation/decompiled/ClassWithConstructor.kt rename to idea/testData/decompiler/navigation/decompiled/ClassWithConstructor.kt diff --git a/idea/testData/libraries/navigation/decompiled/Color.kt b/idea/testData/decompiler/navigation/decompiled/Color.kt similarity index 100% rename from idea/testData/libraries/navigation/decompiled/Color.kt rename to idea/testData/decompiler/navigation/decompiled/Color.kt diff --git a/idea/testData/libraries/navigation/decompiled/LibrariesPackage.kt b/idea/testData/decompiler/navigation/decompiled/LibrariesPackage.kt similarity index 100% rename from idea/testData/libraries/navigation/decompiled/LibrariesPackage.kt rename to idea/testData/decompiler/navigation/decompiled/LibrariesPackage.kt diff --git a/idea/testData/libraries/navigation/decompiled/NamedObject.kt b/idea/testData/decompiler/navigation/decompiled/NamedObject.kt similarity index 100% rename from idea/testData/libraries/navigation/decompiled/NamedObject.kt rename to idea/testData/decompiler/navigation/decompiled/NamedObject.kt diff --git a/idea/testData/libraries/navigation/decompiled/SimpleClass.kt b/idea/testData/decompiler/navigation/decompiled/SimpleClass.kt similarity index 100% rename from idea/testData/libraries/navigation/decompiled/SimpleClass.kt rename to idea/testData/decompiler/navigation/decompiled/SimpleClass.kt diff --git a/idea/testData/libraries/navigation/decompiled/SimpleTrait.kt b/idea/testData/decompiler/navigation/decompiled/SimpleTrait.kt similarity index 100% rename from idea/testData/libraries/navigation/decompiled/SimpleTrait.kt rename to idea/testData/decompiler/navigation/decompiled/SimpleTrait.kt diff --git a/idea/testData/libraries/navigation/decompiled/SimpleTraitImpl.kt b/idea/testData/decompiler/navigation/decompiled/SimpleTraitImpl.kt similarity index 100% rename from idea/testData/libraries/navigation/decompiled/SimpleTraitImpl.kt rename to idea/testData/decompiler/navigation/decompiled/SimpleTraitImpl.kt diff --git a/idea/testData/libraries/navigation/decompiled/WithInnerAndObject.kt b/idea/testData/decompiler/navigation/decompiled/WithInnerAndObject.kt similarity index 100% rename from idea/testData/libraries/navigation/decompiled/WithInnerAndObject.kt rename to idea/testData/decompiler/navigation/decompiled/WithInnerAndObject.kt diff --git a/idea/testData/libraries/navigation/decompiled/WithTraitClassObject.kt b/idea/testData/decompiler/navigation/decompiled/WithTraitClassObject.kt similarity index 100% rename from idea/testData/libraries/navigation/decompiled/WithTraitClassObject.kt rename to idea/testData/decompiler/navigation/decompiled/WithTraitClassObject.kt diff --git a/idea/testData/libraries/navigation/fromLibSource/Foo.kt b/idea/testData/decompiler/navigation/fromLibSource/Foo.kt similarity index 100% rename from idea/testData/libraries/navigation/fromLibSource/Foo.kt rename to idea/testData/decompiler/navigation/fromLibSource/Foo.kt diff --git a/idea/testData/libraries/navigation/fromLibSource/usage.kt b/idea/testData/decompiler/navigation/fromLibSource/usage.kt similarity index 100% rename from idea/testData/libraries/navigation/fromLibSource/usage.kt rename to idea/testData/decompiler/navigation/fromLibSource/usage.kt diff --git a/idea/testData/libraries/navigation/library/extra.kt b/idea/testData/decompiler/navigation/library/extra.kt similarity index 100% rename from idea/testData/libraries/navigation/library/extra.kt rename to idea/testData/decompiler/navigation/library/extra.kt diff --git a/idea/testData/libraries/navigation/library/main.kt b/idea/testData/decompiler/navigation/library/main.kt similarity index 100% rename from idea/testData/libraries/navigation/library/main.kt rename to idea/testData/decompiler/navigation/library/main.kt diff --git a/idea/testData/libraries/navigation/usercode/ClassObject.kt b/idea/testData/decompiler/navigation/usercode/ClassObject.kt similarity index 100% rename from idea/testData/libraries/navigation/usercode/ClassObject.kt rename to idea/testData/decompiler/navigation/usercode/ClassObject.kt diff --git a/idea/testData/libraries/navigation/usercode/Constructor.kt b/idea/testData/decompiler/navigation/usercode/Constructor.kt similarity index 100% rename from idea/testData/libraries/navigation/usercode/Constructor.kt rename to idea/testData/decompiler/navigation/usercode/Constructor.kt diff --git a/idea/testData/libraries/navigation/usercode/Enum.kt b/idea/testData/decompiler/navigation/usercode/Enum.kt similarity index 100% rename from idea/testData/libraries/navigation/usercode/Enum.kt rename to idea/testData/decompiler/navigation/usercode/Enum.kt diff --git a/idea/testData/libraries/navigation/usercode/ExtensionFunction.kt b/idea/testData/decompiler/navigation/usercode/ExtensionFunction.kt similarity index 100% rename from idea/testData/libraries/navigation/usercode/ExtensionFunction.kt rename to idea/testData/decompiler/navigation/usercode/ExtensionFunction.kt diff --git a/idea/testData/libraries/navigation/usercode/ExtensionProperty.kt b/idea/testData/decompiler/navigation/usercode/ExtensionProperty.kt similarity index 100% rename from idea/testData/libraries/navigation/usercode/ExtensionProperty.kt rename to idea/testData/decompiler/navigation/usercode/ExtensionProperty.kt diff --git a/idea/testData/libraries/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt b/idea/testData/decompiler/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt similarity index 100% rename from idea/testData/libraries/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt rename to idea/testData/decompiler/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt diff --git a/idea/testData/libraries/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt b/idea/testData/decompiler/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt similarity index 100% rename from idea/testData/libraries/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt rename to idea/testData/decompiler/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt diff --git a/idea/testData/libraries/navigation/usercode/GlobalFunction.kt b/idea/testData/decompiler/navigation/usercode/GlobalFunction.kt similarity index 100% rename from idea/testData/libraries/navigation/usercode/GlobalFunction.kt rename to idea/testData/decompiler/navigation/usercode/GlobalFunction.kt diff --git a/idea/testData/libraries/navigation/usercode/GlobalProperty.kt b/idea/testData/decompiler/navigation/usercode/GlobalProperty.kt similarity index 100% rename from idea/testData/libraries/navigation/usercode/GlobalProperty.kt rename to idea/testData/decompiler/navigation/usercode/GlobalProperty.kt diff --git a/idea/testData/libraries/navigation/usercode/NamedObject.kt b/idea/testData/decompiler/navigation/usercode/NamedObject.kt similarity index 100% rename from idea/testData/libraries/navigation/usercode/NamedObject.kt rename to idea/testData/decompiler/navigation/usercode/NamedObject.kt diff --git a/idea/testData/libraries/navigation/usercode/OverloadedFunWithTypeParam.kt b/idea/testData/decompiler/navigation/usercode/OverloadedFunWithTypeParam.kt similarity index 100% rename from idea/testData/libraries/navigation/usercode/OverloadedFunWithTypeParam.kt rename to idea/testData/decompiler/navigation/usercode/OverloadedFunWithTypeParam.kt diff --git a/idea/testData/libraries/navigation/usercode/Property.kt b/idea/testData/decompiler/navigation/usercode/Property.kt similarity index 100% rename from idea/testData/libraries/navigation/usercode/Property.kt rename to idea/testData/decompiler/navigation/usercode/Property.kt diff --git a/idea/testData/libraries/navigation/usercode/SameNameInDifferentSources.kt b/idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt similarity index 100% rename from idea/testData/libraries/navigation/usercode/SameNameInDifferentSources.kt rename to idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt diff --git a/idea/testData/libraries/navigation/usercode/TypeWithSameShortName.kt b/idea/testData/decompiler/navigation/usercode/TypeWithSameShortName.kt similarity index 100% rename from idea/testData/libraries/navigation/usercode/TypeWithSameShortName.kt rename to idea/testData/decompiler/navigation/usercode/TypeWithSameShortName.kt diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/InternalCompiledClassesTest.kt b/idea/tests/org/jetbrains/jet/plugin/decompiler/InternalCompiledClassesTest.kt index ebf98cec0ab..47a89c4945e 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/InternalCompiledClassesTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/InternalCompiledClassesTest.kt @@ -35,7 +35,7 @@ import org.jetbrains.jet.plugin.decompiler.navigation.NavigateToDecompiledLibrar public class InternalCompiledClassesTest : JetLightCodeInsightFixtureTestCase() { - private val TEST_DATA_PATH = PluginTestCaseBase.getTestDataPathBase() + "/libraries/internalClasses" + private val TEST_DATA_PATH = PluginTestCaseBase.getTestDataPathBase() + "/decompiler/internalClasses" fun testPackagePartIsInvisible() = doTestNoPsiFilesAreBuiltForSyntheticClass(PACKAGE_PART) diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/AbstractNavigateToLibraryTest.java b/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/AbstractNavigateToLibraryTest.java index 1c98de0445e..76a384d2f48 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/AbstractNavigateToLibraryTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/AbstractNavigateToLibraryTest.java @@ -21,5 +21,5 @@ import org.jetbrains.jet.plugin.PluginTestCaseBase; public abstract class AbstractNavigateToLibraryTest extends LightCodeInsightFixtureTestCase { protected static final String PACKAGE = "testData.libraries"; - protected static final String TEST_DATA_PATH = PluginTestCaseBase.getTestDataPathBase() + "/libraries/navigation"; + protected static final String TEST_DATA_PATH = PluginTestCaseBase.getTestDataPathBase() + "/decompiler/navigation"; } diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateFromLibrarySourcesTest.kt b/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateFromLibrarySourcesTest.kt index 9071c404954..7dbc44ceccd 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateFromLibrarySourcesTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateFromLibrarySourcesTest.kt @@ -71,7 +71,7 @@ public class NavigateFromLibrarySourcesTest: LightCodeInsightFixtureTestCase() { } override fun getProjectDescriptor(): LightProjectDescriptor { - return JdkAndMockLibraryProjectDescriptor(PluginTestCaseBase.getTestDataPathBase() + "/libraries/navigation/fromLibSource", true) + return JdkAndMockLibraryProjectDescriptor(PluginTestCaseBase.getTestDataPathBase() + "/decompiler/navigation/fromLibSource", true) } private fun checkNavigationElement(element: PsiElement, expectedFqName: String) { diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/AbstractDecompiledTextTest.kt b/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/AbstractDecompiledTextTest.kt index 604b5172979..d10de626726 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/AbstractDecompiledTextTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/AbstractDecompiledTextTest.kt @@ -32,7 +32,7 @@ import org.jetbrains.jet.lang.psi.JetPsiUtil public abstract class AbstractDecompiledTextTest() : JetLightCodeInsightFixtureTestCase() { - private val TEST_DATA_PATH = PluginTestCaseBase.getTestDataPathBase() + "/libraries/decompiledText" + private val TEST_DATA_PATH = PluginTestCaseBase.getTestDataPathBase() + "/decompiler/decompiledText" public fun doTest(path: String) { val classFile = NavigateToDecompiledLibraryTest.getClassFile("test", getTestName(false), myModule!!) diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextTestGenerated.java index cdc5c25dca4..2333a9134f2 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextTestGenerated.java @@ -28,72 +28,72 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("idea/testData/libraries/decompiledText") +@TestMetadata("idea/testData/decompiler/decompiledText") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) @RunWith(JUnit3RunnerWithInners.class) public class DecompiledTextTestGenerated extends AbstractDecompiledTextTest { public void testAllFilesPresentInDecompiledText() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/libraries/decompiledText"), Pattern.compile("^([^\\.]+)$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("Annotations") public void testAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/libraries/decompiledText/Annotations/"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Annotations/"); doTest(fileName); } @TestMetadata("ClassWithClassObject") public void testClassWithClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/libraries/decompiledText/ClassWithClassObject/"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/ClassWithClassObject/"); doTest(fileName); } @TestMetadata("DependencyOnNestedClasses") public void testDependencyOnNestedClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/libraries/decompiledText/DependencyOnNestedClasses/"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/DependencyOnNestedClasses/"); doTest(fileName); } @TestMetadata("Enum") public void testEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/libraries/decompiledText/Enum/"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Enum/"); doTest(fileName); } @TestMetadata("FlexibleTypes") public void testFlexibleTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/libraries/decompiledText/FlexibleTypes/"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/FlexibleTypes/"); doTest(fileName); } @TestMetadata("FunctionTypes") public void testFunctionTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/libraries/decompiledText/FunctionTypes/"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/FunctionTypes/"); doTest(fileName); } @TestMetadata("NestedClasses") public void testNestedClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/libraries/decompiledText/NestedClasses/"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/NestedClasses/"); doTest(fileName); } @TestMetadata("Object") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/libraries/decompiledText/Object/"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Object/"); doTest(fileName); } @TestMetadata("SimpleClass") public void testSimpleClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/libraries/decompiledText/SimpleClass/"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/SimpleClass/"); doTest(fileName); } @TestMetadata("TestPackage") public void testTestPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/libraries/decompiledText/TestPackage/"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/TestPackage/"); doTest(fileName); }