Optimize tests for cluster

Author: mpv1989

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

@@ -43,7 +43,6 @@
 import java.util.Map;
 
 import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -87,16 +86,12 @@ public class ArangoCollectionTest extends BaseTest {
 
 	public ArangoCollectionTest(final Builder builder) {
 		super(builder);
-	}
-
-	@Before
-	public void setup() {
 		db.createCollection(COLLECTION_NAME, null);
 	}
 
 	@After
 	public void teardown() {
-		db.collection(COLLECTION_NAME).drop();
+		db.collection(COLLECTION_NAME).truncate();
 	}
 
 	@Test

src/test/java/com/arangodb/ArangoEdgeCollectionTest.java

@@ -32,7 +32,6 @@
 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;
@@ -64,9 +63,9 @@ public class ArangoEdgeCollectionTest extends BaseTest {
 
 	public ArangoEdgeCollectionTest(final Builder builder) {
 		super(builder);
+		setup();
 	}
 
-	@Before
 	public void setup() {
 		try {
 			db.createCollection(VERTEX_COLLECTION_NAME, null);
@@ -85,12 +84,8 @@ public void setup() {
 	@After
 	public void teardown() {
 		for (final String collection : new String[] { VERTEX_COLLECTION_NAME, EDGE_COLLECTION_NAME }) {
-			try {
-				db.collection(collection).drop();
-			} catch (final ArangoDBException e) {
-			}
+			db.collection(collection).truncate();
 		}
-		db.graph(GRAPH_NAME).drop();
 	}
 
 	private BaseEdgeDocument createEdgeValue() {

src/test/java/com/arangodb/ArangoGraphTest.java

@@ -32,7 +32,6 @@
 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;
@@ -63,9 +62,9 @@ public class ArangoGraphTest extends BaseTest {
 
 	public ArangoGraphTest(final Builder builder) {
 		super(builder);
+		setup();
 	}
 
-	@Before
 	public void setup() {
 		for (final String collection : new String[] { VERTEX_COL_1, VERTEX_COL_2, VERTEX_COL_2, VERTEX_COL_3,
 				VERTEX_COL_4 }) {
@@ -92,12 +91,8 @@ public void setup() {
 	public void teardown() {
 		for (final String collection : new String[] { EDGE_COL_1, EDGE_COL_2, VERTEX_COL_1, VERTEX_COL_2, VERTEX_COL_3,
 				VERTEX_COL_4 }) {
-			try {
-				db.collection(collection).drop();
-			} catch (final ArangoDBException e) {
-			}
+			db.collection(collection).truncate();
 		}
-		db.graph(GRAPH_NAME).drop();
 	}
 
 	@Test

src/test/java/com/arangodb/ArangoVertexCollectionTest.java

@@ -31,7 +31,6 @@
 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;
@@ -58,9 +57,9 @@ public class ArangoVertexCollectionTest extends BaseTest {
 
 	public ArangoVertexCollectionTest(final Builder builder) {
 		super(builder);
+		setup();
 	}
 
-	@Before
 	public void setup() {
 		try {
 			db.createCollection(COLLECTION_NAME, null);
@@ -72,11 +71,7 @@ public void setup() {
 
 	@After
 	public void teardown() {
-		try {
-			db.collection(COLLECTION_NAME).drop();
-		} catch (final ArangoDBException e) {
-		}
-		db.graph(GRAPH_NAME).drop();
+		db.collection(COLLECTION_NAME).truncate();
 	}
 
 	@Test

src/test/java/com/arangodb/DocumentTest.java

@@ -26,7 +26,7 @@
 
 import java.util.Map;
 
-import org.junit.Before;
+import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -47,16 +47,17 @@ public class DocumentTest extends BaseTest {
 
 	public DocumentTest(final Builder builder) {
 		super(builder);
+		setup();
 	}
 
-	@Before
 	public void setup() {
-		collection = db.collection(COLLECTION_NAME);
-		try {
-			collection.drop();
-		} catch (final ArangoDBException e) {
-		}
 		db.createCollection(COLLECTION_NAME);
+		collection = db.collection(COLLECTION_NAME);
+	}
+
+	@After
+	public void teardown() {
+		collection.truncate();
 	}
 
 	@SuppressWarnings("unchecked")