Mercurial > hg > mercurial
changeset 695:5164285ece2b
fix tests
author | eugene.petrenko@gmail.com |
---|---|
date | Thu, 19 Dec 2013 19:27:07 +0100 |
parents | 6e33b89c682b |
children | a07f685ce394 |
files | mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialModificationInfoBuilderTest.java |
diffstat | 2 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java Thu Dec 19 19:22:16 2013 +0100 +++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java Thu Dec 19 19:27:07 2013 +0100 @@ -501,6 +501,10 @@ } } + public void syncRepository(@NotNull final VcsRoot root) throws VcsException { + syncRepository(myHgVcsRootFactory.createHgRoot(root)); + } + public void syncRepository(@NotNull final HgVcsRoot root) throws VcsException { File workingDir = getWorkingDir(root); lockWorkDir(workingDir);
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialModificationInfoBuilderTest.java Thu Dec 19 19:22:16 2013 +0100 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialModificationInfoBuilderTest.java Thu Dec 19 19:27:07 2013 +0100 @@ -25,6 +25,7 @@ private File myRemoteRepository; private MercurialModificationInfoBuilder myModInfoBuilder; + private MercurialVcsSupport myVcs; @BeforeMethod public void setUp() throws Exception { @@ -38,6 +39,7 @@ Util.copyRepository(new File("mercurial-tests/testData/rep2"), myRemoteRepository); MercurialSupportBuilder hgBuilder = mercurialSupport().withConfig(config); MercurialVcsSupport vcs = hgBuilder.build(); + myVcs = vcs; myModInfoBuilder = new MercurialModificationInfoBuilder(vcs, hgBuilder.getHgRootFactory(), hgBuilder.getHgRepoFactory(), hgBuilder.getHgPathProvider()); } @@ -45,6 +47,7 @@ public void should_return_commits_for_every_revision_in_state(HgVersion _) throws Exception { VcsRoot root = vcsRoot().withUrl(myRemoteRepository.getAbsolutePath()).build(); final List<ChangeData> changes = new ArrayList<ChangeData>(); + myVcs.syncRepository(root); myModInfoBuilder.fetchChangesInfo(root, CheckoutRules.DEFAULT, Arrays.asList("505c5b9d01e6", "9ec402c74298"), new ChangesConsumer() { public void consumeChange(@NotNull ChangeData change) { changes.add(change); @@ -68,6 +71,7 @@ public void should_return_commits_for_every_revision_in_state_parent_child(HgVersion _) throws Exception { VcsRoot root = vcsRoot().withUrl(myRemoteRepository.getAbsolutePath()).build(); final List<ChangeData> changes = new ArrayList<ChangeData>(); + myVcs.syncRepository(root); myModInfoBuilder.fetchChangesInfo(root, CheckoutRules.DEFAULT, Arrays.asList("505c5b9d01e6", "9ec402c74298", "96b78d73081d"), new ChangesConsumer() { public void consumeChange(@NotNull ChangeData change) { changes.add(change); @@ -92,6 +96,7 @@ public void should_return_commits_for_every_revision_in_state_parent_gap_child(HgVersion _) throws Exception { VcsRoot root = vcsRoot().withUrl(myRemoteRepository.getAbsolutePath()).build(); final List<ChangeData> changes = new ArrayList<ChangeData>(); + myVcs.syncRepository(root); myModInfoBuilder.fetchChangesInfo(root, CheckoutRules.DEFAULT, Arrays.asList("505c5b9d01e6", "9ec402c74298", "dec47d2d49bf"), new ChangesConsumer() { public void consumeChange(@NotNull ChangeData change) { changes.add(change);