8000 test fixes · arangodb/arangodb-java-driver@f3be939 · GitHub
[go: up one dir, main page]
Skip to content

Commit f3be939

Browse files
rashtaorashtao
committed
test fixes
1 parent 2a82050 commit f3be939

File tree

7 files changed

+30
-14
lines changed

7 files changed

+30
-14
lines changed

‎.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ commands:
99
timeout:
1010
parameters:
1111
duration:
12-
default: '5m'
12+
default: '10m'
1313
type: 'string'
1414
steps:
1515
- run:

‎test-non-functional/src/test/java/CommunicationTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import org.junit.jupiter.api.Timeout;
44
import org.junit.jupiter.params.ParameterizedTest;
55
import org.junit.jupiter.params.provider.EnumSource;
6+
import util.TestUtils;
67

78
import java.io.IOException;
89
import java.util.concurrent.CompletableFuture;
@@ -23,6 +24,7 @@ void disconnectAsync(Protocol protocol) throws InterruptedException, ExecutionEx
2324
ArangoDBAsync arangoDB = new ArangoDB.Builder()
2425
.loadProperties(ArangoConfigProperties.fromFile())
2526
.protocol(protocol)
27+
.serde(TestUtils.createSerde(protocol))
2628
.build()
2729
.async();
2830
arangoDB.getVersion().get();
@@ -48,6 +50,7 @@ void disconnect(Protocol protocol) {
4850
ArangoDB arangoDB = new ArangoDB.Builder()
4951
.loadProperties(ArangoConfigProperties.fromFile())
5052
.protocol(protocol)
53+
.serde(TestUtils.createSerde(protocol))
5154
.build();
5255
arangoDB.getVersion();
5356

‎test-non-functional/src/test/java/arch/SerdeArchTest.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@ public class SerdeArchTest {
2626
.should().dependOnClassesThat()
2727
.resideInAPackage("com.arangodb.jackson.dataformat.velocypack..");
2828

29-
@ArchTest
30-
public static final ArchRule noDependencyOnJsonB = noClasses().that()
31-
.resideInAPackage("com.arangodb..")
32-
.should().dependOnClassesThat()
33-
.resideInAPackage("com.arangodb.serde.jsonb..");
34-
3529
@ArchTest
3630
public static final ArchRule noDependencyOnJacksonSerde = noClasses().that()
3731
.resideInAPackage("com.arangodb..").and()

‎test-non-functional/src/test/java/example/ExampleBase.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,11 @@
2323
import com.arangodb.ArangoCollection;
2424
import com.arangodb.ArangoDB;
2525
import com.arangodb.ArangoDatabase;
26+
import com.arangodb.Protocol;
2627
import com.arangodb.config.ArangoConfigProperties;
2728
import org.junit.jupiter.api.AfterAll;
2829
import org.junit.jupiter.api.BeforeAll;
30+
import util.TestUtils;
2931

3032
/**
3133
* @author Mark Vollmary
@@ -40,8 +42,10 @@ public class ExampleBase {
4042

4143
@BeforeAll
4244
static void setUp() {
45+
ArangoConfigProperties config = ArangoConfigProperties.fromFile();
4346
arangoDB = new ArangoDB.Builder()
44-
.loadProperties(ArangoConfigProperties.fromFile())
47+
.loadProperties(config)
48+
.serde(TestUtils.createSerde(config.getProtocol().orElse(Protocol.HTTP2_JSON)))
4549
.build();
4650
String dbName = DB_NAME;
4751
if (arangoDB.db(dbName).exists())

‎test-non-functional/src/test/java/example/graph/AQLActorsAndMoviesExampleTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@
2020

2121
package example.graph;
2222

23-
import com.arangodb.ArangoCollection;
24-
import com.arangodb.ArangoCursor;
25-
import com.arangodb.ArangoDB;
26-
import com.arangodb.ArangoDatabase;
23+
import com.arangodb.*;
2724
import com.arangodb.config.ArangoConfigProperties;
2825
import com.arangodb.entity.BaseDocument;
2926
import com.arangodb.entity.BaseEdgeDocument;
@@ -35,6 +32,7 @@
3532
import org.junit.jupiter.api.AfterAll;
3633
import org.junit.jupiter.api.BeforeAll;
3734
import org.junit.jupiter.api.Test;
35+
import util.TestUtils;
3836

3937
import java.util.UUID;
4038

@@ -55,8 +53,10 @@ class AQLActorsAndMoviesExampleTest {
5553

5654
@BeforeAll
5755
static void setUp() {
56+
ArangoConfigProperties config = ArangoConfigProperties.fromFile();
5857
arangoDB = new ArangoDB.Builder()
59-
.loadProperties(ArangoConfigProperties.fromFile())
58+
.loadProperties(config)
59+
.serde(TestUtils.createSerde(config.getProtocol().orElse(Protocol.HTTP2_JSON)))
6060
.build();
6161
if (arangoDB.db(TEST_DB).exists())
6262
arangoDB.db(TEST_DB).drop();

‎test-non-functional/src/test/java/example/graph/BaseGraphTest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,13 @@
2323
import com.arangodb.ArangoDB;
2424
import com.arangodb.ArangoDBException;
2525
import com.arangodb.ArangoDatabase;
26+
import com.arangodb.Protocol;
2627
import com.arangodb.config.ArangoConfigProperties;
2728
import com.arangodb.entity.EdgeDefinition;
2829
import com.arangodb.entity.VertexEntity;
2930
import org.junit.jupiter.api.AfterAll;
3031
import org.junit.jupiter.api.BeforeAll;
32+
import util.TestUtils;
3133

3234
import java.util.ArrayList;
3335
import java.util.Collection;
@@ -47,8 +49,10 @@ abstract class BaseGraphTest {
4749
@BeforeAll
4850
static void init() {
4951
if (arangoDB == null) {
52+
ArangoConfigProperties config = ArangoConfigProperties.fromFile();
5053
arangoDB = new ArangoDB.Builder()
51-
.loadProperties(ArangoConfigProperties.fromFile())
54+
.loadProperties(config)
55+
.serde(TestUtils.createSerde(config.getProtocol().orElse(Protocol.HTTP2_JSON)))
5256
.build();
5357
}
5458
if (arangoDB.db(TEST_DB).exists())

‎test-non-functional/src/test/java/util/TestUtils.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
package util;
2323

2424

25+
import com.arangodb.ContentType;
26+
import com.arangodb.Protocol;
27+
import com.arangodb.serde.ArangoSerde;
28+
import com.arangodb.serde.jackson.JacksonSerde;
2529
import com.arangodb.util.UnicodeUtils;
2630

2731
import java.util.ArrayList;
@@ -40,6 +44,13 @@ public final class TestUtils {
4044
private TestUtils() {
4145
}
4246

47+
public static ArangoSerde createSerde(Protocol protocol) {
48+
return switch (protocol) {
49+
case VST, HTTP_VPACK, HTTP2_VPACK -> JacksonSerde.of(ContentType.VPACK);
50+
case HTTP_JSON, HTTP2_JSON -> JacksonSerde.of(ContentType.JSON);
51+
};
52+
}
53+
4354
/**
4455
* Parses {@param version} and checks whether it is greater or equal to <{@param otherMajor}, {@param otherMinor},
4556
* {@param otherPatch}> comparing the corresponding version components in lexicographical order.

0 commit comments

Comments
 (0)
2922
0