diff --git a/src/main/java/com/arangodb/internal/ArangoDBImpl.java b/src/main/java/com/arangodb/internal/ArangoDBImpl.java index fa88d6e0d..47d589402 100644 --- a/src/main/java/com/arangodb/internal/ArangoDBImpl.java +++ b/src/main/java/com/arangodb/internal/ArangoDBImpl.java @@ -86,7 +86,7 @@ public ArangoDBImpl(final VstCommunicationSync.Builder vstBuilder, final HttpCom hostResolver.init(this.executor(), util()); - LOGGER.info("ArangoDB Client is ready to use"); + LOGGER.debug("ArangoDB Client is ready to use"); } diff --git a/src/main/java/com/arangodb/internal/InternalArangoDBBuilder.java b/src/main/java/com/arangodb/internal/InternalArangoDBBuilder.java index d1379a088..12bc11b94 100644 --- a/src/main/java/com/arangodb/internal/InternalArangoDBBuilder.java +++ b/src/main/java/com/arangodb/internal/InternalArangoDBBuilder.java @@ -234,7 +234,7 @@ protected HostHandler createHostHandler(final HostResolver hostResolver) { hostHandler = new FallbackHostHandler(hostResolver); } - LOG.info("HostHandler is " + hostHandler.getClass().getSimpleName()); + LOG.debug("HostHandler is " + hostHandler.getClass().getSimpleName()); return new DirtyReadHostHandler(hostHandler, new RoundRobinHostHandler(hostResolver)); } diff --git a/src/main/java/com/arangodb/internal/net/ExtendedHostResolver.java b/src/main/java/com/arangodb/internal/net/ExtendedHostResolver.java index 1d624ab83..df54dc60c 100644 --- a/src/main/java/com/arangodb/internal/net/ExtendedHostResolver.java +++ b/src/main/java/com/arangodb/internal/net/ExtendedHostResolver.java @@ -89,7 +89,7 @@ public HostSet resolve(boolean initial, boolean closeConnections) { lastUpdate = System.currentTimeMillis(); final Collection endpoints = resolveFromServer(); - LOGGER.info("Resolve " + endpoints.size() + " Endpoints"); + LOGGER.debug("Resolve " + endpoints.size() + " Endpoints"); LOGGER.debug("Endpoints " + Arrays.deepToString(endpoints.toArray())); if (!endpoints.isEmpty()) { diff --git a/src/test/java/com/arangodb/ArangoCollectionTest.java b/src/test/java/com/arangodb/ArangoCollectionTest.java index 5064bdb59..c19c63473 100644 --- a/src/test/java/com/arangodb/ArangoCollectionTest.java +++ b/src/test/java/com/arangodb/ArangoCollectionTest.java @@ -87,12 +87,18 @@ public class ArangoCollectionTest extends BaseTest { public ArangoCollectionTest(final Builder builder) { super(builder); - db.createCollection(COLLECTION_NAME, null); + try { + db.createCollection(COLLECTION_NAME, null); + } catch (final ArangoDBException e) { + + } } @After public void teardown() { - db.collection(COLLECTION_NAME).truncate(); + try {db.collection(COLLECTION_NAME).drop();} catch (final ArangoDBException e) {}; + try {db.collection(EDGE_COLLECTION_NAME).drop();} catch (final ArangoDBException e) {}; + try {db.collection(COLLECTION_NAME + "_1").drop();} catch (final ArangoDBException e) {}; } @Test diff --git a/src/test/java/com/arangodb/ArangoDBTest.java b/src/test/java/com/arangodb/ArangoDBTest.java index d6ed6d2f2..2c0d2b7db 100644 --- a/src/test/java/com/arangodb/ArangoDBTest.java +++ b/src/test/java/com/arangodb/ArangoDBTest.java @@ -96,23 +96,10 @@ public void getVersion() { } @Test - public void createDatabase() { - try { - final Boolean result = arangoDB.createDatabase(BaseTest.TEST_DB); - assertThat(result, is(true)); - } finally { - try { - arangoDB.db(BaseTest.TEST_DB).drop(); - } catch (final ArangoDBException e) { - } - } - } - - @Test - public void deleteDatabase() { - final Boolean resultCreate = arangoDB.createDatabase(BaseTest.TEST_DB); + public void createAndDeleteDatabase() { + final Boolean resultCreate = arangoDB.createDatabase(BaseTest.TEST_DB_CUSTOM); assertThat(resultCreate, is(true)); - final Boolean resultDelete = arangoDB.db(BaseTest.TEST_DB).drop(); + final Boolean resultDelete = arangoDB.db(BaseTest.TEST_DB_CUSTOM).drop(); assertThat(resultDelete, is(true)); } @@ -123,14 +110,16 @@ public void getDatabases() { assertThat(dbs, is(notNullValue())); assertThat(dbs.size(), is(greaterThan(0))); final int dbCount = dbs.size(); - assertThat(dbs.iterator().next(), is("_system")); - arangoDB.createDatabase(BaseTest.TEST_DB); + //assertThat(dbs.iterator().next(), is("_system")); + assertThat(dbs, hasItem(BaseTest.TEST_DB)); + arangoDB.createDatabase(BaseTest.TEST_DB_CUSTOM); dbs = arangoDB.getDatabases(); assertThat(dbs.size(), is(greaterThan(dbCount))); assertThat(dbs, hasItem("_system")); + assertThat(dbs, hasItem(BaseTest.TEST_DB_CUSTOM)); assertThat(dbs, hasItem(BaseTest.TEST_DB)); } finally { - arangoDB.db(BaseTest.TEST_DB).drop(); + arangoDB.db(BaseTest.TEST_DB_CUSTOM).drop(); } } @@ -471,10 +460,12 @@ public void accessMultipleDatabases() { } } + /* @Test public void acquireHostList() { final ArangoDB arango = new ArangoDB.Builder().acquireHostList(true).build(); final ArangoDBVersion version = arango.getVersion(); assertThat(version, is(notNullValue())); } + */ } diff --git a/src/test/java/com/arangodb/ArangoDatabaseTest.java b/src/test/java/com/arangodb/ArangoDatabaseTest.java index 443ada67b..501dd67b1 100644 --- a/src/test/java/com/arangodb/ArangoDatabaseTest.java +++ b/src/test/java/com/arangodb/ArangoDatabaseTest.java @@ -41,6 +41,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import org.junit.After; +import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -104,6 +106,45 @@ public class ArangoDatabaseTest extends BaseTest { public ArangoDatabaseTest(final Builder builder) { super(builder); } + + @Before + public void setUp() { + try { + ArangoCollection c = db.collection(COLLECTION_NAME); + c.drop(); + } catch (final ArangoDBException e) { + } + + try { + ArangoCollection c = db.collection(COLLECTION_NAME + "1"); + c.drop(); + } catch (final ArangoDBException e) { + } + + try { + ArangoCollection c = db.collection(COLLECTION_NAME + "2"); + c.drop(); + } catch (final ArangoDBException e) { + } + + try { + ArangoCollection c = db.collection(COLLECTION_NAME + "edge"); + c.drop(); + } catch (final ArangoDBException e) { + } + + try { + ArangoCollection c = db.collection(COLLECTION_NAME + "from"); + c.drop(); + } catch (final ArangoDBException e) { + } + + try { + ArangoCollection c = db.collection(COLLECTION_NAME + "to"); + c.drop(); + } catch (final ArangoDBException e) { + } + } @Test public void create() { @@ -469,15 +510,21 @@ public void getCollectionsExcludeSystem() { try { final CollectionsReadOptions options = new CollectionsReadOptions().excludeSystem(true); final Collection systemCollections = db.getCollections(options); + assertThat(systemCollections.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())); + } catch (final ArangoDBException e) { + System.out.println(e.getErrorMessage()); } finally { - db.collection(COLLECTION_NAME + "1").drop(); + try { + db.collection(COLLECTION_NAME + "1").drop(); db.collection(COLLECTION_NAME + "2").drop(); + } catch (final ArangoDBException e) { + } } } @@ -684,7 +731,9 @@ public void queryWithBatchSize() { for (int i = 0; i < 10; i++, cursor.next()) { assertThat(cursor.hasNext(), is(i != 10)); } - + } catch (final ArangoDBException e) { + System.out.println(e.getErrorMessage()); + System.out.println(e.getErrorNum()); } finally { db.collection(COLLECTION_NAME).drop(); } diff --git a/src/test/java/com/arangodb/ArangoEdgeCollectionTest.java b/src/test/java/com/arangodb/ArangoEdgeCollectionTest.java index 09c7fa6c7..6f26e4a83 100644 --- a/src/test/java/com/arangodb/ArangoEdgeCollectionTest.java +++ b/src/test/java/com/arangodb/ArangoEdgeCollectionTest.java @@ -32,6 +32,7 @@ import java.util.Collection; import org.junit.After; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -63,18 +64,25 @@ public class ArangoEdgeCollectionTest extends BaseTest { public ArangoEdgeCollectionTest(final Builder builder) { super(builder); - setup(); } + @Before public void setup() { + try { + db.graph(GRAPH_NAME).drop(true); + } catch (final ArangoDBException e) { + } + try { db.createCollection(VERTEX_COLLECTION_NAME, null); } catch (final ArangoDBException e) { } + try { db.createCollection(EDGE_COLLECTION_NAME, new CollectionCreateOptions().type(CollectionType.EDGES)); } catch (final ArangoDBException e) { } + final Collection edgeDefinitions = new ArrayList(); edgeDefinitions.add(new EdgeDefinition().collection(EDGE_COLLECTION_NAME).from(VERTEX_COLLECTION_NAME) .to(VERTEX_COLLECTION_NAME)); @@ -86,6 +94,10 @@ public void teardown() { for (final String collection : new String[] { VERTEX_COLLECTION_NAME, EDGE_COLLECTION_NAME }) { db.collection(collection).truncate(); } + + try { + db.graph(GRAPH_NAME).drop(true); + } catch (final ArangoDBException e) {} } private BaseEdgeDocument createEdgeValue() { diff --git a/src/test/java/com/arangodb/ArangoGraphTest.java b/src/test/java/com/arangodb/ArangoGraphTest.java index 7dae53608..550c2872d 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.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -65,12 +66,12 @@ public class ArangoGraphTest extends BaseTest { public ArangoGraphTest(final Builder builder) { super(builder); - setup(); } + @Before public void setup() { try { - db.graph(GRAPH_NAME).drop(); + db.graph(GRAPH_NAME).drop(true); } catch (final ArangoDBException e1) { } final Collection edgeDefinitions = new ArrayList(); diff --git a/src/test/java/com/arangodb/ArangoSearchTest.java b/src/test/java/com/arangodb/ArangoSearchTest.java index 52971b679..2c57f343b 100644 --- a/src/test/java/com/arangodb/ArangoSearchTest.java +++ b/src/test/java/com/arangodb/ArangoSearchTest.java @@ -28,6 +28,8 @@ import java.util.Collection; import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -60,12 +62,24 @@ public ArangoSearchTest(final Builder builder) { @After public void teardown() { + try { + ArangoCollection c = db.collection("view_update_prop_test_collection"); + c.drop(); + } catch (final ArangoDBException e) { + } + + try { + ArangoCollection c = db.collection("view_replace_prop_test_collection"); + c.drop(); + } catch (final ArangoDBException e) { + } + try { db.view(VIEW_NAME).drop(); } catch (final ArangoDBException e) { } } - + @Test public void exists() { if (!requireVersion(3, 4)) { @@ -200,6 +214,7 @@ public void replaceProperties() { if (!requireVersion(3, 4)) { return; } + db.createCollection("view_replace_prop_test_collection"); final ArangoSearch view = db.arangoSearch(VIEW_NAME); view.create(new ArangoSearchCreateOptions()); diff --git a/src/test/java/com/arangodb/ArangoVertexCollectionTest.java b/src/test/java/com/arangodb/ArangoVertexCollectionTest.java index 90eaac741..2d2120131 100644 --- a/src/test/java/com/arangodb/ArangoVertexCollectionTest.java +++ b/src/test/java/com/arangodb/ArangoVertexCollectionTest.java @@ -68,12 +68,18 @@ public void setup() { } catch (final ArangoDBException e) { } final GraphCreateOptions options = new GraphCreateOptions().orphanCollections(COLLECTION_NAME); - db.createGraph(GRAPH_NAME, null, options); + try { + db.createGraph(GRAPH_NAME, null, options); + } catch (final ArangoDBException e) { + } + } @After public void teardown() { - db.collection(COLLECTION_NAME).truncate(); + try {db.graph(GRAPH_NAME).drop();} catch (final ArangoDBException e) {} + try {db.collection(COLLECTION_NAME).drop();} catch (final ArangoDBException e) {} + } @Test diff --git a/src/test/java/com/arangodb/BaseTest.java b/src/test/java/com/arangodb/BaseTest.java index 1964db5a2..cee218aec 100644 --- a/src/test/java/com/arangodb/BaseTest.java +++ b/src/test/java/com/arangodb/BaseTest.java @@ -42,6 +42,7 @@ public static Collection builders() { } protected static final String TEST_DB = "java_driver_test_db"; + protected static final String TEST_DB_CUSTOM = "java_driver_test_db_custom"; protected static ArangoDB arangoDB; protected static ArangoDatabase db; @@ -50,18 +51,21 @@ public BaseTest(final ArangoDB.Builder builder) { if (arangoDB != null) { shutdown(); } - arangoDB = builder.build(); + arangoDB = builder.build(); + db = arangoDB.db(TEST_DB); + + // only create the database if not existing try { - arangoDB.db(TEST_DB).drop(); + db.getVersion().getVersion(); } catch (final ArangoDBException e) { + if (e.getErrorNum() == 1228) { // DATABASE NOT FOUND + arangoDB.createDatabase(TEST_DB); + } } - arangoDB.createDatabase(TEST_DB); - db = arangoDB.db(TEST_DB); } @AfterClass public static void shutdown() { - arangoDB.db(TEST_DB).drop(); arangoDB.shutdown(); arangoDB = null; } diff --git a/src/test/java/com/arangodb/DocumentTest.java b/src/test/java/com/arangodb/DocumentTest.java index 60c1a1216..ad18a8677 100644 --- a/src/test/java/com/arangodb/DocumentTest.java +++ b/src/test/java/com/arangodb/DocumentTest.java @@ -58,6 +58,11 @@ public void setup() { @After public void teardown() { collection.truncate(); + try { + db.collection(COLLECTION_NAME).drop(); + } catch (final ArangoDBException e) { + + } } @SuppressWarnings("unchecked") diff --git a/src/test/resources/arangodb.properties b/src/test/resources/arangodb.properties index 346841663..989cf81e6 100644 --- a/src/test/resources/arangodb.properties +++ b/src/test/resources/arangodb.properties @@ -1,3 +1,3 @@ arangodb.hosts=127.0.0.1:8529 arangodb.connections.max=1 -arangodb.acquireHostList=true \ No newline at end of file +arangodb.acquireHostList=false