Skip to content

Commit 7197da9

Browse files
committed
Re-enable unit tests
See #1166
1 parent 47030d5 commit 7197da9

File tree

3 files changed

+26
-4
lines changed

3 files changed

+26
-4
lines changed

Diff for: build.gradle

+6-1
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@ dependencies {
2222
api 'org.glassfish.jersey.media:jersey-media-multipart:2.39.1'
2323
api 'org.glassfish.jersey.media:jersey-media-json-jackson:2.39.1'
2424
api 'jakarta.servlet:jakarta.servlet-api:4.0.4'
25-
testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
2625
testImplementation 'org.mockito:mockito-core:4.4.0'
2726
testImplementation 'org.mockito:mockito-junit-jupiter:4.4.0'
2827
testImplementation 'org.hamcrest:hamcrest-all:1.3'
2928
testImplementation 'uk.org.webcompere:system-stubs-jupiter:1.2.0'
29+
testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.4"
30+
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.4"
3031
}
3132

3233
signing {
@@ -50,6 +51,10 @@ java {
5051
}
5152
}
5253

54+
tasks.named('test') {
55+
useJUnitPlatform()
56+
}
57+
5358
repositories {
5459
mavenCentral()
5560
}

Diff for: src/main/java/org/gitlab4j/api/models/GroupHook.java

+18
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ public class GroupHook implements Serializable {
2929
private Boolean subgroupEvents;
3030
private Boolean memberEvents;
3131
private Boolean enableSslVerification;
32+
private String alertStatus;
33+
private Date disabledUntil;
3234
private Boolean repositoryUpdateEvents;
3335
private Date createdAt;
3436
private Boolean resourceAccessTokenEvents;
@@ -218,6 +220,22 @@ public void setEnableSslVerification(Boolean enableSslVerification) {
218220
this.enableSslVerification = enableSslVerification;
219221
}
220222

223+
public String getAlertStatus() {
224+
return alertStatus;
225+
}
226+
227+
public void setAlertStatus(String alertStatus) {
228+
this.alertStatus = alertStatus;
229+
}
230+
231+
public Date getDisabledUntil() {
232+
return disabledUntil;
233+
}
234+
235+
public void setDisabledUntil(Date disabledUntil) {
236+
this.disabledUntil = disabledUntil;
237+
}
238+
221239
public Boolean getRepositoryUpdateEvents() {
222240
return repositoryUpdateEvents;
223241
}

Diff for: src/test/resources/org/gitlab4j/api/group-hook.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@
2424
"enable_ssl_verification": true,
2525
"repository_update_events": false,
2626
"alert_status": "executable",
27-
"disabled_until": null,
28-
"url_variables": [ ],
27+
"disabled_until": "2012-10-12T17:04:47Z",
2928
"created_at": "2012-10-12T17:04:47Z",
3029
"resource_access_token_events": true,
31-
"custom_webhook_template": "{\"event\":\"{{object_kind}}\"}",
30+
"custom_webhook_template": "{\"event\":\"{{object_kind}}\"}"
3231
}

0 commit comments

Comments
 (0)