Refactor: encapsulate MONGODB_IMAGE_NAME

Author: prdoyle

bosk-mongo/src/test/java/works/bosk/drivers/mongo/internal/MongoService.java

@@ -41,7 +41,7 @@ public class MongoService implements Closeable {
 	// We do logging in some static initializers, so this needs to be initialized first
 	private static final Logger LOGGER = LoggerFactory.getLogger(MongoService.class);
 
-	public static final DockerImageName MONGODB_IMAGE_NAME = DockerImageName.parse("mongo:8.0");
+	private static final DockerImageName MONGODB_IMAGE_NAME = DockerImageName.parse("mongo:8.0");
 
 	private final MongoClient mongoClient = MongoClients.create(normalClientSettings);
 
@@ -101,14 +101,21 @@ public void close() {
 	}
 
 	private static MongoDBContainer mongoContainer() {
-		MongoDBContainer container = new MongoDBContainer(MONGODB_IMAGE_NAME)
-			.withReplicaSet()
+		MongoDBContainer container = newPlainMongoContainer()
 			.withTmpFs(Map.of("/data/db", "rw"))
-			.withNetwork(NETWORK);
+			.withNetwork(NETWORK)
+			.withReplicaSet();
 		container.start();
 		return container;
 	}
 
+	/**
+	 * @return just the {@link MongoDBContainer} with no options, and not yet started
+	 */
+	static MongoDBContainer newPlainMongoContainer() {
+		return new MongoDBContainer(MONGODB_IMAGE_NAME);
+	}
+
 	private static ToxiproxyContainer toxiproxyContainer() {
 		ToxiproxyContainer result = new ToxiproxyContainer(
 			DockerImageName.parse("ghcr.io/shopify/toxiproxy:2.12.0")

bosk-mongo/src/test/java/works/bosk/drivers/mongo/internal/ServerMisconfigurationTest.java

@@ -5,7 +5,6 @@
 import java.io.IOException;
 import java.net.ServerSocket;
 import org.junit.jupiter.api.Test;
-import org.testcontainers.mongodb.MongoDBContainer;
 import works.bosk.Bosk;
 import works.bosk.BoskConfig;
 import works.bosk.DriverStack;
@@ -21,7 +20,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static works.bosk.drivers.mongo.MongoDriverSettings.InitialDatabaseUnavailableMode.FAIL_FAST;
-import static works.bosk.drivers.mongo.internal.MongoService.MONGODB_IMAGE_NAME;
+import static works.bosk.drivers.mongo.internal.MongoService.newPlainMongoContainer;
 
 /**
  * Separated out from other tests because this involves booting a custom
@@ -49,7 +48,7 @@ void unreachable() throws IOException {
 	 */
 	@Test
 	void notAReplicaSet() {
-		try (var mongo = new MongoDBContainer(MONGODB_IMAGE_NAME)) {
+		try (var mongo = newPlainMongoContainer()) {
 			mongo.start();
 			MongoClientSettings clientSettings = MongoService.mongoClientSettings(
 				new ServerAddress(