Mercurial > hg > mercurial
changeset 738:1e4021519ff3
fix subrepo infos parsing in CommitsInfoBuilder + test
author | eugene.petrenko@jetbrains.com |
---|---|
date | Thu, 23 Jan 2014 15:16:10 +0100 |
parents | 73364919b7cc |
children | c27df31c72fc |
files | mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/HgSubs.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/CommitsInfoBuilderSupportTest.java |
diffstat | 2 files changed, 30 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/HgSubs.java Wed Jan 22 14:00:16 2014 +0100 +++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/HgSubs.java Thu Jan 23 15:16:10 2014 +0100 @@ -61,7 +61,7 @@ return readSubrepositories( readHgsub(Arrays.asList(StringUtil.splitByLines(hgsubText))), - readHgsub(Arrays.asList(StringUtil.splitByLines(hgsubstateText))) + readHgsubstate(Arrays.asList(StringUtil.splitByLines(hgsubstateText))) ); }
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/CommitsInfoBuilderSupportTest.java Wed Jan 22 14:00:16 2014 +0100 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/CommitsInfoBuilderSupportTest.java Thu Jan 23 15:16:10 2014 +0100 @@ -27,6 +27,7 @@ import java.io.File; import java.io.IOException; import java.util.*; +import java.util.concurrent.atomic.AtomicBoolean; import static jetbrains.buildServer.buildTriggers.vcs.mercurial.MercurialSupportBuilder.mercurialSupport; import static jetbrains.buildServer.buildTriggers.vcs.mercurial.Util.copyRepository; @@ -119,19 +120,43 @@ } } - @Test(enabled = false) - public void should_return_graphcommits() throws Exception { - VcsRoot root = vcsRoot().withLocalRepository(new File("F:\\Work\\ReSharper")).build(); + @Test + public void should_return_subrepos_graphcommits() throws Exception { + myRemoteRepo = myTempFiles.createTempDir(); + copyRepository(new File("mercurial-tests/testData/subrepos/r1"), myRemoteRepo); + VcsRoot root = vcsRoot().withUrl(myRemoteRepo).build(); + + final AtomicBoolean hasSubRepo = new AtomicBoolean(false); final long start = System.currentTimeMillis(); mySupport.collectCommits(root, CheckoutRules.DEFAULT, new CommitsInfoBuilder.CommitsConsumer() { public void consumeCommit(@NotNull CommitInfo commit) { - + if (commit.getMountPoints().size() > 0) hasSubRepo.set(true); } }); final long actual = System.currentTimeMillis() - start; System.out.println("computed in " + actual + " ms"); + + Assert.assertTrue(hasSubRepo.get(), "Must have sub-repos"); + } + + @Test(enabled = false) + public void should_return_graphcommits() throws Exception { + VcsRoot root = vcsRoot().withLocalRepository(new File("F:\\Work\\ReSharper")).build(); + + final AtomicBoolean hasSubRepo = new AtomicBoolean(false); + final long start = System.currentTimeMillis(); + mySupport.collectCommits(root, CheckoutRules.DEFAULT, new CommitsInfoBuilder.CommitsConsumer() { + public void consumeCommit(@NotNull CommitInfo commit) { + if (commit.getMountPoints().size() > 0) hasSubRepo.set(true); + } + }); + + final long actual = System.currentTimeMillis() - start; + System.out.println("computed in " + actual + " ms"); + + Assert.assertTrue(hasSubRepo.get(), "Must have sub-repos"); }