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

cleanup

Browse Source
This commit is contained in:
Alexey Kudravtsev
2017-03-01 17:28:20 +03:00
parent 9f1b3fed20
commit 0f23908574
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/testFramework/src/com/intellij/testFramework/TestSourceBasedTestCase.java
+1 -1
View File
@@ -44,7 +44,7 @@ import java.io.File;
FileUtil.copyDir(currentTestRoot, new File(myTempDirectory, getTestDirectoryName()));
ApplicationManager.getApplication().runWriteAction(() -> setupContentRoot());
ApplicationManager.getApplication().runWriteAction(this::setupContentRoot);
ProjectViewTestUtil.setupImpl(getProject(), true);
}
platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/NonProjectFileAccessTest.java
+7 -10
View File
@@ -15,7 +15,7 @@
*/
package com.intellij.openapi.fileEditor;
import com.intellij.openapi.actionSystem.DataConstants;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.Result;
@@ -185,7 +185,7 @@ public class NonProjectFileAccessTest extends HeavyFileEditorManagerTestCase {
VirtualFile nonProjectFileDir12 = createFileExternally(dir);
File subDir = new File(dir, "subdir");
subDir.mkdirs();
assertTrue(subDir.mkdirs());
VirtualFile nonProjectFileDirSubdir1 = createFileExternally(subDir);
VirtualFile nonProjectFileDir2 = createNonProjectFile();
@@ -356,7 +356,7 @@ public class NonProjectFileAccessTest extends HeavyFileEditorManagerTestCase {
protected void run(@NotNull Result<VirtualFile> result) throws Throwable {
// create externally, since files created via VFS are marked for editing automatically
File file = new File(dir, FileUtil.createSequentFileName(dir, "extfile", "txt"));
file.createNewFile();
assertTrue(file.createNewFile());
result.setResult(LocalFileSystem.getInstance().refreshAndFindFileByIoFile(file));
}
}.execute().getResultObject();
@@ -399,13 +399,10 @@ public class NonProjectFileAccessTest extends HeavyFileEditorManagerTestCase {
}
private DataContext createDataContextFor(final Editor editor) {
return new DataContext() {
@Override
public Object getData(String dataId) {
if (dataId.equals(DataConstants.EDITOR)) return editor;
if (dataId.equals(DataConstants.PROJECT)) return getProject();
return null;
}
return dataId -> {
if (dataId.equals(CommonDataKeys.EDITOR.getName())) return editor;
if (dataId.equals(CommonDataKeys.PROJECT.getName())) return getProject();
return null;
};
}