updated ArtifactRules_new.json (eiffel-community#56)

* added testexecution & sourcecange rulesets to resources

* updated ArtifactRules_new.json

Author: emichaf

src/main/resources/ArtifactRules_new.json

@@ -8,10 +8,13 @@
     "IdentifyRules" : "[meta.id]",
     "MatchIdRules": {"_id": "%IdentifyRules_objid%"},
     "ExtractionRules" : "{ id : meta.id, type : meta.type, time : meta.time, gav : data.gav, fileInformation : data.fileInformation, buildCommand : data.buildCommand }",
-    "MergeResolverRules" : "",
+    "DownstreamIdentifyRules" : "links | [?type=='COMPOSITION'].target",
+    "DownstreamMergeRules": "{\"externalComposition\":{\"eventId\":%IdentifyRules%}}",
+    "DownstreamExtractionRules" : "{artifacts: [{id : meta.id}]}",
     "ArrayMergeOptions": "",
     "HistoryIdentifyRules":"links | [?type=='COMPOSITION'].target",
-    "HistoryExtractionRules":"{artifacts: [{id : meta.id}]}",
+    "HistoryExtractionRules":"{internalComposition:{artifacts: [{id : meta.id}]}}",
+    "HistoryPathRules": "{artifacts: {id: meta.id}}",
     "ProcessRules" : null,
     "ProcessFunction" : null
   },
@@ -24,7 +27,6 @@
     "IdentifyRules" : "links | [?type=='ARTIFACT'].target",
     "MatchIdRules": {"_id": "%IdentifyRules_objid%"},
     "ExtractionRules" : "{ publications :[ { eventId : meta.id, time : meta.time, locations : data.locations  }] }",
-    "MergeResolverRules" : "",
     "ArrayMergeOptions": "",
     "HistoryIdentifyRules": "",
     "HistoryExtractionRules": "",
@@ -40,7 +42,6 @@
     "IdentifyRules" : "links | [?type=='SUBJECT'].target",
     "MatchIdRules": {"_id": "%IdentifyRules_objid%"},
     "ExtractionRules" : "{confidenceLevels :[{ eventId:meta.id, time:meta.time, name:data.name, value:data.value}]}",
-    "MergeResolverRules" : "",
     "ArrayMergeOptions": "",
     "HistoryIdentifyRules": "",
     "HistoryExtractionRules": "",
@@ -49,15 +50,30 @@
   },
   {
     "TemplateName":"ARTIFACT_1",
-    "Type":"EiffelTestCaseStartedEvent",
+    "Type":"EiffelTestCaseTriggeredEvent",
     "TypeRule": "meta.type",
     "IdRule": "meta.id",
     "StartEvent": "NO",
     "IdentifyRules" : "links | [?type=='IUT'].target",
     "MatchIdRules": {"_id": "%IdentifyRules_objid%"},
+    "ExtractionRules" : "{testCaseExecutions :[{ testCaseTrigeredEventId:meta.id, testCaseTrigeredTime:meta.time, testCase:data.testCase}]}",
+    "ArrayOptions": "",
+    "HistoryIdentifyRules": "",
+    "HistoryExtractionRules": "",
+    "ProcessRules":null,
+    "ProcessFunction" : null
+  },
+  {
+    "TemplateName":"ARTIFACT_1",
+    "Type":"EiffelTestCaseStartedEvent",
+    "TypeRule": "meta.type",
+    "IdRule": "meta.id",
+    "StartEvent": "NO",
+    "IdentifyRules" : "links | [?type=='TEST_CASE_EXECUTION'].target",
+    "MatchIdRules": {"_id": "%IdentifyRules_objid%"},
     "ExtractionRules" : "{testCaseExecutions :[{ testCaseStartedEventId:meta.id, testCaseStartedTime:meta.time, testCase:data.testCase}]}",
-    "MergeResolverRules" : "",
-    "ArrayMergeOptions": "",
+    "MergeResolverRules" : "{\"testCaseTrigeredEventId\":%IdentifyRules%}",
+    "ArrayOptions": "",
     "HistoryIdentifyRules": "",
     "HistoryExtractionRules": "",
     "ProcessRules":null,
@@ -71,12 +87,12 @@
     "StartEvent": "NO",
     "IdentifyRules" : "links | [?type=='TEST_CASE_EXECUTION'].target",
     "MatchIdRules": { "$and": [{"aggregatedObject.testCaseExecutions.testCaseStartedEventId": "%IdentifyRules%"}]},
-    "ExtractionRules" : "{testCaseExecutions :[{ testCaseFinishEventId:meta.id, testCaseFinishedTime:meta.time, testCase:data.outcome}]}",
-    "MergeResolverRules" : {"testCaseStartedEventId":"%IdentifyRules%"},
+    "ExtractionRules" : "{ testCaseFinishEventId:meta.id, testCaseFinishedTime:meta.time, testCase:data.outcome}",
+    "MergeResolverRules" : "{\"testCaseStartedEventId\":%IdentifyRules%}",
     "ArrayMergeOptions": "",
     "HistoryIdentifyRules": "",
     "HistoryExtractionRules": "",
-    "ProcessRules":"{testCaseExecutions :[{testCaseDuration : diff(testCaseExecutions[0].testCaseFinishedTime, testCaseExecutions[0].testCaseStartedTime)}]}",
+    "ProcessRules":"{testCaseDuration : diff(testCaseExecutions[0].testCaseFinishedTime, testCaseExecutions[0].testCaseStartedTime)}",
     "ProcessFunction" : "difference"
   },
   {
@@ -88,10 +104,12 @@
     "IdentifyRules" : "",
     "MatchIdRules": { },
     "ExtractionRules" : "",
-    "MergeResolverRules" : "",
     "ArrayMergeOptions": "",
-    "HistoryIdentifyRules":"links | [?type=='ELEMENT'].target",
-    "HistoryExtractionRules": "{internalComposition: {eventId: meta.id, time:meta.time, name:data.name}}",
+    "DownstreamIdentifyRules":"links | [?type=='ELEMENT'].target",
+    "DownstreamExtractionRules": "{externalComposition: {eventId: meta.id, time:meta.time, name:data.name}}",
+    "DownstreamMergeRules": "{\"eventId\":%IdentifyRules%}",
+    "HistoryExtractionRules": "{eventId: meta.id, time: meta.time,  name: data.name}",
+    "HistoryPathRules": "{internalComposition:{compositions: [{eventId: meta.id}]}}",
     "ProcessRules":null,
     "ProcessFunction" : null
   },
@@ -104,10 +122,10 @@
     "IdentifyRules" : "",
     "MatchIdRules": {},
     "ExtractionRules" : "",
-    "MergeResolverRules" : "",
     "ArrayMergeOptions": "",
     "HistoryIdentifyRules": "",
-    "HistoryExtractionRules": "{internalComposition: {sourceChanges :[{ author:data.author, issues:data.issues}]}}",
+    "HistoryExtractionRules": "{SCCEventId: meta.id, author:data.author, issues:data.issues}",
+    "HistoryPathRules": "{sourceCreations: [{SCCEventId: meta.id}]}",
     "ProcessRules":null,
     "ProcessFunction" : null
   },
@@ -120,10 +138,10 @@
     "IdentifyRules" : "",
     "MatchIdRules": {},
     "ExtractionRules" : "",
-    "MergeResolverRules" : "",
     "ArrayMergeOptions": "",
     "HistoryIdentifyRules":"links | [?type=='CHANGE'].target",
-    "HistoryExtractionRules": "{internalComposition: {sourceChanges :[{svnIdentifier:data.svnIdentifier, submitter:data.submitter}]}}",
+    "HistoryExtractionRules": "{SCSEventId: meta.id,svnIdentifier:data.svnIdentifier, submitter:data.submitter}",
+    "HistoryPathRules": "{sourceChanges: [{SCSEventId: meta.id}]}",
     "ProcessRules":null,
     "ProcessFunction" : null
   }