This is an automated email from the ASF dual-hosted git repository. drazzib pushed a commit to branch GORA-669-improve-tests-stability in repository https://gitbox.apache.org/repos/asf/gora.git
The following commit(s) were added to refs/heads/GORA-669-improve-tests-stability by this push: new 80ac571 GORA-669 Avoid using deprecated constructor 80ac571 is described below commit 80ac571aa7d233a5efeabfd2e4eec5006cfab3f1 Author: Damien Raude-Morvan <draz...@drazzib.com> AuthorDate: Sat Oct 31 23:27:29 2020 +0100 GORA-669 Avoid using deprecated constructor --- .../gora/aerospike/mapreduce/TestAerospikeStoreCountQuery.java | 3 ++- .../mapreduce/TestAerospikeStoreMapReduceSerialization.java | 3 ++- .../apache/gora/aerospike/mapreduce/TestAerospikeStoreWordCount.java | 3 ++- .../java/org/apache/gora/aerospike/store/TestAerospikeStore.java | 3 ++- .../test/java/org/apache/gora/couchdb/store/TestCouchDBStore.java | 3 ++- .../src/test/java/org/apache/gora/redis/GoraRedisTestDriver.java | 5 ++++- .../org/apache/gora/rethinkdb/store/RethinkDBGoraDataStoreTest.java | 3 ++- 7 files changed, 16 insertions(+), 7 deletions(-) diff --git a/gora-aerospike/src/test/java/org/apache/gora/aerospike/mapreduce/TestAerospikeStoreCountQuery.java b/gora-aerospike/src/test/java/org/apache/gora/aerospike/mapreduce/TestAerospikeStoreCountQuery.java index 72a2ba5..bcae11f 100644 --- a/gora-aerospike/src/test/java/org/apache/gora/aerospike/mapreduce/TestAerospikeStoreCountQuery.java +++ b/gora-aerospike/src/test/java/org/apache/gora/aerospike/mapreduce/TestAerospikeStoreCountQuery.java @@ -27,6 +27,7 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.testcontainers.containers.GenericContainer; +import org.testcontainers.utility.DockerImageName; import java.time.Duration; @@ -38,7 +39,7 @@ public class TestAerospikeStoreCountQuery { private static final String DOCKER_CONTAINER_NAME = "aerospike/aerospike-server:4.3.1.4"; @ClassRule - public static GenericContainer aerospikeContainer = new GenericContainer(DOCKER_CONTAINER_NAME) + public static GenericContainer aerospikeContainer = new GenericContainer(DockerImageName.parse(DOCKER_CONTAINER_NAME)) .withExposedPorts(3000).waitingFor(new AerospikeStartupLogWaitStrategy()) .withStartupTimeout(Duration.ofSeconds(240)); diff --git a/gora-aerospike/src/test/java/org/apache/gora/aerospike/mapreduce/TestAerospikeStoreMapReduceSerialization.java b/gora-aerospike/src/test/java/org/apache/gora/aerospike/mapreduce/TestAerospikeStoreMapReduceSerialization.java index b8f281e..c55ed0c 100644 --- a/gora-aerospike/src/test/java/org/apache/gora/aerospike/mapreduce/TestAerospikeStoreMapReduceSerialization.java +++ b/gora-aerospike/src/test/java/org/apache/gora/aerospike/mapreduce/TestAerospikeStoreMapReduceSerialization.java @@ -28,6 +28,7 @@ import org.junit.After; import org.junit.ClassRule; import org.testcontainers.containers.GenericContainer; +import org.testcontainers.utility.DockerImageName; import java.time.Duration; @@ -39,7 +40,7 @@ public class TestAerospikeStoreMapReduceSerialization { private static final String DOCKER_CONTAINER_NAME = "aerospike/aerospike-server:4.3.1.4"; @ClassRule - public static GenericContainer aerospikeContainer = new GenericContainer(DOCKER_CONTAINER_NAME) + public static GenericContainer aerospikeContainer = new GenericContainer(DockerImageName.parse(DOCKER_CONTAINER_NAME)) .withExposedPorts(3000).waitingFor(new AerospikeStartupLogWaitStrategy()) .withStartupTimeout(Duration.ofSeconds(240)); diff --git a/gora-aerospike/src/test/java/org/apache/gora/aerospike/mapreduce/TestAerospikeStoreWordCount.java b/gora-aerospike/src/test/java/org/apache/gora/aerospike/mapreduce/TestAerospikeStoreWordCount.java index 5e31f56..068636c 100644 --- a/gora-aerospike/src/test/java/org/apache/gora/aerospike/mapreduce/TestAerospikeStoreWordCount.java +++ b/gora-aerospike/src/test/java/org/apache/gora/aerospike/mapreduce/TestAerospikeStoreWordCount.java @@ -28,6 +28,7 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.testcontainers.containers.GenericContainer; +import org.testcontainers.utility.DockerImageName; import java.time.Duration; @@ -39,7 +40,7 @@ public class TestAerospikeStoreWordCount { private static final String DOCKER_CONTAINER_NAME = "aerospike/aerospike-server:4.3.1.4"; @ClassRule - public static GenericContainer aerospikeContainer = new GenericContainer(DOCKER_CONTAINER_NAME) + public static GenericContainer aerospikeContainer = new GenericContainer(DockerImageName.parse(DOCKER_CONTAINER_NAME)) .withExposedPorts(3000).waitingFor(new AerospikeStartupLogWaitStrategy()) .withStartupTimeout(Duration.ofSeconds(240)); diff --git a/gora-aerospike/src/test/java/org/apache/gora/aerospike/store/TestAerospikeStore.java b/gora-aerospike/src/test/java/org/apache/gora/aerospike/store/TestAerospikeStore.java index 97f33d1..38483ba 100644 --- a/gora-aerospike/src/test/java/org/apache/gora/aerospike/store/TestAerospikeStore.java +++ b/gora-aerospike/src/test/java/org/apache/gora/aerospike/store/TestAerospikeStore.java @@ -29,6 +29,7 @@ import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Test; import org.testcontainers.containers.GenericContainer; +import org.testcontainers.utility.DockerImageName; import java.time.Duration; @@ -42,7 +43,7 @@ public class TestAerospikeStore extends DataStoreTestBase { private static final String DOCKER_CONTAINER_NAME = "aerospike/aerospike-server:4.3.1.4"; @ClassRule - public static GenericContainer aerospikeContainer = new GenericContainer(DOCKER_CONTAINER_NAME) + public static GenericContainer aerospikeContainer = new GenericContainer(DockerImageName.parse(DOCKER_CONTAINER_NAME)) .withExposedPorts(3000).waitingFor(new AerospikeStartupLogWaitStrategy()) .withStartupTimeout(Duration.ofSeconds(240)); diff --git a/gora-couchdb/src/test/java/org/apache/gora/couchdb/store/TestCouchDBStore.java b/gora-couchdb/src/test/java/org/apache/gora/couchdb/store/TestCouchDBStore.java index da6996f..bb6f3fa 100644 --- a/gora-couchdb/src/test/java/org/apache/gora/couchdb/store/TestCouchDBStore.java +++ b/gora-couchdb/src/test/java/org/apache/gora/couchdb/store/TestCouchDBStore.java @@ -29,6 +29,7 @@ import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Test; import org.testcontainers.containers.GenericContainer; +import org.testcontainers.utility.DockerImageName; import java.io.IOException; import java.nio.ByteBuffer; @@ -49,7 +50,7 @@ public class TestCouchDBStore extends DataStoreTestBase { * JUnit integration testing with Docker and Testcontainers */ @ClassRule - public static GenericContainer CouchDB_CONTAINER = new GenericContainer(DOCKER_CONTAINER_NAME) + public static GenericContainer CouchDB_CONTAINER = new GenericContainer(DockerImageName.parse(DOCKER_CONTAINER_NAME)) .withExposedPorts(5984) .waitingFor(new CouchDBStartupLogWaitStrategy()) .withStartupTimeout(Duration.ofSeconds(240)); diff --git a/gora-redis/src/test/java/org/apache/gora/redis/GoraRedisTestDriver.java b/gora-redis/src/test/java/org/apache/gora/redis/GoraRedisTestDriver.java index 1180b23..ab3c6a2 100755 --- a/gora-redis/src/test/java/org/apache/gora/redis/GoraRedisTestDriver.java +++ b/gora-redis/src/test/java/org/apache/gora/redis/GoraRedisTestDriver.java @@ -25,6 +25,9 @@ import org.apache.gora.redis.util.RedisStartupLogWaitStrategy; import org.apache.gora.redis.util.ServerMode; import org.apache.gora.redis.util.StorageMode; import org.testcontainers.containers.GenericContainer; +import org.testcontainers.utility.DockerImageName; + +import javax.print.Doc; /** * Helper class to execute tests in a embedded instance of Redis. @@ -42,7 +45,7 @@ public class GoraRedisTestDriver extends GoraTestDriver { super(RedisStore.class); this.storageMode = storageMode; this.serverMode = serverMode; - GenericContainer container = new GenericContainer(DOCKER_IMAGE) + GenericContainer container = new GenericContainer(DockerImageName.parse(DOCKER_IMAGE)) .waitingFor(new RedisStartupLogWaitStrategy()) .withStartupTimeout(Duration.ofMinutes(3)) .withEnv("STANDALONE", "true") diff --git a/gora-rethinkdb/src/test/java/org/apache/gora/rethinkdb/store/RethinkDBGoraDataStoreTest.java b/gora-rethinkdb/src/test/java/org/apache/gora/rethinkdb/store/RethinkDBGoraDataStoreTest.java index 23edbbc..aa51d5b 100644 --- a/gora-rethinkdb/src/test/java/org/apache/gora/rethinkdb/store/RethinkDBGoraDataStoreTest.java +++ b/gora-rethinkdb/src/test/java/org/apache/gora/rethinkdb/store/RethinkDBGoraDataStoreTest.java @@ -29,6 +29,7 @@ import org.junit.Ignore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testcontainers.containers.GenericContainer; +import org.testcontainers.utility.DockerImageName; import java.time.Duration; @@ -42,7 +43,7 @@ public class RethinkDBGoraDataStoreTest extends DataStoreTestBase { private static final String DOCKER_CONTAINER_NAME = "rethinkdb:2.3.6"; @ClassRule - public static GenericContainer rethinkdbContainer = new GenericContainer(DOCKER_CONTAINER_NAME) + public static GenericContainer rethinkdbContainer = new GenericContainer(DockerImageName.parse(DOCKER_CONTAINER_NAME)) .waitingFor(new RethinkDBStartupWaitStrategy()) .withStartupTimeout(Duration.ofSeconds(10));