Skip to content

Commit b65d2a3

Browse files
vasile-balutavasile-baluta
authored
fix flow tests for the new test case triggered event (#42)
1 parent 151577d commit b65d2a3

File tree

5 files changed

+102
-11
lines changed

5 files changed

+102
-11
lines changed

‎src/test/java/com/ericsson/ei/flowtests/FlowTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.slf4j.LoggerFactory;
2222

2323
import org.springframework.boot.test.context.SpringBootTest;
24-
import org.springframework.test.context.TestPropertySource;
2524
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
2625

2726
import java.util.ArrayList;
@@ -38,6 +37,7 @@ protected ArrayList<String> getEventNamesToSend() {
3837
eventNames.add("event_EiffelConfidenceLevelModifiedEvent_3_2");
3938
eventNames.add("event_EiffelArtifactPublishedEvent_3");
4039
eventNames.add("event_EiffelArtifactCreatedEvent_3");
40+
eventNames.add("event_EiffelTestCaseTriggeredEvent_3");
4141
eventNames.add("event_EiffelTestCaseStartedEvent_3");
4242
eventNames.add("event_EiffelTestCaseFinishedEvent_3");
4343

‎src/test/java/com/ericsson/ei/flowtests/FlowTest2.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,14 @@ protected ArrayList<String> getEventNamesToSend() {
4343
eventNames.add("event_EiffelArtifactCreatedEvent_3");
4444
eventNames.add("event_EiffelArtifactPublishedEvent_3");
4545
eventNames.add("event_EiffelConfidenceLevelModifiedEvent_3_2");
46+
eventNames.add("event_EiffelTestCaseTriggeredEvent_3");
4647
eventNames.add("event_EiffelTestCaseStartedEvent_3");
4748
eventNames.add("event_EiffelTestCaseFinishedEvent_3");
4849

4950
eventNames.add("event_EiffelArtifactCreatedEvent_1");
5051
eventNames.add("event_EiffelArtifactPublishedEvent_1");
5152
eventNames.add("event_EiffelConfidenceLevelModifiedEvent_1");
53+
eventNames.add("event_EiffelTestCaseTriggeredEvent_1");
5254
eventNames.add("event_EiffelTestCaseStartedEvent_1");
5355
eventNames.add("event_EiffelTestCaseFinishedEvent_1");
5456

‎src/test/resources/AggregatedDocument.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ "TemplateName":"ARTIFACT_1", "_id" : "6acc3c87-75e0-4b6d-88f5-b1a5d4e62b43" , "aggregatedObject" : {"fileInformation":[{"extension":"jar","classifier":""}],"buildCommand":null,"confidenceLevels":[{"eventId":"f37d59a3-069e-4f4c-8cc5-a52e73501a75","name":"readyForDelivery","time":1481875944272,"value":"SUCCESS"}],"testCaseExecutions":[{"testCaseFinishEventId":"11109351-41e0-474a-bc1c-f6e81e58a1c9","testCaseStartedTime":1481875925916,"testCaseStartedEventId":"cb9d64b0-a6e9-4419-8b5d-a650c27c59ca","testCaseFinishedTime":1481875935919,"testCaseDuration":10003,"testCase":{"conclusion":"SUCCESSFUL","verdict":"PASSED","tracker":"My Other Test Management System","id":"TC5","uri":"https://other-tm.company.com/testCase/TC5"}}],"id":"6acc3c87-75e0-4b6d-88f5-b1a5d4e62b43","time":1481875891763,"type":"EiffelArtifactCreatedEvent","gav":{"groupId":"com.mycompany.myproduct","artifactId":"sub-system","version":"1.1.0"},"publications":[{"eventId":"33d05e6f-9bd9-4138-83b6-e20cc74680a3","locations":[{"type":"PLAIN","uri":"https://myrepository.com/mySubSystemArtifact"}],"time":1481875921763}]}}
1+
{ "TemplateName":"ARTIFACT_1", "_id" : "6acc3c87-75e0-4b6d-88f5-b1a5d4e62b43" , "aggregatedObject" : {"fileInformation":[{"extension":"jar","classifier":""}],"buildCommand":null,"confidenceLevels":[{"eventId":"f37d59a3-069e-4f4c-8cc5-a52e73501a75","name":"readyForDelivery","time":1481875944272,"value":"SUCCESS"}],"testCaseExecutions":[{\"testCaseTrigeredEventId\":\"6d3df0e0-404d-46ee-ab4f-3118457148f4\",\"testCaseTrigeredTime\":1490777327230,"testCaseFinishEventId":"11109351-41e0-474a-bc1c-f6e81e58a1c9","testCaseStartedTime":1481875925916,"testCaseStartedEventId":"cb9d64b0-a6e9-4419-8b5d-a650c27c59ca","testCaseFinishedTime":1481875935919,"testCaseDuration":10003,"testCase":{"conclusion":"SUCCESSFUL","verdict":"PASSED","tracker":"My Other Test Management System","id":"TC5","uri":"https://other-tm.company.com/testCase/TC5"}}],"id":"6acc3c87-75e0-4b6d-88f5-b1a5d4e62b43","time":1481875891763,"type":"EiffelArtifactCreatedEvent","gav":{"groupId":"com.mycompany.myproduct","artifactId":"sub-system","version":"1.1.0"},"publications":[{"eventId":"33d05e6f-9bd9-4138-83b6-e20cc74680a3","locations":[{"type":"PLAIN","uri":"https://myrepository.com/mySubSystemArtifact"}],"time":1481875921763}]}}

‎src/test/resources/ArtifactRules_new.json

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,31 @@
4747
"ProcessRules":null,
4848
"ProcessFunction" : null
4949
},
50+
{
51+
"TemplateName":"ARTIFACT_1",
52+
"Type":"EiffelTestCaseTriggeredEvent",
53+
"TypeRule": "meta.type",
54+
"IdRule": "meta.id",
55+
"StartEvent": "NO",
56+
"IdentifyRules" : "links | [?type=='IUT'].target",
57+
"MatchIdRules": {"_id": "%IdentifyRules_objid%"},
58+
"ExtractionRules" : "{testCaseExecutions :[{ testCaseTrigeredEventId:meta.id, testCaseTrigeredTime:meta.time, testCase:data.testCase}]}",
59+
"ArrayOptions": "",
60+
"HistoryIdentifyRules": "",
61+
"HistoryExtractionRules": "",
62+
"ProcessRules":null,
63+
"ProcessFunction" : null
64+
},
5065
{
5166
"TemplateName":"ARTIFACT_1",
5267
"Type":"EiffelTestCaseStartedEvent",
5368
"TypeRule": "meta.type",
5469
"IdRule": "meta.id",
5570
"StartEvent": "NO",
56-
"IdentifyRules" : "links | [?type=='IUT'].target",
71+
"IdentifyRules" : "links | [?type=='TEST_CASE_EXECUTION'].target",
5772
"MatchIdRules": {"_id": "%IdentifyRules_objid%"},
5873
"ExtractionRules" : "{testCaseExecutions :[{ testCaseStartedEventId:meta.id, testCaseStartedTime:meta.time, testCase:data.testCase}]}",
74+
"MergeResolverRules" : "{\"testCaseTrigeredEventId\":%IdentifyRules%}",
5975
"ArrayOptions": "",
6076
"HistoryIdentifyRules": "",
6177
"HistoryExtractionRules": "",

‎src/test/resources/test_events.json

Lines changed: 81 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -541,6 +541,45 @@
541541
}
542542
]
543543
},
544+
"event_EiffelTestCaseTriggeredEvent_3" :
545+
{
546+
"data": {
547+
"customData": [
548+
{
549+
"key": "name",
550+
"value": "TCT7"
551+
},
552+
{
553+
"key": "iteration",
554+
"value": 1
555+
}
556+
],
557+
"testCase": {
558+
"id": "TC5",
559+
"uri": "https://other-tm.company.com/testCase/TC5",
560+
"tracker": "My Other Test Management System"
561+
}
562+
},
563+
"meta": {
564+
"type": "EiffelTestCaseTriggeredEvent",
565+
"source": {
566+
"domainId": "example.domain"
567+
},
568+
"version": "1.0.0",
569+
"id": "6d3df0e0-404d-46ee-ab4f-3118457148f4",
570+
"time": 1490777327230
571+
},
572+
"links": [
573+
{
574+
"type": "CONTEXT",
575+
"target": "bebdb0b7-f59e-4b77-ba8e-3912593d0153"
576+
},
577+
{
578+
"type": "IUT",
579+
"target": "6acc3c87-75e0-4b6d-88f5-b1a5d4e62b43"
580+
}
581+
]
582+
},
544583

545584
"event_EiffelTestCaseStartedEvent_3" :
546585

@@ -552,7 +591,7 @@
552591
},
553592
{
554593
"target": "6acc3c87-75e0-4b6d-88f5-b1a5d4e62b43",
555-
"type": "IUT"
594+
"type": "TEST_CASE_EXECUTION"
556595
}
557596
],
558597
"meta": {
@@ -565,11 +604,6 @@
565604
"version": "1.0.0"
566605
},
567606
"data": {
568-
"testCase": {
569-
"id": "TC5",
570-
"uri": "https://other-tm.company.com/testCase/TC5",
571-
"tracker": "My Other Test Management System"
572-
},
573607
"customData": [
574608
{
575609
"value": "TCS5",
@@ -1098,6 +1132,45 @@
10981132
}
10991133
},
11001134

1135+
"event_EiffelTestCaseTriggeredEvent_1" :
1136+
{
1137+
"data": {
1138+
"customData": [
1139+
{
1140+
"key": "name",
1141+
"value": "TCT7"
1142+
},
1143+
{
1144+
"key": "iteration",
1145+
"value": 1
1146+
}
1147+
],
1148+
"testCase": {
1149+
"id": "TC5",
1150+
"uri": "https://other-tm.company.com/testCase/TC5",
1151+
"tracker": "My Other Test Management System"
1152+
}
1153+
},
1154+
"meta": {
1155+
"type": "EiffelTestCaseTriggeredEvent",
1156+
"source": {
1157+
"domainId": "example.domain"
1158+
},
1159+
"version": "1.0.0",
1160+
"id": "6d3df0e0-404d-46ee-ab4f-v11dr57148f4",
1161+
"time": 1490777327230
1162+
},
1163+
"links": [
1164+
{
1165+
"type": "CONTEXT",
1166+
"target": "bebdb0b7-f59e-4b77-ba8e-3912593d0153"
1167+
},
1168+
{
1169+
"type": "IUT",
1170+
"target": "ccce572c-c364-441e-abc9-b62fed080ca2"
1171+
}
1172+
]
1173+
},
11011174

11021175
"event_EiffelTestCaseStartedEvent_1" :
11031176
{
@@ -1116,8 +1189,8 @@
11161189
"type": "CONTEXT"
11171190
},
11181191
{
1119-
"target": "ccce572c-c364-441e-abc9-b62fed080ca2",
1120-
"type": "IUT"
1192+
"target": "6d3df0e0-404d-46ee-ab4f-v11dr57148f4",
1193+
"type": "TEST_CASE_EXECUTION"
11211194
}
11221195
],
11231196
"data": {

0 commit comments

Comments
 (0)