From 3a64aa749946f0a8d1325aa997558bbf83f78ed0 Mon Sep 17 00:00:00 2001 From: Tomas Bjerre Date: Fri, 2 Jun 2017 08:04:43 +0200 Subject: [PATCH] Avoiding error in Eclipse --- CHANGELOG.md | 11 ++++++++ .../PrnfbPullRequestEventListenerTest.java | 27 ++++++++++++------- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f64046c..be207be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ Changelog of Pull Request Notifier for Bitbucket. ## Unreleased +### No issue + Fix typo + + [7e9306755d0f9f4](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/7e9306755d0f9f4) J.T. Conklin *2017-05-18 15:18:35* + +## 3.0 +### GitHub [#215](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/issues/215) Bitbucket Server 5.0 support + Bitbucket Server 5.0 + + [37aed01e288ac56](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/37aed01e288ac56) Tomas Bjerre *2017-05-13 12:18:26* + ### No issue Updating install script diff --git a/src/test/java/se/bjurr/prnfb/listener/PrnfbPullRequestEventListenerTest.java b/src/test/java/se/bjurr/prnfb/listener/PrnfbPullRequestEventListenerTest.java index 45dc166..37206ed 100644 --- a/src/test/java/se/bjurr/prnfb/listener/PrnfbPullRequestEventListenerTest.java +++ b/src/test/java/se/bjurr/prnfb/listener/PrnfbPullRequestEventListenerTest.java @@ -29,15 +29,6 @@ import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import com.atlassian.bitbucket.event.pull.PullRequestCommentAddedEvent; -import com.atlassian.bitbucket.event.pull.PullRequestEvent; -import com.atlassian.bitbucket.project.Project; -import com.atlassian.bitbucket.pull.PullRequest; -import com.atlassian.bitbucket.pull.PullRequestRef; -import com.atlassian.bitbucket.pull.PullRequestService; -import com.atlassian.bitbucket.repository.Repository; -import com.google.common.base.Function; - import se.bjurr.prnfb.http.ClientKeyStore; import se.bjurr.prnfb.http.HttpResponse; import se.bjurr.prnfb.http.Invoker; @@ -45,10 +36,21 @@ import se.bjurr.prnfb.service.PrnfbRenderer; import se.bjurr.prnfb.service.PrnfbRendererFactory; import se.bjurr.prnfb.service.SettingsService; +import se.bjurr.prnfb.service.VariablesContext; import se.bjurr.prnfb.settings.PrnfbNotification; import se.bjurr.prnfb.settings.PrnfbSettingsData; import se.bjurr.prnfb.settings.ValidationException; +import com.atlassian.bitbucket.event.pull.PullRequestCommentAddedEvent; +import com.atlassian.bitbucket.event.pull.PullRequestEvent; +import com.atlassian.bitbucket.project.Project; +import com.atlassian.bitbucket.pull.PullRequest; +import com.atlassian.bitbucket.pull.PullRequestRef; +import com.atlassian.bitbucket.pull.PullRequestService; +import com.atlassian.bitbucket.repository.Repository; +import com.atlassian.bitbucket.user.ApplicationUser; +import com.google.common.base.Function; + public class PrnfbPullRequestEventListenerTest { private final ClientKeyStore clientKeyStore = null; @@ -144,7 +146,12 @@ public HttpResponse invoke(UrlInvoker urlInvoker) { when(settingsService.getNotifications()) // .thenReturn(notifications); - when(prnfbRendererFactory.create(any(), any(), any(), any(), any())) // + when(prnfbRendererFactory.create( + any(PullRequest.class), + any(PrnfbPullRequestAction.class), + any(PrnfbNotification.class), + any(VariablesContext.class), + any(ApplicationUser.class))) // .thenReturn(renderer); when(renderer.render(any(), any(), any(), any())) // .thenAnswer(