From bec8f149768a63bff659a5aed5c9d2ba67cd00b5 Mon Sep 17 00:00:00 2001
From: Max Medvedev <maxim.medvedev@jetbrains.com>
Date: Tue, 23 Sep 2014 19:53:03 +0400
Subject: [PATCH] don't run refactoring tests in write command action

---
 .../move/GroovyMoveClassTest.groovy           | 23 ++++---------------
 .../move/GroovyMoveScriptTest.java            |  7 +-----
 2 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveClassTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveClassTest.groovy
index 07fc032967c1..16e6f3ddfa6c 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveClassTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveClassTest.groovy
@@ -15,12 +15,8 @@
  */
 
 package org.jetbrains.plugins.groovy.refactoring.move
-
 import com.intellij.ide.fileTemplates.FileTemplate
 import com.intellij.ide.fileTemplates.FileTemplateManager
-import com.intellij.openapi.application.Application
-import com.intellij.openapi.application.ApplicationManager
-import com.intellij.openapi.command.CommandProcessor
 import com.intellij.openapi.fileEditor.FileDocumentManager
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.*
@@ -130,21 +126,10 @@ class ${NAME} {
     assertNotNull("Package " + newPackageName + " not found", aPackage);
     final PsiDirectory[] dirs = aPackage.getDirectories();
 
-    final Application application = ApplicationManager.getApplication();
-    CommandProcessor.getInstance().executeCommand(myFixture.getProject(), new Runnable() {
-      @Override
-      public void run() {
-        application.runWriteAction(new Runnable() {
-          @Override
-          public void run() {
-            final PsiDirectory dir = dirs[dirs.length - 1];
-            final SingleSourceRootMoveDestination moveDestination =
-              new SingleSourceRootMoveDestination(PackageWrapper.create(JavaDirectoryService.getInstance().getPackage(dir)), dir);
-            new MoveClassesOrPackagesProcessor(getProject(), classes, moveDestination, true, true, null).run();
-          }
-        });
-      }
-    }, "", null);
+    final PsiDirectory dir = dirs[dirs.length - 1];
+    final SingleSourceRootMoveDestination moveDestination =
+      new SingleSourceRootMoveDestination(PackageWrapper.create(JavaDirectoryService.getInstance().getPackage(dir)), dir);
+    new MoveClassesOrPackagesProcessor(getProject(), classes, moveDestination, true, true, null).run();
 
     PsiDocumentManager.getInstance(getProject()).commitAllDocuments();
     FileDocumentManager.getInstance().saveAllDocuments();
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveScriptTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveScriptTest.java
index 84cbb69ec4d0..0047b59bd017 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveScriptTest.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveScriptTest.java
@@ -90,12 +90,7 @@ public class GroovyMoveScriptTest extends LightCodeInsightFixtureTestCase {
       Collections.addAll(classList, ((PsiClassOwner)file).getClasses());
     }
     final PsiClass[] classes = classList.toArray(new PsiClass[classList.size()]);
-    new WriteCommandAction(myFixture.getProject()) {
-      @Override
-      protected void run(Result result) throws Throwable {
-        new MoveClassesOrPackagesProcessor(getProject(), classes, new SingleSourceRootMoveDestination(PackageWrapper.create(pkg), psiDirectory), true, true, null).run();
-      }
-    }.execute();
+    new MoveClassesOrPackagesProcessor(getProject(), classes, new SingleSourceRootMoveDestination(PackageWrapper.create(pkg), psiDirectory), true, true, null).run();
 
     PsiDocumentManager.getInstance(getProject()).commitAllDocuments();
     FileDocumentManager.getInstance().saveAllDocuments();