Merge branch 'develop' of github.com:orientechnologies/orientdb into …

…develop
orientechnologies · Jul 6, 2017 · 48e68c6 · 48e68c6
2 parents 8e31725 + 8e3e5ad
commit 48e68c6
Show file tree

Hide file tree

Showing 7 changed files with 82 additions and 5 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -174,6 +174,22 @@
                     </properties>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>${surefire.version}</version>
+                <configuration>
+                    <systemPropertyVariables>
+                        <buildDirectory>${project.build.directory}</buildDirectory>
+                    </systemPropertyVariables>
+                    <properties>
+                        <property>
+                            <name>listener</name>
+                            <value>com.orientechnologies.OJUnitTestLeaksListener</value>
+                        </property>
+                    </properties>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>

diff --git a/...t/java/com/orientechnologies/orient/core/index/hashindex/local/OLocalHashTableTestIT.java b/...t/java/com/orientechnologies/orient/core/index/hashindex/local/OLocalHashTableTestIT.java
@@ -7,6 +7,7 @@
 import com.orientechnologies.orient.core.storage.impl.local.OAbstractPaginatedStorage;
 import org.junit.After;
 
+import java.io.File;
 import java.io.IOException;
 
 /**
@@ -15,13 +16,16 @@
  */
 public class OLocalHashTableTestIT extends OLocalHashTableBase {
 
-  public OLocalHashTableTestIT() {
+  public OLocalHashTableTestIT() throws Exception {
 
     String buildDirectory = System.getProperty("buildDirectory");
     if (buildDirectory == null)
       buildDirectory = ".";
 
-    databaseDocumentTx = new ODatabaseDocumentTx("plocal:" + buildDirectory + "/localHashTableTest");
+    final File dbDirectory = new File(buildDirectory, "localHashTableTest");
+    System.out.println(this.getClass().getSimpleName() + " test is initializing using DB directory = " + dbDirectory);
+
+    databaseDocumentTx = new ODatabaseDocumentTx("plocal:" + dbDirectory.getCanonicalPath());
     if (databaseDocumentTx.exists()) {
       databaseDocumentTx.open("admin", "admin");
       databaseDocumentTx.drop();

diff --git a/core/src/test/java/com/orientechnologies/orient/core/index/sbtree/local/SBTreeTestIT.java b/core/src/test/java/com/orientechnologies/orient/core/index/sbtree/local/SBTreeTestIT.java
@@ -5,12 +5,14 @@
 import com.orientechnologies.orient.core.db.record.OIdentifiable;
 import com.orientechnologies.orient.core.id.ORID;
 import com.orientechnologies.orient.core.id.ORecordId;
+import com.orientechnologies.orient.core.index.hashindex.local.OLocalHashTableTestIT;
 import com.orientechnologies.orient.core.serialization.serializer.binary.impl.OLinkSerializer;
 import com.orientechnologies.orient.core.storage.impl.local.OAbstractPaginatedStorage;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.io.File;
 import java.util.*;
 
 /**
@@ -28,6 +30,9 @@ public SBTreeTestIT() {
     if (buildDirectory == null)
       buildDirectory = ".";
 
+    final File dbDirectory = new File(buildDirectory, "localSBTreeTest");
+    System.out.println(this.getClass().getSimpleName() + " test is initializing using DB directory = " + dbDirectory);
+
     databaseDocumentTx = new ODatabaseDocumentTx("plocal:" + buildDirectory + "/localSBTreeTest");
     if (databaseDocumentTx.exists()) {
       databaseDocumentTx.open("admin", "admin");

diff --git a/graphdb/pom.xml b/graphdb/pom.xml
@@ -164,6 +164,16 @@
                     </systemPropertyVariables>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>${surefire.version}</version>
+                <configuration>
+                    <systemPropertyVariables>
+                        <buildDirectory>${project.build.directory}</buildDirectory>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/object/pom.xml b/object/pom.xml
@@ -107,6 +107,23 @@
                     </properties>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>${surefire.version}</version>
+                <configuration>
+                    <systemPropertyVariables>
+                        <buildDirectory>${project.build.directory}</buildDirectory>
+                    </systemPropertyVariables>
+                    <properties>
+                        <property>
+                            <name>listener</name>
+                            <value>com.orientechnologies.OJUnitTestLeaksListener</value>
+                        </property>
+                    </properties>
+                </configuration>
+            </plugin>
+
         </plugins>
         <testResources>
             <testResource>

diff --git a/server/pom.xml b/server/pom.xml
@@ -157,8 +157,6 @@
                 <configuration>
                     <systemPropertyVariables>
                         <buildDirectory>${project.build.directory}</buildDirectory>
-                        <orient.server.testMode>${orient.server.testMode}</orient.server.testMode>
-                        <orient.server.port>${orient.server.port}</orient.server.port>
                     </systemPropertyVariables>
                     <excludes>
                         <exclude>${exclude.test.1}</exclude>

diff --git a/tests/pom.xml b/tests/pom.xml
@@ -194,7 +194,34 @@
                     </execution>
                 </executions>
             </plugin>
-
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>${surefire.version}</version>
+                <configuration>
+                    <systemPropertyVariables>
+                        <storage.lockTimeout>60000</storage.lockTimeout>
+                        <storage.makeFullCheckpointAfterCreate>false</storage.makeFullCheckpointAfterCreate>
+                        <storage.makeFullCheckpointAfterClusterCreate>false
+                        </storage.makeFullCheckpointAfterClusterCreate>
+                        <storage.wal.syncOnPageFlush>false</storage.wal.syncOnPageFlush>
+                        <storage.configuration.syncOnUpdate>false</storage.configuration.syncOnUpdate>
+                        <index.flushAfterCreate>false</index.flushAfterCreate>
+                        <security.userPasswordSaltIterations>10</security.userPasswordSaltIterations>
+                        <buildDirectory>${project.build.directory}</buildDirectory>
+                        <testPath>${project.basedir}</testPath>
+                        <orientdb.test.keepDatabase>true</orientdb.test.keepDatabase>
+                        <storage.diskCache.bufferSize>4096</storage.diskCache.bufferSize>
+                        <memory.directMemory.trackMode>true</memory.directMemory.trackMode>
+                    </systemPropertyVariables>
+                    <properties>
+                        <property>
+                            <name>listener</name>
+                            <value>com.orientechnologies.OTestNGTestLeaksListener</value>
+                        </property>
+                    </properties>
+                </configuration>
+            </plugin>
         </plugins>
     </build>