Mercurial > hg > mercurial
changeset 642:4d76b4b8b814
Run test only if hg 1.7+ found
author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
---|---|
date | Mon, 26 Aug 2013 16:22:35 +0400 |
parents | da9ab34663d8 |
children | 2f6c4b61686a |
files | mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MergeSupportTest.java |
diffstat | 1 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MergeSupportTest.java Fri Aug 23 12:27:35 2013 +0400 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MergeSupportTest.java Mon Aug 26 16:22:35 2013 +0400 @@ -1,6 +1,7 @@ package jetbrains.buildServer.buildTriggers.vcs.mercurial; import jetbrains.buildServer.vcs.*; +import org.jetbrains.annotations.NotNull; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -18,7 +19,9 @@ import static org.testng.AssertJUnit.assertFalse; import static org.testng.AssertJUnit.assertTrue; -@Test + +@RequiredHgVersion(min = "1.7.0") +@Test(dataProviderClass = HgVersionConstraint.class, dataProvider = "installedHgVersion") public class MergeSupportTest extends BaseMercurialTestCase { private File myRemoteRepo; @@ -40,14 +43,14 @@ } - public void should_return_succesful_result_when_merge_succeeds() throws Exception { + public void should_return_succesful_result_when_merge_succeeds(@NotNull HgVersion _) throws Exception { VcsRoot root = vcsRoot().withUrl(myRemoteRepo).build(); MergeResult mergeResult = myMergeSupport.merge(root, "2742914d19b2", "default", "merge topic1 into default", new MergeOptions()); assertTrue(mergeResult.isSuccess()); } - public void result_of_succesful_merge_should_appear_in_remote_repository() throws Exception { + public void result_of_succesful_merge_should_appear_in_remote_repository(@NotNull HgVersion _) throws Exception { final String mergeDestinationBranch = "default"; final String mergeCommitMessage = "merge topic1 into default"; @@ -66,7 +69,7 @@ } - public void should_return_unsuccesful_result_when_merge_fails() throws Exception { + public void should_return_unsuccesful_result_when_merge_fails(@NotNull HgVersion _) throws Exception { VcsRoot root = vcsRoot().withUrl(myRemoteRepo).build(); MergeResult mergeResult = myMergeSupport.merge(root, "79d836707416", "default", "merge topic2 into default", new MergeOptions()); assertFalse(mergeResult.isSuccess()); @@ -74,7 +77,7 @@ } - public void result_of_failed_merge_should_not_appear_in_remote_repository() throws Exception { + public void result_of_failed_merge_should_not_appear_in_remote_repository(@NotNull HgVersion _) throws Exception { final String mergeDestinationBranch = "default"; VcsRoot root = vcsRoot().withUrl(myRemoteRepo).build(); @@ -89,7 +92,7 @@ } - public void try_merge_returns_correct_result_for_every_task() throws Exception { + public void try_merge_returns_correct_result_for_every_task(@NotNull HgVersion _) throws Exception { VcsRoot root = vcsRoot().withUrl(myRemoteRepo).build(); final MergeTask topic1ToDefault = new MergeTask("2742914d19b2", "09dd527b77ec");