Skip to content

Commit 048e645

Browse files
committed
Fixed Trigger test including newly mapped fields
1 parent 5f94617 commit 048e645

File tree

4 files changed

+16
-6
lines changed

4 files changed

+16
-6
lines changed

src/main/java/org/zendesk/client/v2/model/Trigger.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,12 @@ public class Trigger implements Serializable {
2222
private int position;
2323
private Conditions conditions;
2424
private List<Action> actions;
25+
@JsonProperty("created_at")
2526
private Date createdAt;
27+
@JsonProperty("updated_at")
2628
private Date updatedAt;
29+
30+
@JsonProperty("category_id")
2731
private String categoryId;
2832

2933
public Long getId() {
@@ -34,8 +38,7 @@ public void setId(Long id) {
3438
this.id = id;
3539
}
3640

37-
@JsonProperty("category_id")
38-
public String getCategoryId() {
41+
public String getCategoryId() {
3942
return categoryId;
4043
}
4144

@@ -59,7 +62,7 @@ public void setActive(boolean active) {
5962
this.active = active;
6063
}
6164

62-
@JsonProperty("created_at")
65+
6366
public Date getCreatedAt() {
6467
return createdAt;
6568
}
@@ -92,7 +95,6 @@ public void setActions(List<Action> actions) {
9295
this.actions = actions;
9396
}
9497

95-
@JsonProperty("updated_at")
9698
public Date getUpdatedAt() {
9799
return updatedAt;
98100
}

src/test/java/org/zendesk/client/v2/model/TriggerTest.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
import com.fasterxml.jackson.core.JsonProcessingException;
88
import com.fasterxml.jackson.databind.ObjectMapper;
9+
10+
import java.sql.Date;
911
import java.util.Arrays;
1012
import org.junit.Test;
1113
import org.zendesk.client.v2.Utils;
@@ -44,6 +46,9 @@ public void testTriggerWithComplexActionValues() throws Exception {
4446
trigger.getActions().get(0).getValue());
4547
assertEquals(0, trigger.getConditions().getAll().size());
4648
assertEquals(1, trigger.getConditions().getAny().size());
49+
assertEquals("1", trigger.getCategoryId());
50+
assertEquals(Date.valueOf("2024-03-10"), trigger.getCreatedAt());
51+
assertEquals(Date.valueOf("2024-03-11"), trigger.getUpdatedAt());
4752
assertEquals("comment_includes_word", trigger.getConditions().getAny().get(0).getField());
4853
assertEquals("includes", trigger.getConditions().getAny().get(0).getOperator());
4954
assertEquals("@triggerTest", trigger.getConditions().getAny().get(0).getValue());
@@ -76,6 +81,9 @@ public void testTriggerWithMultilineActionValues() throws Exception {
7681
trigger.getActions().get(1).getValue());
7782
assertEquals(0, trigger.getConditions().getAll().size());
7883
assertEquals(1, trigger.getConditions().getAny().size());
84+
assertEquals("1", trigger.getCategoryId());
85+
assertEquals(Date.valueOf("2024-03-10"), trigger.getCreatedAt());
86+
assertEquals(Date.valueOf("2024-03-11"), trigger.getUpdatedAt());
7987
assertEquals("comment_includes_word", trigger.getConditions().getAny().get(0).getField());
8088
assertEquals("includes", trigger.getConditions().getAny().get(0).getOperator());
8189
assertEquals("@triggerTest", trigger.getConditions().getAny().get(0).getValue());
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"id":12345678,"title":"Test Trigger","active":true,"position":45,"conditions":{"all":[],"any":[{"field":"comment_includes_word","operator":"includes","value":"@triggerTest"}]},"actions":[{"field":"notification_target","value":["1234567890",[["key1","value1"],["key2","value2"]]]}],"createdAt":null,"updatedAt":null,"categoryId":null}
1+
{"id":12345678,"title":"Test Trigger","active":true,"position":45,"conditions":{"all":[],"any":[{"field":"comment_includes_word","operator":"includes","value":"@triggerTest"}]},"actions":[{"field":"notification_target","value":["1234567890",[["key1","value1"],["key2","value2"]]]}],"created_at":1710025200000,"updated_at":1710111600000,"category_id":"1"}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"id":12345678,"title":"Test Trigger","active":true,"position":45,"conditions":{"all":[],"any":[{"field":"comment_includes_word","operator":"includes","value":"@triggerTest"}]},"actions":[{"field":"notification_user","value":["09876543","Trigger Target 1 {{ticket.title}}","Test Multiline\n\n{{ticket.comments_formatted}}\n\n--------------------------"]},{"field":"notification_target","value":["98765432","{\n \"color\":\"purple\",\n \"message_format\":\"text\",\n \"message\":\"Trigger Target 2 {{ticket.title}}.\"\n}"]}],"createdAt":null,"updatedAt":null,"categoryId":null}
1+
{"id":12345678,"title":"Test Trigger","active":true,"position":45,"conditions":{"all":[],"any":[{"field":"comment_includes_word","operator":"includes","value":"@triggerTest"}]},"actions":[{"field":"notification_user","value":["09876543","Trigger Target 1 {{ticket.title}}","Test Multiline\n\n{{ticket.comments_formatted}}\n\n--------------------------"]},{"field":"notification_target","value":["98765432","{\n \"color\":\"purple\",\n \"message_format\":\"text\",\n \"message\":\"Trigger Target 2 {{ticket.title}}.\"\n}"]}],"created_at":1710025200000,"updated_at":1710111600000,"category_id":"1"}

0 commit comments

Comments
 (0)