azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Return short name in test LightVirtualFile.getName()

Browse Source
This commit is contained in:
Michael Bogdanov
2015-02-16 18:30:23 +03:00
parent 50c9c93f37
commit 7f788f86fe
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/codegen/SourceInfoGenTest.java
+7 -5
View File
@@ -23,6 +23,8 @@ import org.jetbrains.org.objectweb.asm.ClassVisitor;
import org.jetbrains.org.objectweb.asm.Opcodes; import org.jetbrains.org.objectweb.asm.Opcodes;
public class SourceInfoGenTest extends CodegenTestCase { public class SourceInfoGenTest extends CodegenTestCase {
private static final String TEST_FOLDER = "sourceInfo/";
@Override @Override
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp(); super.setUp();
@@ -30,19 +32,19 @@ public class SourceInfoGenTest extends CodegenTestCase {
} }
public void testSingleFilePackage() { public void testSingleFilePackage() {
String producer = "sourceInfo/foo1.kt"; String producer = "foo1.kt";
loadFiles(producer); loadFiles(TEST_FOLDER + producer);
assertEquals(producer, getProducerInfo("foo/FooPackage.class")); assertEquals(producer, getProducerInfo("foo/FooPackage.class"));
} }
public void testMultiFilePackage() { 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")); assertEquals(null, getProducerInfo("foo/FooPackage.class"));
} }
public void testSingleClass() { public void testSingleClass() {
String producer = "sourceInfo/singleClass.kt"; String producer = "singleClass.kt";
loadFiles(producer); loadFiles(TEST_FOLDER + producer);
assertEquals(producer, getProducerInfo("SingleClass.class")); assertEquals(producer, getProducerInfo("SingleClass.class"));
} }
compiler/tests/org/jetbrains/kotlin/test/JetTestUtils.java
+12 -2
View File
@@ -363,8 +363,18 @@ public class JetTestUtils {
} }
@NotNull @NotNull
public static JetFile createFile(@NotNull @NonNls String name, @NotNull String text, @NotNull Project project) { public static JetFile createFile(@NotNull @NonNls final String name, @NotNull String text, @NotNull Project project) {
LightVirtualFile virtualFile = new LightVirtualFile(name, JetLanguage.INSTANCE, text); 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); virtualFile.setCharset(CharsetToolkit.UTF8_CHARSET);
PsiFileFactoryImpl factory = (PsiFileFactoryImpl) PsiFileFactory.getInstance(project); PsiFileFactoryImpl factory = (PsiFileFactoryImpl) PsiFileFactory.getInstance(project);
//noinspection ConstantConditions //noinspection ConstantConditions