Skip to content

Commit 78c3a0c

Browse files
committed
Added tests for other changes and issue and merge request specific changes (#362).
1 parent 36b888b commit 78c3a0c

File tree

3 files changed

+77
-7
lines changed

3 files changed

+77
-7
lines changed

src/test/java/org/gitlab4j/api/TestGitLabApiEvents.java

Lines changed: 44 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
import static org.gitlab4j.api.JsonUtils.readTreeFromResource;
66
import static org.gitlab4j.api.JsonUtils.unmarshalResource;
77
import static org.junit.Assert.assertEquals;
8+
import static org.junit.Assert.assertFalse;
89
import static org.junit.Assert.assertNotNull;
10+
import static org.junit.Assert.assertNull;
911
import static org.junit.Assert.assertTrue;
1012
import static org.mockito.BDDMockito.given;
1113
import static org.mockito.Mockito.mock;
@@ -23,7 +25,7 @@
2325
import org.gitlab4j.api.systemhooks.SystemHookManager;
2426
import org.gitlab4j.api.systemhooks.TeamMemberSystemHookEvent;
2527
import org.gitlab4j.api.utils.JacksonJson;
26-
import org.gitlab4j.api.webhook.BuildEvent;
28+
import org.gitlab4j.api.webhook.*;
2729
import org.gitlab4j.api.webhook.Event;
2830
import org.gitlab4j.api.webhook.IssueEvent;
2931
import org.gitlab4j.api.webhook.JobEvent;
@@ -65,17 +67,56 @@ public static void teardown() {
6567
@Test
6668
public void testIssueEvent() throws Exception {
6769

68-
Event issueEvent = unmarshalResource(IssueEvent.class, "issue-event.json");
70+
IssueEvent issueEvent = unmarshalResource(IssueEvent.class, "issue-event.json");
6971
assertTrue(compareJson(issueEvent, "issue-event.json"));
72+
73+
ChangeContainer<Integer> idChange = issueEvent.getChanges().get("id");
74+
assertNotNull(idChange);
75+
assertEquals(123, (int)idChange.getPrevious());
76+
assertEquals(456, (int)idChange.getCurrent());
77+
}
78+
79+
@Test
80+
public void testIssueChanges() throws Exception {
81+
82+
IssueEvent issueEvent = unmarshalResource(IssueEvent.class, "issue-event.json");
83+
assertNotNull(issueEvent);
84+
85+
ChangeContainer<Integer> idChange = issueEvent.getChanges().get("id");
86+
assertNotNull(idChange);
87+
assertEquals(123, (int)idChange.getPrevious());
88+
assertEquals(456, (int)idChange.getCurrent());
89+
90+
ChangeContainer<Boolean> confidentialChange = issueEvent.getChanges().getConfidential();
91+
assertNotNull(confidentialChange);
92+
assertFalse(confidentialChange.getPrevious());
93+
assertTrue(confidentialChange.getCurrent());
7094
}
7195

7296
@Test
7397
public void testMergeRequestEvent() throws Exception {
7498

75-
Event mergeRequestEvent = unmarshalResource(MergeRequestEvent.class, "merge-request-event.json");
99+
MergeRequestEvent mergeRequestEvent = unmarshalResource(MergeRequestEvent.class, "merge-request-event.json");
76100
assertTrue(compareJson(mergeRequestEvent, "merge-request-event.json"));
77101
}
78102

103+
@Test
104+
public void testMergeRequestEventChanges() throws Exception {
105+
106+
MergeRequestEvent mergeRequestEvent = unmarshalResource(MergeRequestEvent.class, "merge-request-event.json");
107+
assertNotNull(mergeRequestEvent);
108+
109+
ChangeContainer<Integer> iidChange = mergeRequestEvent.getChanges().get("iid");
110+
assertNotNull(iidChange);
111+
assertEquals(12, (int)iidChange.getPrevious());
112+
assertEquals(34, (int)iidChange.getCurrent());
113+
114+
ChangeContainer<String> mergeStatusChangeChange = mergeRequestEvent.getChanges().getMergeStatus();
115+
assertNotNull(mergeStatusChangeChange);
116+
assertNull(mergeStatusChangeChange.getPrevious());
117+
assertEquals("unchecked", mergeStatusChangeChange.getCurrent());
118+
}
119+
79120
@Test
80121
public void testPipelineEvent() throws Exception {
81122
Event event = unmarshalResource(PipelineEvent.class, "pipeline-event.json");

src/test/resources/org/gitlab4j/api/issue-event.json

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@
5757
"previous": "2020-06-01T08:00:00Z",
5858
"current": "2020-02-04T08:00:00Z"
5959
},
60+
"confidential": {
61+
"previous": false,
62+
"current": true
63+
},
6064
"updated_at": {
6165
"previous":"2019-04-12T01:10:28Z",
6266
"current":"2019-04-12T01:11:33Z"
@@ -65,13 +69,21 @@
6569
"previous": 2,
6670
"current": 6
6771
},
72+
"id":{
73+
"previous":123,
74+
"current":456
75+
},
76+
"iid":{
77+
"previous":12,
78+
"current":34
79+
},
6880
"milestone_id": {
6981
"previous":0,
7082
"current":1
7183
},
7284
"confidential": {
73-
"previous":true,
74-
"current":false
85+
"previous":false,
86+
"current":true
7587
},
7688
"labels": {
7789
"previous": [{

src/test/resources/org/gitlab4j/api/merge-request-event.json

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,31 @@
104104
"group_id": 41
105105
}],
106106
"changes": {
107+
"author_id": {
108+
"current":2
109+
},
107110
"updated_at": {
108-
"previous":"2019-04-12T01:10:28Z",
109-
"current":"2019-04-12T01:11:33Z"
111+
"current": "2013-12-03T17:23:34Z"
110112
},
111113
"updated_by_id": {
112114
"previous": 2,
113115
"current": 6
114116
},
117+
"id":{
118+
"previous":123,
119+
"current":456
120+
},
121+
"iid":{
122+
"previous":12,
123+
"current":34
124+
},
125+
"merge_status": {
126+
"current": "unchecked"
127+
},
128+
"milestone_id": {
129+
"previous":0,
130+
"current":1
131+
},
115132
"labels": {
116133
"previous": [{
117134
"id": 206,

0 commit comments

Comments
 (0)