Skip to content

Commit c743d5f

Browse files
ned29ned29
authored
merge (#19)
* ADD: subscription template (#66) * ADD: subscription template * Add RAML implementation * Subscription multikey post form and raw json body support added. Unit… (#67) * Subscription multikey post form and raw json body support added. Unit & Flowtests updated/added * Subscription multikey post form and raw json body support added. Unit & Flowtests updated/added * Subscription validation updated for MAIL (#69) * Updated TestExecutionRules for aggregtedTestActivityObject (#71)
1 parent d89281f commit c743d5f

File tree

2 files changed

+98
-62
lines changed

2 files changed

+98
-62
lines changed

‎src/test/resources/TestExecutionObjectRules.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@
4141
"IdRule": "meta.id",
4242
"StartEvent": "NO",
4343
"IdentifyRules": "links | [?type=='ACTIVITY_EXECUTION'].target",
44-
"MatchIdRules": {"_id": "%IdentifyRules_objid%"},
44+
"MatchIdRules": {
45+
"_id": "%IdentifyRules_objid%"
46+
},
4547
"ExtractionRules": "{ ongoing : `\"false\"`, outcome : data.outcome}",
4648
"MergeResolverRules": null,
4749
"ArrayMergeOptions": "",
@@ -96,8 +98,8 @@
9698
"MatchIdRules": {
9799
"_id": "%IdentifyRules_objid%"
98100
},
99-
"ExtractionRules": "{ test_cases : [{trigger_event_id : meta.id, test_data : data.testcase, ongoing : `\"false\"`}]}",
100-
"MergeResolverRules": "{\"trigger_event_id:\":%IdentifyRules%}",
101+
"ExtractionRules": "{trigger_event_id : meta.id, test_data : data.testcase, ongoing : `\"false\"`}",
102+
"MergeResolverRules": "[{NONEPATH:NONE}, {test_suite: [{ test_case : [{ trigger_event_id:meta.id}]} ]}]",
101103
"ArrayMergeOptions": "",
102104
"HistoryIdentifyRules": "",
103105
"HistoryExtractionRules": "",
@@ -114,8 +116,8 @@
114116
"MatchIdRules": {
115117
"_id": "%IdentifyRules_objid%"
116118
},
117-
"ExtractionRules": "{ test_cases : [{trigger_event_id : links | [] | [?type=='TEST_CASE_EXECUTION'].target | [0], ongoing : `\"true\"`}]}",
118-
"MergeResolverRules": "{\"trigger_event_id:\":%IdentifyRules%}",
119+
"ExtractionRules": "{ ongoing : `\"true\"`}",
120+
"MergeResolverRules": "[{NONEPATH:NONE}, {test_suite: [{ test_case : [{ trigger_event_id: links | [?type=='TEST_CASE_EXECUTION'] | [0].target }]} ]}]",
119121
"ArrayMergeOptions": "",
120122
"HistoryIdentifyRules": "",
121123
"HistoryExtractionRules": "",
@@ -132,8 +134,8 @@
132134
"MatchIdRules": {
133135
"_id": "%IdentifyRules_objid%"
134136
},
135-
"ExtractionRules": "{ test_cases : [{trigger_event_id : links | [] | [?type=='TEST_CASE_EXECUTION'].target | [0], ongoing : `\"false\"`, verdict : data.outcome.verdict, conclusion : data.outcome.conclusion}]}",
136-
"MergeResolverRules": "{\"trigger_event_id:\":%IdentifyRules%}",
137+
"ExtractionRules": "{ongoing : `\"false\"`, verdict : data.outcome.verdict, conclusion : data.outcome.conclusion, metrics : data.outcome.metrics, description : data.outcome.description}",
138+
"MergeResolverRules": "[{NONEPATH:NONE}, {test_suite: [{ test_case : [{ trigger_event_id: links | [?type=='TEST_CASE_EXECUTION'] | [0].target }]} ]}]",
137139
"ArrayMergeOptions": "",
138140
"HistoryIdentifyRules": "",
139141
"HistoryExtractionRules": "",

‎src/test/resources/aggregatedTestActivityObject.json

Lines changed: 89 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,110 @@
11
{
2-
"_id": "b46ef12d-25gb-4d7y-b9fd-8763re66de47",
3-
"aggregatedObject": {
4-
"ongoing": "false",
5-
"test_batches": [
2+
"_id":"b46ef12d-25gb-4d7y-b9fd-8763re66de47",
3+
"aggregatedObject":{
4+
"ongoing":"false",
5+
"test_suite":[
66
{
7-
"recipes": [
7+
"test_case":[
88
{
9-
"id": "aaaaaaaa-bbbb-5ccc-addd-eeeeeeeeeee0",
10-
"constraints": {
11-
"environment": {
12-
"os": "ubuntu-15.04",
13-
"MY_PATH": "/home/lt-worf"
9+
"conclusion":"SUCCESSFUL",
10+
"ongoing":"false",
11+
"test_data":null,
12+
"verdict":"PASSED",
13+
"trigger_event_id":"v46ef19d-20gb-4d2y-h9fa-87dada6kde47",
14+
"description":"Accidentally started a fire in the lab during execution.",
15+
"metrics":[
16+
{
17+
"name":"myMetric",
18+
"value":5
1419
},
15-
"load": 10000
20+
{
21+
"name":"throughput",
22+
"value":8.325
23+
},
24+
{
25+
"name":"somethingElse",
26+
"value":"hello"
27+
}
28+
]
29+
},
30+
{
31+
"conclusion":"SUCCESSFUL",
32+
"ongoing":"true",
33+
"test_data":null,
34+
"verdict":"PASSED",
35+
"trigger_event_id":"v46ef19a-20ga-4d2y-h9fa-8763ae6kde47",
36+
"description":"Accidentally started a fire in the lab during execution.",
37+
"metrics":[
38+
{
39+
"name":"myMetric",
40+
"value":5
41+
},
42+
{
43+
"name":"throughput",
44+
"value":8.325
45+
},
46+
{
47+
"name":"somethingElse",
48+
"value":"hello"
49+
}
50+
]
51+
}
52+
]
53+
}
54+
],
55+
"test_batches":[
56+
{
57+
"recipes":[
58+
{
59+
"id":"aaaaaaaa-bbbb-5ccc-addd-eeeeeeeeeee0",
60+
"constraints":{
61+
"environment":{
62+
"os":"ubuntu-15.04",
63+
"MY_PATH":"/home/lt-worf"
64+
},
65+
"load":10000
1666
},
17-
"testCase": {
18-
"tracker": "My Test Management System",
19-
"id": "TC-1234",
20-
"uri": "http://tm.company.com/browse/TC-1234"
67+
"testCase":{
68+
"tracker":"My Test Management System",
69+
"id":"TC-1234",
70+
"uri":"http://tm.company.com/browse/TC-1234"
2171
}
2272
},
2373
{
24-
"id": "aaaaaaaa-bbbb-5ccc-addd-eeeeeeeeeee1",
25-
"constraints": {
26-
"environment": {
27-
"os": "ubuntu-16.04.1",
28-
"MY_PATH": "/home/cpt-picard"
74+
"id":"aaaaaaaa-bbbb-5ccc-addd-eeeeeeeeeee1",
75+
"constraints":{
76+
"environment":{
77+
"os":"ubuntu-16.04.1",
78+
"MY_PATH":"/home/cpt-picard"
2979
},
30-
"load": 500
80+
"load":500
3181
},
32-
"testCase": {
33-
"tracker": "My Test Management System",
34-
"id": "TC-1234",
35-
"uri": "http://tm.company.com/browse/TC-1234"
82+
"testCase":{
83+
"tracker":"My Test Management System",
84+
"id":"TC-1234",
85+
"uri":"http://tm.company.com/browse/TC-1234"
3686
}
3787
}
3888
],
39-
"name": "First batch",
40-
"priority": 1,
41-
"dependencies": [
89+
"name":"First batch",
90+
"priority":1,
91+
"dependencies":[
4292
{
43-
"dependency": "aaaaaaaa-bbbb-5ccc-addd-eeeeeeeeeee1",
44-
"dependent": "aaaaaaaa-bbbb-5ccc-addd-eeeeeeeeeee0"
93+
"dependency":"aaaaaaaa-bbbb-5ccc-addd-eeeeeeeeeee1",
94+
"dependent":"aaaaaaaa-bbbb-5ccc-addd-eeeeeeeeeee0"
4595
}
4696
]
4797
}
4898
],
49-
"test_cases": [
50-
{
51-
"ongoing": "false",
52-
"test_data": null,
53-
"test_cases": [
54-
{
55-
"conclusion": "SUCCESSFUL",
56-
"ongoing": "true",
57-
"test_data": null,
58-
"verdict": "PASSED",
59-
"trigger_event_id": "v46ef19a-20ga-4d2y-h9fa-8763ae6kde47"
60-
}
61-
],
62-
"trigger_event_id": "v46ef19a-20ga-4d2y-h9fa-8763ae6kde47"
63-
}
64-
],
65-
"TemplateName": "TEST_EXECUTION_1",
66-
"id": "b46ef12d-25gb-4d7y-b9fd-8763re66de47",
67-
"time": 1234567890,
68-
"type": "EiffelActivityTriggeredEvent",
69-
"version": "1.0.0",
70-
"outcome": {
71-
"conclusion": "TIMED_OUT",
72-
"description": "Compilation timed out."
99+
"TemplateName":"TEST_EXECUTION_1",
100+
"id":"b46ef12d-25gb-4d7y-b9fd-8763re66de47",
101+
"time":1234567890,
102+
"type":"EiffelActivityTriggeredEvent",
103+
"version":"1.0.0",
104+
"outcome":{
105+
"conclusion":"TIMED_OUT",
106+
"description":"Compilation timed out."
73107
},
74-
"test_suite_name": "Pre-release installation and security verification"
108+
"test_suite_name":"Pre-release installation and security verification"
75109
}
76110
}

0 commit comments

Comments
 (0)