optimize tests (too many open http connections) -step 3

Author: User

src/test/java/com/arangodb/ArangoTestSuite.java

@@ -16,6 +16,8 @@
 
 package com.arangodb;
 
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
@@ -121,4 +123,15 @@
 
 public class ArangoTestSuite {
 
+	@BeforeClass
+	public static void setup() {
+		BaseTest.__setup();
+		BaseTest.MANAGE_SETUP = false;
+	}
+
+	@AfterClass
+	public static void shutdown() {
+		BaseTest.MANAGE_SETUP = true;
+		BaseTest.__shutdown();
+	}
 }

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

@@ -30,33 +30,37 @@ public abstract class BaseTest {
 
 	protected static final String DATABASE_NAME = "unitTestDatabase";
 
+	protected static boolean MANAGE_SETUP = true;
 	protected static ArangoConfigure configure;
 	protected static ArangoDriver driver;
 
 	@BeforeClass
 	public static void __setup() {
-		final ArangoConfigure configure = new ArangoConfigure();
-		configure.setConnectRetryCount(2);
-		configure.init();
-		final ArangoDriver driver = new ArangoDriver(configure);
+		if (MANAGE_SETUP) {
+			final ArangoConfigure configure = new ArangoConfigure();
+			configure.setConnectRetryCount(2);
+			configure.init();
+			final ArangoDriver driver = new ArangoDriver(configure);
 
+			BaseTest.driver = driver;
+			BaseTest.configure = configure;
+		}
 		try {
 			driver.createDatabase(DATABASE_NAME);
 		} catch (final ArangoException e) {
 		}
 		driver.setDefaultDatabase(DATABASE_NAME);
-
-		BaseTest.driver = driver;
-		BaseTest.configure = configure;
 	}
 
 	@AfterClass
 	public static void __shutdown() {
-		try {
-			driver.deleteDatabase(DATABASE_NAME);
-		} catch (final ArangoException e) {
+		if (MANAGE_SETUP) {
+			try {
+				driver.deleteDatabase(DATABASE_NAME);
+			} catch (final ArangoException e) {
+			}
+			configure.shutdown();
 		}
-		configure.shutdown();
 	}
 
 	protected boolean isMinimumVersion(final String version) throws ArangoException {