ACC-2780 add S3MockUtils.s3mockContainer()

Author: NielsCW

contentgrid-appserver-contentstore-impl-s3/src/test/java/com/contentgrid/appserver/contentstore/impl/s3/S3ContentStoreWriteFailureTest.java

@@ -35,7 +35,7 @@
 class S3ContentStoreWriteFailureTest {
 
     @Container
-    private static final S3MockContainer s3MockContainer = new S3MockContainer(S3MockUtils.S3_MOCK_VERSION);
+    private static final S3MockContainer s3MockContainer = S3MockUtils.s3MockContainer();
 
     private MinioAsyncClient client;
 

contentgrid-appserver-contentstore-impl-s3/src/test/java/com/contentgrid/appserver/contentstore/impl/s3/S3MockContentStoreTest.java

@@ -10,7 +10,7 @@
 class S3MockContentStoreTest extends AbstractS3ContentStoreTest {
 
     @Container
-    private static final S3MockContainer s3MockContainer = new S3MockContainer(S3MockUtils.S3_MOCK_VERSION);
+    private static final S3MockContainer s3MockContainer = S3MockUtils.s3MockContainer();
 
     @Override
     protected MinioAsyncClient createClient() {

contentgrid-appserver-contentstore-impl-utils/src/testFixtures/java/com/contentgrid/appserver/contentstore/impl/utils/testing/S3MockUtils.java

@@ -11,7 +11,7 @@
 @UtilityClass
 public class S3MockUtils {
 
-    public static final String S3_MOCK_VERSION;
+    private static final String S3_MOCK_VERSION;
 
     static {
         // Read the version of com.adobe.testing:s3mock-testcontainers by looking at pom.properties
@@ -26,4 +26,8 @@ public class S3MockUtils {
             throw new RuntimeException(e);
         }
     }
+
+    public static S3MockContainer s3MockContainer() {
+        return new S3MockContainer(S3_MOCK_VERSION);
+    }
 }

contentgrid-appserver-infrastructure-impl-s3/build.gradle

@@ -11,6 +11,7 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core'
     testImplementation testFixtures(project(':contentgrid-appserver-infrastructure-api'))
+    testImplementation testFixtures(project(':contentgrid-appserver-contentstore-impl-utils'))
     testImplementation "org.testcontainers:junit-jupiter"
     testImplementation "com.adobe.testing:s3mock-testcontainers"
 }

contentgrid-appserver-infrastructure-impl-s3/src/test/java/com/contentgrid/appserver/impl/s3/S3ArtifactTest.java

@@ -1,6 +1,7 @@
 package com.contentgrid.appserver.impl.s3;
 
 import com.adobe.testing.s3mock.testcontainers.S3MockContainer;
+import com.contentgrid.appserver.contentstore.impl.utils.testing.S3MockUtils;
 import com.contentgrid.appserver.infrastructure.api.AbstractArtifactTest;
 import com.contentgrid.appserver.infrastructure.api.Artifact;
 import io.minio.MakeBucketArgs;
@@ -9,7 +10,6 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.Properties;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 import org.junit.jupiter.api.BeforeAll;
@@ -23,21 +23,10 @@ class S3ArtifactTest extends AbstractArtifactTest {
     private static final String OBJECT_KEY = "test.zip";
 
     @Container
-    private static final S3MockContainer S3_MOCK = new S3MockContainer(s3MockVersion());
+    private static final S3MockContainer S3_MOCK = S3MockUtils.s3MockContainer();
 
     private static S3Artifact artifact;
 
-    private static String s3MockVersion() {
-        var props = new Properties();
-        try (var is = S3MockContainer.class.getResourceAsStream(
-                "/META-INF/maven/com.adobe.testing/s3mock-testcontainers/pom.properties")) {
-            props.load(is);
-            return props.getProperty("version");
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
     @BeforeAll
     static void setup() throws Exception {
         var client = MinioAsyncClient.builder()

contentgrid-appserver-integration-test/src/test/java/com/contentgrid/appserver/integration/test/fixture/invoicing/InvoicingApiApplicationTest.java

@@ -119,7 +119,7 @@ class InvoicingApiApplicationTest {
     PlatformTransactionManager transactionManager;
 
     @Container
-    static S3MockContainer s3MockContainer = new S3MockContainer(S3MockUtils.S3_MOCK_VERSION)
+    static S3MockContainer s3MockContainer = S3MockUtils.s3MockContainer()
             .withInitialBuckets(BUCKET_NAME);
 
     @DynamicPropertySource