faster tests

Author: rashtao

src/test/java/com/arangodb/springframework/AbstractArangoTest.java

@@ -20,23 +20,25 @@
 
 package com.arangodb.springframework;
 
-import org.junit.After;
+import com.arangodb.springframework.core.ArangoOperations;
+import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import com.arangodb.springframework.core.ArangoOperations;
+import javax.annotation.PostConstruct;
 
 /**
  * @author Mark Vollmary
- *
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = { ArangoTestConfiguration.class })
+@ContextConfiguration(classes = {ArangoTestConfiguration.class})
 public abstract class AbstractArangoTest {
 
+	private static volatile ArangoOperations staticTemplate;
+
 	@Autowired
 	protected ArangoOperations template;
 	protected final Class<?>[] collections;
@@ -48,17 +50,20 @@ protected AbstractArangoTest(final Class<?>... collections) {
 
 	@Before
 	public void before() {
-		try {
-			for (final Class<?> collection : collections) {
-				template.collection(collection).truncate();
-			}
-		} catch (final Exception e) {
+		for (final Class<?> collection : collections) {
+			template.collection(collection).truncate();
 		}
 	}
 
-	@After
-	public void after() {
-		template.dropDatabase();
+	@AfterClass
+	public static void afterClass() {
+		staticTemplate.dropDatabase();
+	}
+
+
+	@PostConstruct
+	private void postConstruct() {
+		staticTemplate = template;
 	}
 
 }

src/test/java/com/arangodb/springframework/core/mapping/MultiTenancyDBLevelMappingTest.java

@@ -89,8 +89,6 @@ public void cleanup() {
 		template.dropDatabase();
 		tenantProvider.setId(TENANT01);
 		template.dropDatabase();
-		tenantProvider.setId("");
-		template.dropDatabase();
 	}
 
 }

src/test/java/com/arangodb/springframework/core/template/ArangoTemplateTest.java

@@ -409,10 +409,10 @@ public String getId() {
 	public void upsertWithUserGeneratedKey() {
 		final NewEntityTest entity = new NewEntityTest("test");
 		template.upsert(entity, UpsertStrategy.REPLACE);
-		assertThat(template.collection(NewEntityTest.class).count(), is(1L));
+		assertThat(template.exists("test", NewEntityTest.class), is(true));
 		entity.setPersisted(true);
 		template.upsert(entity, UpsertStrategy.REPLACE);
-		assertThat(template.collection(NewEntityTest.class).count(), is(1L));
+		assertThat(template.exists("test", NewEntityTest.class), is(true));
 	}
 
 	@SuppressWarnings("deprecation")