diff --git a/src/main/java/org/gridsuite/modification/server/modifications/NetworkModificationApplicator.java b/src/main/java/org/gridsuite/modification/server/modifications/NetworkModificationApplicator.java index 3c5de611f..a33ee0463 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/NetworkModificationApplicator.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/NetworkModificationApplicator.java @@ -104,10 +104,10 @@ public NetworkModificationResult applyModifications(ModificationApplicationGroup ApplicationStatus groupApplicationStatus; if (preloadingStrategy == PreloadingStrategy.ALL_COLLECTIONS_NEEDED_FOR_BUS_VIEW) { groupApplicationStatus = largeNetworkModificationExecutionService - .supplyAsync(() -> apply(modificationInfosGroup, listener)) + .supplyAsync(() -> apply(modificationInfosGroup, listener, false)) .join(); } else { - groupApplicationStatus = apply(modificationInfosGroup, listener); + groupApplicationStatus = apply(modificationInfosGroup, listener, false); } return flushModificationApplications(groupApplicationStatus, listener); @@ -157,7 +157,7 @@ public NetworkModificationResult applyModifications(List apply(List modificationInfosGroups, NetworkStoreListener listener) { return modificationInfosGroups.stream() - .map(g -> apply(g, listener)) + .map(g -> apply(g, listener, true)) .toList(); } @@ -171,7 +171,7 @@ private NetworkModificationResult flushModificationApplications(List r.matches(String.format("/v1/reports/%s", reportUuid)))); + assertTrue(TestUtils.getRequestsDone(1, server).stream().anyMatch(r -> r.matches(String.format("/v1/reports/%s\\?replace=false", reportUuid)))); // Incremental mode : No error send with exception ModificationApplicationContext applicationContext = new ModificationApplicationContext(TEST_NETWORK_ID, variantId, reportUuid, reporterId); @@ -990,7 +990,7 @@ void testApplyModificationWithErrors(final MockWebServer server) { assertEquals(1, networkModificationsResult.modificationResults().size()); assertTrue(networkModificationsResult.modificationResults().get(0).isPresent()); testEmptyImpactsWithErrors(networkModificationResult); - assertTrue(TestUtils.getRequestsDone(1, server).stream().anyMatch(r -> r.matches(String.format("/v1/reports/%s", reportUuid)))); + assertTrue(TestUtils.getRequestsDone(1, server).stream().anyMatch(r -> r.matches(String.format("/v1/reports/%s\\?replace=false", reportUuid)))); testNetworkModificationsCount(groupUuid, 2); // Save mode only (variant does not exist) : No log and no error send with exception @@ -1021,7 +1021,7 @@ void testLastGroupModificationStatus(final MockWebServer server) { NetworkModificationResult networkModificationResult = networkModificationApplicator.applyModifications(modificationInfosGroups, new NetworkInfos(network, TEST_NETWORK_ID, true)); assertNotNull(networkModificationResult); testEmptyImpactsWithErrorsLastOK(networkModificationResult); - assertTrue(TestUtils.getRequestsDone(2, server).stream().anyMatch(r -> r.matches(String.format("/v1/reports/%s", reportUuid)))); + assertTrue(TestUtils.getRequestsDone(2, server).stream().anyMatch(r -> r.matches(String.format("/v1/reports/%s\\?replace=true", reportUuid)))); } @Test diff --git a/src/test/java/org/gridsuite/modification/server/utils/TestUtils.java b/src/test/java/org/gridsuite/modification/server/utils/TestUtils.java index e1093786f..e9c274d69 100644 --- a/src/test/java/org/gridsuite/modification/server/utils/TestUtils.java +++ b/src/test/java/org/gridsuite/modification/server/utils/TestUtils.java @@ -130,7 +130,7 @@ public static String resourceToString(String resource) throws IOException { public static void assertLogNthMessage(String expectedMessage, String reportKey, ReportService reportService, int rank) { ArgumentCaptor reporterCaptor = ArgumentCaptor.forClass(ReportNode.class); - verify(reportService, atLeast(1)).sendReport(any(UUID.class), reporterCaptor.capture()); + verify(reportService, atLeast(1)).sendReport(any(UUID.class), reporterCaptor.capture(), anyBoolean()); assertNotNull(reporterCaptor.getValue()); Optional message = getMessageFromReporter(reportKey, reporterCaptor.getValue(), rank); assertTrue(message.isPresent()); @@ -143,7 +143,7 @@ public static void assertLogMessage(String expectedMessage, String reportKey, Re public static void assertLogMessageWithoutRank(String expectedMessage, String reportKey, ReportService reportService) { ArgumentCaptor reporterCaptor = ArgumentCaptor.forClass(ReportNode.class); - verify(reportService, atLeast(1)).sendReport(any(UUID.class), reporterCaptor.capture()); + verify(reportService, atLeast(1)).sendReport(any(UUID.class), reporterCaptor.capture(), anyBoolean()); assertNotNull(reporterCaptor.getValue()); assertTrue(assertMessageFoundFromReporter(expectedMessage, reportKey, reporterCaptor.getValue())); }