From e90f6b3324a5e3a4fc4f982b2daa7305bd77f87c Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Wed, 16 May 2012 13:34:17 +0400
Subject: [PATCH] svn: fix tests

---
 .../testSource/org/jetbrains/idea/svn/SvnTestCase.java       | 5 ++++-
 .../org/jetbrains/idea/svn/SvnTreeConflictDataTest.java      | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java
index acf1369d58d7..ca7a6393433f 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java
@@ -26,6 +26,7 @@ import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.startup.StartupManager;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.ui.TestDialog;
+import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vcs.VcsConfiguration;
 import com.intellij.openapi.vcs.VcsException;
@@ -61,6 +62,7 @@ public abstract class SvnTestCase extends AbstractJunitVcsTestCase  {
   protected AtomicSectionsAware myRefreshCopiesStub;
   private TestClientRunner myRunner;
   protected String myWcrootName;
+  private File mySvnExcutable;
 
   protected SvnTestCase() {
     PlatformTestCase.initPlatformLangPrefix();
@@ -91,6 +93,7 @@ public abstract class SvnTestCase extends AbstractJunitVcsTestCase  {
             pluginRoot = new File(rootPath).getParentFile().getParentFile().getParentFile();
           }
           myClientBinaryPath = new File(pluginRoot, "testData/svn/bin");
+          mySvnExcutable = new File(myClientBinaryPath, SystemInfo.isWindows ? "svn.exe" : "svn");
 
           ZipUtil.extract(new File(pluginRoot, "testData/svn/newrepo.zip"), myRepoRoot, null);
 
@@ -159,7 +162,7 @@ public abstract class SvnTestCase extends AbstractJunitVcsTestCase  {
   }
 
   protected ProcessOutput runSvn(String... commandLine) throws IOException {
-    return myRunner.runClient("svn", null, myWcRoot, commandLine);
+    return myRunner.runClient(mySvnExcutable.getPath(), null, myWcRoot, commandLine);
   }
 
   protected void enableSilentOperation(final VcsConfiguration.StandardConfirmation op) {
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTreeConflictDataTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTreeConflictDataTest.java
index c4baa369fe06..c15ebdb13abe 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTreeConflictDataTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTreeConflictDataTest.java
@@ -50,6 +50,7 @@ public class SvnTreeConflictDataTest extends SvnTestCase {
   @Before
   public void setUp() throws Exception {
     myWcrootName = "wcRootConflictData";
+    myTraceClient = true;
     super.setUp();
     disableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);