Skip to content

Commit 2330c28

Browse files
ned29ned29
authored
UPDATE: source_change_object (#70)
* UPDATE: source_change_object * FIX: assert
1 parent 6e06823 commit 2330c28

File tree

4 files changed

+303
-140
lines changed

4 files changed

+303
-140
lines changed

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

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
import com.ericsson.ei.rules.RulesHandler;
1717
import com.fasterxml.jackson.databind.JsonNode;
1818
import com.fasterxml.jackson.databind.ObjectMapper;
19-
import org.apache.commons.io.FileUtils;
19+
import org.apache.qpid.util.FileUtils;
2020
import org.junit.runner.RunWith;
21+
import org.skyscreamer.jsonassert.JSONAssert;
2122
import org.slf4j.Logger;
2223
import org.slf4j.LoggerFactory;
2324
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,15 +28,14 @@
2728
import java.io.File;
2829
import java.util.ArrayList;
2930

30-
import static org.junit.Assert.assertEquals;
31-
3231
@RunWith(SpringJUnit4ClassRunner.class)
3332
@SpringBootTest
3433
public class FlowSourceChangeObject extends FlowTest {
35-
static protected String inputFilePath = "src/test/resources/aggregatedSourceChangeObject.json";
36-
static protected String jsonFilePath = "src/test/resources/TestSourceChangeObject.json";
37-
static protected String rulePath = "src/test/resources/TestSourceChangeObjectRules.json";
38-
private static Logger log = LoggerFactory.getLogger(FlowTest.class);
34+
35+
private static String inputFilePath = "src/test/resources/aggregatedSourceChangeObject.json";
36+
private static String jsonFilePath = "src/test/resources/TestSourceChangeObject.json";
37+
private static String rulePath = "src/test/resources/TestSourceChangeObjectRules.json";
38+
private static final Logger LOGGER = LoggerFactory.getLogger(FlowTest.class);
3939

4040
@Autowired
4141
private RulesHandler rulesHandler;
@@ -53,21 +53,26 @@ protected ArrayList<String> getEventNamesToSend() {
5353
eventNames.add("event_EiffelConfidenceLevelModifiedEvent_3");
5454
eventNames.add("event_EiffelConfidenceLevelModifiedEvent_3_2");
5555
eventNames.add("event_EiffelActivityTriggeredEvent_3");
56+
eventNames.add("event_EiffelActivityTriggeredEvent_3_2");
5657
eventNames.add("event_EiffelActivityStartedEvent_3");
58+
eventNames.add("event_EiffelActivityStartedEvent_3_2");
5759
eventNames.add("event_EiffelActivityFinishedEvent_3");
60+
eventNames.add("event_EiffelActivityFinishedEvent_3_2");
61+
eventNames.add("event_EiffelActivityCanceledEvent_3");
62+
eventNames.add("event_EiffelActivityCanceledEvent_3_2");
5863
return eventNames;
5964
}
6065

6166
protected void checkResult() {
6267
try {
63-
String expectedDocuments = FileUtils.readFileToString(new File(inputFilePath));
68+
String expectedDocuments = FileUtils.readFileAsString(new File(inputFilePath));
6469
ObjectMapper objectmapper = new ObjectMapper();
65-
JsonNode expectedJsons = objectmapper.readTree(expectedDocuments);
70+
JsonNode expectedJson = objectmapper.readTree(expectedDocuments);
6671
String document = objectHandler.findObjectById("fb6efi4n-25fb-4d77-b9fd-5f2xrrefe66de47");
6772
JsonNode actualJson = objectmapper.readTree(document);
68-
assertEquals(expectedJsons.toString().length(), actualJson.toString().length(),9);
73+
JSONAssert.assertEquals(expectedJson.toString(), actualJson.toString(), false);
6974
} catch (Exception e) {
70-
log.info(e.getMessage(), e);
75+
LOGGER.error(e.getMessage(), e);
7176
}
7277
}
7378
}

‎src/test/resources/TestSourceChangeObject.json

Lines changed: 195 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -52,57 +52,57 @@
5252
]
5353
},
5454
"event_EiffelSourceChangeCreatedEvent_3_2": {
55-
"meta": {
56-
"type": "EiffelSourceChangeCreatedEvent",
57-
"version": "1.0.0",
58-
"time": 1234567890,
59-
"id": "fb6ef12d-25fb-4d7j-b9fd-5fgvsr4fe66de47",
60-
"source": {
61-
"domainId": "example.domain"
62-
}
55+
"meta": {
56+
"type": "EiffelSourceChangeCreatedEvent",
57+
"version": "1.0.0",
58+
"time": 1234567890,
59+
"id": "fb6ef12d-25fb-4d7j-b9fd-5fgvsr4fe66de47",
60+
"source": {
61+
"domainId": "example.domain"
62+
}
63+
},
64+
"data": {
65+
"gitIdentifier": {
66+
"commitId": "fd090b60a4aedc5161dn9c035a47b14a319829b4",
67+
"branch": "myBranch",
68+
"repoName": "myPrivateRepo",
69+
"repoUri": "https://github.com/johndoe/myPrivateRepo.git"
6370
},
64-
"data": {
65-
"gitIdentifier": {
66-
"commitId": "fd090b60a4aedc5161dn9c035a47b14a319829b4",
67-
"branch": "myBranch",
68-
"repoName": "myPrivateRepo",
69-
"repoUri": "https://github.com/johndoe/myPrivateRepo.git"
70-
},
71-
"author": {
72-
"name": "John Doe",
73-
"email": "john.doe@company.com",
74-
"id": "johndoe",
75-
"group": "Team Gophers"
76-
},
77-
"change": {
78-
"files": "https://company.com/changes/fd090b60a4aedc5161da9c035a49b14a319829b4",
79-
"insertions": 135,
80-
"deletions": 23,
81-
"tracker": "GitHub",
82-
"details": "https://github.com/johndoe/myPrivateRepo/commit/fd090b60a4aedc5161da9c035a49b14a319829b4",
83-
"id": "43"
84-
},
85-
"issues": [
86-
{
87-
"type": "BUG",
88-
"tracker": "JIRA",
89-
"id": "JIRA-1234",
90-
"uri": "http://jira.company.com/browse/JIRA-1234",
91-
"transition": "RESOLVED"
92-
}
93-
]
71+
"author": {
72+
"name": "John Doe",
73+
"email": "john.doe@company.com",
74+
"id": "johndoe",
75+
"group": "Team Gophers"
9476
},
95-
"links": [
96-
{
97-
"type": "BASE",
98-
"target": "fb6efi4n-25fb-4d77-b9fd-5f2xrrefe66de47"
99-
},
77+
"change": {
78+
"files": "https://company.com/changes/fd090b60a4aedc5161da9c035a49b14a319829b4",
79+
"insertions": 135,
80+
"deletions": 23,
81+
"tracker": "GitHub",
82+
"details": "https://github.com/johndoe/myPrivateRepo/commit/fd090b60a4aedc5161da9c035a49b14a319829b4",
83+
"id": "43"
84+
},
85+
"issues": [
10086
{
101-
"type": "PREVIOUS_VERSION",
102-
"target": "6acc3c87-75e0-4b6d-88f5-b1a5dcd62b43"
87+
"type": "BUG",
88+
"tracker": "JIRA",
89+
"id": "JIRA-1234",
90+
"uri": "http://jira.company.com/browse/JIRA-1234",
91+
"transition": "RESOLVED"
10392
}
10493
]
10594
},
95+
"links": [
96+
{
97+
"type": "BASE",
98+
"target": "fb6efi4n-25fb-4d77-b9fd-5f2xrrefe66de47"
99+
},
100+
{
101+
"type": "PREVIOUS_VERSION",
102+
"target": "6acc3c87-75e0-4b6d-88f5-b1a5dcd62b43"
103+
}
104+
]
105+
},
106106
"event_EiffelSourceChangeSubmittedEvent_3": {
107107
"meta": {
108108
"type": "EiffelSourceChangeSubmittedEvent",
@@ -141,11 +141,11 @@
141141
"event_EiffelConfidenceLevelModifiedEvent_3": {
142142
"links": [
143143
{
144-
"target": "40df7fc4-0c40-40a3-a349-9f6da0ba81c5",
144+
"target": "fb6efi4n-25fb-4d77-b9fd-5f2xrrefe66de47",
145145
"type": "CAUSE"
146146
},
147147
{
148-
"target": "fb6ef12d-25fb-4d77-b9fd-5fktsrefe66de47",
148+
"target": "fb6efi4n-25fb-4d77-b9fd-5f2xrrefe66de47",
149149
"type": "SUBJECT"
150150
}
151151
],
@@ -176,11 +176,11 @@
176176
"event_EiffelConfidenceLevelModifiedEvent_3_2": {
177177
"links": [
178178
{
179-
"target": "40df7fc4-0c40-40a3-a349-9f6da0ba81c5",
179+
"target": "fb6efi4n-25fb-4d77-b9fd-5f2xrrefe66de47",
180180
"type": "CAUSE"
181181
},
182182
{
183-
"target": "fb6ef12d-25fb-4d77-b9fd-5fktsrefe66de47",
183+
"target": "fb6efi4n-25fb-4d77-b9fd-5f2xrrefe66de47",
184184
"type": "SUBJECT"
185185
}
186186
],
@@ -287,5 +287,151 @@
287287
"target": "e1e93f13-7c3c-4f17-9753-ebf0c86ff1c2"
288288
}
289289
]
290+
},
291+
"event_EiffelActivityTriggeredEvent_3_2": {
292+
"meta": {
293+
"id": "5e878b37-95f4-4d20-99b7-de9bdf351eed",
294+
"type": "EiffelActivityTriggeredEvent",
295+
"version": "1.1.0",
296+
"time": 1521113723785,
297+
"tags": [],
298+
"source": {
299+
"domainId": "eiffel038.seki.fem002",
300+
"host": "esekilxv9305",
301+
"name": "fem002-eiffel038",
302+
"serializer": {
303+
"groupId": "com.github.Ericsson",
304+
"artifactId": "eiffel-remrem-semantics",
305+
"version": "0.0.10"
306+
},
307+
"uri": "https://fem002-eiffel038.rnd.ki.sw.ericsson.se:8443/jenkins/job/test_xneekas/"
308+
}
309+
},
310+
"data": {
311+
"name": "test_xneekas",
312+
"categories": [],
313+
"triggers": [
314+
{
315+
"type": "MANUAL",
316+
"description": "Started by user Neeraj Kasula"
317+
}
318+
],
319+
"customData": []
320+
},
321+
"links": [{
322+
"type": "CAUSE",
323+
"target": "f37d59a3-069e-4f4c-8cc5-a52e73501a76"
324+
}]
325+
},
326+
"event_EiffelActivityStartedEvent_3_2": {
327+
"meta": {
328+
"type": "EiffelActivityStartedEvent",
329+
"version": "1.0.0",
330+
"time": 1234567890,
331+
"id": "e1e93f13-7c3c-4f17-9753-ebf0c7f4sey1c3"
332+
},
333+
"data": {
334+
"executionUri": "https://my.jenkins.host/myJob/43",
335+
"liveLogs": [
336+
{
337+
"name": "My build log",
338+
"uri": "file:///tmp/logs/data.log"
339+
}
340+
]
341+
},
342+
"links": [
343+
{
344+
"type": "ACTIVITY_EXECUTION",
345+
"target": "5e878b37-95f4-4d20-99b7-de9bdf351eed"
346+
}
347+
]
348+
},
349+
"event_EiffelActivityFinishedEvent_3_2": {
350+
"meta": {
351+
"type": "EiffelActivityFinishedEvent",
352+
"version": "1.0.0",
353+
"time": 1234567890,
354+
"id": "e1e93f13-7c3c-3f17-975f-ebf0cd6ff1c3"
355+
},
356+
"data": {
357+
"outcome": {
358+
"conclusion": "TIMED_OUT",
359+
"description": "Compilation timed out."
360+
},
361+
"persistentLogs": [
362+
{
363+
"name": "firstLog",
364+
"uri": "http://myHost.com/firstLog"
365+
},
366+
{
367+
"name": "otherLog",
368+
"uri": "isbn:0-486-27557-4"
369+
}
370+
]
371+
},
372+
"links": [
373+
{
374+
"type": "ACTIVITY_EXECUTION",
375+
"target": "5e878b37-95f4-4d20-99b7-de9bdf351eed"
376+
}
377+
]
378+
},
379+
"event_EiffelActivityCanceledEvent_3": {
380+
"meta": {
381+
"id": "cc24f5e8-9225-4f7b-9c77-7bafc7d03f6e",
382+
"type": "EiffelActivityCanceledEvent",
383+
"version": "1.1.0",
384+
"time": 1521641056231,
385+
"tags": [],
386+
"source": {
387+
"domainId": "eiffel039.seli.fem101",
388+
"host": "eselivm2v1464l",
389+
"name": "fem101-eiffel039",
390+
"serializer": {
391+
"groupId": "com.github.Ericsson",
392+
"artifactId": "eiffel-remrem-semantics",
393+
"version": "0.0.10"
394+
},
395+
"uri": "https://fem101-eiffel039.lmera.ericsson.se:8443/jenkins/job/eandzab_test2/"
396+
}
397+
},
398+
"data": {
399+
"customData": []
400+
},
401+
"links": [
402+
{
403+
"type": "ACTIVITY_EXECUTION",
404+
"target": "e1e93f13-7c3c-4f17-9753-ebf0c86ff1c2"
405+
}
406+
]
407+
},
408+
"event_EiffelActivityCanceledEvent_3_2": {
409+
"meta": {
410+
"id": "cc24f5e8-9225-4f7b-9c77-7bafc7d03f7e",
411+
"type": "EiffelActivityCanceledEvent",
412+
"version": "1.1.0",
413+
"time": 1521641056231,
414+
"tags": [],
415+
"source": {
416+
"domainId": "eiffel039.seli.fem101",
417+
"host": "eselivm2v1464l",
418+
"name": "fem101-eiffel039",
419+
"serializer": {
420+
"groupId": "com.github.Ericsson",
421+
"artifactId": "eiffel-remrem-semantics",
422+
"version": "0.0.10"
423+
},
424+
"uri": "https://fem101-eiffel039.lmera.ericsson.se:8443/jenkins/job/eandzab_test2/"
425+
}
426+
},
427+
"data": {
428+
"customData": []
429+
},
430+
"links": [
431+
{
432+
"type": "ACTIVITY_EXECUTION",
433+
"target": "5e878b37-95f4-4d20-99b7-de9bdf351eed"
434+
}
435+
]
290436
}
291437
}

‎src/test/resources/TestSourceChangeObjectRules.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"IdRule": "meta.id",
88
"IdentifyRules": "links | [?type=='CHANGE'].target",
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": "",
@@ -98,7 +98,7 @@
9898
"IdentifyRules": "links | [?type=='CAUSE'].target",
9999
"MatchIdRules": {"_id": "%IdentifyRules_objid%"},
100100
"ExtractionRules": "{triggeredEventId: meta.id, triggeredTime: meta.time, name:data.name, categories:data.categories}",
101-
"MergeResolverRules": "[{triggeredEventId : meta.id}, {causedActivities: [{ triggeredEventId : meta.id}]}]",
101+
"MergeResolverRules": "[{NONEPATH:NONE}, {causedActivities: [{ triggeredEventId : meta.id}]}]",
102102
"ArrayMergeOptions": "",
103103
"HistoryIdentifyRules": "",
104104
"HistoryExtractionRules": "",

0 commit comments

Comments
 (0)