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

svn: fix tests

Browse Source
This commit is contained in:
irengrig
2012-05-16 13:34:17 +04:00
parent 2bbb2a9432
commit e90f6b3324
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java
+4 -1
View File
@@ -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) {
plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTreeConflictDataTest.java
+1
View File
@@ -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);