diff options
author | S.Nishio <nishio@densan-labs.net> | 2016-02-07 16:46:06 +0900 |
---|---|---|
committer | S.Nishio <nishio@densan-labs.net> | 2016-02-07 16:46:06 +0900 |
commit | 77e9636ee92d8d5635be21b9598d5b37b58a7951 (patch) | |
tree | cc44795d13511885860b4372e255e758984f48ea /src/test/java/BitbucketBuildFilterTest.java | |
parent | bcedbd3da1781bdf13db196f5854f945f112e27c (diff) | |
parent | 85a09f7392c50531365e89e94766a9caf3cac0f1 (diff) | |
download | bbprb-77e9636ee92d8d5635be21b9598d5b37b58a7951.tar.gz |
Merge pull request #74 from maxvodo/master
Add support for credentials from the Jenkins credentials store
Diffstat (limited to 'src/test/java/BitbucketBuildFilterTest.java')
-rw-r--r-- | src/test/java/BitbucketBuildFilterTest.java | 39 |
1 files changed, 7 insertions, 32 deletions
diff --git a/src/test/java/BitbucketBuildFilterTest.java b/src/test/java/BitbucketBuildFilterTest.java index 0fabfe4..3b35dbc 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,23 +5,23 @@ 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; + import jenkins.plugins.git.AbstractGitSCMSource; +import org.jvnet.hudson.test.JenkinsRule; +import org.jvnet.hudson.test.WithoutJenkins; + import org.easymock.*; import org.junit.Test; -import static org.junit.Assert.*; import org.junit.Rule; -import org.jvnet.hudson.test.JenkinsRule; -import org.jvnet.hudson.test.WithoutJenkins; +import static org.junit.Assert.*; /** - * - * @author maxvodo + * Tests */ public class BitbucketBuildFilterTest { @@ -288,24 +283,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(); - } } |