Skip to content

Commit d28f5ad

Browse files
proskijakub-bochenski
authored andcommitted
StashRepositoryTest: No need to stub getCiSkipPhrases() everywhere
Mockito returns null for unstubbed methods on mocked classes. It's OK for getCiSkipPhrases() to return null, as it's only used in isSkipBuild() that can deal with null. Stub getCiSkipPhrases() only when it's relevant to the test.
1 parent d56749e commit d28f5ad

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

src/test/java/stashpullrequestbuilder/stashpullrequestbuilder/StashRepositoryTest.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ public void getTargetPullRequests_returns_empty_list_for_no_pull_requests() thro
147147
@Test
148148
public void getTargetPullRequests_accepts_open_pull_requests() throws Exception {
149149
when(stashApiClient.getPullRequests()).thenReturn(pullRequestList);
150-
when(trigger.getCiSkipPhrases()).thenReturn("NO TEST");
151150

152151
assertThat(stashRepository.getTargetPullRequests(), contains(pullRequest));
153152
}
@@ -171,7 +170,6 @@ public void getTargetPullRequests_skips_null_state_pull_requests() throws Except
171170
@Test
172171
public void getTargetPullRequests_accepts_matching_branches() throws Exception {
173172
when(stashApiClient.getPullRequests()).thenReturn(pullRequestList);
174-
when(trigger.getCiSkipPhrases()).thenReturn("NO TEST");
175173
when(trigger.getTargetBranchesToBuild()).thenReturn("release/.*,feature/.*,testing/.*");
176174

177175
assertThat(stashRepository.getTargetPullRequests(), contains(pullRequest));
@@ -180,7 +178,6 @@ public void getTargetPullRequests_accepts_matching_branches() throws Exception {
180178
@Test
181179
public void getTargetPullRequests_accepts_matching_branches_with_padding() throws Exception {
182180
when(stashApiClient.getPullRequests()).thenReturn(pullRequestList);
183-
when(trigger.getCiSkipPhrases()).thenReturn("NO TEST");
184181
when(trigger.getTargetBranchesToBuild())
185182
.thenReturn("\trelease/.*, \n\tfeature/.* \r\n, testing/.*\r");
186183

@@ -190,7 +187,6 @@ public void getTargetPullRequests_accepts_matching_branches_with_padding() throw
190187
@Test
191188
public void getTargetPullRequests_skips_mismatching_branches() throws Exception {
192189
when(stashApiClient.getPullRequests()).thenReturn(pullRequestList);
193-
when(trigger.getCiSkipPhrases()).thenReturn("NO TEST");
194190
when(trigger.getTargetBranchesToBuild()).thenReturn("release/.*,testing/.*");
195191

196192
assertThat(stashRepository.getTargetPullRequests(), empty());
@@ -200,7 +196,6 @@ public void getTargetPullRequests_skips_mismatching_branches() throws Exception
200196
public void getTargetPullRequests_accepts_any_branch_if_Branches_to_Build_is_empty()
201197
throws Exception {
202198
when(stashApiClient.getPullRequests()).thenReturn(pullRequestList);
203-
when(trigger.getCiSkipPhrases()).thenReturn("NO TEST");
204199
when(trigger.getTargetBranchesToBuild()).thenReturn("");
205200

206201
assertThat(stashRepository.getTargetPullRequests(), contains(pullRequest));
@@ -210,7 +205,6 @@ public void getTargetPullRequests_accepts_any_branch_if_Branches_to_Build_is_emp
210205
public void getTargetPullRequests_accepts_any_branch_if_Branches_to_Build_is_null()
211206
throws Exception {
212207
when(stashApiClient.getPullRequests()).thenReturn(pullRequestList);
213-
when(trigger.getCiSkipPhrases()).thenReturn("NO TEST");
214208
when(trigger.getTargetBranchesToBuild()).thenReturn(null);
215209

216210
assertThat(stashRepository.getTargetPullRequests(), contains(pullRequest));
@@ -488,7 +482,6 @@ public void getTargetPullRequests_returns_empty_if_getPullRequests_throws() thro
488482
public void getTargetPullRequests_skips_pull_request_if_getPullRequestComments_throws()
489483
throws Exception {
490484
when(stashApiClient.getPullRequests()).thenReturn(pullRequestList);
491-
when(trigger.getCiSkipPhrases()).thenReturn("NO TEST");
492485
when(stashApiClient.getPullRequestComments(any(), any(), any()))
493486
.thenThrow(new StashApiException("cannot read PR comments"));
494487

0 commit comments

Comments
 (0)