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

Commit 8a07512

Browse files
rashtaorashtao
committed
tests fixes
1 parent ad5adb2 commit 8a07512

File tree

8 files changed

+122
-77
lines changed

8 files changed

+122
-77
lines changed

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

Lines changed: 0 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -133,80 +133,6 @@
133133
* @author Horacio Hoyos Rodriguez (https://www.york.ac.uk)
134134
*/
135135

136-
@Graph.OptIn(Graph.OptIn.SUITE_STRUCTURE_STANDARD)
137-
@Graph.OptIn(Graph.OptIn.SUITE_PROCESS_STANDARD)
138-
@Graph.OptIn("com.arangodb.tinkerpop.gremlin.StructureIntegrateSuite")
139-
@Graph.OptIn("com.arangodb.tinkerpop.gremlin.ArangoDBTestSuite")
140-
@Graph.OptIn("com.arangodb.tinkerpop.gremlin.custom.CustomStandardSuite")
141-
@Graph.OptOut(
142-
test = "org.apache.tinkerpop.gremlin.structure.util.detached.DetachedGraphTest",
143-
method = "testAttachableCreateMethod",
144-
reason = "replaced by com.arangodb.tinkerpop.gremlin.custom.structure.util.detached.DetachedGraphTest#testAttachableCreateMethod()")
145-
@Graph.OptOut(
146-
test = "org.apache.tinkerpop.gremlin.structure.GraphTest",
147-
method = "shouldAddVertexWithUserSuppliedStringId",
148-
reason = "FIXME")
149-
@Graph.OptOut(
150-
test = "org.apache.tinkerpop.gremlin.structure.GraphTest",
151-
method = "shouldRemoveVertices",
152-
reason = "Test creates vertices with random labels, which does not work with our schema-based approach.")
153-
@Graph.OptOut(
154-
test = "org.apache.tinkerpop.gremlin.structure.GraphTest",
155-
method = "shouldRemoveEdges",
156-
reason = "Test creates edges with random labels, which does not work with our schema-based approach.")
157-
@Graph.OptOut(
158-
test = "org.apache.tinkerpop.gremlin.structure.GraphTest",
159-
method = "shouldEvaluateConnectivityPatterns",
160-
reason = "FIXME")
161-
@Graph.OptOut(
162-
test = "org.apache.tinkerpop.gremlin.structure.util.star.StarGraphTest",
163-
method = "shouldAttachWithCreateMethod",
164-
reason = "FIXME")
165-
@Graph.OptOut(
166-
test = "org.apache.tinkerpop.gremlin.structure.util.star.StarGraphTest",
167-
method = "shouldCopyFromGraphAToGraphB",
168-
reason = "FIXME")
169-
@Graph.OptOut(
170-
test = "org.apache.tinkerpop.gremlin.structure.VertexTest$BasicVertexTest",
171-
method = "shouldEvaluateEquivalentVertexHashCodeWithSuppliedIds",
172-
reason = "FIXME")
173-
@Graph.OptOut(
174-
test = "org.apache.tinkerpop.gremlin.structure.VertexTest$BasicVertexTest",
175-
method = "shouldEvaluateVerticesEquivalentWithSuppliedIdsViaTraversal",
176-
reason = "FIXME")
177-
@Graph.OptOut(
178-
test = "org.apache.tinkerpop.gremlin.structure.VertexTest$BasicVertexTest",
179-
method = "shouldEvaluateVerticesEquivalentWithSuppliedIdsViaIterators",
180-
reason = "FIXME")
181-
@Graph.OptOut(
182-
test = "org.apache.tinkerpop.gremlin.structure.VertexTest$AddEdgeTest",
183-
method = "shouldAddEdgeWithUserSuppliedStringId",
184-
reason = "FIXME")
185-
@Graph.OptOut(
186-
test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MergeEdgeTest$Traversals",
187-
method = "*",
188-
reason = "replaced by com.arangodb.tinkerpop.gremlin.custom.process.traversal.step.map.MergeEdgeTest"
189-
)
190-
@Graph.OptOut(
191-
test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MergeVertexTest$Traversals",
192-
method = "g_withSideEffectXc_label_person_name_markoX_withSideEffectXm_age_19X_mergeVXselectXcXX_optionXonMatch_selectXmXX_option",
193-
reason = "FIXME: DE-995"
194-
)
195-
@Graph.OptOut(
196-
test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MergeVertexTest$Traversals",
197-
method = "g_mergeVXlabel_person_name_markoX_optionXonMatch_age_19X_option",
198-
reason = "FIXME: DE-995"
199-
)
200-
@Graph.OptOut(
201-
test = "org.apache.tinkerpop.gremlin.process.traversal.step.OrderabilityTest$Traversals",
202-
method = "*",
203-
reason = "replaced by com.arangodb.tinkerpop.gremlin.custom.process.traversal.step.OrderabilityTest"
204-
)
205-
@Graph.OptOut(
206-
test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SubgraphTest$Traversals",
207-
method = "*",
208-
reason = "FIXME: DE-996"
209-
)
210136
public class ArangoDBGraph implements Graph {
211137

212138
public static class ArangoDBGraphFeatures implements Features {

‎src/test/java/com/arangodb/tinkerpop/gremlin/TestGraph.java‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
package com.arangodb.tinkerpop.gremlin;
2+
3+
import com.arangodb.tinkerpop.gremlin.structure.ArangoDBGraph;
4+
import org.apache.commons.configuration2.Configuration;
5+
import org.apache.tinkerpop.gremlin.structure.Graph;
6+
7+
@Graph.OptIn(Graph.OptIn.SUITE_STRUCTURE_STANDARD)
8+
@Graph.OptIn(Graph.OptIn.SUITE_PROCESS_STANDARD)
9+
@Graph.OptOut(
10+
test = "org.apache.tinkerpop.gremlin.structure.util.detached.DetachedGraphTest",
11+
method = "testAttachableCreateMethod",
12+
reason = "replaced by com.arangodb.tinkerpop.gremlin.custom.structure.util.detached.DetachedGraphTest#testAttachableCreateMethod()")
13+
@Graph.OptOut(
14+
test = "org.apache.tinkerpop.gremlin.structure.GraphTest",
15+
method = "shouldAddVertexWithUserSuppliedStringId",
16+
reason = "FIXME")
17+
@Graph.OptOut(
18+
test = "org.apache.tinkerpop.gremlin.structure.GraphTest",
19+
method = "shouldRemoveVertices",
20+
reason = "Test creates vertices with random labels, which does not work with our schema-based approach.")
21+
@Graph.OptOut(
22+
test = "org.apache.tinkerpop.gremlin.structure.GraphTest",
23+
method = "shouldRemoveEdges",
24+
reason = "Test creates edges with random labels, which does not work with our schema-based approach.")
25+
@Graph.OptOut(
26+
test = "org.apache.tinkerpop.gremlin.structure.GraphTest",
27+
method = "shouldEvaluateConnectivityPatterns",
28+
reason = "FIXME")
29+
@Graph.OptOut(
30+
test = "org.apache.tinkerpop.gremlin.structure.util.star.StarGraphTest",
31+
method = "shouldAttachWithCreateMethod",
32+
reason = "FIXME")
33+
@Graph.OptOut(
34+
test = "org.apache.tinkerpop.gremlin.structure.util.star.StarGraphTest",
35+
method = "shouldCopyFromGraphAToGraphB",
36+
reason = "FIXME")
37+
@Graph.OptOut(
38+
test = "org.apache.tinkerpop.gremlin.structure.VertexTest$BasicVertexTest",
39+
method = "shouldEvaluateEquivalentVertexHashCodeWithSuppliedIds",
40+
reason = "FIXME")
41+
@Graph.OptOut(
42+
test = "org.apache.tinkerpop.gremlin.structure.VertexTest$BasicVertexTest",
43+
method = "shouldEvaluateVerticesEquivalentWithSuppliedIdsViaTraversal",
44+
reason = "FIXME")
45+
@Graph.OptOut(
46+
test = "org.apache.tinkerpop.gremlin.structure.VertexTest$BasicVertexTest",
47+
method = "shouldEvaluateVerticesEquivalentWithSuppliedIdsViaIterators",
48+
reason = "FIXME")
49+
@Graph.OptOut(
50+
test = "org.apache.tinkerpop.gremlin.structure.VertexTest$AddEdgeTest",
51+
method = "shouldAddEdgeWithUserSuppliedStringId",
52+
reason = "FIXME")
53+
@Graph.OptOut(
54+
test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MergeEdgeTest$Traversals",
55+
method = "*",
56+
reason = "replaced by com.arangodb.tinkerpop.gremlin.custom.process.traversal.step.map.MergeEdgeTest"
57+
)
58+
@Graph.OptOut(
59+
test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MergeVertexTest$Traversals",
60+
method = "g_withSideEffectXc_label_person_name_markoX_withSideEffectXm_age_19X_mergeVXselectXcXX_optionXonMatch_selectXmXX_option",
61+
reason = "FIXME: DE-995"
62+
)
63+
@Graph.OptOut(
64+
test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MergeVertexTest$Traversals",
65+
method = "g_mergeVXlabel_person_name_markoX_optionXonMatch_age_19X_option",
66+
reason = "FIXME: DE-995"
67+
)
68+
@Graph.OptOut(
69+
test = "org.apache.tinkerpop.gremlin.process.traversal.step.OrderabilityTest$Traversals",
70+
method = "*",
71+
reason = "replaced by com.arangodb.tinkerpop.gremlin.custom.process.traversal.step.OrderabilityTest"
72+
)
73+
@Graph.OptOut(
74+
test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SubgraphTest$Traversals",
75+
method = "*",
76+
reason = "FIXME: DE-996"
77+
)
78+
public class TestGraph extends ArangoDBGraph {
79+
80+
@SuppressWarnings("unused")
81+
public static TestGraph open(Configuration configuration) {
82+
return new TestGraph(configuration);
83+
}
84+
85+
public TestGraph(Configuration configuration) {
86+
super(configuration);
87+
}
88+
}

‎src/test/java/com/arangodb/tinkerpop/gremlin/custom/CustomGraph.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
import com.arangodb.tinkerpop.gremlin.structure.ArangoDBGraph;
44
import org.apache.commons.configuration2.Configuration;
5+
import org.apache.tinkerpop.gremlin.structure.Graph;
56

7+
@Graph.OptIn("com.arangodb.tinkerpop.gremlin.custom.CustomStandardSuite")
68
public class CustomGraph extends ArangoDBGraph {
79

810
@SuppressWarnings("unused")

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

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

3+
import com.arangodb.tinkerpop.gremlin.TestGraph;
34
import com.arangodb.tinkerpop.gremlin.util.BaseGraphProvider;
45
import com.arangodb.tinkerpop.gremlin.utils.ArangoDBConfigurationBuilder;
6+
import org.apache.commons.configuration2.Configuration;
7+
import org.apache.tinkerpop.gremlin.LoadGraphWith;
8+
import org.apache.tinkerpop.gremlin.structure.Graph;
9+
10+
import java.util.Map;
511

612
public class ProcessGraphProvider extends BaseGraphProvider {
713

14+
@Override
15+
public Configuration newGraphConfiguration(String graphName, Class<?> test, String testMethodName, Map<String, Object> configurationOverrides, LoadGraphWith.GraphData loadGraphWith) {
16+
Configuration conf = super.newGraphConfiguration(graphName, test, testMethodName, configurationOverrides, loadGraphWith);
17+
conf.setProperty(Graph.GRAPH, TestGraph.class.getName());
18+
return conf;
19+
}
20+
821
@Override
922
protected void configure(ArangoDBConfigurationBuilder builder, Class<?> test, String testMethodName) {
1023
switch (testMethodName) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.arangodb.tinkerpop.gremlin.process;
22

3-
import com.arangodb.tinkerpop.gremlin.structure.ArangoDBGraph;
3+
import com.arangodb.tinkerpop.gremlin.TestGraph;
44
import org.apache.tinkerpop.gremlin.GraphProviderClass;
55
import org.apache.tinkerpop.gremlin.process.ProcessStandardSuite;
66
import org.junit.runner.RunWith;
77

88
@RunWith(ProcessStandardSuite.class)
9-
@GraphProviderClass(provider = ProcessGraphProvider.class, graph = ArangoDBGraph.class)
9+
@GraphProviderClass(provider = ProcessGraphProvider.class, graph = TestGraph.class)
1010
public class ProcessStandardSuiteTest {
1111

1212
}

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,25 @@
11
package com.arangodb.tinkerpop.gremlin.structure;
22

3+
import com.arangodb.tinkerpop.gremlin.TestGraph;
34
import com.arangodb.tinkerpop.gremlin.util.BaseGraphProvider;
45

56
import com.arangodb.tinkerpop.gremlin.utils.ArangoDBConfigurationBuilder;
7+
import org.apache.commons.configuration2.Configuration;
8+
import org.apache.tinkerpop.gremlin.LoadGraphWith;
9+
import org.apache.tinkerpop.gremlin.structure.Graph;
610
import org.apache.tinkerpop.gremlin.structure.VertexTest;
711

12+
import java.util.Map;
13+
814
public class StructureGraphProvider extends BaseGraphProvider {
915

16+
@Override
17+
public Configuration newGraphConfiguration(String graphName, Class<?> test, String testMethodName, Map<String, Object> configurationOverrides, LoadGraphWith.GraphData loadGraphWith) {
18+
Configuration conf = super.newGraphConfiguration(graphName, test, testMethodName, configurationOverrides, loadGraphWith);
19+
conf.setProperty(Graph.GRAPH, TestGraph.class.getName());
20+
return conf;
21+
}
22+
1023
@Override
1124
protected void configure(ArangoDBConfigurationBuilder builder, Class<?> test, String testMethodName) {
1225
if (testMethodName.startsWith("shouldProcessVerticesEdges")

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package com.arangodb.tinkerpop.gremlin.structure;
22

3+
import com.arangodb.tinkerpop.gremlin.TestGraph;
34
import org.apache.tinkerpop.gremlin.GraphProviderClass;
45
import org.apache.tinkerpop.gremlin.structure.StructureStandardSuite;
56
import org.junit.runner.RunWith;
67

78
@RunWith(StructureStandardSuite.class)
8-
@GraphProviderClass(provider = StructureGraphProvider.class, graph = ArangoDBGraph.class)
9+
@GraphProviderClass(provider = StructureGraphProvider.class, graph = TestGraph.class)
910
public class StructureStandardSuiteTest {
1011

1112
}

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

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

3+
import com.arangodb.tinkerpop.gremlin.TestGraph;
34
import com.arangodb.tinkerpop.gremlin.custom.CustomGraph;
45
import com.arangodb.tinkerpop.gremlin.structure.*;
56
import com.arangodb.tinkerpop.gremlin.utils.ArangoDBConfigurationBuilder;
@@ -128,6 +129,7 @@ public Set<Class> getImplementations() {
128129
return Stream.of(
129130
ArangoDBEdge.class,
130131
ArangoDBElement.class,
132+
TestGraph.class,
131133
CustomGraph.class,
132134
ArangoDBGraph.class,
133135
ArangoDBGraphVariables.class,

0 commit comments

Comments
 (0)