Skip to content

Commit 2215468

Browse files
vasile-balutavasile-baluta
authored
update main rules
update main rules
1 parent 2f6de83 commit 2215468

File tree

4 files changed

+41
-56
lines changed

4 files changed

+41
-56
lines changed

‎src/functionaltests/java/com/ericsson/ei/utils/FunctionalTestBase.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
package com.ericsson.ei.utils;
1515

1616
import com.ericsson.ei.App;
17-
import com.ericsson.ei.mongodbhandler.MongoDBHandler;
1817

1918
import org.junit.Ignore;
2019
import org.junit.runner.RunWith;
@@ -25,9 +24,7 @@
2524
import org.springframework.boot.test.context.SpringBootContextLoader;
2625
import org.springframework.boot.test.context.SpringBootTest;
2726
import org.springframework.test.context.ContextConfiguration;
28-
2927
import org.springframework.test.context.TestContext;
30-
3128
import org.springframework.test.context.TestExecutionListeners;
3229
import org.springframework.test.context.junit4.SpringRunner;
3330
import org.springframework.test.context.support.AbstractTestExecutionListener;

‎src/main/resources/ArtifactRules_new.json

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@
1111
"DownstreamIdentifyRules" : "links | [?type=='COMPOSITION'].target",
1212
"DownstreamMergeRules": "{\"externalComposition\":{\"eventId\":%IdentifyRules%}}",
1313
"DownstreamExtractionRules" : "{artifacts: [{id : meta.id}]}",
14-
"ArrayMergeOptions": "",
1514
"HistoryIdentifyRules":"links | [?type=='COMPOSITION'].target",
16-
"HistoryExtractionRules":"{internalComposition:{artifacts: [{id : meta.id}]}}",
17-
"HistoryPathRules": "{artifacts: {id: meta.id}}",
15+
"HistoryExtractionRules":"{id : meta.id, gav : data.gav, fileInformation : data.fileInformation}",
16+
"HistoryPathRules": "{artifacts: [{id: meta.id}]}",
1817
"ProcessRules" : null,
1918
"ProcessFunction" : null
2019
},
@@ -26,8 +25,8 @@
2625
"StartEvent": "NO",
2726
"IdentifyRules" : "links | [?type=='ARTIFACT'].target",
2827
"MatchIdRules": {"_id": "%IdentifyRules_objid%"},
29-
"ExtractionRules" : "{ publications :[ { eventId : meta.id, time : meta.time, locations : data.locations }] }",
30-
"ArrayMergeOptions": "",
28+
"ExtractionRules" : "{ eventId : meta.id, time : meta.time, locations : data.locations }",
29+
"MergeResolverRules": "[ {NONEPATH:NONE}, {publications: [{ eventId: meta.id }]} ]",
3130
"HistoryIdentifyRules": "",
3231
"HistoryExtractionRules": "",
3332
"ProcessRules":null,
@@ -41,7 +40,8 @@
4140
"StartEvent": "NO",
4241
"IdentifyRules" : "links | [?type=='SUBJECT'].target",
4342
"MatchIdRules": {"_id": "%IdentifyRules_objid%"},
44-
"ExtractionRules" : "{confidenceLevels :[{ eventId:meta.id, time:meta.time, name:data.name, value:data.value}]}",
43+
"ExtractionRules" : "{ eventId:meta.id, time:meta.time, name:data.name, value:data.value }",
44+
"MergeResolverRules": "[ {NONEPATH:NONE}, {confidenceLevels: [{ eventId: meta.id }]} ]",
4545
"ArrayMergeOptions": "",
4646
"HistoryIdentifyRules": "",
4747
"HistoryExtractionRules": "",
@@ -56,7 +56,8 @@
5656
"StartEvent": "NO",
5757
"IdentifyRules" : "links | [?type=='IUT'].target",
5858
"MatchIdRules": {"_id": "%IdentifyRules_objid%"},
59-
"ExtractionRules" : "{testCaseExecutions :[{ testCaseTrigeredEventId:meta.id, testCaseTrigeredTime:meta.time, testCase:data.testCase}]}",
59+
"ExtractionRules" : "{ testCaseTriggeredEventId:meta.id, testCaseTriggeredTime:meta.time, outcome:data.testCase }",
60+
"MergeResolverRules": "[ {NONEPATH:NONE}, {testCaseExecutions: [{ testCaseTriggeredEventId: meta.id }]} ]",
6061
"ArrayOptions": "",
6162
"HistoryIdentifyRules": "",
6263
"HistoryExtractionRules": "",
@@ -71,8 +72,8 @@
7172
"StartEvent": "NO",
7273
"IdentifyRules" : "links | [?type=='TEST_CASE_EXECUTION'].target",
7374
"MatchIdRules": {"_id": "%IdentifyRules_objid%"},
74-
"ExtractionRules" : "{testCaseExecutions :[{ testCaseStartedEventId:meta.id, testCaseStartedTime:meta.time, testCase:data.testCase}]}",
75-
"MergeResolverRules" : "{\"testCaseTrigeredEventId\":%IdentifyRules%}",
75+
"ExtractionRules" : "{ testCaseStartedEventId:meta.id, testCaseStartedTime:meta.time, outcome:data.testCase }",
76+
"MergeResolverRules": "[{NONEPATH:NONE}, {testCaseExecutions: [{ testCaseTriggeredEventId: links | [?type=='TEST_CASE_EXECUTION'] | [0].target }] }]",
7677
"ArrayOptions": "",
7778
"HistoryIdentifyRules": "",
7879
"HistoryExtractionRules": "",
@@ -87,12 +88,12 @@
8788
"StartEvent": "NO",
8889
"IdentifyRules" : "links | [?type=='TEST_CASE_EXECUTION'].target",
8990
"MatchIdRules": { "$and": [{"aggregatedObject.testCaseExecutions.testCaseStartedEventId": "%IdentifyRules%"}]},
90-
"ExtractionRules" : "{ testCaseFinishEventId:meta.id, testCaseFinishedTime:meta.time, testCase:data.outcome}",
91+
"ExtractionRules" : "{ testCaseFinishedEventId:meta.id, testCaseFinishedTime:meta.time, outcome:data.outcome}",
9192
"MergeResolverRules" : "{\"testCaseStartedEventId\":%IdentifyRules%}",
9293
"ArrayMergeOptions": "",
9394
"HistoryIdentifyRules": "",
9495
"HistoryExtractionRules": "",
95-
"ProcessRules":"{testCaseDuration : diff(testCaseExecutions[0].testCaseFinishedTime, testCaseExecutions[0].testCaseStartedTime)}",
96+
"ProcessRules": "{testCaseDuration : diff(testCaseExecutions | [?testCaseStartedEventId=='%IdentifyRules%'].testCaseFinishedTime | [0], testCaseExecutions | [?testCaseStartedEventId=='%IdentifyRules%'].testCaseStartedTime | [0])}",
9697
"ProcessFunction" : "difference"
9798
},
9899
{

‎src/main/resources/TestExecutionObjectRules.json

Lines changed: 20 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@
66
"IdRule": "meta.id",
77
"StartEvent": "YES",
88
"IdentifyRules": "[meta.id]",
9-
"MatchIdRules": {
10-
"_id": "%IdentifyRules_objid%"
11-
},
12-
"ExtractionRules": "{ id : meta.id, type : meta.type, time : meta.time, version : meta.version, ongoing : `\"false\"` }",
9+
"MatchIdRules": {"_id": "%IdentifyRules_objid%"},
10+
"ExtractionRules": "{ activity_triggered_event_id : meta.id, type : meta.type, time : meta.time, version : meta.version, ongoing : `\"false\"` }",
1311
"MergeResolverRules": null,
1412
"ArrayMergeOptions": "",
1513
"HistoryIdentifyRules": "",
@@ -24,10 +22,8 @@
2422
"IdRule": "meta.id",
2523
"StartEvent": "NO",
2624
"IdentifyRules": "links | [?type=='ACTIVITY_EXECUTION'].target",
27-
"MatchIdRules": {
28-
"_id": "%IdentifyRules_objid%"
29-
},
30-
"ExtractionRules": "{ ongoing : `\"true\"`}",
25+
"MatchIdRules": {"_id": "%IdentifyRules_objid%"},
26+
"ExtractionRules": "{activity_started_event_id: meta.id, ongoing : `\"true\"`}",
3127
"ArrayMergeOptions": "",
3228
"HistoryIdentifyRules": "",
3329
"HistoryExtractionRules": "",
@@ -42,8 +38,8 @@
4238
"StartEvent": "NO",
4339
"IdentifyRules": "links | [?type=='ACTIVITY_EXECUTION'].target",
4440
"MatchIdRules": {"_id": "%IdentifyRules_objid%"},
45-
"ExtractionRules": "{ ongoing : `\"false\"`, outcome : data.outcome}",
46-
"MergeResolverRules": null,
41+
"ExtractionRules": "{activity_finished_event_id: meta.id, ongoing : `\"false\"`, outcome : data.outcome}",
42+
"MergeResolverRules": "{\"activity_started_event_id\":%IdentifyRules%}",
4743
"ArrayMergeOptions": "",
4844
"HistoryIdentifyRules": "",
4945
"HistoryExtractionRules": "",
@@ -57,9 +53,7 @@
5753
"IdRule": "meta.id",
5854
"StartEvent": "NO",
5955
"IdentifyRules": "links | [?type=='CONTEXT'].target",
60-
"MatchIdRules": {
61-
"_id": "%IdentifyRules_objid%"
62-
},
56+
"MatchIdRules": {"_id": "%IdentifyRules_objid%"},
6357
"ExtractionRules": "{ test_batches : data.batches }",
6458
"MergeResolverRules": null,
6559
"ArrayMergeOptions": "",
@@ -75,11 +69,9 @@
7569
"IdRule": "meta.id",
7670
"StartEvent": "NO",
7771
"IdentifyRules": "links | [?type=='CONTEXT'].target",
78-
"MatchIdRules": {
79-
"_id": "%IdentifyRules_objid%"
80-
},
81-
"ExtractionRules": "{ test_suite_name : data.name }",
82-
"MergeResolverRules": null,
72+
"MatchIdRules": {"_id": "%IdentifyRules_objid%"},
73+
"ExtractionRules": "{test_suite_started_event_id: meta.id, test_suite_name : data.name }",
74+
"MergeResolverRules": "[{NONEPATH:NONE}, {test_suite: [{test_suite_started_event_id: meta.id}]} ]",
8375
"ArrayMergeOptions": "",
8476
"HistoryIdentifyRules": "",
8577
"HistoryExtractionRules": "",
@@ -92,12 +84,10 @@
9284
"TypeRule": "meta.type",
9385
"IdRule": "meta.id",
9486
"StartEvent": "NO",
95-
"IdentifyRules": "links | [?type=='CONTEXT'].target",
96-
"MatchIdRules": {
97-
"_id": "%IdentifyRules_objid%"
98-
},
99-
"ExtractionRules": "{ test_cases : [{trigger_event_id : meta.id, test_data : data.testcase, ongoing : `\"false\"`}]}",
100-
"MergeResolverRules": "{\"trigger_event_id:\":%IdentifyRules%}",
87+
"IdentifyRules": "links | [?type=='IUT'].target",
88+
"MatchIdRules": {"_id": "%IdentifyRules_objid%"},
89+
"ExtractionRules": "{test_case_triggered_event_id : meta.id, test_data : data.testCase, ongoing : `\"false\"`}",
90+
"MergeResolverRules": "[{test_suite_started_event_id: links | [?type=='IUT'] | [0].target}, {test_case : [{ test_case_triggered_event_id:meta.id}] }]",
10191
"ArrayMergeOptions": "",
10292
"HistoryIdentifyRules": "",
10393
"HistoryExtractionRules": "",
@@ -111,11 +101,9 @@
111101
"IdRule": "meta.id",
112102
"StartEvent": "NO",
113103
"IdentifyRules": "links | [?type=='TEST_CASE_EXECUTION'].target",
114-
"MatchIdRules": {
115-
"_id": "%IdentifyRules_objid%"
116-
},
117-
"ExtractionRules": "{ test_cases : [{trigger_event_id : links | [] | [?type=='TEST_CASE_EXECUTION'].target | [0], ongoing : `\"true\"`}]}",
118-
"MergeResolverRules": "{\"trigger_event_id:\":%IdentifyRules%}",
104+
"MatchIdRules": {"_id": "%IdentifyRules_objid%"},
105+
"ExtractionRules": "{test_case_started_event_id: meta.id, ongoing : `\"true\"`}",
106+
"MergeResolverRules": "[{NONEPATH:NONE}, {test_suite: [{ test_case : [{ test_case_triggered_event_id: links | [?type=='TEST_CASE_EXECUTION'] | [0].target }]} ]}]",
119107
"ArrayMergeOptions": "",
120108
"HistoryIdentifyRules": "",
121109
"HistoryExtractionRules": "",
@@ -129,11 +117,9 @@
129117
"IdRule": "meta.id",
130118
"StartEvent": "NO",
131119
"IdentifyRules": "links | [?type=='TEST_CASE_EXECUTION'].target",
132-
"MatchIdRules": {
133-
"_id": "%IdentifyRules_objid%"
134-
},
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%}",
120+
"MatchIdRules": {"_id": "%IdentifyRules_objid%"},
121+
"ExtractionRules": "{test_case_finished_event_id: meta.id, ongoing : `\"false\"`, verdict : data.outcome.verdict, conclusion : data.outcome.conclusion, metrics : data.outcome.metrics, description : data.outcome.description}",
122+
"MergeResolverRules": "[{NONEPATH:NONE}, {test_suite: [{ test_case : [{ test_case_started_event_id: links | [?type=='TEST_CASE_EXECUTION'] | [0].target }]} ]}]",
137123
"ArrayMergeOptions": "",
138124
"HistoryIdentifyRules": "",
139125
"HistoryExtractionRules": "",

‎src/main/resources/TestSourceChangeObjectRules.json

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"StartEvent": "YES",
66
"TypeRule": "meta.type",
77
"IdRule": "meta.id",
8-
"IdentifyRules": "links | [?type=='CHANGE'].target",
8+
"IdentifyRules": "[meta.id]",
99
"MatchIdRules": {"_id": "%IdentifyRules_objid%"},
10-
"ExtractionRules": "{id : meta.id, submission: {sourceChanges :[{eventId : meta.id, time : meta.time, gitIdentifier:data.gitIdentifier, svnIdentifier: data.svnIdentifier, ccCompositeIdentifier:data.ccCompositeIdentifier, hgIdentifier: data.hgIdentifier, submitter:data.submitter}]}}",
10+
"ExtractionRules": "{id : meta.id, submission: {eventId : meta.id, time : meta.time, svnIdentifier: data.svnIdentifier, submitter:data.submitter}}",
1111
"MergeResolverRules": null,
1212
"ArrayMergeOptions": "",
1313
"HistoryIdentifyRules": "",
@@ -20,13 +20,14 @@
2020
"StartEvent": "NO",
2121
"TypeRule": "meta.type",
2222
"IdRule": "meta.id",
23-
"IdentifyRules": "links | [?type=='BASE'].target",
24-
"MatchIdRules": {"_id": "%IdentifyRules_objid%"},
25-
"ExtractionRules": "{eventId : meta.id, time : meta.time, author:data.author, issues:data.issues}",
26-
"MergeResolverRules": "[{NONEPATH:NONE}, {creation: [{ eventId : meta.id}]}]",
23+
"IdentifyRules": "",
24+
"MatchIdRules": {},
25+
"ExtractionRules": "",
26+
"MergeResolverRules": "",
2727
"ArrayMergeOptions": "",
2828
"HistoryIdentifyRules": "",
29-
"HistoryExtractionRules": "",
29+
"HistoryExtractionRules": "{eventId : meta.id, time : meta.time, author:data.author, issues:data.issues}",
30+
"HistoryPathRules":"[{NONEPATH:NONE}, {creations: [{ eventId : meta.id}]}]",
3031
"ProcessRules": null
3132
},
3233
{
@@ -98,7 +99,7 @@
9899
"IdentifyRules": "links | [?type=='CAUSE'].target",
99100
"MatchIdRules": {"_id": "%IdentifyRules_objid%"},
100101
"ExtractionRules": "{triggeredEventId: meta.id, triggeredTime: meta.time, name:data.name, categories:data.categories}",
101-
"MergeResolverRules": "[{triggeredEventId : meta.id}, {causedActivities: [{ triggeredEventId : meta.id}]}]",
102+
"MergeResolverRules": "[{NONEPATH:NONE}, {causedActivities: [{ triggeredEventId : meta.id}]}]",
102103
"ArrayMergeOptions": "",
103104
"HistoryIdentifyRules": "",
104105
"HistoryExtractionRules": "",

0 commit comments

Comments
 (0)