Tests refactoring:

1. ant tests are removed. 2. properties to set server port in test mode were added. 3. few minor configuration mistakes were fixed.
orientechnologies · Aug 14, 2015 · 2738efc · 2738efc
1 parent 1901822
commit 2738efc
Show file tree

Hide file tree

Showing 51 changed files with 79 additions and 524 deletions.
diff --git a/build.xml b/build.xml
diff --git a/client/build.xml b/client/build.xml
diff --git a/client/src/main/java/com/orientechnologies/orient/client/remote/OStorageRemote.java b/client/src/main/java/com/orientechnologies/orient/client/remote/OStorageRemote.java
@@ -100,10 +100,33 @@ public class OStorageRemote extends OStorageAbstract implements OStorageProxy {
   public static final String            PARAM_MAX_POOL       = "maxpool";
   public static final String            PARAM_DB_TYPE        = "dbtype";
   private static final String           DEFAULT_HOST         = "localhost";
-  private static final int              DEFAULT_PORT         = 2424;
+  private static final int              DEFAULT_PORT;
   private static final int              DEFAULT_SSL_PORT     = 2434;
   private static final String           ADDRESS_SEPARATOR    = ";";
   private static final String           DRIVER_NAME          = "OrientDB Java";
+
+  static {
+    int serverPort = -1;
+
+    String serverTestMode = System.getProperty("orient.server.testMode", "false");
+    if (serverTestMode.equals("true")) {
+      String serverTestPort = System.getProperty("orient.server.port");
+      if (serverTestPort != null) {
+        try {
+          serverPort = Integer.parseInt(serverTestPort);
+
+        } catch (NumberFormatException e) {
+          serverPort = -1;
+        }
+      }
+    }
+
+    if (serverPort == -1)
+      serverPort = 2424;
+
+    DEFAULT_PORT = serverPort;
+  }
+
   protected final List<String>          serverURLs           = new ArrayList<String>();
   protected final Map<String, OCluster> clusterMap           = new ConcurrentHashMap<String, OCluster>();
   private final ExecutorService         asynchExecutor;

diff --git a/core/build.xml b/core/build.xml
diff --git a/core/lib/concurrentlinkedhashmap-lru-1.4.jar b/core/lib/concurrentlinkedhashmap-lru-1.4.jar
diff --git a/core/lib/jna-4.0.0.jar b/core/lib/jna-4.0.0.jar
diff --git a/core/lib/jna-platform-4.0.0.jar b/core/lib/jna-platform-4.0.0.jar
diff --git a/core/lib/mockito-all-1.9.5.jar b/core/lib/mockito-all-1.9.5.jar
diff --git a/core/lib/snappy-java-1.1.0.1.jar b/core/lib/snappy-java-1.1.0.1.jar
diff --git a/core/lib/testng-6.8.8.jar b/core/lib/testng-6.8.8.jar
diff --git a/...test/java/com/orientechnologies/orient/core/index/hashindex/local/cache/WOWCacheTest.java b/...test/java/com/orientechnologies/orient/core/index/hashindex/local/cache/WOWCacheTest.java
@@ -242,7 +242,7 @@ public void testFlushAllContentEventually() throws Exception {
       Assert.assertEquals(dataTwo, dataOne);
     }
 
-    Thread.sleep(10000);
+    Thread.sleep(20000);
 
     for (int i = 0; i < pageData.length; i++) {
       byte[] dataContent = pageData[i];