re-enabled some ignored tests

Author: rashtao

src/test/java/com/arangodb/ArangoCollectionTest.java

@@ -371,14 +371,12 @@ public void getDocumentIfNoneMatchFail() {
     }
 
     @Test
-    @Ignore
-    // FIXME: test with VelocyJack fails due to slash escape char
     public void getDocumentAsJson() {
         String key = rnd();
         collection.insertDocument("{\"_key\":\"" + key + "\",\"a\":\"test\"}", null);
         final String readResult = collection.getDocument(key, String.class, null);
-        assertThat(readResult.contains("\"_key\":\"" + key + "\""), is(true));
-        assertThat(readResult.contains("\"_id\":\"" + COLLECTION_NAME + "\\/" + key + "\""), is(true));
+        assertThat(readResult, containsString("\"_key\":\"" + key + "\""));
+        assertThat(readResult, containsString("\"_id\":\"" + COLLECTION_NAME + "/" + key + "\""));
     }
 
     @Test
@@ -437,11 +435,7 @@ public void getDocuments() {
         }
     }
 
-    /**
-     * TODO: uncomment once the fix has been backported (3.4.9 and 3.5.1)
-     */
     @Test
-    @Ignore
     public void getDocumentsWithCustomShardingKey() {
         ArangoCollection collection = db.collection("customShardingKeyCollection");
         if (collection.exists())

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

@@ -54,7 +54,6 @@ public StreamTransactionConflictsTest(final ArangoDB arangoDB) {
     }
 
     @Test
-    @Ignore
     public void conflictOnInsertDocumentWithNotYetCommittedTx() {
         assumeTrue(isSingleServer());
         assumeTrue(isAtLeastVersion(3, 5));