tests refactoring

Author: rashtao

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

@@ -1,34 +1,49 @@
 package com.arangodb.springframework;
 
+import com.arangodb.model.DocumentCreateOptions;
+import com.arangodb.model.DocumentReadOptions;
 import com.arangodb.model.StreamTransactionOptions;
 import com.arangodb.springframework.core.mapping.testdata.BasicEdgeLazyTestEntity;
 import com.arangodb.springframework.core.mapping.testdata.BasicEdgeTestEntity;
 import com.arangodb.springframework.core.mapping.testdata.BasicTestEntity;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.Collections;
 
 public abstract class AbstractTxTest extends AbstractArangoTest {
     protected String tx;
+    protected DocumentCreateOptions insertOpts;
+    protected DocumentReadOptions findOpts;
+
+    private static Class<?>[] enrichCollections(final Class<?>... collections) {
+        ArrayList<Class<?>> classes = new ArrayList<>();
+        Collections.addAll(classes, collections);
+        classes.add(BasicTestEntity.class);
+        classes.add(BasicEdgeTestEntity.class);
+        classes.add(BasicEdgeLazyTestEntity.class);
+        return classes.toArray(new Class[0]);
+    }
+
+    protected AbstractTxTest(final Class<?>... collections) {
+        super(enrichCollections(collections));
+    }
 
     @BeforeEach
     void beginTx() {
-        Set<Class<?>> cols = new HashSet<>(Arrays.asList(getClass().getDeclaredClasses()));
-        cols.add(BasicTestEntity.class);
-        cols.add(BasicEdgeTestEntity.class);
-        cols.add(BasicEdgeLazyTestEntity.class);
-
-        String[] txCols = cols.stream()
+        String[] txCols = Arrays.stream(collections)
                 .map(it -> template.collection(it).name())
                 .toArray(String[]::new);
 
         tx = db.beginStreamTransaction(new StreamTransactionOptions()
                 .readCollections(txCols)
                 .writeCollections(txCols)
         ).getId();
+
+        insertOpts = new DocumentCreateOptions().streamTransactionId(tx);
+        findOpts = new DocumentReadOptions().streamTransactionId(tx);
     }
 
     @AfterEach

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

@@ -20,6 +20,7 @@
 
 package com.arangodb.springframework.core.mapping;
 
+import com.arangodb.springframework.AbstractTxTest;
 import com.arangodb.springframework.annotation.From;
 import com.arangodb.springframework.annotation.To;
 import com.arangodb.springframework.core.mapping.testdata.BasicEdgeLazyTestEntity;
@@ -35,7 +36,11 @@
  * @author Mark Vollmary
  *
  */
-public class EdgeMappingTxTest extends AbstractMappingTxTest {
+public class EdgeMappingTxTest extends AbstractTxTest {
+
+	EdgeMappingTxTest() {
+		super(EdgeMappingTxTest.class.getDeclaredClasses());
+	}
 
 	@Test
 	public void edgeFromTo() {