ACS-6151 - added requested changes

Alfresco · Nov 29, 2023 · 85c838d · 85c838d
1 parent 51062f4
commit 85c838d
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 6 deletions.
diff --git a/engines/base/pom.xml b/engines/base/pom.xml
@@ -109,7 +109,6 @@
             <groupId>org.testcontainers</groupId>
             <artifactId>junit-jupiter</artifactId>
             <version>1.19.1</version>
-            <scope>test</scope>
         </dependency>
     </dependencies>
 

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
@@ -22,6 +22,8 @@
 
 public abstract class LivenessReadinessProbeTest
 {
+    protected final Integer MAX_TRANSFORMS = 10;
+
     @Test
     public void readinessShouldReturnAn429ErrorAfterReachingMaxTransforms() throws URISyntaxException
     {
@@ -32,8 +34,13 @@ public void readinessShouldReturnAn429ErrorAfterReachingMaxTransforms() throws U
             env.start();
             var url = "http://localhost:" + env.getFirstMappedPort();
 
-            int max_transforms = 11;
-            for (int i = 0; i<max_transforms; i++) {
+            /*
+                Asserts that /ready probe hasn't died before sending a transformation request.
+                Each /ready request creates a valid transformation and increases the counter of
+                used transformations, hence the need to divide MAX_TRANSFORMS
+            */
+            for (int i = 0; i<MAX_TRANSFORMS/2; i++) {
+                assertProbeIsOk(url);
                 sendTransformRequest(url, testData.sourceMimetype, testData.targetMimetype, testData.filename);
             }
 
@@ -52,7 +59,7 @@ private GenericContainer<?> createEnv(String image) throws URISyntaxException
         final GenericContainer<?> transformCore = new GenericContainer<>("alfresco/"+image+":latest");
 
         return transformCore.withEnv("livenessTransformEnabled", "true")
-            .withEnv("maxTransforms", "10")
+            .withEnv("maxTransforms", MAX_TRANSFORMS.toString())
             .withNetworkAliases(image)
             .withExposedPorts(8090)
             .waitingFor(Wait.forListeningPort());
@@ -104,4 +111,12 @@ private static void assertProbeDied(String url)
                 .exchange()
                 .expectStatus().isEqualTo(TOO_MANY_REQUESTS);
     }
+
+    private static void assertProbeIsOk(String url)
+    {
+        WebTestClient client = WebTestClient.bindToServer().baseUrl(url+"/ready").build();
+        client.get()
+                .exchange()
+                .expectStatus().isEqualTo(OK);
+    }
 }
diff --git a/engines/base/src/test/resources/test.jpeg b/engines/base/src/test/resources/test.jpeg
diff --git a/engines/base/src/test/resources/test.pdf b/engines/base/src/test/resources/test.pdf
diff --git a/...c/test/java/org/alfresco/transform/imagemagick/ImageMagickLivenessReadinessProbeTest.java b/...c/test/java/org/alfresco/transform/imagemagick/ImageMagickLivenessReadinessProbeTest.java
@@ -32,6 +32,6 @@
 public class ImageMagickLivenessReadinessProbeTest extends LivenessReadinessProbeTest {
     @Override
     protected ImagesForTests getImageForTest() {
-        return new ImagesForTests("alfresco-imagemagick", "image/jpeg", "image/png", "test.jpeg");
+        return new ImagesForTests("alfresco-imagemagick", "image/jpeg", "image/png", "quick.jpg");
     }
 }
diff --git a/...c/test/java/org/alfresco/transform/pdfrenderer/PdfRendererLivenessReadinessProbeTest.java b/...c/test/java/org/alfresco/transform/pdfrenderer/PdfRendererLivenessReadinessProbeTest.java
@@ -32,6 +32,6 @@
 public class PdfRendererLivenessReadinessProbeTest extends LivenessReadinessProbeTest {
     @Override
     protected ImagesForTests getImageForTest() {
-        return new ImagesForTests("alfresco-pdf-renderer", "application/pdf", "image/png", "test.pdf");
+        return new ImagesForTests("alfresco-pdf-renderer", "application/pdf", "image/png", "quick.pdf");
     }
 }