From f5ce966dc26697ec153c0fc1c68bd5eb8395b7c8 Mon Sep 17 00:00:00 2001 From: Grzegorz Oleksy Date: Tue, 28 Nov 2023 09:39:37 +0100 Subject: [PATCH] ACS-6151 - divided tests for each image --- .../aio/AIOLivenessReadinessProbeTest.java | 10 ++++++ .../base/LivenessReadinessProbeTest.java | 33 ++++++------------- ...ImageMagickLivenessReadinessProbeTest.java | 10 ++++++ ...LibreOfficeLivenessReadinessProbeTest.java | 10 ++++++ .../misc/MiscLivenessReadinessProbeTest.java | 10 ++++++ ...PdfRendererLivenessReadinessProbeTest.java | 10 ++++++ .../tika/TikaLivenessReadinessProbeTest.java | 11 +++++++ 7 files changed, 71 insertions(+), 23 deletions(-) create mode 100644 engines/aio/src/test/java/org/alfresco/transform/aio/AIOLivenessReadinessProbeTest.java create mode 100644 engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickLivenessReadinessProbeTest.java create mode 100644 engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeLivenessReadinessProbeTest.java create mode 100644 engines/misc/src/test/java/org/alfresco/transform/misc/MiscLivenessReadinessProbeTest.java create mode 100644 engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/PdfRendererLivenessReadinessProbeTest.java create mode 100644 engines/tika/src/test/java/org/alfresco/transform/tika/TikaLivenessReadinessProbeTest.java diff --git a/engines/aio/src/test/java/org/alfresco/transform/aio/AIOLivenessReadinessProbeTest.java b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOLivenessReadinessProbeTest.java new file mode 100644 index 00000000..2d334ea7 --- /dev/null +++ b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOLivenessReadinessProbeTest.java @@ -0,0 +1,10 @@ +package org.alfresco.transform.aio; + +import org.alfresco.transform.base.LivenessReadinessProbeTest; + +public class AIOLivenessReadinessProbeTest extends LivenessReadinessProbeTest { + @Override + protected LivenessReadinessProbeTest.ImagesForTests getImageForTest() { + return new ImagesForTests("ats-aio", "alfresco-transform-core-aio", "text/plain", "text/plain", "original.txt"); + } +} diff --git a/engines/base/src/test/java/org/alfresco/transform/base/LivenessReadinessProbeTest.java b/engines/base/src/test/java/org/alfresco/transform/base/LivenessReadinessProbeTest.java index cc859b0e..e67256a8 100644 --- a/engines/base/src/test/java/org/alfresco/transform/base/LivenessReadinessProbeTest.java +++ b/engines/base/src/test/java/org/alfresco/transform/base/LivenessReadinessProbeTest.java @@ -1,7 +1,6 @@ package org.alfresco.transform.base; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.MethodSource; +import org.junit.jupiter.api.Test; import org.springframework.core.io.ClassPathResource; @@ -12,7 +11,6 @@ import org.testcontainers.containers.wait.strategy.Wait; import java.net.URISyntaxException; -import java.util.List; import java.util.Objects; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -22,17 +20,16 @@ import static org.springframework.http.HttpStatus.TOO_MANY_REQUESTS; import org.springframework.web.reactive.function.client.WebClient; -public class LivenessReadinessProbeTest +public abstract class LivenessReadinessProbeTest { - protected String url; + @Test + public void readinessShouldReturnAn429ErrorAfterReachingMaxTransforms() throws URISyntaxException { + final ImagesForTests testData = getImageForTest(); - @ParameterizedTest - @MethodSource ("containers") - public void readinessShouldReturnAn429ErrorAfterReachingMaxTransforms(final ImagesForTests testData) throws URISyntaxException { try (final var env = createEnv(testData.image)) { env.start(); - url = "http://localhost:" + env.getFirstMappedPort(); + var url = "http://localhost:" + env.getFirstMappedPort(); int max_transforms = 11; for (int i = 0; i createEnv(String image) throws URISyntaxException { System.out.println(image); @@ -58,19 +57,7 @@ public class LivenessReadinessProbeTest .waitingFor(Wait.forListeningPort()); } - private static List containers() - { - final var allContainers = List.of( - new ImagesForTests("imagemagick", "alfresco-imagemagick", "image/jpeg", "image/png", "test.jpeg"), - new ImagesForTests("ats-aio", "alfresco-transform-core-aio", "text/plain", "text/plain", "original.txt"), - new ImagesForTests("libreoffice", "alfresco-libreoffice", "text/plain", "application/pdf", "original.txt"), - new ImagesForTests("misc", "alfresco-transform-misc", "text/plain", "text/plain", "original.txt"), - new ImagesForTests("pdf-renderer", "alfresco-pdf-renderer", "application/pdf", "image/png", "test.pdf"), - new ImagesForTests("tika", "alfresco-tika", "text/plain", "text/plain", "original.txt")); - - return allContainers; - } - private static class ImagesForTests + protected static class ImagesForTests { private final String name; private final String image; @@ -79,7 +66,7 @@ public class LivenessReadinessProbeTest private final String targetMimetype; private final String filename; - private ImagesForTests(String name, String image, String sourceMimetype, String targetMimetype, String filename) + public ImagesForTests(String name, String image, String sourceMimetype, String targetMimetype, String filename) { this.name = Objects.requireNonNull(name); this.image = Objects.requireNonNull(image); diff --git a/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickLivenessReadinessProbeTest.java b/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickLivenessReadinessProbeTest.java new file mode 100644 index 00000000..964438ae --- /dev/null +++ b/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickLivenessReadinessProbeTest.java @@ -0,0 +1,10 @@ +package org.alfresco.transform.imagemagick; + +import org.alfresco.transform.base.LivenessReadinessProbeTest; + +public class ImageMagickLivenessReadinessProbeTest extends LivenessReadinessProbeTest { + @Override + protected ImagesForTests getImageForTest() { + return new ImagesForTests("imagemagick", "alfresco-imagemagick", "image/jpeg", "image/png", "test.jpeg"); + } +} diff --git a/engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeLivenessReadinessProbeTest.java b/engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeLivenessReadinessProbeTest.java new file mode 100644 index 00000000..07b205c0 --- /dev/null +++ b/engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeLivenessReadinessProbeTest.java @@ -0,0 +1,10 @@ +package org.alfresco.transform.libreoffice; + +import org.alfresco.transform.base.LivenessReadinessProbeTest; + +public class LibreOfficeLivenessReadinessProbeTest extends LivenessReadinessProbeTest { + @Override + protected ImagesForTests getImageForTest() { + return new ImagesForTests("tika", "alfresco-tika", "text/plain", "text/plain", "original.txt"); + } +} diff --git a/engines/misc/src/test/java/org/alfresco/transform/misc/MiscLivenessReadinessProbeTest.java b/engines/misc/src/test/java/org/alfresco/transform/misc/MiscLivenessReadinessProbeTest.java new file mode 100644 index 00000000..b84f67c0 --- /dev/null +++ b/engines/misc/src/test/java/org/alfresco/transform/misc/MiscLivenessReadinessProbeTest.java @@ -0,0 +1,10 @@ +package org.alfresco.transform.misc; + +import org.alfresco.transform.base.LivenessReadinessProbeTest; + +public class MiscLivenessReadinessProbeTest extends LivenessReadinessProbeTest { + @Override + protected ImagesForTests getImageForTest() { + return new ImagesForTests("misc", "alfresco-transform-misc", "text/plain", "text/plain", "original.txt"); + } +} diff --git a/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/PdfRendererLivenessReadinessProbeTest.java b/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/PdfRendererLivenessReadinessProbeTest.java new file mode 100644 index 00000000..97700598 --- /dev/null +++ b/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/PdfRendererLivenessReadinessProbeTest.java @@ -0,0 +1,10 @@ +package org.alfresco.transform.pdfrenderer; + +import org.alfresco.transform.base.LivenessReadinessProbeTest; + +public class PdfRendererLivenessReadinessProbeTest extends LivenessReadinessProbeTest { + @Override + protected ImagesForTests getImageForTest() { + return new ImagesForTests("pdf-renderer", "alfresco-pdf-renderer", "application/pdf", "image/png", "test.pdf"); + } +} diff --git a/engines/tika/src/test/java/org/alfresco/transform/tika/TikaLivenessReadinessProbeTest.java b/engines/tika/src/test/java/org/alfresco/transform/tika/TikaLivenessReadinessProbeTest.java new file mode 100644 index 00000000..8ce33681 --- /dev/null +++ b/engines/tika/src/test/java/org/alfresco/transform/tika/TikaLivenessReadinessProbeTest.java @@ -0,0 +1,11 @@ +package org.alfresco.transform.tika; + +import org.alfresco.transform.base.LivenessReadinessProbeTest; + + +public class TikaLivenessReadinessProbeTest extends LivenessReadinessProbeTest { + @Override + protected ImagesForTests getImageForTest() { + return new ImagesForTests("libreoffice", "alfresco-libreoffice", "text/plain", "application/pdf", "original.txt"); + } +}