diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java index 76eddafa1..838acaee9 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java @@ -1767,27 +1767,39 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest { .dossierId(dossier.getId()) .build()); - manualRedactionClient.forceRedactionBulk(dossier.getId(), + ManualRedactionResponse forceResponse2 = manualRedactionClient.forceRedactionBulk(dossier.getId(), file.getId(), Set.of(ForceRedactionRequestModel.builder().annotationId("forceRedactionAnnotation2").comment("comment").legalBasis("1").build())); allManualRedactions = manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), false, true); assertEquals(allManualRedactions.getForceRedactions().size(), 2); - assertTrue(allManualRedactions.getForceRedactions() + assertFalse(allManualRedactions.getForceRedactions() .stream() .anyMatch(entry -> entry.getAnnotationId().equals("forceRedactionAnnotation"))); assertTrue(allManualRedactions.getForceRedactions() + .stream() + .anyMatch(entry -> entry.getAnnotationId().equals(forceResponse.getManualAddResponses().get(0).getAnnotationId()))); + assertFalse(allManualRedactions.getForceRedactions() .stream() - .anyMatch(entry -> entry.getAnnotationId().equals("forceRedactionAnnotation"))); + .anyMatch(entry -> entry.getAnnotationId().equals("forceRedactionAnnotation2"))); + assertTrue(allManualRedactions.getForceRedactions() + .stream() + .anyMatch(entry -> entry.getAnnotationId().equals(forceResponse2.getManualAddResponses().get(1).getAnnotationId()))); unprocessedManualRedactions = manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), true, true); assertEquals(unprocessedManualRedactions.getForceRedactions().size(), 1); - assertTrue(unprocessedManualRedactions.getForceRedactions() + assertFalse(unprocessedManualRedactions.getForceRedactions() .stream() .noneMatch(entry -> entry.getAnnotationId().equals("forceRedactionAnnotation"))); assertTrue(unprocessedManualRedactions.getForceRedactions() + .stream() + .anyMatch(entry -> entry.getAnnotationId().equals(forceResponse.getManualAddResponses().get(0).getAnnotationId()))); + assertFalse(unprocessedManualRedactions.getForceRedactions() .stream() .anyMatch(entry -> entry.getAnnotationId().equals("forceRedactionAnnotation2"))); + assertTrue(unprocessedManualRedactions.getForceRedactions() + .stream() + .anyMatch(entry -> entry.getAnnotationId().equals(forceResponse2.getManualAddResponses().get(1).getAnnotationId()))); fileProcessingClient.analysisSuccessful(dossier.getId(), file.getId(),