concurrent test fixes

Author: rashtao

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

@@ -64,13 +64,21 @@ public static void shutdown() throws InterruptedException, ExecutionException {
         arangoDB = null;
     }
 
+    protected static boolean isAtLeastVersion(final ArangoDBAsync arangoDB, final int major, final int minor, final int patch)
+            throws InterruptedException, ExecutionException {
+        return com.arangodb.util.TestUtils.isAtLeastVersion(arangoDB.getVersion().get().getVersion(), major, minor, patch);
+    }
     protected static boolean isAtLeastVersion(final ArangoDBAsync arangoDB, final int major, final int minor)
             throws InterruptedException, ExecutionException {
-        return com.arangodb.util.TestUtils.isAtLeastVersion(arangoDB.getVersion().get().getVersion(), major, minor, 0);
+        return isAtLeastVersion(arangoDB, major, minor, 0);
+    }
+
+    protected boolean isAtLeastVersion(final int major, final int minor, final int patch) throws InterruptedException, ExecutionException {
+        return isAtLeastVersion(arangoDB, major, minor, patch);
     }
 
     protected boolean isAtLeastVersion(final int major, final int minor) throws InterruptedException, ExecutionException {
-        return isAtLeastVersion(arangoDB, major, minor);
+        return isAtLeastVersion(major, minor, 0);
     }
 
     boolean isStorageEngine(ArangoDBEngine.StorageEngineName name) throws ExecutionException, InterruptedException {

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

@@ -59,7 +59,6 @@ public void teardown() throws ExecutionException, InterruptedException {
 
     @Test
     public void conflictOnInsertDocumentWithNotYetCommittedTx() throws ExecutionException, InterruptedException {
-        assumeTrue(isSingleServer());
         assumeTrue(isAtLeastVersion(3, 5));
         assumeTrue(isStorageEngine(ArangoDBEngine.StorageEngineName.rocksdb));
 
@@ -82,7 +81,6 @@ public void conflictOnInsertDocumentWithNotYetCommittedTx() throws ExecutionExce
             fail();
         } catch (ExecutionException e) {
             assertThat(e.getCause(), Matchers.instanceOf(ArangoDBException.class));
-            e.getCause().printStackTrace();
         }
 
         db.abortStreamTransaction(tx1.getId()).get();
@@ -91,7 +89,6 @@ public void conflictOnInsertDocumentWithNotYetCommittedTx() throws ExecutionExce
 
     @Test
     public void conflictOnInsertDocumentWithAlreadyCommittedTx() throws ExecutionException, InterruptedException {
-        assumeTrue(isSingleServer());
         assumeTrue(isAtLeastVersion(3, 5));
         assumeTrue(isStorageEngine(ArangoDBEngine.StorageEngineName.rocksdb));
 
@@ -117,7 +114,6 @@ public void conflictOnInsertDocumentWithAlreadyCommittedTx() throws ExecutionExc
             fail();
         } catch (ExecutionException e) {
             assertThat(e.getCause(), Matchers.instanceOf(ArangoDBException.class));
-            e.getCause().printStackTrace();
         }
 
         db.abortStreamTransaction(tx2.getId()).get();