From ea6a8c8d0a7fbaa649edc8c08008063da2a230f0 Mon Sep 17 00:00:00 2001 From: Nadya Zabrodina Date: Sat, 2 Nov 2013 02:02:16 +0400 Subject: [PATCH] Test for root scanner and root errors detector moved to platform. --- .../vcs/roots/VcsRootErrorsFinder.java | 2 +- .../com/intellij/openapi/vcs}/Executor.java | 2 +- .../intellij/openapi/vcs/VcsTestUtil.java} | 31 +++++++++++++++++-- .../openapi/vcs/roots/VcsPlatformTest.java | 10 +++--- .../vcs/roots/VcsRootDetectorTest.java | 26 ++++++---------- .../vcs/roots/VcsRootErrorsFinderTest.java | 22 ++++++------- .../test-stepdefs/git4idea/CommitDetails.java | 4 +-- .../git4idea/GitCherryPickStepdefs.java | 2 +- .../git4idea/GitCucumberWorld.java | 4 +-- .../git4idea/test/GitExecutor.java | 2 +- .../git4idea/test/GitTestRunEnv.java | 2 +- .../git4idea/test/GitTestUtil.java | 8 ++--- .../branch/GitBranchWorkerTest.groovy | 2 +- .../crlf/GitCrlfProblemsDetectorTest.groovy | 2 +- .../tests/git4idea/repo/GitConfigTest.java | 12 +++---- .../repo/GitRepositoryReaderTest.groovy | 4 +-- .../GithubCreatePullRequestTestBase.java | 2 +- .../github/GithubShareProjectTest.java | 2 +- .../testSrc/hg4idea/test/HgEncodingTest.java | 4 +-- .../testSrc/hg4idea/test/HgExecutor.java | 2 +- .../testSrc/hg4idea/test/HgPlatformTest.java | 4 +-- .../test/annotation/HgAnnotationTest.java | 4 +-- .../hg4idea/test/config/HgConfigTest.java | 6 ++-- .../test/history/HgBrowseChangesTest.java | 4 +-- .../hg4idea/test/history/HgHistoryTest.java | 2 +- .../hg4idea/test/history/HgLogTest.java | 4 +-- .../test/merge/HgMergeProviderTest.java | 2 +- .../test/repo/HgRealRepositoryReaderTest.java | 12 +++---- .../test/repo/HgRepositoryReaderTest.java | 8 ++--- 29 files changed, 105 insertions(+), 86 deletions(-) rename platform/{dvcs/testFramework/com/intellij/dvcs/test => vcs-impl/testSrc/com/intellij/openapi/vcs}/Executor.java (99%) rename platform/{dvcs/testFramework/com/intellij/dvcs/test/TestRepositoryUtil.java => vcs-impl/testSrc/com/intellij/openapi/vcs/VcsTestUtil.java} (88%) rename plugins/git4idea/tests/git4idea/roots/GitPlatformTest.java => platform/vcs-impl/testSrc/com/intellij/openapi/vcs/roots/VcsPlatformTest.java (95%) rename plugins/git4idea/tests/git4idea/roots/GitRootDetectorTest.java => platform/vcs-impl/testSrc/com/intellij/openapi/vcs/roots/VcsRootDetectorTest.java (94%) rename plugins/git4idea/tests/git4idea/roots/GitRootErrorsFinderTest.java => platform/vcs-impl/testSrc/com/intellij/openapi/vcs/roots/VcsRootErrorsFinderTest.java (94%) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootErrorsFinder.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootErrorsFinder.java index 9a5aa900bf40..3c2c494c7f97 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootErrorsFinder.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootErrorsFinder.java @@ -114,7 +114,7 @@ public class VcsRootErrorsFinder { return ContainerUtil.find(checkers, new Condition() { @Override public boolean value(VcsRootChecker checker) { - return checker.getSupportedVcs().getName().equals(mapping.getVcs()) && checker.isRoot(pathToCheck); + return checker.getSupportedVcs().getName().equalsIgnoreCase(mapping.getVcs()) && checker.isRoot(pathToCheck); } }) != null; } diff --git a/platform/dvcs/testFramework/com/intellij/dvcs/test/Executor.java b/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/Executor.java similarity index 99% rename from platform/dvcs/testFramework/com/intellij/dvcs/test/Executor.java rename to platform/vcs-impl/testSrc/com/intellij/openapi/vcs/Executor.java index a736f4bf2de3..5f40300f09c6 100644 --- a/platform/dvcs/testFramework/com/intellij/dvcs/test/Executor.java +++ b/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/Executor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.dvcs.test; +package com.intellij.openapi.vcs; import com.intellij.execution.process.CapturingProcessHandler; import com.intellij.execution.process.ProcessOutput; diff --git a/platform/dvcs/testFramework/com/intellij/dvcs/test/TestRepositoryUtil.java b/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/VcsTestUtil.java similarity index 88% rename from platform/dvcs/testFramework/com/intellij/dvcs/test/TestRepositoryUtil.java rename to platform/vcs-impl/testSrc/com/intellij/openapi/vcs/VcsTestUtil.java index 9b33b6719e49..a76dde616cab 100644 --- a/platform/dvcs/testFramework/com/intellij/dvcs/test/TestRepositoryUtil.java +++ b/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/VcsTestUtil.java @@ -1,4 +1,4 @@ -package com.intellij.dvcs.test; +package com.intellij.openapi.vcs; import com.intellij.openapi.application.PluginPathManager; import com.intellij.openapi.command.WriteCommandAction; @@ -7,6 +7,8 @@ import com.intellij.openapi.util.Ref; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.CharsetToolkit; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.util.Function; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -15,6 +17,8 @@ import java.io.FilenameFilter; import java.io.IOException; import java.util.Arrays; import java.util.Collection; +import java.util.Collections; +import java.util.List; import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.fail; @@ -22,8 +26,7 @@ import static junit.framework.Assert.fail; /** * @author Nadya Zabrodina */ -public class TestRepositoryUtil { - +public class VcsTestUtil { // TODO: option - create via IDEA or via java.io. In latter case no need in Project parameter. public static VirtualFile createFile(@NotNull Project project, @@ -193,4 +196,26 @@ public class TestRepositoryUtil { public static String stringifyActualExpected(@NotNull Object actual, @NotNull Object expected) { return "\nExpected:\n" + expected + "\nActual:\n" + actual; } + + @NotNull + public static String toAbsolute(@NotNull String relPath, @NotNull Project project) { + new File(toAbsolute(Collections.singletonList(relPath), project).get(0)).mkdir(); + return toAbsolute(Collections.singletonList(relPath), project).get(0); + } + + @NotNull + public static List toAbsolute(@NotNull Collection relPaths, @NotNull final Project project) { + return ContainerUtil.map2List(relPaths, new Function() { + @Override + public String fun(String s) { + try { + return FileUtil.toSystemIndependentName((new File(project.getBasePath() + "/" + s).getCanonicalPath())); + } + catch (IOException e) { + e.printStackTrace(); + return ""; + } + } + }); + } } diff --git a/plugins/git4idea/tests/git4idea/roots/GitPlatformTest.java b/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/roots/VcsPlatformTest.java similarity index 95% rename from plugins/git4idea/tests/git4idea/roots/GitPlatformTest.java rename to platform/vcs-impl/testSrc/com/intellij/openapi/vcs/roots/VcsPlatformTest.java index c435e76a0b27..a12bf406293e 100644 --- a/plugins/git4idea/tests/git4idea/roots/GitPlatformTest.java +++ b/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/roots/VcsPlatformTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package git4idea.roots; +package com.intellij.openapi.vcs.roots; import com.intellij.ide.highlighter.ModuleFileType; import com.intellij.openapi.application.Result; @@ -41,12 +41,13 @@ import java.io.IOException; import java.util.Collection; import java.util.HashSet; -import static com.intellij.dvcs.test.Executor.*; +import static com.intellij.openapi.vcs.Executor.*; + /** * @author Nadya Zabrodina */ -public abstract class GitPlatformTest extends UsefulTestCase { +public abstract class VcsPlatformTest extends UsefulTestCase { protected Project myProject; protected VirtualFile myProjectRoot; @@ -54,11 +55,12 @@ public abstract class GitPlatformTest extends UsefulTestCase { public static final String myRepositoryFolderName = "repository"; private RootModelImpl myRootModel; protected static final Collection myFilesToDelete = new HashSet(); + protected final static String myVcsName = "Git"; //now scanner test executed only for git todo: create for all protected IdeaProjectTestFixture myProjectFixture; @SuppressWarnings("JUnitTestCaseWithNonTrivialConstructors") - protected GitPlatformTest() { + protected VcsPlatformTest() { PlatformTestCase.initPlatformLangPrefix(); } diff --git a/plugins/git4idea/tests/git4idea/roots/GitRootDetectorTest.java b/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/roots/VcsRootDetectorTest.java similarity index 94% rename from plugins/git4idea/tests/git4idea/roots/GitRootDetectorTest.java rename to platform/vcs-impl/testSrc/com/intellij/openapi/vcs/roots/VcsRootDetectorTest.java index 75e5a15edc5d..c24c9b9725ac 100644 --- a/plugins/git4idea/tests/git4idea/roots/GitRootDetectorTest.java +++ b/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/roots/VcsRootDetectorTest.java @@ -13,15 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package git4idea.roots; +package com.intellij.openapi.vcs.roots; -import com.intellij.dvcs.test.Executor; -import com.intellij.dvcs.test.TestRepositoryUtil; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vcs.VcsRoot; -import com.intellij.openapi.vcs.roots.VcsRootDetectInfo; -import com.intellij.openapi.vcs.roots.VcsRootDetector; +import com.intellij.openapi.vcs.VcsTestUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; @@ -32,13 +29,14 @@ import java.io.File; import java.io.IOException; import java.util.*; -import static com.intellij.dvcs.test.Executor.cd; +import static com.intellij.openapi.vcs.Executor.cd; +import static com.intellij.openapi.vcs.Executor.mkdir; /** * @author Nadya Zabrodina */ -public class GitRootDetectorTest extends GitPlatformTest { +public class VcsRootDetectorTest extends VcsPlatformTest { public void testNoRootsInProject() throws IOException { Map> map = new HashMap>(); @@ -59,8 +57,8 @@ public class GitRootDetectorTest extends GitPlatformTest { map.put("git", Arrays.asList("community")); map.put("content_roots", Collections.emptyList()); cd(myProjectRoot); - Executor.mkdir("src"); - Executor.mkdir(".idea"); + mkdir("src"); + mkdir(".idea"); doTest(map, myProjectRoot, Arrays.asList("community"), false, false); } @@ -72,11 +70,10 @@ public class GitRootDetectorTest extends GitPlatformTest { doTest(map, myProjectRoot, Arrays.asList(dirNames), false, false); } - public void testProjectUnderVcsAboveIt() throws IOException { String subdir = "insideRepo"; cd(myRepository); - Executor.mkdir(subdir); + mkdir(subdir); Map> map = new HashMap>(); map.put("git", Arrays.asList(myRepository.getName())); map.put("content_roots", Collections.emptyList()); @@ -85,7 +82,6 @@ public class GitRootDetectorTest extends GitPlatformTest { true, true); } - public void testIDEAProject() throws IOException { String[] names = {"community", "contrib", "."}; Map> map = new HashMap>(); @@ -94,7 +90,6 @@ public class GitRootDetectorTest extends GitPlatformTest { doTest(map, myProjectRoot, Arrays.asList(names), true, false); } - public void testOneAboveAndOneUnder() throws IOException { String[] names = {myRepository.getName() + "/community", "."}; Map> map = new HashMap>(); @@ -119,14 +114,13 @@ public class GitRootDetectorTest extends GitPlatformTest { doTest(map, myRepository, Arrays.asList(names), true, true); } - public void testMultipleAboveShouldBeDetectedAsOneAbove() throws IOException { Map> map = new HashMap>(); map.put("git", Arrays.asList(".", myRepository.getName())); map.put("content_roots", Collections.emptyList()); String subdir = "insideRepo"; cd(myRepository); - Executor.mkdir(subdir); + mkdir(subdir); VirtualFile vfile = myRepository.findChild(subdir); doTest(map, vfile, Arrays.asList(myRepository.getName()), true, true); } @@ -169,7 +163,7 @@ public class GitRootDetectorTest extends GitPlatformTest { } void assertRoots(Collection expectedRelativePaths, Collection actual) { - TestRepositoryUtil.assertEqualCollections(actual, toAbsolute(expectedRelativePaths, myProject)); + VcsTestUtil.assertEqualCollections(actual, toAbsolute(expectedRelativePaths, myProject)); } @NotNull diff --git a/plugins/git4idea/tests/git4idea/roots/GitRootErrorsFinderTest.java b/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/roots/VcsRootErrorsFinderTest.java similarity index 94% rename from plugins/git4idea/tests/git4idea/roots/GitRootErrorsFinderTest.java rename to platform/vcs-impl/testSrc/com/intellij/openapi/vcs/roots/VcsRootErrorsFinderTest.java index b1bf00feabc1..9efe81347b6b 100644 --- a/plugins/git4idea/tests/git4idea/roots/GitRootErrorsFinderTest.java +++ b/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/roots/VcsRootErrorsFinderTest.java @@ -13,25 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package git4idea.roots; +package com.intellij.openapi.vcs.roots; -import com.intellij.dvcs.test.TestRepositoryUtil; import com.intellij.openapi.vcs.ProjectLevelVcsManager; import com.intellij.openapi.vcs.VcsDirectoryMapping; import com.intellij.openapi.vcs.VcsRootError; -import com.intellij.openapi.vcs.roots.VcsRootErrorsFinder; -import git4idea.GitVcs; +import com.intellij.openapi.vcs.VcsTestUtil; import org.jetbrains.annotations.NotNull; import java.io.IOException; import java.util.*; -import static git4idea.test.GitGTestUtil.toAbsolute; /** * @author Nadya Zabrodina */ -public class GitRootErrorsFinderTest extends GitPlatformTest { +public class VcsRootErrorsFinderTest extends VcsPlatformTest { static final String PROJECT = VcsDirectoryMapping.PROJECT_CONSTANT; @NotNull private ProjectLevelVcsManager myVcsManager; @@ -225,17 +222,17 @@ public class GitRootErrorsFinderTest extends GitPlatformTest { expected.addAll(extraAll(extraPaths)); } Collection actual = new VcsRootErrorsFinder(myProject).find(); - TestRepositoryUtil.assertEqualCollections(actual, expected); + VcsTestUtil.assertEqualCollections(actual, expected); } void addVcsRoots(@NotNull Collection relativeRoots) { for (String root : relativeRoots) { if (root.equals(PROJECT)) { - myVcsManager.setDirectoryMapping("", GitVcs.NAME); + myVcsManager.setDirectoryMapping("", myVcsName); } else { - String absoluteRoot = toAbsolute(root, myProject); - myVcsManager.setDirectoryMapping(absoluteRoot, GitVcs.NAME); + String absoluteRoot = VcsTestUtil.toAbsolute(root, myProject); + myVcsManager.setDirectoryMapping(absoluteRoot, myVcsName); } } } @@ -260,11 +257,12 @@ public class GitRootErrorsFinderTest extends GitPlatformTest { @NotNull VcsRootError unreg(@NotNull String path) { - return new VcsRootError(VcsRootError.Type.UNREGISTERED_ROOT, toAbsolute(path, myProject), GitVcs.NAME); + return new VcsRootError(VcsRootError.Type.UNREGISTERED_ROOT, VcsTestUtil.toAbsolute(path, myProject), myVcsName); } @NotNull VcsRootError extra(@NotNull String path) { - return new VcsRootError(VcsRootError.Type.EXTRA_MAPPING, PROJECT.equals(path) ? PROJECT : toAbsolute(path, myProject), GitVcs.NAME); + return new VcsRootError(VcsRootError.Type.EXTRA_MAPPING, PROJECT.equals(path) ? PROJECT : VcsTestUtil.toAbsolute(path, myProject), + myVcsName); } } diff --git a/plugins/git4idea/test-stepdefs/git4idea/CommitDetails.java b/plugins/git4idea/test-stepdefs/git4idea/CommitDetails.java index 76b9bebfc5b6..bd2d22aad6ba 100644 --- a/plugins/git4idea/test-stepdefs/git4idea/CommitDetails.java +++ b/plugins/git4idea/test-stepdefs/git4idea/CommitDetails.java @@ -23,8 +23,8 @@ import java.util.Collection; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static com.intellij.dvcs.test.Executor.echo; -import static com.intellij.dvcs.test.Executor.touch; +import static com.intellij.openapi.vcs.Executor.echo; +import static com.intellij.openapi.vcs.Executor.touch; import static git4idea.GitCucumberWorld.virtualCommits; import static git4idea.test.GitExecutor.git; import static org.junit.Assert.assertTrue; diff --git a/plugins/git4idea/test-stepdefs/git4idea/GitCherryPickStepdefs.java b/plugins/git4idea/test-stepdefs/git4idea/GitCherryPickStepdefs.java index 5aa6c58a9aee..f7504275d9df 100644 --- a/plugins/git4idea/test-stepdefs/git4idea/GitCherryPickStepdefs.java +++ b/plugins/git4idea/test-stepdefs/git4idea/GitCherryPickStepdefs.java @@ -43,7 +43,7 @@ import git4idea.log.GitContentRevisionFactory; import java.util.*; -import static com.intellij.dvcs.test.Executor.echo; +import static com.intellij.openapi.vcs.Executor.echo; import static git4idea.GitCucumberWorld.*; import static git4idea.test.GitExecutor.git; import static junit.framework.Assert.assertEquals; diff --git a/plugins/git4idea/test-stepdefs/git4idea/GitCucumberWorld.java b/plugins/git4idea/test-stepdefs/git4idea/GitCucumberWorld.java index f100ba54b72f..89dfd4481245 100644 --- a/plugins/git4idea/test-stepdefs/git4idea/GitCucumberWorld.java +++ b/plugins/git4idea/test-stepdefs/git4idea/GitCucumberWorld.java @@ -45,8 +45,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicReference; -import static com.intellij.dvcs.test.Executor.cd; -import static com.intellij.dvcs.test.Executor.mkdir; +import static com.intellij.openapi.vcs.Executor.cd; +import static com.intellij.openapi.vcs.Executor.mkdir; import static org.junit.Assume.assumeTrue; /** diff --git a/plugins/git4idea/testFramework/git4idea/test/GitExecutor.java b/plugins/git4idea/testFramework/git4idea/test/GitExecutor.java index a1d9704b4ee2..d77d20c6a11c 100644 --- a/plugins/git4idea/testFramework/git4idea/test/GitExecutor.java +++ b/plugins/git4idea/testFramework/git4idea/test/GitExecutor.java @@ -15,7 +15,7 @@ */ package git4idea.test; -import com.intellij.dvcs.test.Executor; +import com.intellij.openapi.vcs.Executor; import git4idea.repo.GitRepository; import java.util.Arrays; diff --git a/plugins/git4idea/testFramework/git4idea/test/GitTestRunEnv.java b/plugins/git4idea/testFramework/git4idea/test/GitTestRunEnv.java index 437f0bf5e3d3..2a5109205547 100644 --- a/plugins/git4idea/testFramework/git4idea/test/GitTestRunEnv.java +++ b/plugins/git4idea/testFramework/git4idea/test/GitTestRunEnv.java @@ -15,8 +15,8 @@ */ package git4idea.test; -import com.intellij.dvcs.test.Executor; import com.intellij.openapi.util.text.StringUtil; +import com.intellij.openapi.vcs.Executor; import org.jetbrains.annotations.NotNull; import java.io.File; diff --git a/plugins/git4idea/testFramework/git4idea/test/GitTestUtil.java b/plugins/git4idea/testFramework/git4idea/test/GitTestUtil.java index 74eec538d1cd..e5db2c9adfbd 100644 --- a/plugins/git4idea/testFramework/git4idea/test/GitTestUtil.java +++ b/plugins/git4idea/testFramework/git4idea/test/GitTestUtil.java @@ -35,10 +35,10 @@ import java.io.File; import java.util.HashMap; import java.util.Map; -import static com.intellij.dvcs.test.Executor.cd; -import static com.intellij.dvcs.test.Executor.touch; -import static com.intellij.dvcs.test.TestRepositoryUtil.createDir; -import static com.intellij.dvcs.test.TestRepositoryUtil.createFile; +import static com.intellij.openapi.vcs.Executor.cd; +import static com.intellij.openapi.vcs.Executor.touch; +import static com.intellij.openapi.vcs.VcsTestUtil.createDir; +import static com.intellij.openapi.vcs.VcsTestUtil.createFile; import static git4idea.test.GitExecutor.git; import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertNull; diff --git a/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.groovy b/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.groovy index e109fe74ce9f..8fb477b4532e 100644 --- a/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.groovy +++ b/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.groovy @@ -42,7 +42,7 @@ import org.junit.Test import java.util.regex.Matcher -import static com.intellij.dvcs.test.Executor.* +import static com.intellij.openapi.vcs.Executor.* import static git4idea.test.GitExecutor.cd import static git4idea.test.GitExecutor.git import static git4idea.test.GitScenarios.* diff --git a/plugins/git4idea/tests/git4idea/crlf/GitCrlfProblemsDetectorTest.groovy b/plugins/git4idea/tests/git4idea/crlf/GitCrlfProblemsDetectorTest.groovy index da7de5b7fefa..a5285e2bd0c3 100644 --- a/plugins/git4idea/tests/git4idea/crlf/GitCrlfProblemsDetectorTest.groovy +++ b/plugins/git4idea/tests/git4idea/crlf/GitCrlfProblemsDetectorTest.groovy @@ -24,7 +24,7 @@ import org.junit.Before import org.junit.Ignore import org.junit.Test -import static com.intellij.dvcs.test.Executor.cd +import static com.intellij.openapi.vcs.Executor.cd import static git4idea.test.GitExecutor.git import static org.junit.Assert.assertFalse import static org.junit.Assert.assertTrue diff --git a/plugins/git4idea/tests/git4idea/repo/GitConfigTest.java b/plugins/git4idea/tests/git4idea/repo/GitConfigTest.java index fa68213da981..f0690e354d56 100644 --- a/plugins/git4idea/tests/git4idea/repo/GitConfigTest.java +++ b/plugins/git4idea/tests/git4idea/repo/GitConfigTest.java @@ -17,9 +17,9 @@ package git4idea.repo; import com.google.common.base.Function; import com.google.common.collect.Collections2; -import com.intellij.dvcs.test.TestRepositoryUtil; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; +import com.intellij.openapi.vcs.VcsTestUtil; import git4idea.GitBranch; import git4idea.GitLocalBranch; import git4idea.GitRemoteBranch; @@ -40,23 +40,23 @@ public class GitConfigTest { @DataProvider(name = "remote") public Object[][] loadRemotes() throws IOException { - return TestRepositoryUtil.loadConfigData(getTestDataFolder("remote")); + return VcsTestUtil.loadConfigData(getTestDataFolder("remote")); } @DataProvider(name = "branch") public Object[][] loadBranches() throws IOException { - return TestRepositoryUtil.loadConfigData(getTestDataFolder("branch")); + return VcsTestUtil.loadConfigData(getTestDataFolder("branch")); } private static File getTestDataFolder(String subfolder) { - File testData = TestRepositoryUtil.getTestDataFolder(); + File testData = VcsTestUtil.getTestDataFolder(); return new File(new File(testData, "config"), subfolder); } @Test(dataProvider = "remote") public void testRemotes(String testName, File configFile, File resultFile) throws IOException { GitConfig config = GitConfig.read(new GitTestPlatformFacade(), configFile); - TestRepositoryUtil.assertEqualCollections(config.parseRemotes(), readRemoteResults(resultFile)); + VcsTestUtil.assertEqualCollections(config.parseRemotes(), readRemoteResults(resultFile)); } @Test(dataProvider = "branch") @@ -77,7 +77,7 @@ public class GitConfigTest { } }); - TestRepositoryUtil.assertEqualCollections( + VcsTestUtil.assertEqualCollections( GitConfig.read(new GitTestPlatformFacade(), configFile).parseTrackInfos(localBranches, remoteBranches), expectedInfos); } diff --git a/plugins/git4idea/tests/git4idea/repo/GitRepositoryReaderTest.groovy b/plugins/git4idea/tests/git4idea/repo/GitRepositoryReaderTest.groovy index 6fc661d2be65..e1fa21e3ecec 100644 --- a/plugins/git4idea/tests/git4idea/repo/GitRepositoryReaderTest.groovy +++ b/plugins/git4idea/tests/git4idea/repo/GitRepositoryReaderTest.groovy @@ -15,9 +15,9 @@ */ package git4idea.repo -import com.intellij.dvcs.test.TestRepositoryUtil import com.intellij.openapi.application.PluginPathManager import com.intellij.openapi.util.io.FileUtil +import com.intellij.openapi.vcs.VcsTestUtil import com.intellij.util.Processor import git4idea.GitBranch import git4idea.branch.GitBranchesCollection @@ -88,7 +88,7 @@ public class GitRepositoryReaderTest extends GitLightTest { } private static void assertBranches(Collection actualBranches, Collection expectedBranches) { - TestRepositoryUtil.assertEqualCollections(actualBranches, expectedBranches, new TestRepositoryUtil.EqualityChecker() { + VcsTestUtil.assertEqualCollections(actualBranches, expectedBranches, new VcsTestUtil.EqualityChecker() { @Override public boolean areEqual(@NotNull GitBranch actual, @NotNull GitTestBranch expected) { return branchesAreEqual(actual, expected); diff --git a/plugins/github/test/org/jetbrains/plugins/github/GithubCreatePullRequestTestBase.java b/plugins/github/test/org/jetbrains/plugins/github/GithubCreatePullRequestTestBase.java index 741ccd6e08f4..643c3d2db5f0 100644 --- a/plugins/github/test/org/jetbrains/plugins/github/GithubCreatePullRequestTestBase.java +++ b/plugins/github/test/org/jetbrains/plugins/github/GithubCreatePullRequestTestBase.java @@ -33,7 +33,7 @@ import org.jetbrains.plugins.github.util.GithubUtil; import java.util.Random; -import static com.intellij.dvcs.test.Executor.cd; +import static com.intellij.openapi.vcs.Executor.cd; import static git4idea.test.GitExecutor.git; /** diff --git a/plugins/github/test/org/jetbrains/plugins/github/GithubShareProjectTest.java b/plugins/github/test/org/jetbrains/plugins/github/GithubShareProjectTest.java index fe2f40a82593..c4063629cbbe 100644 --- a/plugins/github/test/org/jetbrains/plugins/github/GithubShareProjectTest.java +++ b/plugins/github/test/org/jetbrains/plugins/github/GithubShareProjectTest.java @@ -9,7 +9,7 @@ import org.jetbrains.plugins.github.util.GithubAuthData; import java.io.IOException; -import static com.intellij.dvcs.test.Executor.cd; +import static com.intellij.openapi.vcs.Executor.cd; import static git4idea.test.GitExecutor.git; /** diff --git a/plugins/hg4idea/testSrc/hg4idea/test/HgEncodingTest.java b/plugins/hg4idea/testSrc/hg4idea/test/HgEncodingTest.java index 9c2d0648ee63..1e5e3ee9f6a3 100644 --- a/plugins/hg4idea/testSrc/hg4idea/test/HgEncodingTest.java +++ b/plugins/hg4idea/testSrc/hg4idea/test/HgEncodingTest.java @@ -25,8 +25,8 @@ import org.zmlx.hg4idea.execution.HgCommandException; import java.util.List; -import static com.intellij.dvcs.test.Executor.cd; -import static com.intellij.dvcs.test.Executor.echo; +import static com.intellij.openapi.vcs.Executor.cd; +import static com.intellij.openapi.vcs.Executor.echo; /** * @author Nadya Zabrodina diff --git a/plugins/hg4idea/testSrc/hg4idea/test/HgExecutor.java b/plugins/hg4idea/testSrc/hg4idea/test/HgExecutor.java index 02a74da03b2c..db23fda54740 100644 --- a/plugins/hg4idea/testSrc/hg4idea/test/HgExecutor.java +++ b/plugins/hg4idea/testSrc/hg4idea/test/HgExecutor.java @@ -15,10 +15,10 @@ */ package hg4idea.test; -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 com.intellij.openapi.vcs.Executor; import org.jetbrains.annotations.NotNull; import java.io.File; diff --git a/plugins/hg4idea/testSrc/hg4idea/test/HgPlatformTest.java b/plugins/hg4idea/testSrc/hg4idea/test/HgPlatformTest.java index 4e3af6c0d524..95c834c004b6 100644 --- a/plugins/hg4idea/testSrc/hg4idea/test/HgPlatformTest.java +++ b/plugins/hg4idea/testSrc/hg4idea/test/HgPlatformTest.java @@ -32,8 +32,8 @@ import org.zmlx.hg4idea.util.HgUtil; import java.io.File; import java.io.IOException; -import static com.intellij.dvcs.test.Executor.cd; -import static com.intellij.dvcs.test.Executor.touch; +import static com.intellij.openapi.vcs.Executor.cd; +import static com.intellij.openapi.vcs.Executor.touch; import static hg4idea.test.HgExecutor.hg; /** diff --git a/plugins/hg4idea/testSrc/hg4idea/test/annotation/HgAnnotationTest.java b/plugins/hg4idea/testSrc/hg4idea/test/annotation/HgAnnotationTest.java index 8a0fa9d9f01b..86487916a687 100644 --- a/plugins/hg4idea/testSrc/hg4idea/test/annotation/HgAnnotationTest.java +++ b/plugins/hg4idea/testSrc/hg4idea/test/annotation/HgAnnotationTest.java @@ -14,8 +14,8 @@ import java.util.Arrays; import java.util.Date; import java.util.List; -import static com.intellij.dvcs.test.Executor.cd; -import static com.intellij.dvcs.test.Executor.echo; +import static com.intellij.openapi.vcs.Executor.cd; +import static com.intellij.openapi.vcs.Executor.echo; import static hg4idea.test.HgExecutor.hg; /** diff --git a/plugins/hg4idea/testSrc/hg4idea/test/config/HgConfigTest.java b/plugins/hg4idea/testSrc/hg4idea/test/config/HgConfigTest.java index 62c0abaa21ad..8b69c2d74ed4 100644 --- a/plugins/hg4idea/testSrc/hg4idea/test/config/HgConfigTest.java +++ b/plugins/hg4idea/testSrc/hg4idea/test/config/HgConfigTest.java @@ -1,7 +1,7 @@ package hg4idea.test.config; -import com.intellij.dvcs.test.TestRepositoryUtil; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.vcs.VcsTestUtil; import hg4idea.test.HgPlatformTest; import org.zmlx.hg4idea.util.HgUtil; @@ -10,7 +10,7 @@ import java.io.IOException; import java.util.Arrays; import java.util.Collection; -import static com.intellij.dvcs.test.Executor.cd; +import static com.intellij.openapi.vcs.Executor.cd; /** * @author Nadya Zabrodina @@ -63,7 +63,7 @@ public class HgConfigTest extends HgPlatformTest { updateRepoConfig(myProject, myChildRepo); final Collection paths = HgUtil.getRepositoryPaths(myProject, myChildRepo); final Collection expectedPaths = Arrays.asList(FileUtil.toSystemDependentName(myRepository.getPath()), path1, path2, path3); - TestRepositoryUtil.assertEqualCollections(paths,expectedPaths); + VcsTestUtil.assertEqualCollections(paths, expectedPaths); } public void testLargeExtensionInClonedRepo() throws IOException { diff --git a/plugins/hg4idea/testSrc/hg4idea/test/history/HgBrowseChangesTest.java b/plugins/hg4idea/testSrc/hg4idea/test/history/HgBrowseChangesTest.java index 1f7bf027ad75..5b5782731144 100644 --- a/plugins/hg4idea/testSrc/hg4idea/test/history/HgBrowseChangesTest.java +++ b/plugins/hg4idea/testSrc/hg4idea/test/history/HgBrowseChangesTest.java @@ -27,8 +27,8 @@ import org.zmlx.hg4idea.provider.HgRepositoryLocation; import java.text.ParseException; import java.util.List; -import static com.intellij.dvcs.test.Executor.cd; -import static com.intellij.dvcs.test.Executor.touch; +import static com.intellij.openapi.vcs.Executor.cd; +import static com.intellij.openapi.vcs.Executor.touch; import static hg4idea.test.HgExecutor.hg; /** diff --git a/plugins/hg4idea/testSrc/hg4idea/test/history/HgHistoryTest.java b/plugins/hg4idea/testSrc/hg4idea/test/history/HgHistoryTest.java index 81c0c219e779..0af39b095804 100644 --- a/plugins/hg4idea/testSrc/hg4idea/test/history/HgHistoryTest.java +++ b/plugins/hg4idea/testSrc/hg4idea/test/history/HgHistoryTest.java @@ -28,7 +28,7 @@ import org.zmlx.hg4idea.util.HgUtil; import java.io.File; import java.util.List; -import static com.intellij.dvcs.test.Executor.*; +import static com.intellij.openapi.vcs.Executor.*; import static hg4idea.test.HgExecutor.hg; /** diff --git a/plugins/hg4idea/testSrc/hg4idea/test/history/HgLogTest.java b/plugins/hg4idea/testSrc/hg4idea/test/history/HgLogTest.java index d6f9d7b2e7bc..b57f0efeb73c 100644 --- a/plugins/hg4idea/testSrc/hg4idea/test/history/HgLogTest.java +++ b/plugins/hg4idea/testSrc/hg4idea/test/history/HgLogTest.java @@ -11,8 +11,8 @@ import org.zmlx.hg4idea.execution.HgCommandException; import java.util.List; -import static com.intellij.dvcs.test.Executor.cd; -import static com.intellij.dvcs.test.Executor.touch; +import static com.intellij.openapi.vcs.Executor.cd; +import static com.intellij.openapi.vcs.Executor.touch; import static hg4idea.test.HgExecutor.hg; /** diff --git a/plugins/hg4idea/testSrc/hg4idea/test/merge/HgMergeProviderTest.java b/plugins/hg4idea/testSrc/hg4idea/test/merge/HgMergeProviderTest.java index 35e65e9a1822..1fc377d4f6b8 100644 --- a/plugins/hg4idea/testSrc/hg4idea/test/merge/HgMergeProviderTest.java +++ b/plugins/hg4idea/testSrc/hg4idea/test/merge/HgMergeProviderTest.java @@ -27,7 +27,7 @@ import org.zmlx.hg4idea.HgVcs; import java.io.IOException; -import static com.intellij.dvcs.test.Executor.*; +import static com.intellij.openapi.vcs.Executor.*; import static hg4idea.test.HgExecutor.hg; import static hg4idea.test.HgExecutor.updateProject; diff --git a/plugins/hg4idea/testSrc/hg4idea/test/repo/HgRealRepositoryReaderTest.java b/plugins/hg4idea/testSrc/hg4idea/test/repo/HgRealRepositoryReaderTest.java index 642e125f1f11..73a1a58e28b8 100644 --- a/plugins/hg4idea/testSrc/hg4idea/test/repo/HgRealRepositoryReaderTest.java +++ b/plugins/hg4idea/testSrc/hg4idea/test/repo/HgRealRepositoryReaderTest.java @@ -16,7 +16,7 @@ package hg4idea.test.repo; import com.intellij.dvcs.repo.Repository; -import com.intellij.dvcs.test.TestRepositoryUtil; +import com.intellij.openapi.vcs.VcsTestUtil; import hg4idea.test.HgPlatformTest; import org.jetbrains.annotations.NotNull; import org.zmlx.hg4idea.repo.HgRepositoryReader; @@ -25,7 +25,7 @@ import org.zmlx.hg4idea.util.HgUtil; import java.io.File; import java.util.Arrays; -import static com.intellij.dvcs.test.Executor.*; +import static com.intellij.openapi.vcs.Executor.*; import static hg4idea.test.HgExecutor.hg; /** @@ -58,17 +58,17 @@ public class HgRealRepositoryReaderTest extends HgPlatformTest { } public void testBranches() { - TestRepositoryUtil.assertEqualCollections(HgUtil.getNamesWithoutHashes(myRepositoryReader.readBranches()), + VcsTestUtil.assertEqualCollections(HgUtil.getNamesWithoutHashes(myRepositoryReader.readBranches()), Arrays.asList("default", "branchA", "branchB")); } public void testTags() { - TestRepositoryUtil.assertEqualCollections(HgUtil.getNamesWithoutHashes(myRepositoryReader.readTags()), + VcsTestUtil.assertEqualCollections(HgUtil.getNamesWithoutHashes(myRepositoryReader.readTags()), Arrays.asList("tag1", "tag2")); } public void testLocalTags() { - TestRepositoryUtil.assertEqualCollections(HgUtil.getNamesWithoutHashes(myRepositoryReader.readLocalTags()), + VcsTestUtil.assertEqualCollections(HgUtil.getNamesWithoutHashes(myRepositoryReader.readLocalTags()), Arrays.asList("localTag")); } @@ -78,7 +78,7 @@ public class HgRealRepositoryReaderTest extends HgPlatformTest { } public void testBookmarks() { - TestRepositoryUtil.assertEqualCollections(HgUtil.getNamesWithoutHashes(myRepositoryReader.readBookmarks()), + VcsTestUtil.assertEqualCollections(HgUtil.getNamesWithoutHashes(myRepositoryReader.readBookmarks()), Arrays.asList("A_BookMark", "B_BookMark", "C_BookMark")); } diff --git a/plugins/hg4idea/testSrc/hg4idea/test/repo/HgRepositoryReaderTest.java b/plugins/hg4idea/testSrc/hg4idea/test/repo/HgRepositoryReaderTest.java index 872951ca5be8..c770de22cd42 100644 --- a/plugins/hg4idea/testSrc/hg4idea/test/repo/HgRepositoryReaderTest.java +++ b/plugins/hg4idea/testSrc/hg4idea/test/repo/HgRepositoryReaderTest.java @@ -15,9 +15,9 @@ */ package hg4idea.test.repo; -import com.intellij.dvcs.test.TestRepositoryUtil; import com.intellij.openapi.application.PluginPathManager; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.vcs.VcsTestUtil; import hg4idea.test.HgPlatformTest; import org.jetbrains.annotations.NotNull; import org.zmlx.hg4idea.repo.HgRepositoryReader; @@ -81,12 +81,12 @@ public class HgRepositoryReaderTest extends HgPlatformTest { public void testBranches() { Collection branches = HgUtil.getNamesWithoutHashes(myRepositoryReader.readBranches()); - TestRepositoryUtil.assertEqualCollections(branches, myBranches); + VcsTestUtil.assertEqualCollections(branches, myBranches); } public void testBookmarks() { - Collection bookmarks = HgUtil.getNamesWithoutHashes(myRepositoryReader.readBookmarks()); - TestRepositoryUtil.assertEqualCollections(bookmarks, myBookmarks); + Collection bookmarks = myRepositoryReader.readBookmarks(); + VcsTestUtil.assertEqualCollections(bookmarks, myBookmarks); } public void testTags() {