Merge branch 'master' of github.com:JNOSQL/diana-driver

Author: Otavio Santana

docker.sh

@@ -1,7 +1,6 @@
 docker run -e ARANGO_NO_AUTH=1 -d --name arangodb-instance -p 8529:8529 -d arangodb/arangodb
 docker run -d --name couchbase-instance -p 8091-8094:8091-8094 -p 11210:11210 couchbase
 docker run --name elasticsearch-instance -p 9300:9300 -p 9200:9200 -d elasticsearch
-docker run --name mongo-instance -p 27017:27017 -d mongo
 docker run -d --name orientdb -p 2424:2424 -p 2480:2480 -e ORIENTDB_ROOT_PASSWORD=rootpwd orientdb
 docker run --name redis-instance -p 6379:6379 -d redis
 docker run --name riak-instance -d -p 8087:8087 -p 8098:8098 basho/riak-ts

mongodb-driver/pom.xml

@@ -63,6 +63,11 @@
             <artifactId>mongodb-driver-async</artifactId>
             <version>${monbodb.driver}</version>
         </dependency>
+        <dependency>
+            <groupId>de.flapdoodle.embed</groupId>
+            <artifactId>de.flapdoodle.embed.mongo</artifactId>
+            <version>2.0.1-SNAPSHOT</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -101,4 +106,10 @@
             </plugin>
         </plugins>
     </build>
+    <repositories>
+        <repository>
+            <id>sonartype</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+        </repository>
+    </repositories>
 </project>

mongodb-driver/src/test/java/org/jnosql/diana/mongodb/document/MongoDBDocumentCollectionManagerAsyncTest.java

@@ -26,9 +26,11 @@
 import org.jnosql.diana.api.document.DocumentEntity;
 import org.jnosql.diana.api.document.DocumentQuery;
 import org.jnosql.diana.api.document.Documents;
-import org.junit.Before;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -40,10 +42,12 @@
 public class MongoDBDocumentCollectionManagerAsyncTest {
 
     public static final String COLLECTION_NAME = "person";
-    private DocumentCollectionManager entityManager;
 
-    @Before
-    public void setUp() {
+    private static DocumentCollectionManager entityManager;
+
+    @BeforeClass
+    public static void setUp() throws IOException {
+        MongoDbHelper.startMongoDb();
         entityManager = get().get("database");
     }
 
@@ -84,4 +88,8 @@ private DocumentEntity getEntity() {
         return entity;
     }
 
+    @AfterClass
+    public static void end() {
+        MongoDbHelper.stopMongoDb();
+    }
 }

mongodb-driver/src/test/java/org/jnosql/diana/mongodb/document/MongoDBDocumentCollectionManagerFactoryTest.java

@@ -20,20 +20,23 @@
 
 package org.jnosql.diana.mongodb.document;
 
-import org.junit.Before;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
+import java.io.IOException;
+
 import static org.junit.Assert.assertNotNull;
 
 
 public class MongoDBDocumentCollectionManagerFactoryTest {
 
-    private MongoDBDocumentConfiguration configuration;
+    private static MongoDBDocumentConfiguration configuration;
 
-    @Before
-    public void setUp() {
+    @BeforeClass
+    public static void setUp() throws IOException {
         configuration = new MongoDBDocumentConfiguration();
-
+        MongoDbHelper.startMongoDb();
     }
 
     @Test
@@ -47,4 +50,9 @@ public void shouldCreateEntityManagerAsync() {
         MongoDBDocumentCollectionManagerFactory mongoDBFactory = configuration.get();
         assertNotNull(mongoDBFactory.getAsync("database"));
     }
+
+    @AfterClass
+    public static void end(){
+        MongoDbHelper.stopMongoDb();
+    }
 }

mongodb-driver/src/test/java/org/jnosql/diana/mongodb/document/MongoDBDocumentCollectionManagerTest.java

@@ -28,9 +28,11 @@
 import org.jnosql.diana.api.document.DocumentEntity;
 import org.jnosql.diana.api.document.DocumentQuery;
 import org.jnosql.diana.api.document.Documents;
-import org.junit.Before;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -48,10 +50,11 @@
 public class MongoDBDocumentCollectionManagerTest {
 
     public static final String COLLECTION_NAME = "person";
-    private DocumentCollectionManager entityManager;
+    private static DocumentCollectionManager entityManager;
 
-    @Before
-    public void setUp() {
+    @BeforeClass
+    public static void setUp() throws IOException {
+        MongoDbHelper.startMongoDb();
         entityManager = get().get("database");
     }
 
@@ -121,6 +124,10 @@ private DocumentEntity getEntity() {
         return entity;
     }
 
+    @AfterClass
+    public static void end(){
+        MongoDbHelper.stopMongoDb();
+    }
 
     public void init() {
         DocumentEntity oReilly = DocumentEntity.of("oReilly");

mongodb-driver/src/test/java/org/jnosql/diana/mongodb/document/MongoDBDocumentConfigurationTest.java

@@ -31,8 +31,6 @@
 
 
 public class MongoDBDocumentConfigurationTest {
-
-
     @Test
     public void shouldCreateDocumentCollectionManagerFactoryByMap() {
         Map<String, String> map  = new HashMap<>();

mongodb-driver/src/test/java/org/jnosql/diana/mongodb/document/MongoDbHelper.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright 2017 Eclipse Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.jnosql.diana.mongodb.document;
+
+import com.mongodb.MongoClient;
+import de.flapdoodle.embed.mongo.MongodExecutable;
+import de.flapdoodle.embed.mongo.MongodProcess;
+import de.flapdoodle.embed.mongo.MongodStarter;
+import de.flapdoodle.embed.mongo.config.MongodConfigBuilder;
+import de.flapdoodle.embed.mongo.config.Net;
+import de.flapdoodle.embed.mongo.distribution.Version;
+import de.flapdoodle.embed.process.runtime.Network;
+
+import java.io.IOException;
+
+
+/**
+ * Class helper to start a mongodb embedded
+ * @author Ivan Junckes Filho
+ */
+public abstract class MongoDbHelper {
+
+    private static final MongodStarter starter = MongodStarter.getDefaultInstance();
+    private static MongodExecutable _mongodExe;
+    private static MongodProcess _mongod;
+    private static MongoClient _mongo;
+
+    public static void startMongoDb() throws IOException {
+        _mongodExe = starter.prepare(new MongodConfigBuilder()
+                .version(Version.Main.PRODUCTION)
+                .net(new Net("localhost", 27017, Network.localhostIsIPv6()))
+                .build());
+        _mongod = _mongodExe.start();
+        _mongo = new MongoClient("localhost", 27017);
+    }
+
+    public static void stopMongoDb(){
+        _mongod.stop();
+        _mongodExe.stop();
+    }
+
+}

pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.jnosql</groupId>
         <artifactId>jnosql-parent</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>0.0.2-SNAPSHOT</version>
     </parent>
 
     <groupId>org.jnosql.diana</groupId>