MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix compilation

Browse Source
This commit is contained in:
Alexey Kudravtsev
2015-09-14 14:38:18 +03:00
parent 97b2ade5e2
commit 8dfe4b86b4
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java
+16 -7
View File
@@ -146,7 +146,7 @@ public abstract class PlatformTestCase extends UsefulTestCase implements DataPro
}
private static final String[] PREFIX_CANDIDATES = {
"AppCode", "CLion", "CidrCommon",
"AppCode", "CLion", "CidrCommon",
"Python", "PyCharmCore", "Ruby", "UltimateLangXml", "Idea", "PlatformLangXml" };
/**
@@ -235,7 +235,6 @@ public abstract class PlatformTestCase extends UsefulTestCase implements DataPro
myProjectManager.openTestProject(myProject);
LocalFileSystem.getInstance().refreshIoFiles(myFilesToDelete);
myProjectManager.openTestProject(myProject);
setUpModule();
setUpJdk();
@@ -246,15 +245,14 @@ public abstract class PlatformTestCase extends UsefulTestCase implements DataPro
((FileTypeManagerImpl)FileTypeManager.getInstance()).drainReDetectQueue();
}
protected Project doCreateProject(File projectFile) throws Exception {
protected Project doCreateProject(@NotNull File projectFile) throws Exception {
return createProject(projectFile, getClass().getName() + "." + getName());
}
@NotNull
public static Project createProject(File projectFile, String creationPlace) {
try {
Project project =
ProjectManagerEx.getInstanceEx().newProject(FileUtil.getNameWithoutExtension(projectFile), projectFile.getPath(), false, false);
Project project = ProjectManagerEx.getInstanceEx().newProject(FileUtil.getNameWithoutExtension(projectFile), projectFile.getPath(), false, false);
assert project != null;
project.putUserData(CREATION_PLACE, creationPlace);
@@ -877,14 +875,14 @@ public abstract class PlatformTestCase extends UsefulTestCase implements DataPro
}
protected static void delete(@NotNull final VirtualFile file) {
ApplicationManager.getApplication().runWriteAction(new Runnable() {
WriteCommandAction.runWriteCommandAction(null, new Runnable() {
@Override
public void run() {
try {
file.delete(null);
}
catch (IOException e) {
fail();
throw new RuntimeException(e);
}
}
});
@@ -920,6 +918,17 @@ public abstract class PlatformTestCase extends UsefulTestCase implements DataPro
return copy[0];
}
public static void copyDirContentsTo(@NotNull final VirtualFile vTestRoot, @NotNull final VirtualFile toDir) {
new WriteCommandAction.Simple(null) {
@Override
protected void run() throws Throwable {
for (VirtualFile file : vTestRoot.getChildren()) {
VfsUtil.copy(this, file, toDir);
}
}
}.execute().throwException();
}
public static void setFileText(@NotNull final VirtualFile file, @NotNull final String text) throws IOException {
new WriteAction() {
@Override