diff --git a/engines/base/pom.xml b/engines/base/pom.xml
index 9904403a..674e5480 100644
--- a/engines/base/pom.xml
+++ b/engines/base/pom.xml
@@ -109,7 +109,6 @@
org.testcontainers
junit-jupiter
1.19.1
- test
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 b200c75a..b1bde0d1 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
@@ -22,6 +22,8 @@ import org.springframework.web.reactive.function.client.WebClient;
public abstract class LivenessReadinessProbeTest
{
+ protected final Integer MAX_TRANSFORMS = 10;
+
@Test
public void readinessShouldReturnAn429ErrorAfterReachingMaxTransforms() throws URISyntaxException
{
@@ -32,8 +34,13 @@ public abstract class LivenessReadinessProbeTest
env.start();
var url = "http://localhost:" + env.getFirstMappedPort();
- int max_transforms = 11;
- for (int i = 0; i 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 @@ public abstract class LivenessReadinessProbeTest
.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);
+ }
}
\ No newline at end of file
diff --git a/engines/base/src/test/resources/test.jpeg b/engines/base/src/test/resources/test.jpeg
deleted file mode 100644
index 33b9bc87..00000000
Binary files a/engines/base/src/test/resources/test.jpeg and /dev/null differ
diff --git a/engines/base/src/test/resources/test.pdf b/engines/base/src/test/resources/test.pdf
deleted file mode 100644
index 6d51f53b..00000000
Binary files a/engines/base/src/test/resources/test.pdf and /dev/null differ
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
index 6415565a..43dfefe5 100644
--- a/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickLivenessReadinessProbeTest.java
+++ b/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickLivenessReadinessProbeTest.java
@@ -32,6 +32,6 @@ import org.alfresco.transform.base.LivenessReadinessProbeTest;
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/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/PdfRendererLivenessReadinessProbeTest.java b/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/PdfRendererLivenessReadinessProbeTest.java
index 30c91f50..a26b51d1 100644
--- a/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/PdfRendererLivenessReadinessProbeTest.java
+++ b/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/PdfRendererLivenessReadinessProbeTest.java
@@ -32,6 +32,6 @@ import org.alfresco.transform.base.LivenessReadinessProbeTest;
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");
}
}