Skip to content

Commit 18a351b

Browse files
ValentinTyhonovemichaf
ValentinTyhonov
authored and
emichaf
committed
Refactored code in flow tests, fixed generating of TestExecution object (#77)
* Update fork (#6) * Refactored code in flow tests * Refactored code in flow tests * Fixed generating TestExecution object * Refactored code in flow tests * Fixed using deprecated method * Refactored code in flow tests
1 parent 810699d commit 18a351b

16 files changed

+553
-815
lines changed

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

Lines changed: 0 additions & 108 deletions
This file was deleted.

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

Lines changed: 24 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -13,40 +13,37 @@
1313
*/
1414
package com.ericsson.ei.flowtests;
1515

16-
import com.ericsson.ei.rules.RulesHandler;
17-
import com.fasterxml.jackson.databind.JsonNode;
18-
import com.fasterxml.jackson.databind.ObjectMapper;
19-
import org.apache.qpid.util.FileUtils;
2016
import org.junit.runner.RunWith;
21-
import org.skyscreamer.jsonassert.JSONAssert;
22-
import org.slf4j.Logger;
23-
import org.slf4j.LoggerFactory;
24-
import org.springframework.beans.factory.annotation.Autowired;
2517
import org.springframework.boot.test.context.SpringBootTest;
2618
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
2719

28-
import java.io.File;
2920
import java.util.ArrayList;
21+
import java.util.HashMap;
22+
import java.util.List;
23+
import java.util.Map;
3024

3125
@RunWith(SpringJUnit4ClassRunner.class)
3226
@SpringBootTest
33-
public class FlowSourceChangeObject extends FlowTest {
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);
27+
public class FlowSourceChangeObject extends FlowTestBase {
3928

40-
@Autowired
41-
private RulesHandler rulesHandler;
29+
private static final String RULES_FILE_PATH = "src/test/resources/TestSourceChangeObjectRules.json";
30+
private static final String EVENTS_FILE_PATH = "src/test/resources/TestSourceChangeObject.json";
31+
private static final String AGGREGATED_OBJECT_FILE_PATH = "src/test/resources/aggregatedSourceChangeObject.json";
32+
private static final String AGGREGATED_OBJECT_ID = "fb6efi4n-25fb-4d77-b9fd-5f2xrrefe66de47";
4233

43-
protected void setSpecificTestCaseParameters() {
44-
setJsonFilePath(jsonFilePath);
45-
rulesHandler.setRulePath(rulePath);
34+
@Override
35+
String setRulesFilePath() {
36+
return RULES_FILE_PATH;
4637
}
4738

48-
protected ArrayList<String> getEventNamesToSend() {
49-
ArrayList<String> eventNames = new ArrayList<>();
39+
@Override
40+
String setEventsFilePath() {
41+
return EVENTS_FILE_PATH;
42+
}
43+
44+
@Override
45+
List<String> setEventNamesToSend() {
46+
List<String> eventNames = new ArrayList<>();
5047
eventNames.add("event_EiffelSourceChangeSubmittedEvent_3");
5148
eventNames.add("event_EiffelSourceChangeCreatedEvent_3");
5249
eventNames.add("event_EiffelSourceChangeCreatedEvent_3_2");
@@ -63,16 +60,10 @@ protected ArrayList<String> getEventNamesToSend() {
6360
return eventNames;
6461
}
6562

66-
protected void checkResult() {
67-
try {
68-
String expectedDocuments = FileUtils.readFileAsString(new File(inputFilePath));
69-
ObjectMapper objectmapper = new ObjectMapper();
70-
JsonNode expectedJson = objectmapper.readTree(expectedDocuments);
71-
String document = objectHandler.findObjectById("fb6efi4n-25fb-4d77-b9fd-5f2xrrefe66de47");
72-
JsonNode actualJson = objectmapper.readTree(document);
73-
JSONAssert.assertEquals(expectedJson.toString(), actualJson.toString(), false);
74-
} catch (Exception e) {
75-
LOGGER.error(e.getMessage(), e);
76-
}
63+
@Override
64+
Map<String, String> setCheckInfo() {
65+
Map<String, String> checkInfo = new HashMap<>();
66+
checkInfo.put(AGGREGATED_OBJECT_ID, AGGREGATED_OBJECT_FILE_PATH);
67+
return checkInfo;
7768
}
7869
}

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

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
import org.junit.Before;
2525
import org.junit.runner.RunWith;
2626
import org.mockito.Mock;
27-
import org.slf4j.Logger;
28-
import org.slf4j.LoggerFactory;
2927
import org.springframework.beans.factory.annotation.Autowired;
3028
import org.springframework.boot.test.context.SpringBootTest;
3129
import org.springframework.http.HttpStatus;
@@ -35,15 +33,21 @@
3533
import java.io.IOException;
3634
import java.net.URL;
3735
import java.util.ArrayList;
36+
import java.util.HashMap;
37+
import java.util.List;
38+
import java.util.Map;
3839

3940
import static org.mockito.Mockito.*;
4041

4142
@RunWith(SpringJUnit4ClassRunner.class)
4243
@SpringBootTest
4344
public class FlowTest extends FlowTestBase {
44-
private static Logger log = LoggerFactory.getLogger(FlowTest.class);
4545

46-
private static String upStreamResultFile = "upStreamResultFile.json";
46+
private static final String UPSTREAM_RESULT_FILE = "upStreamResultFile.json";
47+
private static final String RULES_FILE_PATH = "src/test/resources/ArtifactRules_new.json";
48+
private static final String EVENTS_FILE_PATH = "src/test/resources/test_events.json";
49+
private static final String AGGREGATED_OBJECT_FILE_PATH = "src/test/resources/AggregatedDocumentInternalComposition.json";
50+
private static final String AGGREGATED_OBJECT_ID = "6acc3c87-75e0-4b6d-88f5-b1a5d4e62b43";
4751

4852
@Autowired
4953
private UpStreamEventsHandler upStreamEventsHandler;
@@ -54,20 +58,30 @@ public class FlowTest extends FlowTestBase {
5458
@Before
5559
public void before() throws IOException {
5660
upStreamEventsHandler.setEventRepositoryQueryService(erQueryService);
57-
inputFilePath = "src/test/resources/AggregatedDocumentInternalComposition.json";
5861

59-
final URL upStreamResult = this.getClass().getClassLoader().getResource(upStreamResultFile);
62+
final URL upStreamResult = this.getClass().getClassLoader().getResource(UPSTREAM_RESULT_FILE);
6063
ObjectMapper objectMapper = new ObjectMapper();
6164
ObjectNode objectNode = objectMapper.createObjectNode();
6265
objectNode.set("upstreamLinkObjects", objectMapper.readTree(upStreamResult));
6366
objectNode.set("downstreamLinkObjects", objectMapper.createArrayNode());
6467

65-
when(erQueryService.getEventStreamDataById(anyString(), any(SearchOption.class), anyInt(), anyInt(),
66-
anyBoolean())).thenReturn(new ResponseEntity<>(objectNode, HttpStatus.OK));
68+
when(erQueryService.getEventStreamDataById(anyString(), any(SearchOption.class), anyInt(), anyInt(), anyBoolean()))
69+
.thenReturn(new ResponseEntity<>(objectNode, HttpStatus.OK));
6770
}
6871

69-
protected ArrayList<String> getEventNamesToSend() {
70-
ArrayList<String> eventNames = new ArrayList<>();
72+
@Override
73+
String setRulesFilePath() {
74+
return RULES_FILE_PATH;
75+
}
76+
77+
@Override
78+
String setEventsFilePath() {
79+
return EVENTS_FILE_PATH;
80+
}
81+
82+
@Override
83+
List<String> setEventNamesToSend() {
84+
List<String> eventNames = new ArrayList<>();
7185
eventNames.add("event_EiffelConfidenceLevelModifiedEvent_3_2");
7286
eventNames.add("event_EiffelArtifactPublishedEvent_3");
7387
eventNames.add("event_EiffelArtifactCreatedEvent_3");
@@ -79,7 +93,13 @@ protected ArrayList<String> getEventNamesToSend() {
7993
eventNames.add("event_EiffelTestCaseTriggeredEvent_3_1");
8094
eventNames.add("event_EiffelTestCaseStartedEvent_3_1");
8195
eventNames.add("event_EiffelTestCaseFinishedEvent_3_1");
82-
8396
return eventNames;
8497
}
98+
99+
@Override
100+
Map<String, String> setCheckInfo() {
101+
Map<String, String> checkInfo = new HashMap<>();
102+
checkInfo.put(AGGREGATED_OBJECT_ID, AGGREGATED_OBJECT_FILE_PATH);
103+
return checkInfo;
104+
}
85105
}

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

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,40 @@
1616
*/
1717
package com.ericsson.ei.flowtests;
1818

19-
import com.fasterxml.jackson.databind.JsonNode;
20-
import com.fasterxml.jackson.databind.ObjectMapper;
21-
import org.apache.commons.io.FileUtils;
2219
import org.junit.runner.RunWith;
23-
import org.slf4j.Logger;
24-
import org.slf4j.LoggerFactory;
2520

2621
import org.springframework.boot.test.context.SpringBootTest;
2722
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
2823

29-
import java.io.File;
3024
import java.util.ArrayList;
31-
import static org.junit.Assert.assertEquals;
25+
import java.util.HashMap;
26+
import java.util.List;
27+
import java.util.Map;
3228

3329
@RunWith(SpringJUnit4ClassRunner.class)
3430
@SpringBootTest
3531
public class FlowTest2 extends FlowTestBase {
3632

37-
private static Logger log = LoggerFactory.getLogger(FlowTest2.class);
33+
private static final String RULES_FILE_PATH = "src/test/resources/ArtifactRules_new.json";
34+
private static final String EVENTS_FILE_PATH = "src/test/resources/test_events.json";
35+
private static final String AGGREGATED_OBJECT_FILE_PATH_1 = "src/test/resources/AggregatedDocument.json";
36+
private static final String AGGREGATED_OBJECT_FILE_PATH_2 = "src/test/resources/AggregatedDocument2.json";
37+
private static final String AGGREGATED_OBJECT_ID_1 = "6acc3c87-75e0-4b6d-88f5-b1a5d4e62b43";
38+
private static final String AGGREGATED_OBJECT_ID_2 = "ccce572c-c364-441e-abc9-b62fed080ca2";
3839

39-
static private final String inputFilePath2 = "src/test/resources/AggregatedDocument2.json";
40+
@Override
41+
String setRulesFilePath() {
42+
return RULES_FILE_PATH;
43+
}
44+
45+
@Override
46+
String setEventsFilePath() {
47+
return EVENTS_FILE_PATH;
48+
}
4049

41-
protected ArrayList<String> getEventNamesToSend() {
42-
ArrayList<String> eventNames = new ArrayList<>();
50+
@Override
51+
List<String> setEventNamesToSend() {
52+
List<String> eventNames = new ArrayList<>();
4353
eventNames.add("event_EiffelArtifactCreatedEvent_3");
4454
eventNames.add("event_EiffelArtifactPublishedEvent_3");
4555
eventNames.add("event_EiffelConfidenceLevelModifiedEvent_3_2");
@@ -57,22 +67,11 @@ protected ArrayList<String> getEventNamesToSend() {
5767
return eventNames;
5868
}
5969

60-
protected void checkResult() {
61-
try {
62-
String document = objectHandler.findObjectById("6acc3c87-75e0-4b6d-88f5-b1a5d4e62b43");
63-
String expectedDocument = FileUtils.readFileToString(new File(inputFilePath), "UTF-8");
64-
ObjectMapper objectmapper = new ObjectMapper();
65-
JsonNode expectedJson = objectmapper.readTree(expectedDocument);
66-
JsonNode actualJson = objectmapper.readTree(document);
67-
String breakString = "breakHere";
68-
assertEquals(expectedJson.toString().length(), actualJson.toString().length());
69-
String expectedDocument2 = FileUtils.readFileToString(new File(inputFilePath2), "UTF-8");
70-
String document2 = objectHandler.findObjectById("ccce572c-c364-441e-abc9-b62fed080ca2");
71-
JsonNode expectedJson2 = objectmapper.readTree(expectedDocument2);
72-
JsonNode actualJson2 = objectmapper.readTree(document2);
73-
assertEquals(expectedJson2.toString().length(), actualJson2.toString().length());
74-
} catch (Exception e) {
75-
log.info(e.getMessage(),e);
76-
}
70+
@Override
71+
Map<String, String> setCheckInfo() {
72+
Map<String, String> checkInfo = new HashMap<>();
73+
checkInfo.put(AGGREGATED_OBJECT_ID_1, AGGREGATED_OBJECT_FILE_PATH_1);
74+
checkInfo.put(AGGREGATED_OBJECT_ID_2, AGGREGATED_OBJECT_FILE_PATH_2);
75+
return checkInfo;
7776
}
7877
}

0 commit comments

Comments
 (0)