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

redundant write action in tests removed

Browse Source
This commit is contained in:
Anna.Kozlova
2016-04-29 19:22:54 +02:00
parent 4bdfd976cd
commit 93da26f5b6
4 changed files with 21 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/JarRootsRefreshTest.java
+2 -12
View File
@@ -73,12 +73,7 @@ public class JarRootsRefreshTest extends PlatformTestCase {
assertTrue(jarRoot.isValid());
PsiDirectory directory = getPsiManager().findDirectory(vLibDir);
DataContext psiDataContext = SimpleDataContext.getSimpleContext(LangDataKeys.TARGET_PSI_ELEMENT.getName(), directory);
new WriteCommandAction.Simple(myProject) {
@Override
protected void run() throws Throwable {
new MoveHandler().invoke(myProject, new PsiElement[] {file}, psiDataContext);
}
}.execute();
new MoveHandler().invoke(myProject, new PsiElement[] {file}, psiDataContext);
assertFalse(jarRoot.isValid());
jarRoot = JarFileSystem.getInstance().getRootByLocal(vFile);
@@ -92,11 +87,6 @@ public class JarRootsRefreshTest extends PlatformTestCase {
DataContext psiDataContext = SimpleDataContext.getSimpleContext(CommonDataKeys.PSI_ELEMENT.getName(), file);
RenameHandler renameHandler = RenameHandlerRegistry.getInstance().getRenameHandler(psiDataContext);
assertNotNull(renameHandler);
new WriteCommandAction.Simple(file.getProject()) {
@Override
public void run() {
PsiElementRenameHandler.rename(file, file.getProject(), file, null, newName);
}
}.execute();
PsiElementRenameHandler.rename(file, file.getProject(), file, null, newName);
}
}
platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
+7 -12
View File
@@ -1057,18 +1057,13 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig
public void moveFile(@NotNull final String filePath, @NotNull final String to, @NotNull final String... additionalFiles) {
assertInitialized();
final Project project = getProject();
new WriteCommandAction.Simple(project) {
@Override
protected void run() throws Exception {
configureByFiles(ArrayUtil.reverseArray(ArrayUtil.append(additionalFiles, filePath)));
final VirtualFile file = findFileInTempDir(to);
Assert.assertNotNull("Directory " + to + " not found", file);
Assert.assertTrue(to + " is not a directory", file.isDirectory());
final PsiDirectory directory = myPsiManager.findDirectory(file);
new MoveFilesOrDirectoriesProcessor(project, new PsiElement[]{getFile()}, directory,
false, false, null, null).run();
}
}.execute().throwException();
configureByFiles(ArrayUtil.reverseArray(ArrayUtil.append(additionalFiles, filePath)));
final VirtualFile file = findFileInTempDir(to);
Assert.assertNotNull("Directory " + to + " not found", file);
Assert.assertTrue(to + " is not a directory", file.isDirectory());
final PsiDirectory directory = myPsiManager.findDirectory(file);
new MoveFilesOrDirectoriesProcessor(project, new PsiElement[]{getFile()}, directory,
false, false, null, null).run();
}
@Override
plugins/properties/testSrc/com/intellij/lang/properties/ResourceBundleTest.java
+5
View File
@@ -76,4 +76,9 @@ public class ResourceBundleTest extends LightPlatformCodeInsightFixtureTestCase
assertEquals(fileNameToCheckAfter, toCheck.getName());
}
@Override
protected boolean isWriteActionRequired() {
return false;
}
}
xml/relaxng/test/org/intellij/plugins/relaxNG/RncRenameTest.java
+7 -13
View File
@@ -16,7 +16,6 @@
package org.intellij.plugins.relaxNG;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
@@ -80,18 +79,13 @@ public class RncRenameTest extends HighlightingTestBase {
final PsiFile file = PsiManager.getInstance(project).findFile(copy);
assertNotNull(file);
new WriteCommandAction.Simple(project) {
@Override
protected void run() throws Throwable {
myTestFixture.configureByFile("rename-in-include.rnc");
final RenameRefactoring refactoring = factory.createRename(file, "rename-after.rnc");
refactoring.setPreviewUsages(false);
refactoring.setSearchInComments(false);
refactoring.setSearchInNonJavaFiles(true);
refactoring.run();
myTestFixture.checkResultByFile("rename-in-include_after.rnc");
}
}.execute().throwException();
myTestFixture.configureByFile("rename-in-include.rnc");
final RenameRefactoring refactoring = factory.createRename(file, "rename-after.rnc");
refactoring.setPreviewUsages(false);
refactoring.setSearchInComments(false);
refactoring.setSearchInNonJavaFiles(true);
refactoring.run();
myTestFixture.checkResultByFile("rename-in-include_after.rnc");
assertEquals("rename-after.rnc", file.getName());
}