Skip to content

Commit ddfb679

Browse files
strangelookingnerdstrangelookingnerd
authored
Fix JUnit5 migration (#122)
1 parent 8813a5b commit ddfb679

File tree

5 files changed

+48
-64
lines changed

5 files changed

+48
-64
lines changed

‎src/test/java/com/gitee/jenkins/connection/GiteeConnectionConfigTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import static org.hamcrest.CoreMatchers.containsString;
1111
import static org.hamcrest.CoreMatchers.is;
1212
import static org.hamcrest.MatcherAssert.assertThat;
13-
import static org.junit.Assert.assertSame;
13+
import static org.junit.jupiter.api.Assertions.assertSame;
1414
import static org.junit.jupiter.api.Assertions.assertNotNull;
1515
import static org.junit.jupiter.api.Assertions.assertTrue;
1616
import static org.mockito.Mockito.mock;
@@ -62,7 +62,7 @@
6262

6363
@WithJenkins
6464
@ExtendWith(MockServerExtension.class)
65-
public class GiteeConnectionConfigTest {
65+
class GiteeConnectionConfigTest {
6666
private static final String API_TOKEN = "secret";
6767
private static final String API_TOKEN_ID = "apiTokenId";
6868

@@ -100,7 +100,7 @@ void tearDown() {
100100
}
101101

102102
@Test
103-
public void doCheckConnection_success() {
103+
void doCheckConnection_success() {
104104
String expected = connection_success();
105105
assertThat(doCheckConnection("v5", Response.Status.OK), is(expected));
106106
}

‎src/test/java/com/gitee/jenkins/connection/GiteeConnectionTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import jenkins.model.Jenkins;
3232

3333
@WithJenkins
34-
public class GiteeConnectionTest {
34+
class GiteeConnectionTest {
3535
private static final String API_TOKEN = "secret";
3636
private static final String API_TOKEN_ID = "apiTokenId";
3737
private static final String API_TOKEN_ID_NOT_STORED = "apiTokenNotStored";
@@ -71,6 +71,6 @@ void doGetClientIdNotStoredTest() {
7171
"test", "http://localhost", API_TOKEN_ID_NOT_STORED, new GiteeV5ClientBuilder(), false, 10, 10);
7272

7373
assertThat(connection.getApiTokenId(), equalTo(API_TOKEN_ID_NOT_STORED));
74-
assertThrows(IllegalStateException.class, () -> { connection.getClient(); });
74+
assertThrows(IllegalStateException.class, connection::getClient);
7575
}
7676
}

‎src/test/java/com/gitee/jenkins/webhook/build/BuildWebHookActionTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
package com.gitee.jenkins.webhook.build;
77

8-
import static org.junit.Assert.assertNull;
8+
import static org.junit.jupiter.api.Assertions.assertNull;
99
import static org.junit.jupiter.api.Assertions.assertFalse;
1010
import static org.junit.jupiter.api.Assertions.assertThrows;
1111
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -32,7 +32,7 @@
3232
* @author Mark Waite
3333
*/
3434
@WithJenkins
35-
public class BuildWebHookActionTest {
35+
class BuildWebHookActionTest {
3636
private JenkinsRule j;
3737

3838
private FreeStyleProject project;

‎src/test/java/com/gitee/jenkins/webhook/build/NoteBuildActionTest.java‎

Lines changed: 25 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -70,39 +70,33 @@ void setUp() throws Exception {
7070
}
7171

7272
@Test
73-
void build() {
74-
assertThrows(HttpResponses.HttpResponseException.class, () -> {
75-
FreeStyleProject testProject = jenkins.createFreeStyleProject();
76-
testProject.addTrigger(trigger);
77-
new NoteBuildAction(testProject, getJson("NoteEvent.json"), null).execute(response);
78-
79-
verify(trigger).onPost(any(NoteHook.class));
80-
});
73+
void build() throws Exception {
74+
FreeStyleProject testProject = jenkins.createFreeStyleProject();
75+
testProject.addTrigger(trigger);
76+
assertThrows(HttpResponses.HttpResponseException.class, () ->
77+
new NoteBuildAction(testProject, getJson("NoteEvent.json"), null).execute(response));
78+
verify(trigger).onPost(any(NoteHook.class));
8179
}
8280

8381
@Test
84-
void build_alreadyBuiltPR_alreadyBuiltPR() {
85-
assertThrows(HttpResponses.HttpResponseException.class, () -> {
86-
FreeStyleProject testProject = jenkins.createFreeStyleProject();
87-
testProject.addTrigger(trigger);
88-
testProject.setScm(new GitSCM(gitRepoUrl));
89-
QueueTaskFuture<?> future = testProject.scheduleBuild2(
90-
0, new ParametersAction(new StringParameterValue("gitlabTargetBranch", "master")));
91-
future.get();
92-
new NoteBuildAction(testProject, getJson("NoteEvent_alreadyBuiltMR.json"), null).execute(response);
93-
94-
verify(trigger).onPost(any(NoteHook.class));
95-
});
82+
void build_alreadyBuiltPR_alreadyBuiltPR() throws Exception {
83+
FreeStyleProject testProject = jenkins.createFreeStyleProject();
84+
testProject.addTrigger(trigger);
85+
testProject.setScm(new GitSCM(gitRepoUrl));
86+
QueueTaskFuture<?> future = testProject.scheduleBuild2(
87+
0, new ParametersAction(new StringParameterValue("gitlabTargetBranch", "master")));
88+
future.get();
89+
assertThrows(HttpResponses.HttpResponseException.class, () ->
90+
new NoteBuildAction(testProject, getJson("NoteEvent_alreadyBuiltMR.json"), null).execute(response));
91+
verify(trigger).onPost(any(NoteHook.class));
9692
}
9793

9894
@Test
99-
void build_alreadyBuiltPR_differentTargetBranch() {
100-
assertThrows(HttpResponses.HttpResponseException.class, () -> {
101-
FreeStyleProject testProject = jenkins.createFreeStyleProject();
102-
testProject.addTrigger(trigger);
103-
104-
testProject.setScm(new GitSCM(gitRepoUrl));
105-
QueueTaskFuture<?> future = testProject.scheduleBuild2(
95+
void build_alreadyBuiltPR_differentTargetBranch() throws Exception {
96+
FreeStyleProject testProject = jenkins.createFreeStyleProject();
97+
testProject.addTrigger(trigger);
98+
testProject.setScm(new GitSCM(gitRepoUrl));
99+
QueueTaskFuture<?> future = testProject.scheduleBuild2(
106100
0,
107101
new GiteeWebHookCause(CauseDataBuilder.causeData()
108102
.withActionType(CauseData.ActionType.NOTE)
@@ -129,11 +123,10 @@ void build_alreadyBuiltPR_differentTargetBranch() {
129123
.withLastCommit("123")
130124
.withTargetProjectUrl("https://gitee.com/test")
131125
.build()));
132-
future.get();
133-
new NoteBuildAction(testProject, getJson("NoteEvent_alreadyBuiltMR.json"), null).execute(response);
134-
135-
verify(trigger).onPost(any(NoteHook.class));
136-
});
126+
future.get();
127+
assertThrows(HttpResponses.HttpResponseException.class, () ->
128+
new NoteBuildAction(testProject, getJson("NoteEvent_alreadyBuiltMR.json"), null).execute(response));
129+
verify(trigger).onPost(any(NoteHook.class));
137130
}
138131

139132
private String getJson(String name) throws Exception {

‎src/test/java/com/gitee/jenkins/webhook/build/PushBuildActionTest.java‎

Lines changed: 16 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import static org.junit.jupiter.api.Assertions.assertThrows;
77
import static org.mockito.ArgumentMatchers.any;
88
import static org.mockito.ArgumentMatchers.isA;
9-
import static org.mockito.Mockito.isA;
109
import static org.mockito.Mockito.mock;
1110
import static org.mockito.Mockito.never;
1211
import static org.mockito.Mockito.verify;
@@ -68,33 +67,25 @@ void skip_missingRepositoryUrl() throws Exception {
6867
}
6968

7069
@Test
71-
void build() {
72-
assertThrows(HttpResponses.HttpResponseException.class, () -> {
73-
try {
74-
FreeStyleProject testProject = jenkins.createFreeStyleProject();
75-
testProject.addTrigger(trigger);
76-
77-
// exception.expect(HttpResponses.HttpResponseException.class);
78-
new PushBuildAction(testProject, getJson("PushEvent.json"), null).execute(response);
79-
} finally {
80-
ArgumentCaptor<PushHook> pushHookArgumentCaptor = ArgumentCaptor.forClass(PushHook.class);
81-
verify(trigger).onPost(pushHookArgumentCaptor.capture());
82-
assertThat(pushHookArgumentCaptor.getValue().getProject(), is(notNullValue()));
83-
assertThat(pushHookArgumentCaptor.getValue().getProject().getWebUrl(), is(notNullValue()));
84-
}
85-
});
70+
void build() throws Exception {
71+
FreeStyleProject testProject = jenkins.createFreeStyleProject();
72+
testProject.addTrigger(trigger);
73+
assertThrows(HttpResponses.HttpResponseException.class, () ->
74+
new PushBuildAction(testProject, getJson("PushEvent.json"), null).execute(response));
75+
ArgumentCaptor<PushHook> pushHookArgumentCaptor = ArgumentCaptor.forClass(PushHook.class);
76+
verify(trigger).onPost(pushHookArgumentCaptor.capture());
77+
assertThat(pushHookArgumentCaptor.getValue().getProject(), is(notNullValue()));
78+
assertThat(pushHookArgumentCaptor.getValue().getProject().getWebUrl(), is(notNullValue()));
8679
}
8780

8881
@Test
89-
void invalidToken() {
90-
assertThrows(HttpResponses.HttpResponseException.class, () -> {
91-
FreeStyleProject testProject = jenkins.createFreeStyleProject();
92-
when(trigger.getSecretToken()).thenReturn("secret");
93-
testProject.addTrigger(trigger);
94-
new PushBuildAction(testProject, getJson("PushEvent.json"), "wrong-secret").execute(response);
95-
96-
verify(trigger, never()).onPost(any(PushHook.class));
97-
});
82+
void invalidToken() throws Exception {
83+
FreeStyleProject testProject = jenkins.createFreeStyleProject();
84+
when(trigger.getSecretToken()).thenReturn("secret");
85+
testProject.addTrigger(trigger);
86+
assertThrows(HttpResponses.HttpResponseException.class, () ->
87+
new PushBuildAction(testProject, getJson("PushEvent.json"), "wrong-secret").execute(response));
88+
verify(trigger, never()).onPost(any(PushHook.class));
9889
}
9990

10091
private String getJson(String name) throws Exception {

0 commit comments

Comments
 (0)