Creating library under project directory in library tests. Hope this prevents them from blinking.
This commit is contained in:
@@ -32,7 +32,7 @@ import org.jetbrains.jet.cli.common.ExitCode;
|
|||||||
import org.jetbrains.jet.cli.jvm.K2JVMCompiler;
|
import org.jetbrains.jet.cli.jvm.K2JVMCompiler;
|
||||||
import org.jetbrains.jet.plugin.PluginTestCaseBase;
|
import org.jetbrains.jet.plugin.PluginTestCaseBase;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.IOException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Evgeny Gerashchenko
|
* @author Evgeny Gerashchenko
|
||||||
@@ -49,7 +49,20 @@ public abstract class AbstractLibrariesTest extends PlatformTestCase {
|
|||||||
@Override
|
@Override
|
||||||
protected void setUp() throws Exception {
|
protected void setUp() throws Exception {
|
||||||
super.setUp();
|
super.setUp();
|
||||||
File libraryIoDir = createTempDir("libraries_");
|
final VirtualFile baseDir = getProject().getBaseDir();
|
||||||
|
assertNotNull(baseDir);
|
||||||
|
ApplicationManager.getApplication().runWriteAction(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
try {
|
||||||
|
libraryDir = baseDir.createChildDirectory(this, "lib");
|
||||||
|
}
|
||||||
|
catch (IOException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
VirtualFile testDataDir = LocalFileSystem.getInstance().findFileByPath(TEST_DATA_PATH);
|
VirtualFile testDataDir = LocalFileSystem.getInstance().findFileByPath(TEST_DATA_PATH);
|
||||||
assertNotNull(testDataDir);
|
assertNotNull(testDataDir);
|
||||||
VfsUtilCore.visitChildrenRecursively(testDataDir, new VirtualFileVisitor() {
|
VfsUtilCore.visitChildrenRecursively(testDataDir, new VirtualFileVisitor() {
|
||||||
@@ -62,10 +75,11 @@ public abstract class AbstractLibrariesTest extends PlatformTestCase {
|
|||||||
});
|
});
|
||||||
librarySourceDir = LocalFileSystem.getInstance().findFileByPath(TEST_DATA_PATH + "/library");
|
librarySourceDir = LocalFileSystem.getInstance().findFileByPath(TEST_DATA_PATH + "/library");
|
||||||
assertNotNull(librarySourceDir);
|
assertNotNull(librarySourceDir);
|
||||||
|
|
||||||
|
|
||||||
ExitCode compilerExec =
|
ExitCode compilerExec =
|
||||||
new K2JVMCompiler().exec(System.out, "-src", librarySourceDir.getPath(), "-output", libraryIoDir.getAbsolutePath());
|
new K2JVMCompiler().exec(System.out, "-src", librarySourceDir.getPath(), "-output", libraryDir.getPath());
|
||||||
assertEquals(ExitCode.OK, compilerExec);
|
assertEquals(ExitCode.OK, compilerExec);
|
||||||
libraryDir = LocalFileSystem.getInstance().findFileByIoFile(libraryIoDir);
|
|
||||||
assertNotNull(libraryDir);
|
assertNotNull(libraryDir);
|
||||||
|
|
||||||
((NewVirtualFile)libraryDir).markDirtyRecursively();
|
((NewVirtualFile)libraryDir).markDirtyRecursively();
|
||||||
|
|||||||
Reference in New Issue
Block a user