From 982d5db365e5ff5560db81bbddf488072d08ff9a Mon Sep 17 00:00:00 2001 From: Tomas Bjerre Date: Wed, 20 Jan 2016 15:50:30 +0100 Subject: [PATCH] Correcting link to blog post in README.md * And renaming package in test source --- README.md | 2 +- .../admin/data/PluginSettingsImpl.java | 2 +- .../admin/utils/NotificationBuilder.java | 2 +- .../admin/utils/PrnfbParticipantBuilder.java | 2 +- .../admin/utils/PrnfbTestBuilder.java | 6 +++--- .../admin/utils/PullRequestEventBuilder.java | 4 ++-- .../admin/utils/PullRequestRefBuilder.java | 2 +- .../admin/utils/SyncExecutorService.java | 2 +- .../prnfb/admin/NotificationsStorageTest.java | 4 ++-- .../PrnfbPullRequestEventListenerTest.java | 20 +++++++++---------- 10 files changed, 23 insertions(+), 23 deletions(-) rename src/test/java/se/bjurr/{prnbb => prnb}/admin/data/PluginSettingsImpl.java (94%) rename src/test/java/se/bjurr/{prnbb => prnb}/admin/utils/NotificationBuilder.java (95%) rename src/test/java/se/bjurr/{prnbb => prnb}/admin/utils/PrnfbParticipantBuilder.java (98%) rename src/test/java/se/bjurr/{prnbb => prnb}/admin/utils/PrnfbTestBuilder.java (98%) rename src/test/java/se/bjurr/{prnbb => prnb}/admin/utils/PullRequestEventBuilder.java (97%) rename src/test/java/se/bjurr/{prnbb => prnb}/admin/utils/PullRequestRefBuilder.java (99%) rename src/test/java/se/bjurr/{prnbb => prnb}/admin/utils/SyncExecutorService.java (98%) diff --git a/README.md b/README.md index 6a2bbcc6..07714525 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ The plugin can trigger any system, not only Jenkins. The plugin can notify any s [Here](https://raw.githubusercontent.com/tomasbjerre/pull-request-notifier-for-bitbucket/master/sandbox/all.png) is a screenshot of the admin GUI. -[Here](http://bjurr.se/building-atlassian-bitbucket-pull-requests-in-jenkins/) is a blog post that includes the plugin. +[Here](http://bjurr.se/building-atlassian-stash-pull-requests-in-jenkins/) is a blog post that includes the plugin. Available in [Atlassian Marketplace](https://marketplace.atlassian.com/plugins/se.bjurr.prnfs.pull-request-notifier-for-stash). diff --git a/src/test/java/se/bjurr/prnbb/admin/data/PluginSettingsImpl.java b/src/test/java/se/bjurr/prnb/admin/data/PluginSettingsImpl.java similarity index 94% rename from src/test/java/se/bjurr/prnbb/admin/data/PluginSettingsImpl.java rename to src/test/java/se/bjurr/prnb/admin/data/PluginSettingsImpl.java index 7c9ce8c8..393dfaf3 100644 --- a/src/test/java/se/bjurr/prnbb/admin/data/PluginSettingsImpl.java +++ b/src/test/java/se/bjurr/prnb/admin/data/PluginSettingsImpl.java @@ -1,4 +1,4 @@ -package se.bjurr.prnbb.admin.data; +package se.bjurr.prnb.admin.data; import static com.google.common.collect.Maps.newTreeMap; diff --git a/src/test/java/se/bjurr/prnbb/admin/utils/NotificationBuilder.java b/src/test/java/se/bjurr/prnb/admin/utils/NotificationBuilder.java similarity index 95% rename from src/test/java/se/bjurr/prnbb/admin/utils/NotificationBuilder.java rename to src/test/java/se/bjurr/prnb/admin/utils/NotificationBuilder.java index 835a705b..03a367ab 100644 --- a/src/test/java/se/bjurr/prnbb/admin/utils/NotificationBuilder.java +++ b/src/test/java/se/bjurr/prnb/admin/utils/NotificationBuilder.java @@ -1,4 +1,4 @@ -package se.bjurr.prnbb.admin.utils; +package se.bjurr.prnb.admin.utils; import static se.bjurr.prnfb.admin.AdminFormValues.NAME; import static se.bjurr.prnfb.admin.AdminFormValues.VALUE; diff --git a/src/test/java/se/bjurr/prnbb/admin/utils/PrnfbParticipantBuilder.java b/src/test/java/se/bjurr/prnb/admin/utils/PrnfbParticipantBuilder.java similarity index 98% rename from src/test/java/se/bjurr/prnbb/admin/utils/PrnfbParticipantBuilder.java rename to src/test/java/se/bjurr/prnb/admin/utils/PrnfbParticipantBuilder.java index 1203cc35..3aeef623 100644 --- a/src/test/java/se/bjurr/prnbb/admin/utils/PrnfbParticipantBuilder.java +++ b/src/test/java/se/bjurr/prnb/admin/utils/PrnfbParticipantBuilder.java @@ -1,4 +1,4 @@ -package se.bjurr.prnbb.admin.utils; +package se.bjurr.prnb.admin.utils; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/src/test/java/se/bjurr/prnbb/admin/utils/PrnfbTestBuilder.java b/src/test/java/se/bjurr/prnb/admin/utils/PrnfbTestBuilder.java similarity index 98% rename from src/test/java/se/bjurr/prnbb/admin/utils/PrnfbTestBuilder.java rename to src/test/java/se/bjurr/prnb/admin/utils/PrnfbTestBuilder.java index 618a483e..58e69226 100644 --- a/src/test/java/se/bjurr/prnbb/admin/utils/PrnfbTestBuilder.java +++ b/src/test/java/se/bjurr/prnb/admin/utils/PrnfbTestBuilder.java @@ -1,4 +1,4 @@ -package se.bjurr.prnbb.admin.utils; +package se.bjurr.prnb.admin.utils; import static com.google.common.base.Optional.fromNullable; import static com.google.common.base.Throwables.propagate; @@ -17,7 +17,7 @@ import static org.mockito.Matchers.anyLong; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static se.bjurr.prnbb.admin.utils.PullRequestEventBuilder.pullRequestEventBuilder; +import static se.bjurr.prnb.admin.utils.PullRequestEventBuilder.pullRequestEventBuilder; import static se.bjurr.prnfb.admin.AdminFormValues.NAME; import static se.bjurr.prnfb.admin.AdminFormValues.VALUE; import static se.bjurr.prnfb.admin.AdminFormValues.FIELDS.FORM_IDENTIFIER; @@ -37,7 +37,7 @@ import org.mockito.Matchers; -import se.bjurr.prnbb.admin.data.PluginSettingsImpl; +import se.bjurr.prnb.admin.data.PluginSettingsImpl; import se.bjurr.prnfb.ManualResource; import se.bjurr.prnfb.admin.AdminFormError; import se.bjurr.prnfb.admin.AdminFormValues; diff --git a/src/test/java/se/bjurr/prnbb/admin/utils/PullRequestEventBuilder.java b/src/test/java/se/bjurr/prnb/admin/utils/PullRequestEventBuilder.java similarity index 97% rename from src/test/java/se/bjurr/prnbb/admin/utils/PullRequestEventBuilder.java rename to src/test/java/se/bjurr/prnb/admin/utils/PullRequestEventBuilder.java index 856bc94d..d37da6fa 100644 --- a/src/test/java/se/bjurr/prnbb/admin/utils/PullRequestEventBuilder.java +++ b/src/test/java/se/bjurr/prnb/admin/utils/PullRequestEventBuilder.java @@ -1,4 +1,4 @@ -package se.bjurr.prnbb.admin.utils; +package se.bjurr.prnb.admin.utils; import static com.atlassian.bitbucket.pull.PullRequestAction.COMMENTED; import static com.atlassian.bitbucket.pull.PullRequestAction.RESCOPED; @@ -7,7 +7,7 @@ import static java.lang.Boolean.TRUE; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static se.bjurr.prnbb.admin.utils.PullRequestRefBuilder.pullRequestRefBuilder; +import static se.bjurr.prnb.admin.utils.PullRequestRefBuilder.pullRequestRefBuilder; import java.util.Set; diff --git a/src/test/java/se/bjurr/prnbb/admin/utils/PullRequestRefBuilder.java b/src/test/java/se/bjurr/prnb/admin/utils/PullRequestRefBuilder.java similarity index 99% rename from src/test/java/se/bjurr/prnbb/admin/utils/PullRequestRefBuilder.java rename to src/test/java/se/bjurr/prnb/admin/utils/PullRequestRefBuilder.java index eb5aa4da..be2c84ff 100644 --- a/src/test/java/se/bjurr/prnbb/admin/utils/PullRequestRefBuilder.java +++ b/src/test/java/se/bjurr/prnb/admin/utils/PullRequestRefBuilder.java @@ -1,4 +1,4 @@ -package se.bjurr.prnbb.admin.utils; +package se.bjurr.prnb.admin.utils; import static com.google.common.collect.Sets.newHashSet; import static org.mockito.Mockito.when; diff --git a/src/test/java/se/bjurr/prnbb/admin/utils/SyncExecutorService.java b/src/test/java/se/bjurr/prnb/admin/utils/SyncExecutorService.java similarity index 98% rename from src/test/java/se/bjurr/prnbb/admin/utils/SyncExecutorService.java rename to src/test/java/se/bjurr/prnb/admin/utils/SyncExecutorService.java index 47cf7f64..e438cd7e 100644 --- a/src/test/java/se/bjurr/prnbb/admin/utils/SyncExecutorService.java +++ b/src/test/java/se/bjurr/prnb/admin/utils/SyncExecutorService.java @@ -1,4 +1,4 @@ -package se.bjurr.prnbb.admin.utils; +package se.bjurr.prnb.admin.utils; import java.util.Collection; import java.util.List; diff --git a/src/test/java/se/bjurr/prnfb/admin/NotificationsStorageTest.java b/src/test/java/se/bjurr/prnfb/admin/NotificationsStorageTest.java index 4fca2a47..3aac00a5 100644 --- a/src/test/java/se/bjurr/prnfb/admin/NotificationsStorageTest.java +++ b/src/test/java/se/bjurr/prnfb/admin/NotificationsStorageTest.java @@ -1,8 +1,8 @@ package se.bjurr.prnfb.admin; import static com.atlassian.bitbucket.pull.PullRequestAction.OPENED; -import static se.bjurr.prnbb.admin.utils.NotificationBuilder.notificationBuilder; -import static se.bjurr.prnbb.admin.utils.PrnfbTestBuilder.prnfbTestBuilder; +import static se.bjurr.prnb.admin.utils.NotificationBuilder.notificationBuilder; +import static se.bjurr.prnb.admin.utils.PrnfbTestBuilder.prnfbTestBuilder; import static se.bjurr.prnfb.admin.AdminFormValues.DEFAULT_NAME; import static se.bjurr.prnfb.admin.AdminFormValues.FIELDS.FORM_IDENTIFIER; import static se.bjurr.prnfb.admin.AdminFormValues.FIELDS.events; diff --git a/src/test/java/se/bjurr/prnfb/admin/PrnfbPullRequestEventListenerTest.java b/src/test/java/se/bjurr/prnfb/admin/PrnfbPullRequestEventListenerTest.java index 494f8ecb..536f6697 100644 --- a/src/test/java/se/bjurr/prnfb/admin/PrnfbPullRequestEventListenerTest.java +++ b/src/test/java/se/bjurr/prnfb/admin/PrnfbPullRequestEventListenerTest.java @@ -17,13 +17,13 @@ import static javax.ws.rs.core.HttpHeaders.AUTHORIZATION; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static se.bjurr.prnbb.admin.utils.NotificationBuilder.notificationBuilder; -import static se.bjurr.prnbb.admin.utils.PrnfbParticipantBuilder.prnfbParticipantBuilder; -import static se.bjurr.prnbb.admin.utils.PrnfbTestBuilder.prnfbTestBuilder; -import static se.bjurr.prnbb.admin.utils.PullRequestEventBuilder.PREVIOUS_FROM_HASH; -import static se.bjurr.prnbb.admin.utils.PullRequestEventBuilder.PREVIOUS_TO_HASH; -import static se.bjurr.prnbb.admin.utils.PullRequestEventBuilder.pullRequestEventBuilder; -import static se.bjurr.prnbb.admin.utils.PullRequestRefBuilder.pullRequestRefBuilder; +import static se.bjurr.prnb.admin.utils.NotificationBuilder.notificationBuilder; +import static se.bjurr.prnb.admin.utils.PrnfbParticipantBuilder.prnfbParticipantBuilder; +import static se.bjurr.prnb.admin.utils.PrnfbTestBuilder.prnfbTestBuilder; +import static se.bjurr.prnb.admin.utils.PullRequestEventBuilder.PREVIOUS_FROM_HASH; +import static se.bjurr.prnb.admin.utils.PullRequestEventBuilder.PREVIOUS_TO_HASH; +import static se.bjurr.prnb.admin.utils.PullRequestEventBuilder.pullRequestEventBuilder; +import static se.bjurr.prnb.admin.utils.PullRequestRefBuilder.pullRequestRefBuilder; import static se.bjurr.prnfb.admin.AdminFormValues.BUTTON_VISIBILITY.EVERYONE; import static se.bjurr.prnfb.admin.AdminFormValues.FIELDS.FORM_IDENTIFIER; import static se.bjurr.prnfb.admin.AdminFormValues.FIELDS.FORM_TYPE; @@ -83,9 +83,9 @@ import org.junit.Test; -import se.bjurr.prnbb.admin.utils.PrnfbTestBuilder; -import se.bjurr.prnbb.admin.utils.PullRequestEventBuilder; -import se.bjurr.prnbb.admin.utils.PullRequestRefBuilder; +import se.bjurr.prnb.admin.utils.PrnfbTestBuilder; +import se.bjurr.prnb.admin.utils.PullRequestEventBuilder; +import se.bjurr.prnb.admin.utils.PullRequestRefBuilder; import se.bjurr.prnfb.listener.PrnfbPullRequestAction; import se.bjurr.prnfb.listener.PrnfbRenderer.PrnfbVariable;