From b3e50cc26de6a5e1b004d677c07147e2fc90cc60 Mon Sep 17 00:00:00 2001
From: "Nadya.Zabrodina" <Nadya.Zabrodina@jetbrains.com>
Date: Fri, 12 Apr 2013 15:25:17 +0400
Subject: [PATCH] Hg executable chenged in  test mode: the same executable
 using for idea production hg  execution  and command line hg executor.

*Vcs global settings  for HG_Executable updated
*Annotations added
---
 plugins/hg4idea/testSrc/hg4idea/test/HgExecutor.java     | 7 ++++++-
 plugins/hg4idea/testSrc/hg4idea/test/HgPlatformTest.java | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/plugins/hg4idea/testSrc/hg4idea/test/HgExecutor.java b/plugins/hg4idea/testSrc/hg4idea/test/HgExecutor.java
index 0544e2ac7976..fab19aa4d3c3 100644
--- a/plugins/hg4idea/testSrc/hg4idea/test/HgExecutor.java
+++ b/plugins/hg4idea/testSrc/hg4idea/test/HgExecutor.java
@@ -19,6 +19,7 @@ import com.intellij.dvcs.test.Executor;
 import com.intellij.openapi.application.PluginPathManager;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.io.FileUtil;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
 import java.util.Arrays;
@@ -31,7 +32,7 @@ public class HgExecutor extends Executor {
 
   private static final String HG_EXECUTABLE_ENV = "IDEA_TEST_HG_EXECUTABLE";
 
-  private static final String HG_EXECUTABLE = doFindExecutable();
+  @NotNull private static final String HG_EXECUTABLE = doFindExecutable();
 
   private static String doFindExecutable() {
     final String programName = "hg";
@@ -70,4 +71,8 @@ public class HgExecutor extends Executor {
     return run(split);
   }
 
+  @NotNull
+  public static String getHgExecutable() {
+    return HG_EXECUTABLE;
+  }
 }
diff --git a/plugins/hg4idea/testSrc/hg4idea/test/HgPlatformTest.java b/plugins/hg4idea/testSrc/hg4idea/test/HgPlatformTest.java
index e7bd4cdedac5..78575427cfad 100644
--- a/plugins/hg4idea/testSrc/hg4idea/test/HgPlatformTest.java
+++ b/plugins/hg4idea/testSrc/hg4idea/test/HgPlatformTest.java
@@ -79,6 +79,9 @@ public abstract class HgPlatformTest extends UsefulTestCase {
     hg("version");
 
     createRepository(myProjectRoot);
+    HgVcs hgVcs = HgVcs.getInstance(myProject);
+    assertNotNull(hgVcs);
+    hgVcs.getGlobalSettings().setHgExecutable(HgExecutor.getHgExecutable());
     myRepository = myProjectRoot;
     setUpHgrc(myRepository);