Use Testcontainers Qdrant Module (#24)

* Use Testcontainers Qdrant Module

Testcontainers 1.19.6 offers a qdrant module.

* Update DockerImage.java

Author: eddumelendez

build.gradle

@@ -80,7 +80,7 @@ jar {
 def grpcVersion = '1.59.0'
 def protobufVersion = '3.24.0'
 def protocVersion = protobufVersion
-def testContainersVersion = '1.19.2'
+def testcontainersVersion = '1.19.6'
 def jUnitVersion = '5.8.1'
 
 dependencies {
@@ -102,8 +102,8 @@ dependencies {
 	testImplementation "io.grpc:grpc-testing:${grpcVersion}"
 	testImplementation "org.junit.jupiter:junit-jupiter-api:${jUnitVersion}"
 	testImplementation "org.mockito:mockito-core:3.4.0"
-	testImplementation "org.testcontainers:testcontainers:${testContainersVersion}"
-	testImplementation "org.testcontainers:junit-jupiter:${testContainersVersion}"
+	testImplementation "org.testcontainers:qdrant:${testcontainersVersion}"
+	testImplementation "org.testcontainers:junit-jupiter:${testcontainersVersion}"
 
 	testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${jUnitVersion}"
 }

src/test/java/io/qdrant/client/ApiKeyTest.java

@@ -10,7 +10,7 @@
 import org.junit.jupiter.api.Test;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
-import io.qdrant.client.container.QdrantContainer;
+import org.testcontainers.qdrant.QdrantContainer;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
@@ -24,7 +24,7 @@
 @Testcontainers
 public class ApiKeyTest {
 	@Container
-	private static final QdrantContainer QDRANT_CONTAINER = new QdrantContainer().withApiKey("password!");
+	private static final QdrantContainer QDRANT_CONTAINER = new QdrantContainer(DockerImage.QDRANT_IMAGE).withEnv("QDRANT__SERVICE__API_KEY", "password!");
 	private ManagedChannel channel;
 
 	@BeforeEach

src/test/java/io/qdrant/client/CollectionsTest.java

@@ -12,7 +12,7 @@
 import org.junit.jupiter.api.TestInfo;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
-import io.qdrant.client.container.QdrantContainer;
+import org.testcontainers.qdrant.QdrantContainer;
 
 import java.util.Comparator;
 import java.util.List;
@@ -34,7 +34,7 @@
 @Testcontainers
 class CollectionsTest {
 	@Container
-	private static final QdrantContainer QDRANT_CONTAINER = new QdrantContainer();
+	private static final QdrantContainer QDRANT_CONTAINER = new QdrantContainer(DockerImage.QDRANT_IMAGE);
 	private QdrantClient client;
 	private ManagedChannel channel;
 	private String testName;

src/test/java/io/qdrant/client/DockerImage.java

@@ -0,0 +1,6 @@
+package io.qdrant.client;
+
+public class DockerImage {
+
+	public static final String QDRANT_IMAGE = "qdrant/qdrant:" + System.getProperty("qdrantVersion");
+}

src/test/java/io/qdrant/client/HealthTest.java

@@ -8,7 +8,7 @@
 import org.junit.jupiter.api.Test;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
-import io.qdrant.client.container.QdrantContainer;
+import org.testcontainers.qdrant.QdrantContainer;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
@@ -19,7 +19,7 @@
 @Testcontainers
 class HealthTest {
 	@Container
-	private static final QdrantContainer QDRANT_CONTAINER = new QdrantContainer();
+	private static final QdrantContainer QDRANT_CONTAINER = new QdrantContainer(DockerImage.QDRANT_IMAGE);
 	private QdrantClient client;
 	private ManagedChannel channel;
 

src/test/java/io/qdrant/client/PointsTest.java

@@ -12,7 +12,7 @@
 import org.testcontainers.shaded.com.google.common.collect.ImmutableList;
 import org.testcontainers.shaded.com.google.common.collect.ImmutableMap;
 import org.testcontainers.shaded.com.google.common.collect.ImmutableSet;
-import io.qdrant.client.container.QdrantContainer;
+import org.testcontainers.qdrant.QdrantContainer;
 import io.qdrant.client.grpc.Points.DiscoverPoints;
 import io.qdrant.client.grpc.Points.PointVectors;
 import io.qdrant.client.grpc.Points.PointsIdsList;
@@ -61,7 +61,7 @@
 @Testcontainers
 class PointsTest {
 	@Container
-	private static final QdrantContainer QDRANT_CONTAINER = new QdrantContainer();
+	private static final QdrantContainer QDRANT_CONTAINER = new QdrantContainer(DockerImage.QDRANT_IMAGE);
 	private QdrantClient client;
 	private ManagedChannel channel;
 	private String testName;

src/test/java/io/qdrant/client/QdrantGrpcClientTest.java

@@ -8,7 +8,7 @@
 import org.junit.jupiter.api.Test;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
-import io.qdrant.client.container.QdrantContainer;
+import org.testcontainers.qdrant.QdrantContainer;
 
 import java.util.concurrent.ExecutionException;
 
@@ -18,7 +18,7 @@
 class QdrantGrpcClientTest {
 
 	@Container
-	private static final QdrantContainer QDRANT_CONTAINER = new QdrantContainer();
+	private static final QdrantContainer QDRANT_CONTAINER = new QdrantContainer(DockerImage.QDRANT_IMAGE);
 	private QdrantGrpcClient client;
 
 	@BeforeEach

src/test/java/io/qdrant/client/SnapshotsTest.java

@@ -12,7 +12,7 @@
 import org.junit.jupiter.api.TestInfo;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
-import io.qdrant.client.container.QdrantContainer;
+import org.testcontainers.qdrant.QdrantContainer;
 
 import java.util.List;
 import java.util.concurrent.ExecutionException;
@@ -25,7 +25,7 @@
 @Testcontainers
 class SnapshotsTest {
 	@Container
-	private static final QdrantContainer QDRANT_CONTAINER = new QdrantContainer();
+	private static final QdrantContainer QDRANT_CONTAINER = new QdrantContainer(DockerImage.QDRANT_IMAGE);
 	private QdrantClient client;
 	private ManagedChannel channel;
 	private String testName;