diff options
author | Maxim Epishchev <epishev@garant.ru> | 2016-02-02 13:08:51 +0300 |
---|---|---|
committer | Maxim Epishchev <epishev@garant.ru> | 2016-02-02 13:13:07 +0300 |
commit | 4b880c7045ebf42974f833ffe9b11084c86c3408 (patch) | |
tree | 0181ae4946f8ee784542e4ff2ecad20658ebfa1d /src/test/java/BitbucketBuildFilterTest.java | |
parent | bcedbd3da1781bdf13db196f5854f945f112e27c (diff) | |
parent | 06eccb61d2aa83b9d3a7e94724a6d207011de2d4 (diff) | |
download | bbprb-4b880c7045ebf42974f833ffe9b11084c86c3408.tar.gz |
Merge branch 'CredentialsSupport' into master
Also bump pom version
Conflicts:
.gitignore
Diffstat (limited to 'src/test/java/BitbucketBuildFilterTest.java')
-rw-r--r-- | src/test/java/BitbucketBuildFilterTest.java | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/src/test/java/BitbucketBuildFilterTest.java b/src/test/java/BitbucketBuildFilterTest.java index 0fabfe4..9b84e73 100644 --- a/src/test/java/BitbucketBuildFilterTest.java +++ b/src/test/java/BitbucketBuildFilterTest.java @@ -1,8 +1,3 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ import bitbucketpullrequestbuilder.bitbucketpullrequestbuilder.BitbucketBuildFilter; import bitbucketpullrequestbuilder.bitbucketpullrequestbuilder.BitbucketCause; @@ -10,9 +5,7 @@ import bitbucketpullrequestbuilder.bitbucketpullrequestbuilder.BitbucketPullRequ import bitbucketpullrequestbuilder.bitbucketpullrequestbuilder.BitbucketRepository; import bitbucketpullrequestbuilder.bitbucketpullrequestbuilder.bitbucket.ApiClient; import bitbucketpullrequestbuilder.bitbucketpullrequestbuilder.bitbucket.Pullrequest; -import java.util.Arrays; import java.util.Calendar; -import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.regex.Pattern; @@ -25,8 +18,7 @@ import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.WithoutJenkins; /** - * - * @author maxvodo + * Tests */ public class BitbucketBuildFilterTest { @@ -288,24 +280,4 @@ public class BitbucketBuildFilterTest { for(Pullrequest.Comment comment : comments) assertFalse(repo.hasMyBuildTagInTTPComment(comment.getContent(), myBuildKey)); } - - //@Test - @WithoutJenkins - public void ttpCommentTest() { - ApiClient client = EasyMock.createNiceMock(ApiClient.class); - Collection<List<Pullrequest>> prs = new LinkedList<List<Pullrequest>>(); - - prs.add(Arrays.asList(new Pullrequest[] { - new Pullrequest() - })); - - for(List<Pullrequest> pr : prs) EasyMock.expect(client.getPullRequests()).andReturn(pr).times(1); - BitbucketPullRequestsBuilder builder = EasyMock.createMock(BitbucketPullRequestsBuilder.class); - EasyMock.replay(client, builder); - - BitbucketRepository repo = new BitbucketRepository("", builder); - repo.init(client); - - Collection<Pullrequest> targetPRs = repo.getTargetPullRequests(); - } } |