fixed isAtLeastVersion

Author: rashtao

src/test/java/com/arangodb/ArangoDBTest.java

@@ -23,6 +23,7 @@
 import com.arangodb.entity.*;
 import com.arangodb.model.*;
 import com.arangodb.model.LogOptions.SortOrder;
+import com.arangodb.util.TestUtils;
 import com.arangodb.velocypack.exception.VPackException;
 import com.arangodb.velocystream.Request;
 import com.arangodb.velocystream.RequestType;
@@ -101,8 +102,7 @@ private boolean isCluster() {
 	}
 
 	private boolean isAtLeastVersion(final int major, final int minor) {
-		final String[] split = arangoDB.getVersion().getVersion().split("\\.");
-		return Integer.parseInt(split[0]) >= major && Integer.parseInt(split[1]) >= minor;
+        return TestUtils.isAtLeastVersion(arangoDB.getVersion().getVersion(), major, minor, 0);
 	}
 
 	@Test

src/test/java/com/arangodb/BaseTest.java

@@ -23,6 +23,7 @@
 import com.arangodb.entity.*;
 import com.arangodb.model.CollectionCreateOptions;
 import com.arangodb.model.GraphCreateOptions;
+import com.arangodb.util.TestUtils;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.runners.Parameterized.Parameters;
@@ -111,8 +112,11 @@ static String rnd() {
     }
 
     boolean isAtLeastVersion(final int major, final int minor) {
-        final String[] split = arangoDB.getVersion().getVersion().split("\\.");
-        return Integer.parseInt(split[0]) >= major && Integer.parseInt(split[1]) >= minor;
+        return isAtLeastVersion(major, minor, 0);
+    }
+
+    boolean isAtLeastVersion(final int major, final int minor, final int patch) {
+        return TestUtils.isAtLeastVersion(arangoDB.getVersion().getVersion(), major, minor, patch);
     }
 
     boolean isStorageEngine(ArangoDBEngine.StorageEngineName name) {

src/test/java/com/arangodb/async/ArangoDBTest.java

@@ -69,8 +69,7 @@ private boolean isCluster() {
 
     private boolean isAtLeastVersion(final int major, final int minor) {
         final ArangoDB arangoDB = new ArangoDB.Builder().build();
-        final String[] split = arangoDB.getVersion().getVersion().split("\\.");
-        return Integer.parseInt(split[0]) >= major && Integer.parseInt(split[1]) >= minor;
+        return com.arangodb.util.TestUtils.isAtLeastVersion(arangoDB.getVersion().getVersion(), major,minor,0);
     }
 
     @Test

src/test/java/com/arangodb/async/BaseTest.java

@@ -66,8 +66,7 @@ public static void shutdown() throws InterruptedException, ExecutionException {
 
     protected static boolean isAtLeastVersion(final ArangoDBAsync arangoDB, final int major, final int minor)
             throws InterruptedException, ExecutionException {
-        final String[] split = arangoDB.getVersion().get().getVersion().split("\\.");
-        return Integer.parseInt(split[0]) >= major && Integer.parseInt(split[1]) >= minor;
+        return com.arangodb.util.TestUtils.isAtLeastVersion(arangoDB.getVersion().get().getVersion(), major, minor, 0);
     }
 
     protected boolean isAtLeastVersion(final int major, final int minor) throws InterruptedException, ExecutionException {

src/test/java/com/arangodb/async/TestUtils.java

@@ -1,4 +1,4 @@
-package com.arangodb.async;/*
+/*
  * DISCLAIMER
  *
  * Copyright 2016 ArangoDB GmbH, Cologne, Germany
@@ -19,6 +19,9 @@
  */
 
 
+package com.arangodb.async;
+
+
 import org.junit.rules.TestRule;
 
 import java.io.IOException;

src/test/java/com/arangodb/util/TestUtils.java

@@ -0,0 +1,68 @@
+/*
+ * DISCLAIMER
+ *
+ * Copyright 2016 ArangoDB GmbH, Cologne, Germany
+ *
+ * Licensed 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.
+ *
+ * Copyright holder is ArangoDB GmbH, Cologne, Germany
+ */
+
+
+package com.arangodb.util;
+
+
+/**
+ * @author Michele Rastelli
+ */
+public final class TestUtils {
+
+    private TestUtils() {
+    }
+
+    /**
+     * Parses {@param version} and checks whether it is greater or equal to
+     * <{@param otherMajor}, {@param otherMinor}, {@param otherPatch}>
+     * comparing the corresponding version components in lexicographical order.
+     *
+     * @param version
+     * @param otherMajor
+     * @param otherMinor
+     * @param otherPatch
+     */
+    public static boolean isAtLeastVersion(final String version, final int otherMajor, final int otherMinor, final int otherPatch) {
+        String[] parts = version.split("-")[0].split("\\.");
+
+        int major = Integer.parseInt(parts[0]);
+        int minor = Integer.parseInt(parts[1]);
+        int patch = Integer.parseInt(parts[2]);
+
+        int majorComparison = Integer.compare(major, otherMajor);
+        if (majorComparison != 0) {
+            return majorComparison > 0;
+        }
+
+        int minorComparison = Integer.compare(minor, otherMinor);
+        if (minorComparison != 0) {
+            return minorComparison > 0;
+        }
+
+        int patchComparison = Integer.compare(patch, otherPatch);
+        if (patchComparison != 0) {
+            return patchComparison > 0;
+        }
+
+        return true;
+    }
+
+}