From b6b423935fdb5cfbc68c42542b0b69984a5ee158 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Fri, 21 Feb 2014 16:31:09 +0400 Subject: [PATCH] Move test data for NavigateTo*Library tests to a more specific folder --- .../libraries/{ => navigation}/decompiled/AbstractClass.kt | 0 .../decompiled/ClassWithAbstractAndOpenMembers.kt | 0 .../{ => navigation}/decompiled/ClassWithConstructor.kt | 0 idea/testData/libraries/{ => navigation}/decompiled/Color.kt | 0 .../libraries/{ => navigation}/decompiled/LibrariesPackage.kt | 0 .../libraries/{ => navigation}/decompiled/NamedObject.kt | 0 .../libraries/{ => navigation}/decompiled/SimpleClass.kt | 0 .../libraries/{ => navigation}/decompiled/SimpleTrait.kt | 0 .../libraries/{ => navigation}/decompiled/SimpleTraitImpl.kt | 0 .../libraries/{ => navigation}/decompiled/WithInnerAndObject.kt | 0 .../{ => navigation}/decompiled/WithTraitClassObject.kt | 0 idea/testData/libraries/{ => navigation}/library/extra.kt | 0 idea/testData/libraries/{ => navigation}/library/main.kt | 0 .../testData/libraries/{ => navigation}/usercode/ClassObject.kt | 0 .../testData/libraries/{ => navigation}/usercode/Constructor.kt | 0 idea/testData/libraries/{ => navigation}/usercode/Enum.kt | 0 .../libraries/{ => navigation}/usercode/ExtensionFunction.kt | 0 .../libraries/{ => navigation}/usercode/ExtensionProperty.kt | 0 .../GenericFunctionWithExplicitlyDeclaredTypeArguments.kt | 0 .../usercode/GenericFunctionWithInferredTypeArguments.kt | 0 .../libraries/{ => navigation}/usercode/GlobalFunction.kt | 0 .../libraries/{ => navigation}/usercode/GlobalProperty.kt | 0 .../testData/libraries/{ => navigation}/usercode/NamedObject.kt | 0 .../{ => navigation}/usercode/OverloadedFunWithTypeParam.kt | 0 idea/testData/libraries/{ => navigation}/usercode/Property.kt | 0 .../{ => navigation}/usercode/SameNameInDifferentSources.kt | 0 .../{ => navigation}/usercode/TypeWithSameShortName.kt | 0 .../jet/plugin/libraries/AbstractNavigateToLibraryTest.java | 2 +- 28 files changed, 1 insertion(+), 1 deletion(-) rename idea/testData/libraries/{ => navigation}/decompiled/AbstractClass.kt (100%) rename idea/testData/libraries/{ => navigation}/decompiled/ClassWithAbstractAndOpenMembers.kt (100%) rename idea/testData/libraries/{ => navigation}/decompiled/ClassWithConstructor.kt (100%) rename idea/testData/libraries/{ => navigation}/decompiled/Color.kt (100%) rename idea/testData/libraries/{ => navigation}/decompiled/LibrariesPackage.kt (100%) rename idea/testData/libraries/{ => navigation}/decompiled/NamedObject.kt (100%) rename idea/testData/libraries/{ => navigation}/decompiled/SimpleClass.kt (100%) rename idea/testData/libraries/{ => navigation}/decompiled/SimpleTrait.kt (100%) rename idea/testData/libraries/{ => navigation}/decompiled/SimpleTraitImpl.kt (100%) rename idea/testData/libraries/{ => navigation}/decompiled/WithInnerAndObject.kt (100%) rename idea/testData/libraries/{ => navigation}/decompiled/WithTraitClassObject.kt (100%) rename idea/testData/libraries/{ => navigation}/library/extra.kt (100%) rename idea/testData/libraries/{ => navigation}/library/main.kt (100%) rename idea/testData/libraries/{ => navigation}/usercode/ClassObject.kt (100%) rename idea/testData/libraries/{ => navigation}/usercode/Constructor.kt (100%) rename idea/testData/libraries/{ => navigation}/usercode/Enum.kt (100%) rename idea/testData/libraries/{ => navigation}/usercode/ExtensionFunction.kt (100%) rename idea/testData/libraries/{ => navigation}/usercode/ExtensionProperty.kt (100%) rename idea/testData/libraries/{ => navigation}/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt (100%) rename idea/testData/libraries/{ => navigation}/usercode/GenericFunctionWithInferredTypeArguments.kt (100%) rename idea/testData/libraries/{ => navigation}/usercode/GlobalFunction.kt (100%) rename idea/testData/libraries/{ => navigation}/usercode/GlobalProperty.kt (100%) rename idea/testData/libraries/{ => navigation}/usercode/NamedObject.kt (100%) rename idea/testData/libraries/{ => navigation}/usercode/OverloadedFunWithTypeParam.kt (100%) rename idea/testData/libraries/{ => navigation}/usercode/Property.kt (100%) rename idea/testData/libraries/{ => navigation}/usercode/SameNameInDifferentSources.kt (100%) rename idea/testData/libraries/{ => navigation}/usercode/TypeWithSameShortName.kt (100%) diff --git a/idea/testData/libraries/decompiled/AbstractClass.kt b/idea/testData/libraries/navigation/decompiled/AbstractClass.kt similarity index 100% rename from idea/testData/libraries/decompiled/AbstractClass.kt rename to idea/testData/libraries/navigation/decompiled/AbstractClass.kt diff --git a/idea/testData/libraries/decompiled/ClassWithAbstractAndOpenMembers.kt b/idea/testData/libraries/navigation/decompiled/ClassWithAbstractAndOpenMembers.kt similarity index 100% rename from idea/testData/libraries/decompiled/ClassWithAbstractAndOpenMembers.kt rename to idea/testData/libraries/navigation/decompiled/ClassWithAbstractAndOpenMembers.kt diff --git a/idea/testData/libraries/decompiled/ClassWithConstructor.kt b/idea/testData/libraries/navigation/decompiled/ClassWithConstructor.kt similarity index 100% rename from idea/testData/libraries/decompiled/ClassWithConstructor.kt rename to idea/testData/libraries/navigation/decompiled/ClassWithConstructor.kt diff --git a/idea/testData/libraries/decompiled/Color.kt b/idea/testData/libraries/navigation/decompiled/Color.kt similarity index 100% rename from idea/testData/libraries/decompiled/Color.kt rename to idea/testData/libraries/navigation/decompiled/Color.kt diff --git a/idea/testData/libraries/decompiled/LibrariesPackage.kt b/idea/testData/libraries/navigation/decompiled/LibrariesPackage.kt similarity index 100% rename from idea/testData/libraries/decompiled/LibrariesPackage.kt rename to idea/testData/libraries/navigation/decompiled/LibrariesPackage.kt diff --git a/idea/testData/libraries/decompiled/NamedObject.kt b/idea/testData/libraries/navigation/decompiled/NamedObject.kt similarity index 100% rename from idea/testData/libraries/decompiled/NamedObject.kt rename to idea/testData/libraries/navigation/decompiled/NamedObject.kt diff --git a/idea/testData/libraries/decompiled/SimpleClass.kt b/idea/testData/libraries/navigation/decompiled/SimpleClass.kt similarity index 100% rename from idea/testData/libraries/decompiled/SimpleClass.kt rename to idea/testData/libraries/navigation/decompiled/SimpleClass.kt diff --git a/idea/testData/libraries/decompiled/SimpleTrait.kt b/idea/testData/libraries/navigation/decompiled/SimpleTrait.kt similarity index 100% rename from idea/testData/libraries/decompiled/SimpleTrait.kt rename to idea/testData/libraries/navigation/decompiled/SimpleTrait.kt diff --git a/idea/testData/libraries/decompiled/SimpleTraitImpl.kt b/idea/testData/libraries/navigation/decompiled/SimpleTraitImpl.kt similarity index 100% rename from idea/testData/libraries/decompiled/SimpleTraitImpl.kt rename to idea/testData/libraries/navigation/decompiled/SimpleTraitImpl.kt diff --git a/idea/testData/libraries/decompiled/WithInnerAndObject.kt b/idea/testData/libraries/navigation/decompiled/WithInnerAndObject.kt similarity index 100% rename from idea/testData/libraries/decompiled/WithInnerAndObject.kt rename to idea/testData/libraries/navigation/decompiled/WithInnerAndObject.kt diff --git a/idea/testData/libraries/decompiled/WithTraitClassObject.kt b/idea/testData/libraries/navigation/decompiled/WithTraitClassObject.kt similarity index 100% rename from idea/testData/libraries/decompiled/WithTraitClassObject.kt rename to idea/testData/libraries/navigation/decompiled/WithTraitClassObject.kt diff --git a/idea/testData/libraries/library/extra.kt b/idea/testData/libraries/navigation/library/extra.kt similarity index 100% rename from idea/testData/libraries/library/extra.kt rename to idea/testData/libraries/navigation/library/extra.kt diff --git a/idea/testData/libraries/library/main.kt b/idea/testData/libraries/navigation/library/main.kt similarity index 100% rename from idea/testData/libraries/library/main.kt rename to idea/testData/libraries/navigation/library/main.kt diff --git a/idea/testData/libraries/usercode/ClassObject.kt b/idea/testData/libraries/navigation/usercode/ClassObject.kt similarity index 100% rename from idea/testData/libraries/usercode/ClassObject.kt rename to idea/testData/libraries/navigation/usercode/ClassObject.kt diff --git a/idea/testData/libraries/usercode/Constructor.kt b/idea/testData/libraries/navigation/usercode/Constructor.kt similarity index 100% rename from idea/testData/libraries/usercode/Constructor.kt rename to idea/testData/libraries/navigation/usercode/Constructor.kt diff --git a/idea/testData/libraries/usercode/Enum.kt b/idea/testData/libraries/navigation/usercode/Enum.kt similarity index 100% rename from idea/testData/libraries/usercode/Enum.kt rename to idea/testData/libraries/navigation/usercode/Enum.kt diff --git a/idea/testData/libraries/usercode/ExtensionFunction.kt b/idea/testData/libraries/navigation/usercode/ExtensionFunction.kt similarity index 100% rename from idea/testData/libraries/usercode/ExtensionFunction.kt rename to idea/testData/libraries/navigation/usercode/ExtensionFunction.kt diff --git a/idea/testData/libraries/usercode/ExtensionProperty.kt b/idea/testData/libraries/navigation/usercode/ExtensionProperty.kt similarity index 100% rename from idea/testData/libraries/usercode/ExtensionProperty.kt rename to idea/testData/libraries/navigation/usercode/ExtensionProperty.kt diff --git a/idea/testData/libraries/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt b/idea/testData/libraries/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt similarity index 100% rename from idea/testData/libraries/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt rename to idea/testData/libraries/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt diff --git a/idea/testData/libraries/usercode/GenericFunctionWithInferredTypeArguments.kt b/idea/testData/libraries/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt similarity index 100% rename from idea/testData/libraries/usercode/GenericFunctionWithInferredTypeArguments.kt rename to idea/testData/libraries/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt diff --git a/idea/testData/libraries/usercode/GlobalFunction.kt b/idea/testData/libraries/navigation/usercode/GlobalFunction.kt similarity index 100% rename from idea/testData/libraries/usercode/GlobalFunction.kt rename to idea/testData/libraries/navigation/usercode/GlobalFunction.kt diff --git a/idea/testData/libraries/usercode/GlobalProperty.kt b/idea/testData/libraries/navigation/usercode/GlobalProperty.kt similarity index 100% rename from idea/testData/libraries/usercode/GlobalProperty.kt rename to idea/testData/libraries/navigation/usercode/GlobalProperty.kt diff --git a/idea/testData/libraries/usercode/NamedObject.kt b/idea/testData/libraries/navigation/usercode/NamedObject.kt similarity index 100% rename from idea/testData/libraries/usercode/NamedObject.kt rename to idea/testData/libraries/navigation/usercode/NamedObject.kt diff --git a/idea/testData/libraries/usercode/OverloadedFunWithTypeParam.kt b/idea/testData/libraries/navigation/usercode/OverloadedFunWithTypeParam.kt similarity index 100% rename from idea/testData/libraries/usercode/OverloadedFunWithTypeParam.kt rename to idea/testData/libraries/navigation/usercode/OverloadedFunWithTypeParam.kt diff --git a/idea/testData/libraries/usercode/Property.kt b/idea/testData/libraries/navigation/usercode/Property.kt similarity index 100% rename from idea/testData/libraries/usercode/Property.kt rename to idea/testData/libraries/navigation/usercode/Property.kt diff --git a/idea/testData/libraries/usercode/SameNameInDifferentSources.kt b/idea/testData/libraries/navigation/usercode/SameNameInDifferentSources.kt similarity index 100% rename from idea/testData/libraries/usercode/SameNameInDifferentSources.kt rename to idea/testData/libraries/navigation/usercode/SameNameInDifferentSources.kt diff --git a/idea/testData/libraries/usercode/TypeWithSameShortName.kt b/idea/testData/libraries/navigation/usercode/TypeWithSameShortName.kt similarity index 100% rename from idea/testData/libraries/usercode/TypeWithSameShortName.kt rename to idea/testData/libraries/navigation/usercode/TypeWithSameShortName.kt diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/AbstractNavigateToLibraryTest.java b/idea/tests/org/jetbrains/jet/plugin/libraries/AbstractNavigateToLibraryTest.java index 2cb9334dcae..3d0ff321a51 100644 --- a/idea/tests/org/jetbrains/jet/plugin/libraries/AbstractNavigateToLibraryTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/libraries/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"; + protected static final String TEST_DATA_PATH = PluginTestCaseBase.getTestDataPathBase() + "/libraries/navigation"; }