This is an automated email from the ASF dual-hosted git repository. drazzib pushed a commit to branch GORA-647-test-containers-mongo in repository https://gitbox.apache.org/repos/asf/gora.git
commit c14ef505000723af61e2d6384bdd80ca61339835 Author: Damien Raude-Morvan <draz...@drazzib.com> AuthorDate: Sat Mar 21 23:32:34 2020 +0100 GORA-647 Use MongoContainer as JUnit @ClassRule --- .../org/apache/gora/mongodb/mapreduce/GoraMongoMapredTest.java | 8 +++++++- .../test/java/org/apache/gora/mongodb/store/TestMongoStore34.java | 8 ++++++-- .../test/java/org/apache/gora/mongodb/store/TestMongoStore36.java | 8 ++++++-- .../test/java/org/apache/gora/mongodb/store/TestMongoStore40.java | 8 ++++++-- 4 files changed, 25 insertions(+), 7 deletions(-) diff --git a/gora-mongodb/src/test/java/org/apache/gora/mongodb/mapreduce/GoraMongoMapredTest.java b/gora-mongodb/src/test/java/org/apache/gora/mongodb/mapreduce/GoraMongoMapredTest.java index 77cfc0d..7315192 100644 --- a/gora-mongodb/src/test/java/org/apache/gora/mongodb/mapreduce/GoraMongoMapredTest.java +++ b/gora-mongodb/src/test/java/org/apache/gora/mongodb/mapreduce/GoraMongoMapredTest.java @@ -19,14 +19,20 @@ package org.apache.gora.mongodb.mapreduce; import org.apache.gora.GoraTestDriver; import org.apache.gora.mongodb.GoraMongodbTestDriver; +import org.apache.gora.mongodb.MongoContainer; import org.junit.AfterClass; import org.junit.BeforeClass; +import org.junit.ClassRule; /** * Created by drazzib on 24/05/14. */ public class GoraMongoMapredTest { - protected static GoraTestDriver testDriver = new GoraMongodbTestDriver(); + + @ClassRule + public final static MongoContainer container = new MongoContainer("3.6"); + + protected static GoraTestDriver testDriver = new GoraMongodbTestDriver(container); @BeforeClass public static void setUpClass() throws Exception { diff --git a/gora-mongodb/src/test/java/org/apache/gora/mongodb/store/TestMongoStore34.java b/gora-mongodb/src/test/java/org/apache/gora/mongodb/store/TestMongoStore34.java index 90c0359..5e54486 100644 --- a/gora-mongodb/src/test/java/org/apache/gora/mongodb/store/TestMongoStore34.java +++ b/gora-mongodb/src/test/java/org/apache/gora/mongodb/store/TestMongoStore34.java @@ -17,15 +17,19 @@ */ package org.apache.gora.mongodb.store; -import de.flapdoodle.embed.mongo.distribution.Version; import org.apache.gora.mongodb.GoraMongodbTestDriver; +import org.apache.gora.mongodb.MongoContainer; +import org.junit.ClassRule; /** * Perform {@link TestMongoStore} tests on MongoDB 3.4.x server. */ public class TestMongoStore34 extends TestMongoStore { + @ClassRule + public final static MongoContainer container = new MongoContainer("3.4"); + static { - setTestDriver(new GoraMongodbTestDriver(Version.Main.V3_4)); + setTestDriver(new GoraMongodbTestDriver(container)); } } diff --git a/gora-mongodb/src/test/java/org/apache/gora/mongodb/store/TestMongoStore36.java b/gora-mongodb/src/test/java/org/apache/gora/mongodb/store/TestMongoStore36.java index 7b5d0aa..dd69e42 100644 --- a/gora-mongodb/src/test/java/org/apache/gora/mongodb/store/TestMongoStore36.java +++ b/gora-mongodb/src/test/java/org/apache/gora/mongodb/store/TestMongoStore36.java @@ -17,15 +17,19 @@ */ package org.apache.gora.mongodb.store; -import de.flapdoodle.embed.mongo.distribution.Version; import org.apache.gora.mongodb.GoraMongodbTestDriver; +import org.apache.gora.mongodb.MongoContainer; +import org.junit.ClassRule; /** * Perform {@link TestMongoStore} tests on MongoDB 3.6.x server. */ public class TestMongoStore36 extends TestMongoStore { + @ClassRule + public final static MongoContainer container = new MongoContainer("3.6"); + static { - setTestDriver(new GoraMongodbTestDriver(Version.Main.V3_6)); + setTestDriver(new GoraMongodbTestDriver(container)); } } diff --git a/gora-mongodb/src/test/java/org/apache/gora/mongodb/store/TestMongoStore40.java b/gora-mongodb/src/test/java/org/apache/gora/mongodb/store/TestMongoStore40.java index 6cc9163..6eb3d8b 100644 --- a/gora-mongodb/src/test/java/org/apache/gora/mongodb/store/TestMongoStore40.java +++ b/gora-mongodb/src/test/java/org/apache/gora/mongodb/store/TestMongoStore40.java @@ -17,15 +17,19 @@ */ package org.apache.gora.mongodb.store; -import de.flapdoodle.embed.mongo.distribution.Version; import org.apache.gora.mongodb.GoraMongodbTestDriver; +import org.apache.gora.mongodb.MongoContainer; +import org.junit.ClassRule; /** * Perform {@link TestMongoStore} tests on MongoDB 4.0.x server. */ public class TestMongoStore40 extends TestMongoStore { + @ClassRule + public final static MongoContainer container = new MongoContainer("4.0"); + static { - setTestDriver(new GoraMongodbTestDriver(Version.Main.V4_0)); + setTestDriver(new GoraMongodbTestDriver(container)); } }