From b97e3d908ec022e76445436c5ed7dfa6b0345f1f Mon Sep 17 00:00:00 2001 From: Razi Khaja Date: Tue, 16 Jul 2019 11:24:31 -0400 Subject: [PATCH 1/2] Added @AfterClass test fixture to drop database containing collections: edge_drop and vertex_drop that was causing ArangoDatabaseTest.getCollectionsExcludeSystem() to fail. --- src/test/java/com/arangodb/ArangoGraphTest.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/test/java/com/arangodb/ArangoGraphTest.java b/src/test/java/com/arangodb/ArangoGraphTest.java index 550c2872d..6b5c0a5d4 100644 --- a/src/test/java/com/arangodb/ArangoGraphTest.java +++ b/src/test/java/com/arangodb/ArangoGraphTest.java @@ -33,6 +33,7 @@ import java.util.Iterator; import org.junit.After; +import org.junit.AfterClass; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -288,4 +289,8 @@ public void dropPlusDropCollections() { assertThat(db.collection(vertexCollection).exists(), is(false)); } + @AfterClass + public static void shutdown() { + db.drop(); + } } From 724f2f66462ddc821ce5a6ecfdf0fbfd28d4fa35 Mon Sep 17 00:00:00 2001 From: Razi Khaja Date: Tue, 16 Jul 2019 11:32:42 -0400 Subject: [PATCH 2/2] Renamed variables for clarity. --- src/test/java/com/arangodb/ArangoDatabaseTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test/java/com/arangodb/ArangoDatabaseTest.java b/src/test/java/com/arangodb/ArangoDatabaseTest.java index 501dd67b1..911f3b1d9 100644 --- a/src/test/java/com/arangodb/ArangoDatabaseTest.java +++ b/src/test/java/com/arangodb/ArangoDatabaseTest.java @@ -509,14 +509,14 @@ public void getCollections() { public void getCollectionsExcludeSystem() { try { final CollectionsReadOptions options = new CollectionsReadOptions().excludeSystem(true); - final Collection systemCollections = db.getCollections(options); + final Collection nonSystemCollections = db.getCollections(options); - assertThat(systemCollections.size(), is(0)); + assertThat(nonSystemCollections.size(), is(0)); db.createCollection(COLLECTION_NAME + "1", null); db.createCollection(COLLECTION_NAME + "2", null); - final Collection collections = db.getCollections(options); - assertThat(collections.size(), is(2)); - assertThat(collections, is(notNullValue())); + final Collection newCollections = db.getCollections(options); + assertThat(newCollections.size(), is(2)); + assertThat(newCollections, is(notNullValue())); } catch (final ArangoDBException e) { System.out.println(e.getErrorMessage()); } finally {