Skip to content

Commit 2222273

Browse files
Tristan-WorkGHTristan-WorkGH
committed
Move PR to #587 
1 parent e92d510 commit 2222273

File tree

1 file changed

+34
-17
lines changed

1 file changed

+34
-17
lines changed

‎src/test/java/org/gridsuite/study/server/StudyTest.java‎

Lines changed: 34 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,8 @@ public MockResponse dispatch(RecordedRequest request) {
404404
return new MockResponse().setResponseCode(200)
405405
.addHeader("Content-Type", "application/json; charset=utf-8");
406406
} else if (path.matches("/v1/network-modifications.*") && POST.equals(request.getMethod())) {
407-
ModificationInfos modificationInfos = mapper.readValue(body.readUtf8(), new TypeReference<>() { });
407+
ModificationInfos modificationInfos = mapper.readValue(body.readUtf8(), new TypeReference<ModificationInfos>() {
408+
});
408409
modificationInfos.setSubstationIds(Set.of("s2"));
409410
return new MockResponse().setResponseCode(200)
410411
.setBody("[" + mapper.writeValueAsString(modificationInfos) + "]")
@@ -709,31 +710,37 @@ public void testSearch() throws Exception {
709710
.perform(get("/v1/search?q={request}", String.format("userId:%s", "userId")).header(USER_ID_HEADER, "userId"))
710711
.andExpectAll(status().isOk(), content().contentType(MediaType.APPLICATION_JSON)).andReturn();
711712
resultAsString = mvcResult.getResponse().getContentAsString();
712-
List<CreatedStudyBasicInfos> createdStudyBasicInfosList = mapper.readValue(resultAsString, new TypeReference<>() { });
713+
List<CreatedStudyBasicInfos> createdStudyBasicInfosList = mapper.readValue(resultAsString,
714+
new TypeReference<List<CreatedStudyBasicInfos>>() {
715+
});
713716
assertThat(createdStudyBasicInfosList, new MatcherJson<>(mapper, studiesInfos));
714717

715718
mvcResult = mockMvc
716719
.perform(get("/v1/studies/{studyUuid}/nodes/{nodeUuid}/search?userInput={request}&fieldSelector=NAME",
717720
studyUuid, rootNodeId, "B").header(USER_ID_HEADER, "userId"))
718721
.andExpectAll(status().isOk(), content().contentType(MediaType.APPLICATION_JSON)).andReturn();
719722
resultAsString = mvcResult.getResponse().getContentAsString();
720-
List<EquipmentInfos> equipmentInfos = mapper.readValue(resultAsString, new TypeReference<>() { });
723+
List<EquipmentInfos> equipmentInfos = mapper.readValue(resultAsString,
724+
new TypeReference<List<EquipmentInfos>>() {
725+
});
721726
assertThat(equipmentInfos, new MatcherJson<>(mapper, linesInfos));
722727

723728
mvcResult = mockMvc
724729
.perform(get("/v1/studies/{studyUuid}/nodes/{nodeUuid}/search?userInput={request}&fieldSelector=NAME",
725730
studyUuid, rootNodeId, "B").header(USER_ID_HEADER, "userId"))
726731
.andExpectAll(status().isOk(), content().contentType(MediaType.APPLICATION_JSON)).andReturn();
727732
resultAsString = mvcResult.getResponse().getContentAsString();
728-
equipmentInfos = mapper.readValue(resultAsString, new TypeReference<>() { });
733+
equipmentInfos = mapper.readValue(resultAsString, new TypeReference<List<EquipmentInfos>>() {
734+
});
729735
assertThat(equipmentInfos, new MatcherJson<>(mapper, linesInfos));
730736

731737
mvcResult = mockMvc
732738
.perform(get("/v1/studies/{studyUuid}/nodes/{nodeUuid}/search?userInput={request}&fieldSelector=ID",
733739
studyUuid, rootNodeId, "B").header(USER_ID_HEADER, "userId"))
734740
.andExpectAll(status().isOk(), content().contentType(MediaType.APPLICATION_JSON)).andReturn();
735741
resultAsString = mvcResult.getResponse().getContentAsString();
736-
equipmentInfos = mapper.readValue(resultAsString, new TypeReference<>() { });
742+
equipmentInfos = mapper.readValue(resultAsString, new TypeReference<List<EquipmentInfos>>() {
743+
});
737744
assertThat(equipmentInfos, new MatcherJson<>(mapper, linesInfos));
738745

739746
mockMvc.perform(get("/v1/studies/{studyUuid}/nodes/{nodeUuid}/search?userInput={request}&fieldSelector=bogus",
@@ -782,7 +789,9 @@ public void test() throws Exception {
782789
.andExpectAll(status().isOk(), content().contentType(MediaType.APPLICATION_JSON)).andReturn();
783790

784791
resultAsString = result.getResponse().getContentAsString();
785-
List<CreatedStudyBasicInfos> createdStudyBasicInfosList = mapper.readValue(resultAsString, new TypeReference<>() { });
792+
List<CreatedStudyBasicInfos> createdStudyBasicInfosList = mapper.readValue(resultAsString,
793+
new TypeReference<List<CreatedStudyBasicInfos>>() {
794+
});
786795

787796
assertThat(createdStudyBasicInfosList.get(0), createMatcherCreatedStudyBasicInfos(studyUuid, "UCTE"));
788797

@@ -793,7 +802,9 @@ public void test() throws Exception {
793802
resultAsString = mockMvc.perform(get("/v1/studies").header("userId", "userId2"))
794803
.andExpectAll(status().isOk(), content().contentType(MediaType.APPLICATION_JSON)).andReturn().getResponse().getContentAsString();
795804

796-
createdStudyBasicInfosList = mapper.readValue(resultAsString, new TypeReference<>() { });
805+
createdStudyBasicInfosList = mapper.readValue(resultAsString,
806+
new TypeReference<List<CreatedStudyBasicInfos>>() {
807+
});
797808

798809
assertThat(createdStudyBasicInfosList.get(1),
799810
createMatcherCreatedStudyBasicInfos(studyUuid, "UCTE"));
@@ -813,7 +824,9 @@ public void test() throws Exception {
813824
.andExpectAll(status().isOk(), content().contentType(MediaType.APPLICATION_JSON)).andReturn();
814825

815826
resultAsString = result.getResponse().getContentAsString();
816-
createdStudyBasicInfosList = mapper.readValue(resultAsString, new TypeReference<>() { });
827+
createdStudyBasicInfosList = mapper.readValue(resultAsString,
828+
new TypeReference<List<CreatedStudyBasicInfos>>() {
829+
});
817830
assertEquals(2, createdStudyBasicInfosList.size());
818831

819832
//get available export format
@@ -952,7 +965,9 @@ public void testMetadata() throws Exception {
952965
.header(USER_ID_HEADER, "userId"))
953966
.andExpectAll(status().isOk(), content().contentType(MediaType.APPLICATION_JSON)).andReturn();
954967
String resultAsString = mvcResult.getResponse().getContentAsString();
955-
List<CreatedStudyBasicInfos> createdStudyBasicInfosList = mapper.readValue(resultAsString, new TypeReference<>() { });
968+
List<CreatedStudyBasicInfos> createdStudyBasicInfosList = mapper.readValue(resultAsString,
969+
new TypeReference<List<CreatedStudyBasicInfos>>() {
970+
});
956971

957972
assertNotNull(createdStudyBasicInfosList);
958973
assertEquals(2, createdStudyBasicInfosList.size());
@@ -986,7 +1001,7 @@ public void testLogsReport() throws Exception {
9861001
MvcResult mvcResult = mockMvc.perform(get("/v1/studies/{studyUuid}/nodes/{nodeUuid}/parent-nodes-report?reportType=NETWORK_MODIFICATION", studyUuid, rootNodeUuid).header(USER_ID_HEADER, "userId"))
9871002
.andExpect(status().isOk()).andReturn();
9881003
String resultAsString = mvcResult.getResponse().getContentAsString();
989-
List<ReportNode> reporterModel = mapper.readValue(resultAsString, new TypeReference<>() { });
1004+
List<ReportNode> reporterModel = mapper.readValue(resultAsString, new TypeReference<List<ReportNode>>() { });
9901005

9911006
assertThat(reporterModel.get(0), new MatcherReport(REPORT_TEST));
9921007
assertTrue(TestUtils.getRequestsDone(1, server).stream().anyMatch(r -> r.matches("/v1/reports/.*")));
@@ -1165,7 +1180,7 @@ public void testCreateStudyWithErrorDuringCaseImport() throws Exception {
11651180
.andReturn();
11661181

11671182
String resultAsString = mvcResult.getResponse().getContentAsString();
1168-
List<BasicStudyInfos> bsiListResult = mapper.readValue(resultAsString, new TypeReference<>() { });
1183+
List<BasicStudyInfos> bsiListResult = mapper.readValue(resultAsString, new TypeReference<List<BasicStudyInfos>>() { });
11691184

11701185
assertEquals(List.of(), bsiListResult);
11711186

@@ -1235,7 +1250,7 @@ public void testGetStudyCreationRequests() throws Exception {
12351250
content().contentType(MediaType.APPLICATION_JSON))
12361251
.andReturn();
12371252
resultAsString = mvcResult.getResponse().getContentAsString();
1238-
List<BasicStudyInfos> bsiListResult = mapper.readValue(resultAsString, new TypeReference<>() { });
1253+
List<BasicStudyInfos> bsiListResult = mapper.readValue(resultAsString, new TypeReference<List<BasicStudyInfos>>() { });
12391254

12401255
// once we checked study creation requests, we can countDown latch to trigger study creation request
12411256
countDownLatch.countDown();
@@ -1255,7 +1270,7 @@ public void testGetStudyCreationRequests() throws Exception {
12551270
.andReturn();
12561271

12571272
resultAsString = mvcResult.getResponse().getContentAsString();
1258-
bsiListResult = mapper.readValue(resultAsString, new TypeReference<>() { });
1273+
bsiListResult = mapper.readValue(resultAsString, new TypeReference<List<BasicStudyInfos>>() { });
12591274

12601275
assertEquals(List.of(), bsiListResult);
12611276

@@ -1265,7 +1280,7 @@ public void testGetStudyCreationRequests() throws Exception {
12651280
.andReturn();
12661281

12671282
resultAsString = mvcResult.getResponse().getContentAsString();
1268-
List<CreatedStudyBasicInfos> csbiListResponse = mapper.readValue(resultAsString, new TypeReference<>() { });
1283+
List<CreatedStudyBasicInfos> csbiListResponse = mapper.readValue(resultAsString, new TypeReference<List<CreatedStudyBasicInfos>>() { });
12691284

12701285
countDownLatch = new CountDownLatch(1);
12711286

@@ -1288,7 +1303,7 @@ public void testGetStudyCreationRequests() throws Exception {
12881303
.andReturn();
12891304
resultAsString = mvcResult.getResponse().getContentAsString();
12901305

1291-
bsiListResult = mapper.readValue(resultAsString, new TypeReference<>() { });
1306+
bsiListResult = mapper.readValue(resultAsString, new TypeReference<List<BasicStudyInfos>>() { });
12921307

12931308
countDownLatch.countDown();
12941309

@@ -1308,7 +1323,7 @@ public void testGetStudyCreationRequests() throws Exception {
13081323
.andReturn();
13091324
resultAsString = mvcResult.getResponse().getContentAsString();
13101325

1311-
bsiListResult = mapper.readValue(resultAsString, new TypeReference<>() { });
1326+
bsiListResult = mapper.readValue(resultAsString, new TypeReference<List<BasicStudyInfos>>() { });
13121327

13131328
assertEquals(List.of(), bsiListResult);
13141329

@@ -1318,7 +1333,7 @@ public void testGetStudyCreationRequests() throws Exception {
13181333
content().contentType(MediaType.APPLICATION_JSON))
13191334
.andReturn();
13201335
resultAsString = mvcResult.getResponse().getContentAsString();
1321-
csbiListResponse = mapper.readValue(resultAsString, new TypeReference<>() { });
1336+
csbiListResponse = mapper.readValue(resultAsString, new TypeReference<List<CreatedStudyBasicInfos>>() { });
13221337

13231338
// assert that all http requests have been sent to remote services
13241339
var requests = TestUtils.getRequestsDone(8, server);
@@ -1509,6 +1524,7 @@ public void testDuplicateStudyWithErrorDuringCaseDuplication() throws Exception
15091524
.header(USER_ID_HEADER, "userId"))
15101525
.andExpect(status().isOk()).andReturn().getResponse().getContentAsString();
15111526

1527+
ObjectMapper mapper = new ObjectMapper();
15121528
String duplicatedStudyUuid = mapper.readValue(response, String.class);
15131529
assertNotNull(output.receive(TIMEOUT, studyUpdateDestination));
15141530

@@ -1520,6 +1536,7 @@ private StudyEntity duplicateStudy(UUID studyUuid) throws Exception {
15201536
String response = mockMvc.perform(post(STUDIES_URL + "?duplicateFrom={studyUuid}", studyUuid)
15211537
.header(USER_ID_HEADER, "userId"))
15221538
.andExpect(status().isOk()).andReturn().getResponse().getContentAsString();
1539+
ObjectMapper mapper = new ObjectMapper();
15231540
String newUuid = mapper.readValue(response, String.class);
15241541
StudyEntity sourceStudy = studyRepository.findById(studyUuid).orElseThrow();
15251542
assertNotNull(output.receive(TIMEOUT, studyUpdateDestination));

0 commit comments

Comments
 (0)