From 109f50685b49ccd942e61d4f4ec444cc8fec14fb Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Tue, 11 Dec 2012 20:28:58 +0400
Subject: [PATCH] [git] Make Executor & GitExecutor static

---
 .../com/intellij/dvcs/test/Executor.groovy    | 25 +++++++++----------
 .../git4idea/test/GitExecutor.groovy          |  8 +++---
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/platform/dvcs/testFramework/com/intellij/dvcs/test/Executor.groovy b/platform/dvcs/testFramework/com/intellij/dvcs/test/Executor.groovy
index 72220b35cf20..f05f5d4b8795 100644
--- a/platform/dvcs/testFramework/com/intellij/dvcs/test/Executor.groovy
+++ b/platform/dvcs/testFramework/com/intellij/dvcs/test/Executor.groovy
@@ -25,21 +25,20 @@ import com.intellij.openapi.vfs.CharsetToolkit
  *
  * @author Kirill Likhodedov
  */
-@SuppressWarnings("GrMethodMayBeStatic")
 public class Executor {
 
   private static String ourCurrentDir
 
-  public cd(String path) {
+  public static cd(String path) {
     ourCurrentDir = path
     println "cd ${shortenPath(path)}"
   }
 
-  public String pwd() {
+  public static String pwd() {
     ourCurrentDir
   }
 
-  public String touch(String fileName) {
+  public static String touch(String fileName) {
     File file = child(fileName)
     assert !file.exists()
     file.createNewFile()
@@ -47,34 +46,34 @@ public class Executor {
     file.path
   }
 
-  public String touch(String fileName, String content) {
+  public static String touch(String fileName, String content) {
     String filePath = touch(fileName)
     echo(fileName, content)
     filePath
   }
 
-  public void echo(String fileName, String content) {
+  public static void echo(String fileName, String content) {
     child(fileName).withWriterAppend("UTF-8") { it.write(content) }
   }
 
-  public String mkdir(String dirName) {
+  public static String mkdir(String dirName) {
     File file = child(dirName)
     file.mkdir()
     println("mkdir $dirName")
     file.path
   }
 
-  public String cat(String fileName) {
+  public static String cat(String fileName) {
     def content = FileUtil.loadFile(child(fileName))
     println("cat fileName")
     content
   }
 
-  public void cp(String fileName, File destinationDir) {
+  public static void cp(String fileName, File destinationDir) {
     FileUtil.copy(child(fileName), new File(destinationDir, fileName))
   }
 
-  protected String run(List<String> params) {
+  protected static String run(List<String> params) {
     final ProcessBuilder builder = new ProcessBuilder().command(params);
     builder.directory(ourCurrentDir());
     builder.redirectErrorStream(true);
@@ -126,7 +125,7 @@ public class Executor {
     println msg
   }
 
-  private  String shortenPath(String path) {
+  private static String shortenPath(String path) {
     def split = path.split("/")
     if (split.size() > 3) {
       // split[0] is empty, because the path starts from /
@@ -135,12 +134,12 @@ public class Executor {
     return path
   }
 
-  private File child(String fileName) {
+  private static File child(String fileName) {
     assert ourCurrentDir != null : "Current dir hasn't been initialized yet. Call cd at least once before any other command."
     new File(ourCurrentDir, fileName)
   }
 
-  private File ourCurrentDir() {
+  private static File ourCurrentDir() {
     assert ourCurrentDir != null : "Current dir hasn't been initialized yet. Call cd at least once before any other command."
     new File(ourCurrentDir)
   }
diff --git a/plugins/git4idea/testFramework/git4idea/test/GitExecutor.groovy b/plugins/git4idea/testFramework/git4idea/test/GitExecutor.groovy
index b16be9364842..74845a1c0691 100644
--- a/plugins/git4idea/testFramework/git4idea/test/GitExecutor.groovy
+++ b/plugins/git4idea/testFramework/git4idea/test/GitExecutor.groovy
@@ -34,7 +34,7 @@ class GitExecutor extends Executor {
     return findExecutable("Git", "git", "git.exe", [ GIT_EXECUTABLE_ENV, TEAMCITY_GIT_EXECUTABLE_ENV ])
   }
 
-  public String git(String command) {
+  public static String git(String command) {
     printVersionTheFirstTime();
     def split = StringUtil.split(command, " ")
     split.add(0, GIT_EXECUTABLE)
@@ -53,16 +53,16 @@ class GitExecutor extends Executor {
     throw new RuntimeException("fatal error during execution of Git command: $command");
   }
 
-  public String git(GitRepository repository, String command) {
+  public static String git(GitRepository repository, String command) {
     cd repository.root.path
     git command
   }
 
-  public void cd(GitRepository repository) {
+  public static void cd(GitRepository repository) {
     cd repository.root.path
   }
 
-  private void printVersionTheFirstTime() {
+  private static void printVersionTheFirstTime() {
     if (!myVersionPrinted) {
       myVersionPrinted = true;
       git("version")