diff --git a/plugins/svn4idea/testData/svn/newrepo.zip b/plugins/svn4idea/testData/svn/newrepo.zip new file mode 100644 index 000000000000..f4ef47399dbf Binary files /dev/null and b/plugins/svn4idea/testData/svn/newrepo.zip differ diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnRootAboveTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnRootAboveTest.java index 43dc26719ddb..0dd15cef6541 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnRootAboveTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnRootAboveTest.java @@ -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"); diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java index 9d29401a344e..16acb4db96ab 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java @@ -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); }