Skip to content

Commit 6068184

Browse files
rashtaorashtao
committed
[DE-436] reuse code in shaded integration tests
1 parent c61d706 commit 6068184

File tree

133 files changed

+1173
-23569
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+1173
-23569
lines changed

‎driver/src/test/java/com/arangodb/ArangoCollectionTest.java‎

Lines changed: 0 additions & 421 deletions
Large diffs are not rendered by default.

‎driver/src/test/java/com/arangodb/ArangoDBTest.java‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,9 @@
2222

2323
import com.arangodb.config.ConfigUtils;
2424
import com.arangodb.entity.*;
25-
import com.arangodb.internal.serde.SerdeUtils;
2625
import com.arangodb.model.*;
2726
import com.arangodb.model.LogOptions.SortOrder;
28-
import com.arangodb.util.RawJson;
2927
import com.arangodb.util.TestUtils;
30-
import com.fasterxml.jackson.databind.JsonNode;
3128
import org.junit.jupiter.api.AfterAll;
3229
import org.junit.jupiter.api.BeforeAll;
3330
import org.junit.jupiter.api.Disabled;
@@ -391,26 +388,6 @@ void authenticationFailUser() {
391388
assertThat(((ArangoDBException) thrown).getResponseCode()).isEqualTo(401);
392389
}
393390

394-
@ParameterizedTest(name = "{index}")
395-
@MethodSource("arangos")
396-
void executeGetVersion(ArangoDB arangoDB) {
397-
Request<?> request = Request.builder()
398-
.db(DbName.SYSTEM)
399-
.method(Request.Method.GET)
400-
.path("/_api/version")
401-
.queryParam("details", "true")
402-
.build();
403-
final Response<RawJson> response = arangoDB.execute(request, RawJson.class);
404-
JsonNode body = SerdeUtils.INSTANCE.parseJson(response.getBody().getValue());
405-
assertThat(body.get("version").isTextual()).isTrue();
406-
assertThat(body.get("details").isObject()).isTrue();
407-
assertThat(response.getResponseCode()).isEqualTo(200);
408-
if (isAtLeastVersion(3, 9)) {
409-
String header = response.getHeaders().get("x-arango-queue-time-seconds");
410-
assertThat(header).isNotNull();
411-
}
412-
}
413-
414391
@ParameterizedTest(name = "{index}")
415392
@MethodSource("arangos")
416393
void getLogEntries(ArangoDB arangoDB) {

‎driver/src/test/java/com/arangodb/ArangoDatabaseTest.java‎

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,7 @@
2525
import com.arangodb.entity.QueryCachePropertiesEntity.CacheMode;
2626
import com.arangodb.model.*;
2727
import com.arangodb.util.MapBuilder;
28-
import com.arangodb.util.RawBytes;
2928
import com.arangodb.util.RawJson;
30-
import com.fasterxml.jackson.databind.JsonNode;
31-
import com.fasterxml.jackson.databind.node.ArrayNode;
32-
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
33-
import com.fasterxml.jackson.databind.node.ObjectNode;
3429
import org.junit.jupiter.api.BeforeAll;
3530
import org.junit.jupiter.params.ParameterizedTest;
3631
import org.junit.jupiter.params.provider.MethodSource;
@@ -866,19 +861,6 @@ void queryWithBindVars(ArangoDatabase db) {
866861
}
867862
}
868863

869-
@ParameterizedTest(name = "{index}")
870-
@MethodSource("dbs")
871-
void queryWithRawBindVars(ArangoDatabase db) {
872-
final Map<String, Object> bindVars = new HashMap<>();
873-
bindVars.put("foo", RawJson.of("\"fooValue\""));
874-
bindVars.put("bar", RawBytes.of(db.getSerde().serializeUserData(11)));
875-
876-
final JsonNode res = db.query("RETURN {foo: @foo, bar: @bar}", bindVars, null, JsonNode.class).next();
877-
878-
assertThat(res.get("foo").textValue()).isEqualTo("fooValue");
879-
assertThat(res.get("bar").intValue()).isEqualTo(11);
880-
}
881-
882864
@ParameterizedTest(name = "{index}")
883865
@MethodSource("arangos")
884866
void queryWithWarning(ArangoDB arangoDB) {
@@ -1222,36 +1204,6 @@ void transactionNumber(ArangoDatabase db) {
12221204
assertThat(result).isEqualTo(5);
12231205
}
12241206

1225-
@ParameterizedTest(name = "{index}")
1226-
@MethodSource("dbs")
1227-
void transactionVPack(ArangoDatabase db) {
1228-
final TransactionOptions options = new TransactionOptions().params(JsonNodeFactory.instance.textNode("test"));
1229-
final JsonNode result = db.transaction("function (params) {return params;}", JsonNode.class, options);
1230-
assertThat(result.isTextual()).isTrue();
1231-
assertThat(result.asText()).isEqualTo("test");
1232-
}
1233-
1234-
@ParameterizedTest(name = "{index}")
1235-
@MethodSource("dbs")
1236-
void transactionJsonObject(ArangoDatabase db) {
1237-
ObjectNode params = JsonNodeFactory.instance.objectNode().put("foo", "hello").put("bar", "world");
1238-
final TransactionOptions options = new TransactionOptions().params(params);
1239-
final RawJson result = db
1240-
.transaction("function (params) { return params['foo'] + ' ' + params['bar'];}", RawJson.class,
1241-
options);
1242-
assertThat(result.getValue()).isEqualTo("\"hello world\"");
1243-
}
1244-
1245-
@ParameterizedTest(name = "{index}")
1246-
@MethodSource("dbs")
1247-
void transactionJsonArray(ArangoDatabase db) {
1248-
ArrayNode params = JsonNodeFactory.instance.arrayNode().add("hello").add("world");
1249-
final TransactionOptions options = new TransactionOptions().params(params);
1250-
final RawJson result = db
1251-
.transaction("function (params) { return params[0] + ' ' + params[1];}", RawJson.class, options);
1252-
assertThat(result.getValue()).isEqualTo("\"hello world\"");
1253-
}
1254-
12551207
@ParameterizedTest(name = "{index}")
12561208
@MethodSource("dbs")
12571209
void transactionMap(ArangoDatabase db) {
@@ -1318,22 +1270,6 @@ void transactionEmpty(ArangoDatabase db) {
13181270
db.transaction("function () {}", Void.class, null);
13191271
}
13201272

1321-
@ParameterizedTest(name = "{index}")
1322-
@MethodSource("dbs")
1323-
void transactionAllowImplicit(ArangoDatabase db) {
1324-
final String action = "function (params) {" + "var db = require('internal').db;"
1325-
+ "return {'a':db." + CNAME1 + ".all().toArray()[0], 'b':db." + CNAME2 + ".all().toArray()[0]};"
1326-
+ "}";
1327-
final TransactionOptions options = new TransactionOptions().readCollections(CNAME1);
1328-
db.transaction(action, JsonNode.class, options);
1329-
options.allowImplicit(false);
1330-
Throwable thrown = catchThrowable(() -> db.transaction(action, JsonNode.class, options));
1331-
assertThat(thrown)
1332-
.isInstanceOf(ArangoDBException.class)
1333-
.extracting(it -> ((ArangoDBException) it).getResponseCode())
1334-
.isEqualTo(400);
1335-
}
1336-
13371273
@ParameterizedTest(name = "{index}")
13381274
@MethodSource("dbs")
13391275
void transactionPojoReturn(ArangoDatabase db) {

‎driver/src/test/java/com/arangodb/BaseJunit5.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import java.util.UUID;
1717
import java.util.stream.Stream;
1818

19-
class BaseJunit5 {
19+
public class BaseJunit5 {
2020
protected static final DbName TEST_DB = DbName.of("java_driver_test_db");
2121
protected static final ArangoConfigProperties config = ConfigUtils.loadConfig();
2222
private static final List<ArangoDB> adbs = Arrays.asList(
@@ -39,18 +39,18 @@ protected static Stream<Arguments> dbs() {
3939
return dbsStream().map(Arguments::of);
4040
}
4141

42-
static ArangoDatabase initDB(DbName name) {
42+
public static ArangoDatabase initDB(DbName name) {
4343
ArangoDatabase database = adbs.get(0).db(name);
4444
if (!database.exists())
4545
database.create();
4646
return database;
4747
}
4848

49-
static ArangoDatabase initDB() {
49+
public static ArangoDatabase initDB() {
5050
return initDB(TEST_DB);
5151
}
5252

53-
static void dropDB(DbName name) {
53+
public static void dropDB(DbName name) {
5454
ArangoDatabase database = adbs.get(0).db(name);
5555
if (database.exists())
5656
database.drop();
@@ -61,7 +61,7 @@ static void initGraph(String name, Collection<EdgeDefinition> edgeDefinitions, G
6161
db.createGraph(name, edgeDefinitions, options);
6262
}
6363

64-
static void initCollections(String... collections) {
64+
public static void initCollections(String... collections) {
6565
ArangoDatabase db = initDB();
6666
for (String collection : collections) {
6767
if (db.collection(collection).exists())
@@ -70,7 +70,7 @@ static void initCollections(String... collections) {
7070
}
7171
}
7272

73-
static void initEdgeCollections(String... collections) {
73+
public static void initEdgeCollections(String... collections) {
7474
ArangoDatabase db = initDB();
7575
for (String collection : collections) {
7676
if (db.collection(collection).exists())
@@ -89,11 +89,11 @@ static void shutdown() {
8989
dropDB(TEST_DB);
9090
}
9191

92-
static String rnd() {
92+
public static String rnd() {
9393
return UUID.randomUUID().toString();
9494
}
9595

96-
boolean isAtLeastVersion(final int major, final int minor) {
96+
public boolean isAtLeastVersion(final int major, final int minor) {
9797
return isAtLeastVersion(major, minor, 0);
9898
}
9999

@@ -113,15 +113,15 @@ boolean isStorageEngine(ArangoDBEngine.StorageEngineName name) {
113113
return name.equals(adbs.get(0).getEngine().getName());
114114
}
115115

116-
boolean isSingleServer() {
116+
public boolean isSingleServer() {
117117
return adbs.get(0).getRole() == ServerRole.SINGLE;
118118
}
119119

120-
boolean isCluster() {
120+
public boolean isCluster() {
121121
return adbs.get(0).getRole() == ServerRole.COORDINATOR;
122122
}
123123

124-
boolean isEnterprise() {
124+
public boolean isEnterprise() {
125125
return adbs.get(0).getVersion().getLicense() == License.ENTERPRISE;
126126
}
127127

‎driver/src/test/java/com/arangodb/SerializableTest.java‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
package com.arangodb;
22

3-
import com.arangodb.entity.ErrorEntity;
43
import com.arangodb.internal.net.ArangoDBRedirectException;
5-
import com.fasterxml.jackson.databind.JsonNode;
6-
import com.fasterxml.jackson.databind.ObjectMapper;
7-
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
84
import org.junit.jupiter.api.Test;
95

106
import java.io.*;
@@ -15,24 +11,6 @@
1511

1612
class SerializableTest {
1713

18-
@Test
19-
void serializeArangoDBException() throws IOException, ClassNotFoundException {
20-
ObjectMapper mapper = new ObjectMapper();
21-
JsonNode jn = JsonNodeFactory.instance.objectNode()
22-
.put("errorMessage", "boomError")
23-
.put("exception", "boomException")
24-
.put("code", 11)
25-
.put("errorNum", 22);
26-
ErrorEntity ee = mapper.readerFor(ErrorEntity.class).readValue(jn);
27-
ArangoDBException e = new ArangoDBException(ee);
28-
29-
ArangoDBException e2 = roundTrip(e);
30-
assertThat(e2.getException()).isEqualTo(e.getException());
31-
assertThat(e2.getResponseCode()).isEqualTo(e.getResponseCode());
32-
assertThat(e2.getErrorNum()).isEqualTo(e.getErrorNum());
33-
assertThat(e2.getRequestId()).isEqualTo(e.getRequestId());
34-
}
35-
3614
@Test
3715
void serializeArangoDBRedirectException() throws IOException, ClassNotFoundException {
3816
ArangoDBRedirectException e = new ArangoDBRedirectException("foo", "bar");

0 commit comments

Comments
 (0)