Skip to content

Commit 194bbe7

Browse files
rashtaorashtao
committed
test db accessor
1 parent ac05b8a commit 194bbe7

File tree

6 files changed

+18
-20
lines changed

6 files changed

+18
-20
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
package com.arangodb.springframework;
2222

23+
import com.arangodb.ArangoDatabase;
2324
import org.junit.jupiter.api.AfterAll;
2425
import org.junit.jupiter.api.BeforeEach;
2526
import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +38,7 @@ public abstract class AbstractArangoTest {
3738

3839
@Autowired
3940
protected ArangoOperations template;
41+
protected ArangoDatabase db;
4042
protected final Class<?>[] collections;
4143

4244
protected AbstractArangoTest(final Class<?>... collections) {
@@ -50,6 +52,7 @@ public void before() {
5052
template.collection(collection).truncate();
5153
}
5254
AbstractArangoTest.staticTemplate = template;
55+
db = template.driver().db(ArangoTestConfiguration.DB);
5356
}
5457

5558
@AfterAll

‎src/test/java/com/arangodb/springframework/core/mapping/CustomMappingTest.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import java.util.Optional;
2828

2929
import com.arangodb.ArangoCollection;
30-
import com.arangodb.springframework.ArangoTestConfiguration;
3130
import com.fasterxml.jackson.databind.JsonNode;
3231
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
3332
import org.junit.jupiter.api.Test;
@@ -117,7 +116,7 @@ public void jsonNodeToCustom() {
117116

118117
@Test
119118
public void customToJsonNodeFromDriver() {
120-
ArangoCollection col = template.driver().db(ArangoTestConfiguration.DB).collection("customJsonNodeTestEntity");
119+
ArangoCollection col = db.collection("customJsonNodeTestEntity");
121120
final DocumentEntity meta = col.insertDocument(new CustomJsonNodeTestEntity("abc"));
122121
final BaseDocument doc = col.getDocument(meta.getKey(), BaseDocument.class);
123122
assertThat(doc.getAttribute(FIELD), is("abc"));
@@ -126,7 +125,7 @@ public void customToJsonNodeFromDriver() {
126125

127126
@Test
128127
public void jsonNodeToCustomFromDriver() {
129-
ArangoCollection col = template.driver().db(ArangoTestConfiguration.DB).collection("testEntity");
128+
ArangoCollection col = db.collection("testEntity");
130129
final DocumentEntity meta = col.insertDocument(new TestEntity("abc"));
131130
final CustomJsonNodeTestEntity doc = col.getDocument(meta.getKey(), CustomJsonNodeTestEntity.class);
132131
assertThat(doc.getValue(), is("abc"));
@@ -192,7 +191,7 @@ public void jsonNodeToDBEntity() {
192191

193192
@Test
194193
public void customToDBEntityFromDriver() {
195-
ArangoCollection col = template.driver().db(ArangoTestConfiguration.DB).collection("customDBEntityTestEntity");
194+
ArangoCollection col = db.collection("customDBEntityTestEntity");
196195
final DocumentEntity meta = col.insertDocument(new CustomDBEntityTestEntity("abc"));
197196
final BaseDocument doc = col.getDocument(meta.getKey(), BaseDocument.class);
198197
assertThat(doc.getAttribute(FIELD), is("abc"));
@@ -201,7 +200,7 @@ public void customToDBEntityFromDriver() {
201200

202201
@Test
203202
public void jsonNodeToDBEntityFromDriver() {
204-
ArangoCollection col = template.driver().db(ArangoTestConfiguration.DB).collection("testEntity");
203+
ArangoCollection col = db.collection("testEntity");
205204
final DocumentEntity meta = col.insertDocument(new TestEntity("abc"));
206205
final CustomDBEntityTestEntity doc = col.getDocument(meta.getKey(), CustomDBEntityTestEntity.class);
207206
assertThat(doc.getValue(), is("abc"));

‎src/test/java/com/arangodb/springframework/core/mapping/GeneralMappingTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import com.arangodb.entity.DocumentEntity;
2424
import com.arangodb.model.AqlQueryOptions;
2525
import com.arangodb.springframework.AbstractArangoTest;
26-
import com.arangodb.springframework.ArangoTestConfiguration;
2726
import com.arangodb.springframework.AuditorProvider;
2827
import com.arangodb.springframework.annotation.*;
2928
import com.arangodb.springframework.core.convert.ArangoConverter;
@@ -97,7 +96,7 @@ public void fieldNameAnnotation() {
9796
entity.test = "1234";
9897
final DocumentEntity res = template.insert(entity);
9998
String colName = res.getId().split("/")[0];
100-
final ObjectNode slice = template.driver().db(ArangoTestConfiguration.DB)
99+
final ObjectNode slice = db
101100
.collection(colName)
102101
.getDocument(res.getKey(), ObjectNode.class);
103102
assertThat(slice, is(notNullValue()));
@@ -632,7 +631,7 @@ public void auditingTest() throws InterruptedException {
632631
assertThat(find.modifiedBy.getId(), is(createID));
633632
}
634633

635-
final ObjectNode doc = template.driver().db(ArangoTestConfiguration.DB).collection("auditingTestEntity")
634+
final ObjectNode doc = db.collection("auditingTestEntity")
636635
.getDocument(value.id, ObjectNode.class);
637636
assertThat(doc, is(notNullValue()));
638637
assertThat(doc.get("createdBy").isObject(), is(true));

‎src/test/java/com/arangodb/springframework/core/mapping/InheritanceMappingTest.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import org.junit.jupiter.api.Test;
3434

3535
import com.arangodb.springframework.AbstractArangoTest;
36-
import com.arangodb.springframework.ArangoTestConfiguration;
3736
import com.arangodb.springframework.annotation.Document;
3837
import com.arangodb.springframework.annotation.Edge;
3938
import com.arangodb.springframework.core.mapping.testdata.BasicEdgeTestEntity;
@@ -331,8 +330,8 @@ static class SubClassWithOwnDocumentAnnotation extends BasicTestEntity {
331330
public void overrideDocumentAnnotation() {
332331
final SubClassWithOwnDocumentAnnotation doc = new SubClassWithOwnDocumentAnnotation();
333332
template.insert(doc);
334-
assertThat(template.driver().db(ArangoTestConfiguration.DB).collection("overrideDocAn").exists(), is(true));
335-
assertThat(template.driver().db(ArangoTestConfiguration.DB).collection("overrideDocAn").count().getCount(),
333+
assertThat(db.collection("overrideDocAn").exists(), is(true));
334+
assertThat(db.collection("overrideDocAn").count().getCount(),
336335
is(1L));
337336
}
338337

@@ -351,8 +350,8 @@ public void overrideEdgeAnnotation() {
351350
edge.from = from;
352351
edge.to = to;
353352
template.insert(edge);
354-
assertThat(template.driver().db(ArangoTestConfiguration.DB).collection("overrideEdgeAn").exists(), is(true));
355-
assertThat(template.driver().db(ArangoTestConfiguration.DB).collection("overrideEdgeAn").count().getCount(),
353+
assertThat(db.collection("overrideEdgeAn").exists(), is(true));
354+
assertThat(db.collection("overrideEdgeAn").count().getCount(),
356355
is(1L));
357356
}
358357

‎src/test/java/com/arangodb/springframework/core/mapping/MultiTenancyCollectionLevelMappingTest.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.springframework.beans.factory.annotation.Autowired;
2828

2929
import com.arangodb.springframework.AbstractArangoTest;
30-
import com.arangodb.springframework.ArangoTestConfiguration;
3130
import com.arangodb.springframework.annotation.Document;
3231
import com.arangodb.springframework.component.TenantProvider;
3332

@@ -50,20 +49,20 @@ public void collectionLevel() {
5049
{
5150
tenantProvider.setId("tenant00");
5251
template.insert(new MultiTenancyTestEntity());
53-
assertThat(template.driver().db(ArangoTestConfiguration.DB).collection("tenant00_collection").exists(),
52+
assertThat(db.collection("tenant00_collection").exists(),
5453
is(true));
5554
}
5655
{
5756
tenantProvider.setId("tenant01");
5857
template.insert(new MultiTenancyTestEntity());
59-
assertThat(template.driver().db(ArangoTestConfiguration.DB).collection("tenant01_collection").exists(),
58+
assertThat(db.collection("tenant01_collection").exists(),
6059
is(true));
6160
}
6261
assertThat(
63-
template.driver().db(ArangoTestConfiguration.DB).collection("tenant00_collection").count().getCount(),
62+
db.collection("tenant00_collection").count().getCount(),
6463
is(1L));
6564
assertThat(
66-
template.driver().db(ArangoTestConfiguration.DB).collection("tenant01_collection").count().getCount(),
65+
db.collection("tenant01_collection").count().getCount(),
6766
is(1L));
6867
}
6968

‎src/test/java/com/arangodb/springframework/example/polymorphic/template/PolymorphicTemplate.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import com.arangodb.model.DocumentReplaceOptions;
3232
import com.arangodb.model.DocumentUpdateOptions;
3333
import com.arangodb.springframework.AbstractArangoTest;
34-
import com.arangodb.springframework.ArangoTestConfiguration;
3534
import com.arangodb.springframework.example.polymorphic.entity.Animal;
3635
import com.arangodb.springframework.example.polymorphic.entity.Dog;
3736
import com.arangodb.springframework.example.polymorphic.entity.Eagle;
@@ -49,7 +48,7 @@
4948
public class PolymorphicTemplate extends AbstractArangoTest {
5049

5150
private ArangoCollection col() {
52-
return template.driver().db(ArangoTestConfiguration.DB).collection("animals");
51+
return db.collection("animals");
5352
}
5453

5554
@BeforeEach

0 commit comments

Comments
 (0)