Mercurial > hg > mercurial
diff mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/BaseMercurialTestCase.java @ 90:5d9c34cb543a Darjeeling-5.0.x
improving merge commits reporting
author | Pavel.Sher |
---|---|
date | Wed, 09 Dec 2009 01:28:10 +0300 |
parents | 99e757f2527b |
children | 6c1cff1f61cc |
line wrap: on
line diff
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/BaseMercurialTestCase.java Tue Dec 08 20:21:08 2009 +0300 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/BaseMercurialTestCase.java Wed Dec 09 01:28:10 2009 +0300 @@ -35,26 +35,25 @@ myTempFiles.cleanup(); } - protected VcsRootImpl createVcsRoot() throws IOException { + protected VcsRootImpl createVcsRoot(@NotNull String repPath) throws IOException { VcsRootImpl vcsRoot = new VcsRootImpl(1, Constants.VCS_NAME); vcsRoot.addProperty(Constants.HG_COMMAND_PATH_PROP, new File("mercurial-tests/testData/bin/hg.exe").getAbsolutePath()); - String repPath = getRepositoryPath(); File repository = LocalRepositoryUtil.prepareRepository(repPath); vcsRoot.addProperty(Constants.REPOSITORY_PROP, repository.getAbsolutePath()); return vcsRoot; } - protected VcsRootImpl createVcsRoot(@NotNull String branchName) throws IOException { - VcsRootImpl vcsRoot = createVcsRoot(); + protected VcsRootImpl createVcsRoot(@NotNull String repPath, @NotNull String branchName) throws IOException { + VcsRootImpl vcsRoot = createVcsRoot(repPath); vcsRoot.addProperty(Constants.BRANCH_NAME_PROP, branchName); return vcsRoot; } - private String getRepositoryPath() { - return new File("mercurial-tests/testData/rep1").getAbsolutePath(); + protected void cleanRepositoryAfterTest(@NotNull String repPath) { + LocalRepositoryUtil.forgetRepository(repPath); } - protected void cleanRepositoryAfterTest() { - LocalRepositoryUtil.forgetRepository(getRepositoryPath()); + protected String simpleRepo() { + return new File("mercurial-tests/testData/rep1").getAbsolutePath(); } }