Skip to content

Commit 2e68f12

Browse files
committed
fix TinkerGraph tests
1 parent 51b4beb commit 2e68f12

File tree

2 files changed

+29
-14
lines changed

2 files changed

+29
-14
lines changed
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package org.eclipse.jnosql.databases.tinkerpop.cdi;
2+
3+
import org.testcontainers.containers.GenericContainer;
4+
import org.testcontainers.containers.wait.strategy.Wait;
5+
6+
enum ArangoDeployment {
7+
INSTANCE;
8+
9+
private final GenericContainer<?> arangodb =
10+
new GenericContainer<>("arangodb/arangodb:latest")
11+
.withExposedPorts(8529)
12+
.withEnv("ARANGO_NO_AUTH", "1")
13+
.waitingFor(Wait.forHttp("/")
14+
.forStatusCode(200));
15+
16+
{
17+
arangodb.start();
18+
}
19+
20+
public GenericContainer<?> getContainer() {
21+
return arangodb;
22+
}
23+
}

jnosql-tinkerpop/src/test/java/org/eclipse/jnosql/databases/tinkerpop/cdi/TestGraphSupplier.java

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
2424
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
2525
import org.testcontainers.containers.GenericContainer;
26-
import org.testcontainers.containers.wait.strategy.Wait;
2726

2827
import java.io.File;
2928
import java.util.function.Supplier;
@@ -45,31 +44,24 @@ public Graph get() {
4544
},
4645

4746
ARANGODB {
48-
private final GenericContainer<?> arangodb =
49-
new GenericContainer<>("arangodb/arangodb:latest")
50-
.withExposedPorts(8529)
51-
.withEnv("ARANGO_NO_AUTH", "1")
52-
.waitingFor(Wait.forHttp("/")
53-
.forStatusCode(200));
54-
55-
{
56-
arangodb.start();
57-
}
58-
5947
@Override
6048
public Graph get() {
49+
GenericContainer<?> container = ArangoDeployment.INSTANCE.getContainer();
6150
Configuration configuration = new BaseConfiguration();
6251
configuration.addProperty("gremlin.graph", ArangoDBGraph.class.getName());
6352
configuration.addProperty("gremlin.arangodb.conf.graph.enableDataDefinition", true);
64-
configuration.addProperty("gremlin.arangodb.conf.driver.hosts", arangodb.getHost() + ":" + arangodb.getFirstMappedPort());
53+
configuration.addProperty("gremlin.arangodb.conf.driver.hosts", container.getHost() + ":" + container.getFirstMappedPort());
6554
return GraphFactory.open(configuration);
6655
}
6756
},
6857

6958
TINKER_GRAPH {
7059
@Override
7160
public Graph get() {
72-
return TinkerGraph.open();
61+
Configuration configuration = new BaseConfiguration();
62+
configuration.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_VERTEX_ID_MANAGER, TinkerGraph.DefaultIdManager.STRING.name());
63+
configuration.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_EDGE_ID_MANAGER, TinkerGraph.DefaultIdManager.STRING.name());
64+
return TinkerGraph.open(configuration);
7365
}
7466
}
7567

0 commit comments

Comments
 (0)