From e0f8521f1e223113d0d588c09d4fa871229ed14f Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 23 Mar 2012 19:59:54 +0400 Subject: [PATCH] Moved decompiled files in testdata of LibrariesTest to separate folder. --- idea/testData/libraries/{ => decompiled}/AbstractClass.kt | 0 .../{ => decompiled}/ClassWithAbstractAndOpenMembers.kt | 0 idea/testData/libraries/{ => decompiled}/Color.kt | 0 idea/testData/libraries/{ => decompiled}/SimpleClass.kt | 0 idea/testData/libraries/{ => decompiled}/SimpleTrait.kt | 0 idea/testData/libraries/{ => decompiled}/SimpleTraitImpl.kt | 0 idea/testData/libraries/{ => decompiled}/WithInnerAndObject.kt | 0 .../libraries/{ => decompiled}/WithTraitClassObject.kt | 0 idea/testData/libraries/{ => decompiled}/namespace.kt | 0 .../org/jetbrains/jet/plugin/libraries/LibrariesTest.java | 3 +-- 10 files changed, 1 insertion(+), 2 deletions(-) rename idea/testData/libraries/{ => decompiled}/AbstractClass.kt (100%) rename idea/testData/libraries/{ => decompiled}/ClassWithAbstractAndOpenMembers.kt (100%) rename idea/testData/libraries/{ => decompiled}/Color.kt (100%) rename idea/testData/libraries/{ => decompiled}/SimpleClass.kt (100%) rename idea/testData/libraries/{ => decompiled}/SimpleTrait.kt (100%) rename idea/testData/libraries/{ => decompiled}/SimpleTraitImpl.kt (100%) rename idea/testData/libraries/{ => decompiled}/WithInnerAndObject.kt (100%) rename idea/testData/libraries/{ => decompiled}/WithTraitClassObject.kt (100%) rename idea/testData/libraries/{ => decompiled}/namespace.kt (100%) diff --git a/idea/testData/libraries/AbstractClass.kt b/idea/testData/libraries/decompiled/AbstractClass.kt similarity index 100% rename from idea/testData/libraries/AbstractClass.kt rename to idea/testData/libraries/decompiled/AbstractClass.kt diff --git a/idea/testData/libraries/ClassWithAbstractAndOpenMembers.kt b/idea/testData/libraries/decompiled/ClassWithAbstractAndOpenMembers.kt similarity index 100% rename from idea/testData/libraries/ClassWithAbstractAndOpenMembers.kt rename to idea/testData/libraries/decompiled/ClassWithAbstractAndOpenMembers.kt diff --git a/idea/testData/libraries/Color.kt b/idea/testData/libraries/decompiled/Color.kt similarity index 100% rename from idea/testData/libraries/Color.kt rename to idea/testData/libraries/decompiled/Color.kt diff --git a/idea/testData/libraries/SimpleClass.kt b/idea/testData/libraries/decompiled/SimpleClass.kt similarity index 100% rename from idea/testData/libraries/SimpleClass.kt rename to idea/testData/libraries/decompiled/SimpleClass.kt diff --git a/idea/testData/libraries/SimpleTrait.kt b/idea/testData/libraries/decompiled/SimpleTrait.kt similarity index 100% rename from idea/testData/libraries/SimpleTrait.kt rename to idea/testData/libraries/decompiled/SimpleTrait.kt diff --git a/idea/testData/libraries/SimpleTraitImpl.kt b/idea/testData/libraries/decompiled/SimpleTraitImpl.kt similarity index 100% rename from idea/testData/libraries/SimpleTraitImpl.kt rename to idea/testData/libraries/decompiled/SimpleTraitImpl.kt diff --git a/idea/testData/libraries/WithInnerAndObject.kt b/idea/testData/libraries/decompiled/WithInnerAndObject.kt similarity index 100% rename from idea/testData/libraries/WithInnerAndObject.kt rename to idea/testData/libraries/decompiled/WithInnerAndObject.kt diff --git a/idea/testData/libraries/WithTraitClassObject.kt b/idea/testData/libraries/decompiled/WithTraitClassObject.kt similarity index 100% rename from idea/testData/libraries/WithTraitClassObject.kt rename to idea/testData/libraries/decompiled/WithTraitClassObject.kt diff --git a/idea/testData/libraries/namespace.kt b/idea/testData/libraries/decompiled/namespace.kt similarity index 100% rename from idea/testData/libraries/namespace.kt rename to idea/testData/libraries/decompiled/namespace.kt diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/LibrariesTest.java b/idea/tests/org/jetbrains/jet/plugin/libraries/LibrariesTest.java index aaf69035899..2fc6a4cf04c 100644 --- a/idea/tests/org/jetbrains/jet/plugin/libraries/LibrariesTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/libraries/LibrariesTest.java @@ -43,7 +43,6 @@ import java.util.Map; * @since 3/11/12 */ public class LibrariesTest extends PlatformTestCase { - private static final String PACKAGE = "testData.libraries"; private static final String TEST_DATA_PATH = PluginTestCaseBase.getTestDataPathBase() + "/libraries"; private VirtualFile myLibraryDir; @@ -92,7 +91,7 @@ public class LibrariesTest extends PlatformTestCase { checkNavigationElements(map); String decompiledTextWithMarks = getDecompiledTextWithMarks(map); - assertSameLinesWithFile(TEST_DATA_PATH + "/" + getTestName(false) + ".kt", decompiledTextWithMarks); + assertSameLinesWithFile(TEST_DATA_PATH + "/decompiled/" + getTestName(false) + ".kt", decompiledTextWithMarks); } private String getDecompiledTextWithMarks(Map map) {