diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/SourceInfoGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/SourceInfoGenTest.java index 9df9d20e187..d5370e0e660 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/SourceInfoGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/SourceInfoGenTest.java @@ -23,6 +23,8 @@ import org.jetbrains.org.objectweb.asm.ClassVisitor; import org.jetbrains.org.objectweb.asm.Opcodes; public class SourceInfoGenTest extends CodegenTestCase { + + private static final String TEST_FOLDER = "sourceInfo/"; @Override protected void setUp() throws Exception { super.setUp(); @@ -30,19 +32,19 @@ public class SourceInfoGenTest extends CodegenTestCase { } public void testSingleFilePackage() { - String producer = "sourceInfo/foo1.kt"; - loadFiles(producer); + String producer = "foo1.kt"; + loadFiles(TEST_FOLDER + producer); assertEquals(producer, getProducerInfo("foo/FooPackage.class")); } public void testMultiFilePackage() { - loadFiles("sourceInfo/foo1.kt", "sourceInfo/foo2.kt"); + loadFiles(TEST_FOLDER + "foo1.kt", TEST_FOLDER + "foo2.kt"); assertEquals(null, getProducerInfo("foo/FooPackage.class")); } public void testSingleClass() { - String producer = "sourceInfo/singleClass.kt"; - loadFiles(producer); + String producer = "singleClass.kt"; + loadFiles(TEST_FOLDER + producer); assertEquals(producer, getProducerInfo("SingleClass.class")); } diff --git a/compiler/tests/org/jetbrains/kotlin/test/JetTestUtils.java b/compiler/tests/org/jetbrains/kotlin/test/JetTestUtils.java index ea1fac069d7..b805347d59b 100644 --- a/compiler/tests/org/jetbrains/kotlin/test/JetTestUtils.java +++ b/compiler/tests/org/jetbrains/kotlin/test/JetTestUtils.java @@ -363,8 +363,18 @@ public class JetTestUtils { } @NotNull - public static JetFile createFile(@NotNull @NonNls String name, @NotNull String text, @NotNull Project project) { - LightVirtualFile virtualFile = new LightVirtualFile(name, JetLanguage.INSTANCE, text); + public static JetFile createFile(@NotNull @NonNls final String name, @NotNull String text, @NotNull Project project) { + String shortName = name.substring(name.lastIndexOf('/') + 1); + shortName = shortName.substring(shortName.lastIndexOf('\\') + 1); + LightVirtualFile virtualFile = new LightVirtualFile(shortName, JetLanguage.INSTANCE, text) { + @NotNull + @Override + public String getPath() { + //TODO: patch LightVirtualFile + return "/" + name; + } + }; + virtualFile.setCharset(CharsetToolkit.UTF8_CHARSET); PsiFileFactoryImpl factory = (PsiFileFactoryImpl) PsiFileFactory.getInstance(project); //noinspection ConstantConditions