Skip to content

Commit a439a8b

Browse files
authored
Include type in Message Card messages (#428)
fixes #427
1 parent 0b7c3f1 commit a439a8b

File tree

11 files changed

+60
-0
lines changed

11 files changed

+60
-0
lines changed

src/main/java/jenkins/plugins/office365connector/model/messagecard/MessageCard.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
import java.util.Arrays;
1818
import java.util.List;
1919

20+
import com.google.gson.annotations.SerializedName;
21+
2022
import jenkins.plugins.office365connector.model.CardAction;
2123
import jenkins.plugins.office365connector.model.Card;
2224
import jenkins.plugins.office365connector.model.Section;
@@ -26,6 +28,12 @@
2628
*/
2729
public class MessageCard implements Card {
2830

31+
@SerializedName("@context")
32+
private String context = "https://schema.org/extensions";
33+
34+
@SerializedName("@type")
35+
private String type = "MessageCard";
36+
2937
private String summary;
3038
private String themeColor = "3479BF";
3139

@@ -39,6 +47,14 @@ public MessageCard(String summary, Section section) {
3947
this.sections = Arrays.asList(section);
4048
}
4149

50+
public String getContext() {
51+
return context;
52+
}
53+
54+
public String getType() {
55+
return type;
56+
}
57+
4258
public String getSummary() {
4359
return summary;
4460
}

src/test/java/jenkins/plugins/office365connector/model/messagecard/MessageCardTest.java

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,30 @@ void getPotentialAction_ReturnsPotentialActions() {
7070
assertThat(messageCard.getAction(), hasSize(1));
7171
assertThat(messageCard.getAction(), contains(action));
7272
}
73+
74+
@Test
75+
void getContext_ReturnsContext() {
76+
77+
// given
78+
MessageCard messageCard = new MessageCard("mySummary", null);
79+
80+
// when
81+
String context = messageCard.getContext();
82+
83+
// then
84+
assertThat(context, equalTo("https://schema.org/extensions"));
85+
}
86+
87+
@Test
88+
void getType_ReturnsType() {
89+
90+
// given
91+
MessageCard messageCard = new MessageCard("mySummary", null);
92+
93+
// when
94+
String type = messageCard.getType();
95+
96+
// then
97+
assertThat(type, equalTo("MessageCard"));
98+
}
7399
}

src/test/resources/requests/adaptivecard-step.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{
2+
"@context": "https://schema.org/extensions",
3+
"@type": "MessageCard",
24
"summary": "myFirst_Job_: Build #167",
35
"themeColor": "#FF00FF",
46
"sections": [

src/test/resources/requests/back_to_normal-without_actions.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{
2+
"@context": "https://schema.org/extensions",
3+
"@type": "MessageCard",
24
"summary": "hook » PR-1: Build #3 Back to Normal",
35
"themeColor": "#00FF00",
46
"sections": [

src/test/resources/requests/completed-failed.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{
2+
"@context": "https://schema.org/extensions",
3+
"@type": "MessageCard",
24
"summary": "myFirst_Job_: Build #167 Failed",
35
"themeColor": "#CC0003",
46
"sections": [

src/test/resources/requests/completed-repeated_failure.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{
2+
"@context": "https://schema.org/extensions",
3+
"@type": "MessageCard",
24
"summary": "myFirst_Job_: Build #167 Repeated Failure",
35
"themeColor": "#CC0003",
46
"sections": [

src/test/resources/requests/completed-success.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{
2+
"@context": "https://schema.org/extensions",
3+
"@type": "MessageCard",
24
"summary": "myFirst_Job_: Build #167 Success",
35
"themeColor": "#00FF00",
46
"sections": [

src/test/resources/requests/repeated_failure-pull_request.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{
2+
"@context": "https://schema.org/extensions",
3+
"@type": "MessageCard",
24
"summary": "hook » PR-1: Build #3 Repeated Failure",
35
"themeColor": "#CC0003",
46
"sections": [

src/test/resources/requests/sendstep.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{
2+
"@context": "https://schema.org/extensions",
3+
"@type": "MessageCard",
24
"summary": "myFirst_Job_: Build #167",
35
"themeColor": "#FF00FF",
46
"sections": [

src/test/resources/requests/started-developers.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{
2+
"@context": "https://schema.org/extensions",
3+
"@type": "MessageCard",
24
"summary": "simple job: Build #1",
35
"themeColor": "3479BF",
46
"sections": [

0 commit comments

Comments
 (0)