Skip to content

Commit 2b7f405

Browse files
rashtaorashtao
committed
fixed integration tests
1 parent 4def021 commit 2b7f405

File tree

3 files changed

+29
-31
lines changed

3 files changed

+29
-31
lines changed

‎integration-tests/src/test/internal/java/arch/SerdeTest.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,21 @@ void shadedJsonNode(ArangoDB adb) {
2121
JsonNode doc = JsonNodeFactory.instance
2222
.objectNode()
2323
.put("foo", "bar");
24-
JsonNode res = adb.db().query("return @d", Collections.singletonMap("d", doc), JsonNode.class).next();
24+
JsonNode res = adb.db().query("return @d", JsonNode.class, Collections.singletonMap("d", doc)).next();
2525
assertThat(res.size()).isEqualTo(1);
2626
assertThat(res.get("foo").asText()).isEqualTo("bar");
27-
JsonNode value = adb.db().query("return @d.foo", Collections.singletonMap("d", doc), JsonNode.class).next();
27+
JsonNode value = adb.db().query("return @d.foo", JsonNode.class, Collections.singletonMap("d", doc)).next();
2828
assertThat(value.textValue()).isEqualTo("bar");
2929
}
3030

3131
@ParameterizedTest
3232
@MethodSource("adbByContentType")
3333
void map(ArangoDB adb) {
3434
Map<String, String> doc = Collections.singletonMap("foo", "bar");
35-
Map<?, ?> res = adb.db().query("return @d", Collections.singletonMap("d", doc), Map.class).next();
35+
Map<?, ?> res = adb.db().query("return @d", Map.class, Collections.singletonMap("d", doc)).next();
3636
assertThat(res).hasSize(1);
3737
assertThat(res.get("foo")).isEqualTo("bar");
38-
String value = adb.db().query("return @d.foo", Collections.singletonMap("d", doc), String.class).next();
38+
String value = adb.db().query("return @d.foo", String.class, Collections.singletonMap("d", doc)).next();
3939
assertThat(value).isEqualTo("bar");
4040
}
4141

@@ -44,21 +44,21 @@ void map(ArangoDB adb) {
4444
void rawJson(ArangoDB adb) {
4545
RawJson doc = RawJson.of("""
4646
{"foo":"bar"}""");
47-
RawJson res = adb.db().query("return @d", Collections.singletonMap("d", doc), RawJson.class).next();
47+
RawJson res = adb.db().query("return @d", RawJson.class, Collections.singletonMap("d", doc)).next();
4848
assertThat(res.getValue()).isEqualTo(doc.getValue());
49-
RawJson value = adb.db().query("return @d.foo", Collections.singletonMap("d", doc), RawJson.class).next();
49+
RawJson value = adb.db().query("return @d.foo", RawJson.class, Collections.singletonMap("d", doc)).next();
5050
assertThat(value.getValue()).isEqualTo("\"bar\"");
5151
}
5252

5353
@ParameterizedTest
5454
@MethodSource("adbByContentType")
5555
void person(ArangoDB adb) {
5656
Person doc = new Person("key", "Jim", 22);
57-
Person res = adb.db().query("return @d", Collections.singletonMap("d", doc), Person.class).next();
57+
Person res = adb.db().query("return @d", Person.class, Collections.singletonMap("d", doc)).next();
5858
assertThat(res).isEqualTo(doc);
59-
String key = adb.db().query("return @d._key", Collections.singletonMap("d", doc), String.class).next();
59+
String key = adb.db().query("return @d._key", String.class, Collections.singletonMap("d", doc)).next();
6060
assertThat(key).isEqualTo("key");
61-
String name = adb.db().query("return @d.firstName", Collections.singletonMap("d", doc), String.class).next();
61+
String name = adb.db().query("return @d.firstName", String.class, Collections.singletonMap("d", doc)).next();
6262
assertThat(name).isEqualTo("Jim");
6363
}
6464

‎integration-tests/src/test/jackson/java/arch/SerdeTest.java

+11-13
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ void shadedJsonNode(ArangoDB adb) {
2121
JsonNode doc = JsonNodeFactory.instance
2222
.objectNode()
2323
.put("foo", "bar");
24-
JsonNode res = adb.db().query("return @d", Collections.singletonMap("d", doc), JsonNode.class).next();
24+
JsonNode res = adb.db().query("return @d", JsonNode.class, Collections.singletonMap("d", doc)).next();
2525
assertThat(res.size()).isEqualTo(1);
2626
assertThat(res.get("foo").asText()).isEqualTo("bar");
27-
JsonNode value = adb.db().query("return @d.foo", Collections.singletonMap("d", doc), JsonNode.class).next();
27+
JsonNode value = adb.db().query("return @d.foo", JsonNode.class, Collections.singletonMap("d", doc)).next();
2828
assertThat(value.textValue()).isEqualTo("bar");
2929
}
3030

@@ -35,23 +35,21 @@ void jsonNode(ArangoDB adb) {
3535
com.fasterxml.jackson.databind.JsonNode doc = com.fasterxml.jackson.databind.node.JsonNodeFactory.instance
3636
.objectNode()
3737
.put("foo", "bar");
38-
com.fasterxml.jackson.databind.JsonNode res = adb.db().query("return @d", Collections.singletonMap("d", doc),
39-
com.fasterxml.jackson.databind.JsonNode.class).next();
38+
com.fasterxml.jackson.databind.JsonNode res = adb.db().query("return @d", com.fasterxml.jackson.databind.JsonNode.class, Collections.singletonMap("d", doc)).next();
4039
assertThat(res.size()).isEqualTo(1);
4140
assertThat(res.get("foo").asText()).isEqualTo("bar");
42-
com.fasterxml.jackson.databind.JsonNode value = adb.db().query("return @d.foo", Collections.singletonMap("d", doc),
43-
com.fasterxml.jackson.databind.JsonNode.class).next();
41+
com.fasterxml.jackson.databind.JsonNode value = adb.db().query("return @d.foo", com.fasterxml.jackson.databind.JsonNode.class, Collections.singletonMap("d", doc)).next();
4442
assertThat(value.textValue()).isEqualTo("bar");
4543
}
4644

4745
@ParameterizedTest
4846
@MethodSource("adbByContentType")
4947
void map(ArangoDB adb) {
5048
Map<String, String> doc = Collections.singletonMap("foo", "bar");
51-
Map<?, ?> res = adb.db().query("return @d", Collections.singletonMap("d", doc), Map.class).next();
49+
Map<?, ?> res = adb.db().query("return @d", Map.class, Collections.singletonMap("d", doc)).next();
5250
assertThat(res).hasSize(1);
5351
assertThat(res.get("foo")).isEqualTo("bar");
54-
String value = adb.db().query("return @d.foo", Collections.singletonMap("d", doc), String.class).next();
52+
String value = adb.db().query("return @d.foo", String.class, Collections.singletonMap("d", doc)).next();
5553
assertThat(value).isEqualTo("bar");
5654
}
5755

@@ -60,21 +58,21 @@ void map(ArangoDB adb) {
6058
void rawJson(ArangoDB adb) {
6159
RawJson doc = RawJson.of("""
6260
{"foo":"bar"}""");
63-
RawJson res = adb.db().query("return @d", Collections.singletonMap("d", doc), RawJson.class).next();
61+
RawJson res = adb.db().query("return @d", RawJson.class, Collections.singletonMap("d", doc)).next();
6462
assertThat(res.getValue()).isEqualTo(doc.getValue());
65-
RawJson value = adb.db().query("return @d.foo", Collections.singletonMap("d", doc), RawJson.class).next();
63+
RawJson value = adb.db().query("return @d.foo", RawJson.class, Collections.singletonMap("d", doc)).next();
6664
assertThat(value.getValue()).isEqualTo("\"bar\"");
6765
}
6866

6967
@ParameterizedTest
7068
@MethodSource("adbByContentType")
7169
void person(ArangoDB adb) {
7270
Person doc = new Person("key", "Jim", 22);
73-
Person res = adb.db().query("return @d", Collections.singletonMap("d", doc), Person.class).next();
71+
Person res = adb.db().query("return @d", Person.class, Collections.singletonMap("d", doc)).next();
7472
assertThat(res).isEqualTo(doc);
75-
String key = adb.db().query("return @d._key", Collections.singletonMap("d", doc), String.class).next();
73+
String key = adb.db().query("return @d._key", String.class, Collections.singletonMap("d", doc)).next();
7674
assertThat(key).isEqualTo("key");
77-
String name = adb.db().query("return @d.firstName", Collections.singletonMap("d", doc), String.class).next();
75+
String name = adb.db().query("return @d.firstName", String.class, Collections.singletonMap("d", doc)).next();
7876
assertThat(name).isEqualTo("Jim");
7977
}
8078

‎integration-tests/src/test/jsonb/java/arch/SerdeTest.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ void jsonNode(ArangoDB adb) {
1919
JsonObject doc = Json.createObjectBuilder()
2020
.add("foo", "bar")
2121
.build();
22-
JsonObject res = adb.db().query("return @d", Collections.singletonMap("d", doc), JsonObject.class).next();
22+
JsonObject res = adb.db().query("return @d", JsonObject.class, Collections.singletonMap("d", doc)).next();
2323
assertThat(res.size()).isEqualTo(1);
2424
assertThat(res.getString("foo")).isEqualTo("bar");
25-
JsonValue value = adb.db().query("return @d.foo", Collections.singletonMap("d", doc), JsonValue.class).next();
25+
JsonValue value = adb.db().query("return @d.foo", JsonValue.class, Collections.singletonMap("d", doc)).next();
2626
assertThat(value)
2727
.isInstanceOf(JsonString.class)
2828
.extracting(v -> ((JsonString) v).getString())
@@ -33,10 +33,10 @@ void jsonNode(ArangoDB adb) {
3333
@MethodSource("adbByContentType")
3434
void map(ArangoDB adb) {
3535
Map<String, String> doc = Collections.singletonMap("foo", "bar");
36-
Map<?, ?> res = adb.db().query("return @d", Collections.singletonMap("d", doc), Map.class).next();
36+
Map<?, ?> res = adb.db().query("return @d", Map.class, Collections.singletonMap("d", doc)).next();
3737
assertThat(res).hasSize(1);
3838
assertThat(res.get("foo")).isEqualTo("bar");
39-
String value = adb.db().query("return @d.foo", Collections.singletonMap("d", doc), String.class).next();
39+
String value = adb.db().query("return @d.foo", String.class, Collections.singletonMap("d", doc)).next();
4040
assertThat(value).isEqualTo("bar");
4141
}
4242

@@ -45,21 +45,21 @@ void map(ArangoDB adb) {
4545
void rawJson(ArangoDB adb) {
4646
RawJson doc = RawJson.of("""
4747
{"foo":"bar"}""");
48-
RawJson res = adb.db().query("return @d", Collections.singletonMap("d", doc), RawJson.class).next();
48+
RawJson res = adb.db().query("return @d", RawJson.class, Collections.singletonMap("d", doc)).next();
4949
assertThat(res.getValue()).isEqualTo(doc.getValue());
50-
RawJson value = adb.db().query("return @d.foo", Collections.singletonMap("d", doc), RawJson.class).next();
50+
RawJson value = adb.db().query("return @d.foo", RawJson.class, Collections.singletonMap("d", doc)).next();
5151
assertThat(value.getValue()).isEqualTo("\"bar\"");
5252
}
5353

5454
@ParameterizedTest
5555
@MethodSource("adbByContentType")
5656
void person(ArangoDB adb) {
5757
Person doc = new Person("key", "Jim", 22);
58-
Person res = adb.db().query("return @d", Collections.singletonMap("d", doc), Person.class).next();
58+
Person res = adb.db().query("return @d", Person.class, Collections.singletonMap("d", doc)).next();
5959
assertThat(res).isEqualTo(doc);
60-
String key = adb.db().query("return @d._key", Collections.singletonMap("d", doc), String.class).next();
60+
String key = adb.db().query("return @d._key", String.class, Collections.singletonMap("d", doc)).next();
6161
assertThat(key).isEqualTo("key");
62-
String name = adb.db().query("return @d.firstName", Collections.singletonMap("d", doc), String.class).next();
62+
String name = adb.db().query("return @d.firstName", String.class, Collections.singletonMap("d", doc)).next();
6363
assertThat(name).isEqualTo("Jim");
6464
}
6565

0 commit comments

Comments
 (0)