Use Testcontainers’ CassandraContainer rather than our own

Closes spring-projectsgh-15901

Author: wilkinsona

spring-boot-project/spring-boot-autoconfigure/pom.xml

@@ -810,6 +810,11 @@
 			<artifactId>spring-security-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>cassandra</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.testcontainers</groupId>
 			<artifactId>testcontainers</artifactId>

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,12 +22,12 @@
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Test;
+import org.testcontainers.containers.CassandraContainer;
 
 import org.springframework.boot.autoconfigure.AutoConfigurationPackages;
 import org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.cassandra.city.City;
 import org.springframework.boot.test.util.TestPropertyValues;
-import org.springframework.boot.testsupport.testcontainers.CassandraContainer;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.data.cassandra.config.CassandraSessionFactoryBean;
 import org.springframework.data.cassandra.config.SchemaAction;
@@ -43,15 +43,15 @@
 public class CassandraDataAutoConfigurationIntegrationTests {
 
 	@ClassRule
-	public static CassandraContainer cassandra = new CassandraContainer();
+	public static CassandraContainer<?> cassandra = new CassandraContainer<>();
 
 	private AnnotationConfigApplicationContext context;
 
 	@Before
 	public void setUp() {
 		this.context = new AnnotationConfigApplicationContext();
 		TestPropertyValues
-				.of("spring.data.cassandra.port=" + cassandra.getMappedPort(),
+				.of("spring.data.cassandra.port=" + cassandra.getFirstMappedPort(),
 						"spring.data.cassandra.read-timeout=24000",
 						"spring.data.cassandra.connect-timeout=10000")
 				.applyTo(this.context.getEnvironment());
@@ -96,7 +96,8 @@ public void hasRecreateSchemaActionSet() {
 
 	private void createTestKeyspaceIfNotExists() {
 		Cluster cluster = Cluster.builder().withoutJMXReporting()
-				.withPort(cassandra.getMappedPort()).addContactPoint("localhost").build();
+				.withPort(cassandra.getFirstMappedPort()).addContactPoint("localhost")
+				.build();
 		try (Session session = cluster.connect()) {
 			session.execute("CREATE KEYSPACE IF NOT EXISTS boot_test"
 					+ "  WITH REPLICATION = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 };");