Skip to content

Commit 85d7541

Browse files
saif-ericssonsaif-ericsson
authored
Restructuring object for removing need of using "object" in free-style queries (#332)
* restructuring aggregated object for free-style queries
1 parent b2b34fb commit 85d7541

File tree

52 files changed

+1403
-1436
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1403
-1436
lines changed

‎src/functionaltests/java/com/ericsson/ei/query/QueryAggregatedObjectsTestSteps.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,7 @@ public void perform_valid_query_on_newly_created_aggregated_object() throws Thro
131131
JsonNode jsonNodeResult = objMapper.readValue(response.getBody().toString(), JsonNode.class);
132132
JsonNode responseEntityNode = jsonNodeResult.get("queryResponseEntity");
133133

134-
String actualTestCaseFinishedEventId = responseEntityNode.get("aggregatedObject")
135-
.get("testCaseExecutions")
134+
String actualTestCaseFinishedEventId = responseEntityNode.get("testCaseExecutions")
136135
.get(0)
137136
.get("testCaseFinishedEventId")
138137
.asText();
@@ -204,7 +203,7 @@ public void perform_several_valid_freestyle_queries_on_created_Aggregated_object
204203
+ response.getBody().toString());
205204

206205
JsonNode jsonNodeResult = objMapper.readValue(response.getBody().toString(), JsonNode.class);
207-
JsonNode aggrObjResponse = objMapper.readValue(jsonNodeResult.get(0).get("aggregatedObject").toString(),
206+
JsonNode aggrObjResponse = objMapper.readValue(jsonNodeResult.get(0).toString(),
208207
JsonNode.class);
209208

210209
String actualAggrObjId = aggrObjResponse.get("id").asText();
@@ -357,7 +356,7 @@ public void perform_valid_query_and_filter_on_aggregated_object() throws Throwab
357356

358357
@And("^Perform a query and filter with part of path$")
359358
public void perform__query_and_filter_with_part_of_path() throws Throwable {
360-
final String expectedResponse = "[{\"6acc3c87-75e0-4b6d-88f5-b1a5d4e62b43\":\"\\\"[1481875921843, 1481875988767, 1481875921763, 1481875944272, 5005, 1481875891763, 2000]\\\"\"}]";
359+
final String expectedResponse = "[{\"6acc3c87-75e0-4b6d-88f5-b1a5d4e62b43\":\"\\\"[5005, 1481875921843, 1481875988767, 2000, 1481875921763, 1481875944272, 1481875891763]\\\"\"}]";
361360
final String expectedResponse2 = "[{\"6acc3c87-75e0-4b6d-88f5-b1a5d4e62b43\":\"\\\"null\\\"\"}]";
362361
final String expectedResponse3 = "[{\"6acc3c87-75e0-4b6d-88f5-b1a5d4e62b43\":\"\\\"[33d05e6f-9bd9-4138-83b6-e20cc74680a3, 33d05e6f-9bd9-4138-83b6-e20cc74681b5]\\\"\"}]";
363362
final String entryPoint = "/query";

‎src/functionaltests/resources/aggregatedObject.json

Lines changed: 110 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -1,122 +1,120 @@
11
{
2-
"_id": "b46ef12d-25gb-4d7y-b9fd-8763re66de47",
3-
"aggregatedObject": {
4-
"ongoing": true,
5-
"test_suite": [
2+
"_id":"b46ef12d-25gb-4d7y-b9fd-8763re66de47",
3+
"ongoing":true,
4+
"test_suite":[
65
{
7-
"test_suite_started_event_id": "v46ef19d-20gb-4d7y-h9fd-8763re6kde47",
8-
"test_case": [
9-
{
10-
"conclusion": "SUCCESSFUL",
11-
"ongoing": "false",
12-
"test_data": {
13-
"tracker": "My Test Management System",
14-
"id": "TC-1234",
15-
"version": "42",
16-
"uri": "http://tm.company.com/browse/TC-1234/42"
6+
"test_suite_started_event_id":"v46ef19d-20gb-4d7y-h9fd-8763re6kde47",
7+
"test_case":[
8+
{
9+
"conclusion":"SUCCESSFUL",
10+
"ongoing":"false",
11+
"test_data":{
12+
"tracker":"My Test Management System",
13+
"id":"TC-1234",
14+
"version":"42",
15+
"uri":"http://tm.company.com/browse/TC-1234/42"
16+
},
17+
"test_case_started_event_id":"v46ef19d-20ab-4e2y-e9se-8762ae6kde47",
18+
"verdict":"PASSED",
19+
"description":"Accidentally started a fire in the lab during execution.",
20+
"test_case_finished_event_id":"v46ef19d-20fb-4e2k-h9fa-8763ae6ese47",
21+
"metrics":[
22+
{
23+
"name":"myMetric",
24+
"value":5
25+
},
26+
{
27+
"name":"throughput",
28+
"value":8.325
29+
},
30+
{
31+
"name":"somethingElse",
32+
"value":"hello"
33+
}
34+
],
35+
"test_case_triggered_event_id":"v46ef19a-20ga-4d2y-h9fa-8763ae6kde47"
1736
},
18-
"test_case_started_event_id": "v46ef19d-20ab-4e2y-e9se-8762ae6kde47",
19-
"verdict": "PASSED",
20-
"description": "Accidentally started a fire in the lab during execution.",
21-
"test_case_finished_event_id": "v46ef19d-20fb-4e2k-h9fa-8763ae6ese47",
22-
"metrics": [
23-
{
24-
"name": "myMetric",
25-
"value": 5
26-
},
27-
{
28-
"name": "throughput",
29-
"value": 8.325
30-
},
31-
{
32-
"name": "somethingElse",
33-
"value": "hello"
34-
}
35-
],
36-
"test_case_triggered_event_id": "v46ef19a-20ga-4d2y-h9fa-8763ae6kde47"
37-
},
38-
{
39-
"conclusion": "SUCCESSFUL",
40-
"ongoing": "false",
41-
"test_data": {
42-
"tracker": "My Test Management System",
43-
"id": "TC-1234",
44-
"version": "42",
45-
"uri": "http://tm.company.com/browse/TC-1234/42"
46-
},
47-
"test_case_started_event_id": "v46ef19d-20ab-4d2y-h9fe-87haha6kde47",
48-
"verdict": "PASSED",
49-
"description": "Accidentally started a fire in the lab during execution.",
50-
"test_case_finished_event_id": "v46ef19d-20gb-4c2a-h9fa-8763heheae47",
51-
"metrics": [
52-
{
53-
"name": "myMetric",
54-
"value": 5
55-
},
56-
{
57-
"name": "throughput",
58-
"value": 8.325
59-
},
60-
{
61-
"name": "somethingElse",
62-
"value": "hello"
63-
}
64-
],
65-
"test_case_triggered_event_id": "v46ef19d-20gb-4d2y-h9fa-87dada6kde47"
66-
}
67-
],
68-
"test_suite_name": "Pre-release installation and security verification"
37+
{
38+
"conclusion":"SUCCESSFUL",
39+
"ongoing":"false",
40+
"test_data":{
41+
"tracker":"My Test Management System",
42+
"id":"TC-1234",
43+
"version":"42",
44+
"uri":"http://tm.company.com/browse/TC-1234/42"
45+
},
46+
"test_case_started_event_id":"v46ef19d-20ab-4d2y-h9fe-87haha6kde47",
47+
"verdict":"PASSED",
48+
"description":"Accidentally started a fire in the lab during execution.",
49+
"test_case_finished_event_id":"v46ef19d-20gb-4c2a-h9fa-8763heheae47",
50+
"metrics":[
51+
{
52+
"name":"myMetric",
53+
"value":5
54+
},
55+
{
56+
"name":"throughput",
57+
"value":8.325
58+
},
59+
{
60+
"name":"somethingElse",
61+
"value":"hello"
62+
}
63+
],
64+
"test_case_triggered_event_id":"v46ef19d-20gb-4d2y-h9fa-87dada6kde47"
65+
}
66+
],
67+
"test_suite_name":"Pre-release installation and security verification"
6968
}
70-
],
71-
"activity_triggered_event_id": "b46ef12d-25gb-4d7y-b9fd-8763re66de47",
72-
"test_batches": [
69+
],
70+
"activity_triggered_event_id":"b46ef12d-25gb-4d7y-b9fd-8763re66de47",
71+
"test_batches":[
7372
{
74-
"recipes": [
75-
{
76-
"id": "aaaaaaaa-bbbb-5ccc-addd-eeeeeeeeeee0",
77-
"constraints": {
78-
"environment": {
79-
"os": "ubuntu-15.04",
80-
"MY_PATH": "/home/lt-worf"
81-
},
82-
"load": 10000
73+
"recipes":[
74+
{
75+
"id":"aaaaaaaa-bbbb-5ccc-addd-eeeeeeeeeee0",
76+
"constraints":{
77+
"environment":{
78+
"os":"ubuntu-15.04",
79+
"MY_PATH":"/home/lt-worf"
80+
},
81+
"load":10000
82+
},
83+
"testCase":{
84+
"tracker":"My Test Management System",
85+
"id":"TC-1234",
86+
"uri":"http://tm.company.com/browse/TC-1234"
87+
}
8388
},
84-
"testCase": {
85-
"tracker": "My Test Management System",
86-
"id": "TC-1234",
87-
"uri": "http://tm.company.com/browse/TC-1234"
89+
{
90+
"id":"aaaaaaaa-bbbb-5ccc-addd-eeeeeeeeeee1",
91+
"constraints":{
92+
"environment":{
93+
"os":"ubuntu-16.04.1",
94+
"MY_PATH":"/home/cpt-picard"
95+
},
96+
"load":500
97+
},
98+
"testCase":{
99+
"tracker":"My Test Management System",
100+
"id":"TC-1234",
101+
"uri":"http://tm.company.com/browse/TC-1234"
102+
}
88103
}
89-
},
90-
{
91-
"id": "aaaaaaaa-bbbb-5ccc-addd-eeeeeeeeeee1",
92-
"constraints": {
93-
"environment": {
94-
"os": "ubuntu-16.04.1",
95-
"MY_PATH": "/home/cpt-picard"
96-
},
97-
"load": 500
98-
},
99-
"testCase": {
100-
"tracker": "My Test Management System",
101-
"id": "TC-1234",
102-
"uri": "http://tm.company.com/browse/TC-1234"
104+
],
105+
"name":"First batch",
106+
"priority":1,
107+
"dependencies":[
108+
{
109+
"dependency":"aaaaaaaa-bbbb-5ccc-addd-eeeeeeeeeee1",
110+
"dependent":"aaaaaaaa-bbbb-5ccc-addd-eeeeeeeeeee0"
103111
}
104-
}
105-
],
106-
"name": "First batch",
107-
"priority": 1,
108-
"dependencies": [
109-
{
110-
"dependency": "aaaaaaaa-bbbb-5ccc-addd-eeeeeeeeeee1",
111-
"dependent": "aaaaaaaa-bbbb-5ccc-addd-eeeeeeeeeee0"
112-
}
113-
]
112+
]
114113
}
115-
],
116-
"TemplateName": "TEST_EXECUTION_1",
117-
"time": 1234567890,
118-
"activity_started_event_id": "b46e01ud-25gb-4d7y-b9f6-836fre6yde47",
119-
"type": "EiffelActivityTriggeredEvent",
120-
"version": "3.0.0"
121-
}
114+
],
115+
"TemplateName":"TEST_EXECUTION_1",
116+
"time":1234567890,
117+
"activity_started_event_id":"b46e01ud-25gb-4d7y-b9f6-836fre6yde47",
118+
"type":"EiffelActivityTriggeredEvent",
119+
"version":"3.0.0"
122120
}

0 commit comments

Comments
 (0)