Skip to content

Commit a852436

Browse files
Jalander Ramagiriafrittoli
Jalander Ramagiri
authored and
afrittoli
committed
update unit testing for new events
Signed-off-by: Jalander Ramagiri <[email protected]>
1 parent 51030d0 commit a852436

24 files changed

+315
-607
lines changed

‎generator/src/main/java/dev/cdevents/generator/CDEventsGenerator.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ private static void updateSubjectContentProperties(SchemaData schemaData, JsonNo
147147
Iterator<Map.Entry<String, JsonNode>> contentProps = subjectContentNode.fields();
148148
List<SchemaData.ContentField> contentFields = new ArrayList<>();
149149
List<SchemaData.ContentObjectField> contentObjectFields = new ArrayList<>();
150+
List<SchemaData.ContentObject> contentObjects = new ArrayList<>();
150151
while (contentProps.hasNext()) {
151152
Map.Entry<String, JsonNode> contentMap = contentProps.next();
152153
String contentField = contentMap.getKey();
@@ -163,8 +164,7 @@ private static void updateSubjectContentProperties(SchemaData schemaData, JsonNo
163164
}
164165
contentFields.add(new SchemaData.ContentField(contentField, capitalizedContentField, dataType));
165166
} else {
166-
schemaData.setObjectName(contentField);
167-
schemaData.setCapitalizedObjectName(capitalizedContentField);
167+
contentObjects.add(new SchemaData.ContentObject(capitalizedContentField));
168168
JsonNode contentObjectNode = contentNode.get("properties");
169169
Iterator<String> contentObjectProps = contentObjectNode.fieldNames();
170170
while (contentObjectProps.hasNext()) {
@@ -186,6 +186,7 @@ private static void updateSubjectContentProperties(SchemaData schemaData, JsonNo
186186
}
187187
}
188188
schemaData.setContentFields(contentFields);
189+
schemaData.setContentObjects(contentObjects);
189190
schemaData.setContentObjectFields(contentObjectFields);
190191
}
191192

‎generator/src/main/java/dev/cdevents/generator/SchemaData.java‎

Lines changed: 26 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,15 @@ public class SchemaData {
1010
private String capitalizedSubject;
1111

1212
private String capitalizedPredicate;
13-
14-
private String objectName;
15-
private String capitalizedObjectName;
1613
private String version;
1714
private String upperCaseSubject;
1815
private String schemaFileName;
1916

2017
private String schemaURL;
2118

2219
private List<ContentField> contentFields;
23-
2420
private List<ContentObjectField> contentObjectFields;
21+
private List<ContentObject> contentObjects;
2522

2623
/**
2724
* Default constructor.
@@ -84,35 +81,6 @@ public String getCapitalizedPredicate() {
8481
public void setCapitalizedPredicate(String capitalizedPredicate) {
8582
this.capitalizedPredicate = capitalizedPredicate;
8683
}
87-
88-
/**
89-
* @return the objectName of an event
90-
*/
91-
public String getObjectName() {
92-
return objectName;
93-
}
94-
95-
/**
96-
* @param objectName
97-
*/
98-
public void setObjectName(String objectName) {
99-
this.objectName = objectName;
100-
}
101-
102-
/**
103-
* @return the Capitalized Object name of an event
104-
*/
105-
public String getCapitalizedObjectName() {
106-
return capitalizedObjectName;
107-
}
108-
109-
/**
110-
* @param capitalizedObjectName
111-
*/
112-
public void setCapitalizedObjectName(String capitalizedObjectName) {
113-
this.capitalizedObjectName = capitalizedObjectName;
114-
}
115-
11684
/**
11785
* @return the version of an event
11886
*/
@@ -190,13 +158,22 @@ public List<ContentObjectField> getContentObjectFields() {
190158
return contentObjectFields;
191159
}
192160

161+
193162
/**
194163
* @param contentObjectFields
195164
*/
196165
public void setContentObjectFields(List<ContentObjectField> contentObjectFields) {
197166
this.contentObjectFields = contentObjectFields;
198167
}
199168

169+
public List<ContentObject> getContentObjects() {
170+
return contentObjects;
171+
}
172+
173+
public void setContentObjects(List<ContentObject> contentObjects) {
174+
this.contentObjects = contentObjects;
175+
}
176+
200177
public static class ContentField {
201178
private String fieldName;
202179
private String capitalizedFieldName;
@@ -348,4 +325,20 @@ public ContentObjectField(String fieldName, String capitalizedFieldName, String
348325
this.dataType = dataType;
349326
}
350327
}
328+
329+
public static class ContentObject {
330+
private String capitalizedObjectName;
331+
332+
public String getCapitalizedObjectName() {
333+
return capitalizedObjectName;
334+
}
335+
336+
public void setCapitalizedObjectName(String capitalizedObjectName) {
337+
this.capitalizedObjectName = capitalizedObjectName;
338+
}
339+
340+
public ContentObject(String capitalizedObjectName) {
341+
this.capitalizedObjectName = capitalizedObjectName;
342+
}
343+
}
351344
}

‎generator/src/main/resources/template/event-template.mustache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ public class {{capitalizedSubject}}{{capitalizedPredicate}}CDEvent extends {{cap
6161
context.setTimestamp(new Date());
6262
context.setVersion(CDEventConstants.CDEVENTS_SPEC_VERSION);
6363
getSubject().setContent(new Content());
64-
{{#getCapitalizedObjectName}}
64+
{{#getContentObjects}}
6565
getSubject().getContent().set{{capitalizedObjectName}}(new {{capitalizedObjectName}}());
66-
{{/getCapitalizedObjectName}}
66+
{{/getContentObjects}}
6767
getSubject().setType(Subject.Type.{{upperCaseSubject}});
6868
}
6969

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
<properties>
2222
<project.identifier>${project.name}</project.identifier>
23-
<maven.compiler.source>1.8</maven.compiler.source>
24-
<maven.compiler.target>1.8</maven.compiler.target>
23+
<maven.compiler.source>11</maven.compiler.source>
24+
<maven.compiler.target>11</maven.compiler.target>
2525
<cloudevents.version>2.3.0</cloudevents.version>
2626
<junit-jupiter.version>5.8.2</junit-jupiter.version>
2727
<assertj-core.version>3.22.0</assertj-core.version>

‎sdk/src/main/java/dev/cdevents/constants/CDEventConstants.java‎

Lines changed: 36 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -10,97 +10,11 @@ private CDEventConstants() {
1010
*/
1111
public static final String SCHEMA_FOLDER = "../spec/schemas";
1212

13-
/**
14-
* Mustache generic event template file.
15-
*/
16-
public static final String EVENT_TEMPLATE_MUSTACHE = "template/event-template.mustache";
17-
1813
/**
1914
* CDEvents Version.
2015
*/
2116
public static final String CDEVENTS_SPEC_VERSION = "0.3.0";
2217

23-
public enum SubjectType {
24-
25-
/**
26-
* Subject type repository.
27-
*/
28-
REPOSITORY("repository"),
29-
30-
/**
31-
* Subject type taskRun.
32-
*/
33-
TASKRUN("taskRun"),
34-
35-
/**
36-
* Subject Type pipelineRun.
37-
*/
38-
PIPELINERUN("pipelineRun"),
39-
40-
/**
41-
* Subject Type Environment.
42-
*/
43-
ENVIRONMENT("environment"),
44-
45-
/**
46-
* Subject Type Service.
47-
*/
48-
SERVICE("service"),
49-
50-
/**
51-
* Subject type branch.
52-
*/
53-
BRANCH("branch"),
54-
55-
/**
56-
* Subject type change.
57-
*/
58-
CHANGE("change"),
59-
60-
/**
61-
* Subject type build.
62-
*/
63-
BUILD("build"),
64-
65-
/**
66-
* subject type testCase.
67-
*/
68-
TESTCASE("testCase"),
69-
70-
/**
71-
* subject type testSuite.
72-
*/
73-
TESTSUITE("testSuite"),
74-
75-
/**
76-
* subject type artifact.
77-
*/
78-
ARTIFACT("artifact");
79-
80-
private String subjectType;
81-
82-
/**
83-
* @param subjectType
84-
*/
85-
SubjectType(String subjectType) {
86-
this.subjectType = subjectType;
87-
}
88-
89-
/**
90-
* @return subjectType
91-
*/
92-
public String getSubjectType() {
93-
return subjectType;
94-
}
95-
96-
/**
97-
* @param subjectType
98-
*/
99-
public void setSubjectType(String subjectType) {
100-
this.subjectType = subjectType;
101-
}
102-
}
103-
10418
public enum Outcome {
10519
/**
10620
* Outcome Success.
@@ -225,29 +139,34 @@ public enum CDEventTypes {
225139

226140
/* Test Events */
227141
/**
228-
* TestCase started event.
142+
* TestCaseRun started event.
143+
*/
144+
TestCaseRunStartedEvent("dev.cdevents.testcaserun.started."),
145+
/**
146+
* TestCaseRun queued event.
229147
*/
230-
TestCaseStartedEvent("dev.cdevents.testcase.started."),
148+
TestCaseRunQueuedEvent("dev.cdevents.testcaserun.queued."),
231149
/**
232-
* TestCase queued event.
150+
* TestCaseRun finished event.
233151
*/
234-
TestCaseQueuedEvent("dev.cdevents.testcase.queued."),
152+
TestCaseRunFinishedEvent("dev.cdevents.testcaserun.finished."),
235153
/**
236-
* TestCase finished event.
154+
* TestSuiteRun started event.
237155
*/
238-
TestCaseFinishedEvent("dev.cdevents.testcase.finished."),
156+
TestSuiteRunStartedEvent("dev.cdevents.testsuiterun.started."),
239157
/**
240-
* TestSuite started event.
158+
* TestSuiteRun queued event.
241159
*/
242-
TestSuiteStartedEvent("dev.cdevents.testsuite.started."),
160+
TestSuiteRunQueuedEvent("dev.cdevents.testsuiterun.queued."),
243161
/**
244-
* TestSuite queued event.
162+
* TestSuiteRun finished event.
245163
*/
246-
TestSuiteQueuedEvent("dev.cdevents.testsuite.queued."),
164+
TestSuiteRunFinishedEvent("dev.cdevents.testsuiterun.finished."),
165+
247166
/**
248-
* TestSuite finished event.
167+
* TestOutput published event.
249168
*/
250-
TestSuiteFinishedEvent("dev.cdevents.testsuite.finished."),
169+
TestOutputPublishedEvent("dev.cdevents.testoutput.published."),
251170

252171
/* Artifact Events */
253172
/**
@@ -259,9 +178,9 @@ public enum CDEventTypes {
259178
*/
260179
ArtifactPublishedEvent("dev.cdevents.artifact.published."),
261180
/**
262-
* Artifact created event.
181+
* Artifact signed event.
263182
*/
264-
ArtifactCreatedEvent("dev.cdevents.artifact.created."),
183+
ArtifactSignedEvent("dev.cdevents.artifact.signed."),
265184

266185
/* Environment Events */
267186
/**
@@ -277,6 +196,23 @@ public enum CDEventTypes {
277196
*/
278197
EnvironmentDeletedEvent("dev.cdevents.environment.deleted."),
279198

199+
/* Incident Events */
200+
/**
201+
* Incident detected event
202+
*/
203+
IncidentDetectedEvent("dev.cdevents.incident.detected."),
204+
205+
/**
206+
* Incident reported event
207+
*/
208+
IncidentReportedEvent("dev.cdevents.incident.reported."),
209+
210+
/**
211+
* Incident resolved event
212+
*/
213+
IncidentResolvedEvent("dev.cdevents.incident.resolved."),
214+
215+
280216
/* Service Events */
281217
/**
282218
* Service deployed event.

‎sdk/src/main/java/dev/cdevents/events/IncidentDetectedCDEvent.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ public void initCDEvent() {
6161
context.setTimestamp(new Date());
6262
context.setVersion(CDEventConstants.CDEVENTS_SPEC_VERSION);
6363
getSubject().setContent(new Content());
64+
getSubject().getContent().setEnvironment(new Environment());
6465
getSubject().getContent().setService(new Service());
6566
getSubject().setType(Subject.Type.INCIDENT);
6667
}

‎sdk/src/main/java/dev/cdevents/events/IncidentReportedCDEvent.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ public void initCDEvent() {
6161
context.setTimestamp(new Date());
6262
context.setVersion(CDEventConstants.CDEVENTS_SPEC_VERSION);
6363
getSubject().setContent(new Content());
64+
getSubject().getContent().setEnvironment(new Environment());
6465
getSubject().getContent().setService(new Service());
6566
getSubject().setType(Subject.Type.INCIDENT);
6667
}

‎sdk/src/main/java/dev/cdevents/events/IncidentResolvedCDEvent.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ public void initCDEvent() {
6161
context.setTimestamp(new Date());
6262
context.setVersion(CDEventConstants.CDEVENTS_SPEC_VERSION);
6363
getSubject().setContent(new Content());
64+
getSubject().getContent().setEnvironment(new Environment());
6465
getSubject().getContent().setService(new Service());
6566
getSubject().setType(Subject.Type.INCIDENT);
6667
}

‎sdk/src/main/java/dev/cdevents/events/TestcaserunFinishedCDEvent.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ public void initCDEvent() {
6161
context.setTimestamp(new Date());
6262
context.setVersion(CDEventConstants.CDEVENTS_SPEC_VERSION);
6363
getSubject().setContent(new Content());
64+
getSubject().getContent().setEnvironment(new Environment());
65+
getSubject().getContent().setTestSuiteRun(new TestSuiteRun());
6466
getSubject().getContent().setTestCase(new TestCase());
6567
getSubject().setType(Subject.Type.TEST_CASE_RUN);
6668
}

‎sdk/src/main/java/dev/cdevents/events/TestcaserunQueuedCDEvent.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ public void initCDEvent() {
6161
context.setTimestamp(new Date());
6262
context.setVersion(CDEventConstants.CDEVENTS_SPEC_VERSION);
6363
getSubject().setContent(new Content());
64+
getSubject().getContent().setTrigger(new Trigger());
65+
getSubject().getContent().setEnvironment(new Environment());
66+
getSubject().getContent().setTestSuiteRun(new TestSuiteRun());
6467
getSubject().getContent().setTestCase(new TestCase());
6568
getSubject().setType(Subject.Type.TEST_CASE_RUN);
6669
}

0 commit comments

Comments
 (0)