svn tests no longer require running svnadmin

This commit is contained in:
Dmitry Jemerov
2010-04-21 21:05:22 +04:00
parent 1900c326f3
commit f7d85dc91f
3 changed files with 4 additions and 6 deletions
Binary file not shown.
@@ -13,6 +13,7 @@ import com.intellij.openapi.vcs.changes.pending.DuringChangeListManagerUpdateTes
import com.intellij.openapi.vcs.impl.ProjectLevelVcsManagerImpl;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory;
import com.intellij.util.io.ZipUtil;
import org.junit.Test;
import java.io.File;
@@ -45,7 +46,7 @@ public class SvnRootAboveTest extends SvnTestCase {
}
myClientBinaryPath = new File(pluginRoot, "testData/svn/bin");
verify(runSvnAdmin("create", svnRoot.getPath()));
ZipUtil.extract(new File(pluginRoot, "testData/svn/newrepo.zip"), svnRoot, null);
// real WC root
myLocalWcRoot = new File(myTempDirFixture.getTempDirPath(), "wcroot");
@@ -22,6 +22,7 @@ import com.intellij.testFramework.AbstractVcsTestCase;
import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory;
import com.intellij.testFramework.fixtures.TempDirTestFixture;
import com.intellij.testFramework.vcs.MockChangelistBuilder;
import com.intellij.util.io.ZipUtil;
import org.junit.After;
import org.junit.Before;
@@ -57,7 +58,7 @@ public abstract class SvnTestCase extends AbstractVcsTestCase {
}
myClientBinaryPath = new File(pluginRoot, "testData/svn/bin");
verify(runSvnAdmin("create", svnRoot.getPath()));
ZipUtil.extract(new File(pluginRoot, "testData/svn/newrepo.zip"), svnRoot, null);
myWcRoot = new File(myTempDirFixture.getTempDirPath(), "wcroot");
myWcRoot.mkdir();
@@ -97,10 +98,6 @@ public abstract class SvnTestCase extends AbstractVcsTestCase {
}
}
protected ProcessOutput runSvnAdmin(String... commandLine) throws IOException {
return runClient("svnadmin", null, null, commandLine);
}
protected ProcessOutput runSvn(String... commandLine) throws IOException {
return runClient("svn", null, myWcRoot, commandLine);
}