From daadcf09c706c55385e2bedfc89a148347d54431 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 4 Oct 2021 07:44:50 +0300 Subject: [PATCH] test improvements for new features --- .../annotations/ManualRedactionEntryEntity.java | 1 - .../integration/service/FileTesterAndProvider.java | 11 +++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ManualRedactionEntryEntity.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ManualRedactionEntryEntity.java index a46ead057..69e0ff618 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ManualRedactionEntryEntity.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ManualRedactionEntryEntity.java @@ -45,7 +45,6 @@ public class ManualRedactionEntryEntity { @Column private OffsetDateTime softDeletedTime; - @ElementCollection private List positions = new ArrayList<>(); diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/FileTesterAndProvider.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/FileTesterAndProvider.java index b57a2ff23..b7a656743 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/FileTesterAndProvider.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/FileTesterAndProvider.java @@ -42,15 +42,22 @@ public class FileTesterAndProvider { @SneakyThrows public FileModel testAndProvideFile(Dossier dossier) { + return testAndProvideFile(dossier, "test.pdf"); + } - BinaryFileRequest upload = new BinaryFileRequest("test".getBytes(StandardCharsets.UTF_8), "test.pdf", dossier.getId(), "1"); + + @SneakyThrows + public FileModel testAndProvideFile(Dossier dossier, String fileName) { + + + BinaryFileRequest upload = new BinaryFileRequest("test".getBytes(StandardCharsets.UTF_8), fileName, dossier.getId(), "1"); JSONPrimitive uploadResult = uploadClient.upload(upload); var file = fileClient.getFileStatus(dossier.getId(), uploadResult.getValue()); assertThat(file.getId()).isNotBlank(); - assertThat(fileClient.getDossierStatus(dossier.getId()).size()).isEqualTo(1); + assertThat(fileClient.getDossierStatus(dossier.getId()).size()).isGreaterThanOrEqualTo(1); fileManagementStorageService.storeObject(dossier.getId(), file.getId(), FileType.REDACTION_LOG, objectMapper.writeValueAsBytes(new RedactionLog(1, List.of(RedactionLogEntry.builder().id("annotationId").type("manual").value("value").build()), null, 0, 0, 0, 0)));