Skip to content
This repository was archived by the owner on Sep 17, 2025. It is now read-only.

Commit f9420b6

Browse files
rashtaorashtao
committed
tests fixes
1 parent 4fa901a commit f9420b6

File tree

8 files changed

+95
-59
lines changed

8 files changed

+95
-59
lines changed

‎src/main/java/com/arangodb/tinkerpop/gremlin/client/ArangoDBGraphClient.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,7 @@ public ArangoDBGraphClient(
157157

158158
public void shutdown() {
159159
logger.debug("Shutdown");
160-
if (db != null) {
161-
if (db.exists()) {
162-
db.clearQueryCache();
163-
}
164-
}
160+
db.arango().shutdown();
165161
}
166162

167163
/**

‎src/main/java/com/arangodb/tinkerpop/gremlin/persistence/VertexData.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,14 @@ public class VertexData implements PropertyData<VertexPropertyData>, PersistentD
4040
public VertexData() {
4141
}
4242

43-
public VertexData(String label, String key) {
43+
public static VertexData of(String label, String key) {
4444
ElementHelper.validateLabel(label);
4545
if (key != null && key.isEmpty()) throw new IllegalArgumentException("empty key");
46-
this.label = label;
47-
this.key = key;
46+
47+
VertexData data = new VertexData();
48+
data.label = label;
49+
data.key = key;
50+
return data;
4851
}
4952

5053
@Override

‎src/main/java/com/arangodb/tinkerpop/gremlin/structure/ArangoDBGraph.java‎

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,6 @@
142142
test = "org.apache.tinkerpop.gremlin.structure.util.detached.DetachedGraphTest",
143143
method = "testAttachableCreateMethod",
144144
reason = "test creates id without label prefix")
145-
@Graph.OptOut(
146-
test = "org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexTest",
147-
method = "shouldNotEvaluateToEqualDifferentId",
148-
reason = "Test creates vertex with no labels in schema-based approach")
149145
@Graph.OptOut(
150146
test = "org.apache.tinkerpop.gremlin.structure.GraphTest",
151147
method = "shouldAddVertexWithUserSuppliedStringId",
@@ -162,10 +158,6 @@
162158
test = "org.apache.tinkerpop.gremlin.structure.GraphTest",
163159
method = "shouldEvaluateConnectivityPatterns",
164160
reason = "FIXME")
165-
@Graph.OptOut(
166-
test = "org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertexTest",
167-
method = "shouldNotEvaluateToEqualDifferentId",
168-
reason = "FIXME")
169161
@Graph.OptOut(
170162
test = "org.apache.tinkerpop.gremlin.structure.util.star.StarGraphTest",
171163
method = "shouldAttachWithCreateMethod",
@@ -190,6 +182,18 @@
190182
test = "org.apache.tinkerpop.gremlin.structure.VertexTest$AddEdgeTest",
191183
method = "shouldAddEdgeWithUserSuppliedStringId",
192184
reason = "FIXME")
185+
@Graph.OptOut(
186+
test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.CountTest$Traversals",
187+
method = "g_V_both_both_count",
188+
reason = "FIXME")
189+
@Graph.OptOut(
190+
test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.CountTest$Traversals",
191+
method = "g_V_repeatXoutX_timesX3X_count",
192+
reason = "FIXME")
193+
@Graph.OptOut(
194+
test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.CountTest$Traversals",
195+
method = "g_V_repeatXoutX_timesX8X_count",
196+
reason = "FIXME")
193197
public class ArangoDBGraph implements Graph {
194198

195199
/**
@@ -479,10 +483,6 @@ public VertexFeatures vertex() {
479483

480484
private final List<String> relations;
481485

482-
/** Flat to indicate that the graph has no schema. */
483-
484-
private boolean schemaless = false;
485-
486486
/** The configuration. */
487487

488488
private Configuration configuration;
@@ -525,7 +525,6 @@ public ArangoDBGraph(Configuration configuration) {
525525
name = arangoConfig.getString(PROPERTY_KEY_GRAPH_NAME);
526526
checkValues(arangoConfig.getString(PROPERTY_KEY_DB_NAME), name, vertexCollections, edgeCollections, relations);
527527
if (CollectionUtils.isEmpty(vertexCollections)) {
528-
schemaless = true;
529528
vertexCollections.add(DEFAULT_VERTEX_COLLECTION);
530529
}
531530
if (CollectionUtils.isEmpty(edgeCollections)) {
@@ -587,19 +586,12 @@ public ArangoDBGraph(Configuration configuration) {
587586
@Override
588587
public Vertex addVertex(Object... keyValues) {
589588
ElementHelper.legalPropertyKeyValueArray(keyValues);
590-
String label;
591-
if (!schemaless) {
592-
label = ElementHelper.getLabelValue(keyValues).orElse(null);
593-
ElementHelper.validateLabel(label);
594-
} else {
595-
label = DEFAULT_VERTEX_COLLECTION;
596-
}
597-
if (!vertexCollections().contains(label)) {
598-
throw new IllegalArgumentException(String.format("Vertex label (%s) not in graph (%s) vertex collections.", label, name));
599-
}
600-
589+
String label = ElementHelper.getLabelValue(keyValues).orElse(null);
601590
String id = ArangoDBUtil.getId(features().vertex(), label, keyValues);
602591
ArangoDBVertex vertex = ArangoDBVertex.of(id, label, this);
592+
if (!vertexCollections().contains(vertex.label())) {
593+
throw new IllegalArgumentException(String.format("Vertex label (%s) not in graph (%s) vertex collections.", vertex.label(), name));
594+
}
603595

604596
// TODO: optmize writing only once
605597
vertex.doInsert();

‎src/main/java/com/arangodb/tinkerpop/gremlin/structure/ArangoDBVertex.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
public class ArangoDBVertex extends ArangoDBElement<VertexPropertyData, VertexData> implements Vertex, ArangoDBPersistentElement {
3737

3838
public static ArangoDBVertex of(final String id, final String label, ArangoDBGraph graph) {
39-
return new ArangoDBVertex(graph, new VertexData(extractLabel(id, label).orElse(DEFAULT_LABEL), extractKey(id)));
39+
return new ArangoDBVertex(graph, VertexData.of(extractLabel(id, label).orElse(DEFAULT_LABEL), extractKey(id)));
4040
}
4141

4242
public ArangoDBVertex(ArangoDBGraph graph, VertexData data) {
@@ -83,13 +83,12 @@ public Edge addEdge(String label, Vertex vertex, Object... keyValues) {
8383

8484
ElementHelper.legalPropertyKeyValueArray(keyValues);
8585
ElementHelper.validateLabel(label);
86-
87-
if (!graph.edgeCollections().contains(label)) {
88-
throw new IllegalArgumentException(String.format("Edge label (%s)not in graph (%s) edge collections.", label, graph.name()));
89-
}
90-
9186
String id = ArangoDBUtil.getId(graph.features().edge(), label, keyValues);
9287
ArangoDBEdge edge = ArangoDBEdge.of(id, label, id(), (String) vertex.id(), graph);
88+
if (!graph.edgeCollections().contains(edge.label())) {
89+
throw new IllegalArgumentException(String.format("Edge label (%s) not in graph (%s) edge collections.", edge.label(), graph.name()));
90+
}
91+
9392
// TODO: optmize writing only once
9493
edge.doInsert();
9594
ElementHelper.attachProperties(edge, keyValues);

‎src/test/java/com/arangodb/tinkerpop/gremlin/process/ProcessGraphProvider.java‎

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ protected void configure(ArangoDBConfigurationBuilder builder, Class<?> test, St
1111
case "g_addV_asXfirstX_repeatXaddEXnextX_toXaddVX_inVX_timesX5X_addEXnextX_toXselectXfirstXX":
1212
builder.withEdgeCollection("next");
1313
break;
14-
case "g_V_mergeEXlabel_self_weight_05X":
1514
case "shouldGenerateDefaultIdOnAddEWithSpecifiedId":
1615
case "shouldSetIdOnAddEWithNamePropertyKeySpecifiedAndNameSuppliedAsProperty":
1716
case "shouldSetIdOnAddEWithIdPropertyKeySpecifiedAndNameSuppliedAsProperty":
@@ -41,7 +40,6 @@ protected void configure(ArangoDBConfigurationBuilder builder, Class<?> test, St
4140
case "shouldTriggerAddEdgeByPath":
4241
case "shouldWriteToMultiplePartitions":
4342
case "shouldAppendPartitionToEdge":
44-
case "shouldPartitionWithAbstractLambdaChildTraversal":
4543
case "shouldThrowExceptionOnEInDifferentPartition":
4644
builder.withEdgeCollection("self");
4745
builder.withEdgeCollection("self-but-different");
@@ -59,8 +57,42 @@ protected void configure(ArangoDBConfigurationBuilder builder, Class<?> test, St
5957
case "g_io_readXjsonX":
6058
case "g_io_readXkryoX":
6159
case "g_io_readXxmlX":
60+
builder.withVertexCollection("person");
61+
builder.withVertexCollection("software");
6262
builder.withEdgeCollection("knows");
6363
builder.withEdgeCollection("created");
64+
builder.configureEdge("knows", "person", "person");
65+
builder.configureEdge("created", "person", "software");
66+
break;
67+
case "g_addV_propertyXlabel_personX":
68+
case "g_mergeEXlabel_knows_out_marko_in_vadasX_optionXonCreate_created_YX_optionXonMatch_created_NX_exists_updated":
69+
case "g_mergeEXlabel_knows_out_marko_in_vadas_weight_05X_exists":
70+
case "g_V_hasXperson_name_marko_X_mergeEXlabel_knowsX_optionXonCreate_created_YX_optionXonMatch_created_NX_exists_updated":
71+
case "g_mergeEXlabel_knows_out_marko_in_vadasX":
72+
case "g_mergeEXlabel_knows_out_marko_in_vadasX_optionXonCreate_created_YX_optionXonMatch_created_NX_exists":
73+
case "g_V_mergeEXlabel_self_weight_05X":
74+
case "g_mergeE_with_outV_inV_options":
75+
case "g_injectXlabel_knows_out_marko_in_vadasX_mergeE":
76+
builder.withVertexCollection("person");
77+
builder.withEdgeCollection("self");
78+
break;
79+
case "g_V_hasXname_regexXTinkerXX":
80+
case "g_V_hasXname_regexXTinkerUnicodeXX":
81+
builder.withVertexCollection("software");
82+
break;
83+
case "shouldDetachVertexWhenAdded":
84+
case "shouldReferenceVertexWhenAdded":
85+
case "shouldUseActualVertexWhenAdded":
86+
builder.withVertexCollection("thing");
87+
break;
88+
case "shouldAppendPartitionToAllVertexProperties":
89+
builder.withVertexCollection("person");
90+
builder.withVertexCollection("vertex");
91+
builder.configureEdge("edge", "person", "person");
92+
break;
93+
case "shouldPartitionWithAbstractLambdaChildTraversal":
94+
builder.withVertexCollection("testV");
95+
builder.withEdgeCollection("self");
6496
break;
6597
}
6698
}

‎src/test/java/com/arangodb/tinkerpop/gremlin/structure/StructureGraphProvider.java‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,8 @@ protected void configure(ArangoDBConfigurationBuilder builder, Class<?> test, St
1919
} else if (testMethodName.startsWith("shouldSupportUserSuppliedIds")) {
2020
builder.withEdgeCollection("test");
2121
} else if (testMethodName.startsWith("shouldSupportUUID")) {
22+
builder.withVertexCollection("person");
2223
builder.withEdgeCollection("friend");
23-
} else if (testMethodName.startsWith("shouldReadWriteVertexWithBOTHEdges")) {
24-
builder.withEdgeCollection("friends");
25-
} else if (testMethodName.startsWith("shouldReadWriteVertexWithINEdges")) {
26-
builder.withEdgeCollection("friends");
27-
} else if (testMethodName.startsWith("shouldReadWriteVertexMultiPropsNoEdges")) {
28-
builder.withEdgeCollection("friends");
29-
} else if (testMethodName.startsWith("shouldReadWriteDetachedVertexAsReferenceNoEdges")) {
30-
builder.withEdgeCollection("friends");
31-
} else if (testMethodName.startsWith("shouldReadWriteVertexNoEdges")) {
32-
builder.withEdgeCollection("friends");
33-
} else if (testMethodName.startsWith("shouldReadWriteVertexWithOUTEdges")) {
34-
builder.withEdgeCollection("friends");
35-
} else if (testMethodName.startsWith("shouldReadWriteDetachedVertexNoEdges")) {
36-
builder.withEdgeCollection("friends");
3724
} else if (testMethodName.startsWith("shouldReadWriteDetachedEdge")) {
3825
builder.withVertexCollection("person");
3926
builder.withEdgeCollection("friend");
@@ -47,6 +34,20 @@ protected void configure(ArangoDBConfigurationBuilder builder, Class<?> test, St
4734
builder.withEdgeCollection("self");
4835
} else if (testMethodName.startsWith("shouldThrowOnGraphAddEdge")) {
4936
builder.withEdgeCollection("self");
37+
} else if (testMethodName.startsWith("shouldReadWriteVerticesNoEdgesToGryoManual") ||
38+
testMethodName.startsWith("shouldReadWriteVertexWithBOTHEdges") ||
39+
testMethodName.startsWith("shouldReadWriteVerticesNoEdgesToGraphSONManual") ||
40+
testMethodName.startsWith("shouldReadWriteVerticesNoEdges") ||
41+
testMethodName.startsWith("shouldReadWriteVertexWithINEdges") ||
42+
testMethodName.startsWith("shouldReadWriteVertexMultiPropsNoEdges") ||
43+
testMethodName.startsWith("shouldReadWriteDetachedVertexAsReferenceNoEdges") ||
44+
testMethodName.startsWith("shouldReadWriteVertexNoEdges") ||
45+
testMethodName.startsWith("shouldReadWriteVertexWithOUTEdges") ||
46+
testMethodName.startsWith("shouldReadWriteDetachedVertexNoEdges")) {
47+
builder.withVertexCollection("vertex");
48+
builder.withVertexCollection("person");
49+
builder.withEdgeCollection("friends");
50+
builder.configureEdge("friends", "person", "person");
5051
} else {
5152
// Perhaps change for startsWith, but then it would be more verbose. Perhaps a set?
5253
switch (testMethodName) {

‎src/test/java/com/arangodb/tinkerpop/gremlin/util/BaseGraphProvider.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,12 @@ private Configuration getConfiguration(
9696
break;
9797
case SINK:
9898
System.out.println("SINK");
99+
builder.withVertexCollection("loops");
100+
builder.withVertexCollection("message");
99101
builder.withEdgeCollection("link");
100102
builder.withEdgeCollection("self");
103+
builder.configureEdge("self", "loops", "loops");
104+
builder.configureEdge("link", "message", "message");
101105
break;
102106
}
103107
} else {
@@ -111,7 +115,7 @@ public void clear(Graph graph, Configuration configuration) throws Exception {
111115
Configuration arangoConfig = configuration.subset(ArangoDBGraph.PROPERTY_KEY_PREFIX);
112116
Properties arangoProperties = ConfigurationConverter.getProperties(arangoConfig);
113117
TestGraphClient client = new TestGraphClient(arangoProperties, dbName);
114-
client.deleteGraph(arangoConfig.getString(ArangoDBGraph.PROPERTY_KEY_GRAPH_NAME));
118+
client.clear(arangoConfig.getString(ArangoDBGraph.PROPERTY_KEY_GRAPH_NAME));
115119
if (graph != null) {
116120
graph.close();
117121
}

‎src/test/java/com/arangodb/tinkerpop/gremlin/util/TestGraphClient.java‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,23 @@ public TestGraphClient(Properties properties, String dbname) throws ArangoDBGrap
1818
}
1919
}
2020

21-
public void deleteGraph(String name) {
21+
public void clear(String name) {
2222
try {
23-
db.graph(name).drop(true);
2423
db.collection(ArangoDBGraph.GRAPH_VARIABLES_COLLECTION).deleteDocument(name);
2524
} catch (ArangoDBException e) {
26-
if (e.getErrorNum() == 1924) return; // graph not found
27-
throw e;
25+
if (e.getErrorNum() != 1202 // document not found
26+
&& e.getErrorNum() != 1203 // collection not found
27+
) throw e;
2828
}
29+
30+
try {
31+
db.graph(name).drop(true);
32+
} catch (ArangoDBException e) {
33+
if (e.getErrorNum() != 1924) // graph not found
34+
throw e;
35+
}
36+
37+
db.clearQueryCache();
2938
}
3039

3140
}

0 commit comments

Comments
 (0)