Add support for running MSSQL Testcontainers on Mac ARM64 (#5619)

This commit adds the ability for Mac ARM64 machines to run MSSQL Testcontainers
based tests. The same treatment was added for Oracle previously.

Also, the container support is the final arbiter of container creation and now
all of the DB smoke tests are refactored to use the new support interfaces.

Author: onobc

spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/server/db/migration/AbstractSmokeTest.java

@@ -28,7 +28,6 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
-import org.testcontainers.containers.JdbcDatabaseContainer;
 
 import org.springframework.batch.core.BatchStatus;
 import org.springframework.batch.core.JobParameters;
@@ -57,8 +56,6 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.DynamicPropertyRegistry;
-import org.springframework.test.context.DynamicPropertySource;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.support.TransactionTemplate;
 import org.springframework.util.LinkedMultiValueMap;
@@ -78,16 +75,6 @@
 @ExtendWith(OutputCaptureExtension.class)
 public abstract class AbstractSmokeTest {
 
-	protected static JdbcDatabaseContainer<?> container;
-
-	@DynamicPropertySource
-	static void databaseProperties(DynamicPropertyRegistry registry) {
-		registry.add("spring.datasource.url", container::getJdbcUrl);
-		registry.add("spring.datasource.username", container::getUsername);
-		registry.add("spring.datasource.password", container::getPassword);
-		registry.add("spring.datasource.driver-class-name", container::getDriverClassName);
-	}
-
 	@Autowired
 	private SchemaService schemaService;
 

spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/server/db/migration/DB2SmokeTest.java renamed to spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/server/db/migration/DB2_11_5_SmokeTest.java

@@ -15,19 +15,14 @@
  */
 package org.springframework.cloud.dataflow.server.db.migration;
 
-import org.junit.jupiter.api.BeforeAll;
-import org.testcontainers.containers.Db2Container;
+import org.springframework.cloud.dataflow.server.db.DB2_11_5_ContainerSupport;
 
 
 /**
  * Basic database schema and JPA tests for DB2.
  *
  * @author Corneil du Plessis
+ * @author Chris Bono
  */
-public class DB2SmokeTest extends AbstractSmokeTest {
-	@BeforeAll
-	static void startContainer() {
-		container = new Db2Container("ibmcom/db2:11.5.0.0a").acceptLicense();
-		container.start();
-	}
+public class DB2_11_5_SmokeTest extends AbstractSmokeTest implements DB2_11_5_ContainerSupport {
 }

spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/server/db/migration/MariaDBSmokeTest.java renamed to spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/server/db/migration/MariaDB_10_6_SmokeTest.java

@@ -15,24 +15,17 @@
  */
 package org.springframework.cloud.dataflow.server.db.migration;
 
-import org.junit.jupiter.api.BeforeAll;
-import org.testcontainers.containers.MariaDBContainer;
-
+import org.springframework.cloud.dataflow.server.db.MariaDB_10_6_ContainerSupport;
 import org.springframework.test.context.TestPropertySource;
 
 /**
  * Basic database schema and JPA tests for MariaDB 10.4 or later.
  *
  * @author Corneil du Plessis
+ * @author Chris Bono
  */
 @TestPropertySource(properties = {
 		"spring.jpa.database-platform=org.hibernate.dialect.MariaDB106Dialect"
 })
-public class MariaDBSmokeTest extends AbstractSmokeTest {
-
-	@BeforeAll
-	static void startContainer() {
-		container = new MariaDBContainer<>("mariadb:10.6");
-		container.start();
-	}
+public class MariaDB_10_6_SmokeTest extends AbstractSmokeTest implements MariaDB_10_6_ContainerSupport {
 }

spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/server/db/migration/MariaDB11SmokeTest.java renamed to spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/server/db/migration/MariaDB_11_SmokeTest.java

@@ -15,24 +15,18 @@
  */
 package org.springframework.cloud.dataflow.server.db.migration;
 
-import org.junit.jupiter.api.BeforeAll;
-import org.testcontainers.containers.MariaDBContainer;
-
+import org.springframework.cloud.dataflow.server.db.MariaDB_11_ContainerSupport;
 import org.springframework.test.context.TestPropertySource;
 
 
 /**
  * Basic database schema and JPA tests for MariaDB 10.4 or later.
  *
  * @author Corneil du Plessis
+ * @author Chris Bono
  */
 @TestPropertySource(properties = {
 		"spring.jpa.database-platform=org.hibernate.dialect.MariaDB106Dialect"
 })
-public class MariaDB11SmokeTest extends AbstractSmokeTest {
-	@BeforeAll
-	static void startContainer() {
-		container = new MariaDBContainer<>("mariadb:11");
-		container.start();
-	}
+public class MariaDB_11_SmokeTest extends AbstractSmokeTest implements MariaDB_11_ContainerSupport {
 }

spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/server/db/migration/MySQL57SmokeTest.java renamed to spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/server/db/migration/MySQL_5_7_SmokeTest.java

@@ -15,21 +15,15 @@
  */
 package org.springframework.cloud.dataflow.server.db.migration;
 
-import org.junit.jupiter.api.BeforeAll;
-import org.testcontainers.containers.MySQLContainer;
+import org.springframework.cloud.dataflow.server.db.MySQL_5_7_ContainerSupport;
 
 /**
  * Basic database schema and JPA tests for MySQL 5.7.
  *
  * @author Corneil du Plessis
+ * @author Chris Bono
  */
-public class MySQL57SmokeTest extends AbstractSmokeTest {
-
-	@BeforeAll
-	static void startContainer() {
-		container = new MySQLContainer<>("mysql:5.7");
-		container.start();
-	}
+public class MySQL_5_7_SmokeTest extends AbstractSmokeTest implements MySQL_5_7_ContainerSupport {
 
 	@Override
 	protected boolean supportsRowNumberFunction() {

spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/server/db/migration/MySQL8SmokeTest.java renamed to spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/server/db/migration/MySQL_8_SmokeTest.java

@@ -15,19 +15,13 @@
  */
 package org.springframework.cloud.dataflow.server.db.migration;
 
-import org.junit.jupiter.api.BeforeAll;
-import org.testcontainers.containers.MySQLContainer;
+import org.springframework.cloud.dataflow.server.db.MySQL_8_ContainerSupport;
 
 /**
  * Basic database schema and JPA tests for MySQL 8 or later.
  *
  * @author Corneil du Plessis
+ * @author Chris Bono
  */
-public class MySQL8SmokeTest extends AbstractSmokeTest {
-
-	@BeforeAll
-	static void startContainer() {
-		container = new MySQLContainer<>("mysql:8");
-		container.start();
-	}
+public class MySQL_8_SmokeTest extends AbstractSmokeTest implements MySQL_8_ContainerSupport {
 }

spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/server/db/migration/OracleSmokeTest.java renamed to spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/server/db/migration/Oracle_XE_18_SmokeTest.java

@@ -15,20 +15,13 @@
  */
 package org.springframework.cloud.dataflow.server.db.migration;
 
-import org.junit.jupiter.api.BeforeAll;
-
-import org.springframework.cloud.dataflow.server.db.oracle.OracleContainerSupport;
+import org.springframework.cloud.dataflow.server.db.Oracle_XE_18_ContainerSupport;
 
 /**
  * Basic database schema and JPA tests for Oracle XE.
  *
  * @author Corneil du Plessis
  * @author Chris Bono
  */
-public class OracleSmokeTest extends AbstractSmokeTest implements OracleContainerSupport {
-
-	@BeforeAll
-	static void startContainer() {
-		container = OracleContainerSupport.startContainer();
-	}
+public class Oracle_XE_18_SmokeTest extends AbstractSmokeTest implements Oracle_XE_18_ContainerSupport {
 }

spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/server/db/migration/PostgreSQLSmokeTest.java renamed to spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/server/db/migration/PostgreSQL_14_SmokeTest.java

@@ -15,21 +15,14 @@
  */
 package org.springframework.cloud.dataflow.server.db.migration;
 
-import org.junit.jupiter.api.BeforeAll;
-import org.testcontainers.containers.PostgreSQLContainer;
-import org.testcontainers.utility.DockerImageName;
+import org.springframework.cloud.dataflow.server.db.PostgreSQL_14_ContainerSupport;
 
 
 /**
  * Basic database schema and JPA tests for PostgreSQL 14 or later.
  *
  * @author Corneil du Plessis
+ * @author Chris Bono
  */
-public class PostgreSQLSmokeTest extends AbstractSmokeTest {
-
-	@BeforeAll
-	static void startContainer() {
-		container = new PostgreSQLContainer<>(DockerImageName.parse("postgres:14"));
-		container.start();
-	}
+public class PostgreSQL_14_SmokeTest extends AbstractSmokeTest implements PostgreSQL_14_ContainerSupport {
 }