Skip to content

Fix Flaky Tests in GraphSONTypedCompatibilityTest #3237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 3.7-dev
Choose a base branch
from
Open

Fix Flaky Tests in GraphSONTypedCompatibilityTest #3237

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;

Expand Down Expand Up @@ -115,12 +116,24 @@ private Model() {
addCoreEntry(new java.sql.Timestamp(1481750076295L), "Timestamp", "");
addCoreEntry(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786"), "UUID");

addGraphStructureEntry(graph.edges().next(), "Edge", "");
addGraphStructureEntry(g.V().out().out().path().next(), "Path", "");
addGraphStructureEntry(graph.edges().next().properties().next(), "Property", "");
addGraphStructureEntry(IteratorUtils.list(graph.edges()).stream()
.sorted((e1, e2) -> Integer.compare((Integer)e1.id(), (Integer)e2.id()))
.iterator().next(), "Edge", "");
addGraphStructureEntry(g.V().order().by(T.id).out().out().path().next(), "Path", "");
addGraphStructureEntry(IteratorUtils.list(IteratorUtils.list(graph.edges()).stream()
.sorted((e1, e2) -> Integer.compare((Integer)e1.id(), (Integer)e2.id()))
.iterator().next().properties()).stream()
.sorted((p1, p2) -> p1.key().compareTo(p2.key()))
.iterator().next(), "Property", "");
addGraphStructureEntry(graph, "TinkerGraph", "`TinkerGraph` has a custom serializer that is registered as part of the `TinkerIoRegistry`.");
addGraphStructureEntry(graph.vertices().next(), "Vertex", "");
addGraphStructureEntry(graph.vertices().next().properties().next(), "VertexProperty", "");
addGraphStructureEntry(IteratorUtils.list(graph.vertices()).stream()
.sorted((v1, v2) -> Integer.compare((Integer)v1.id(), (Integer)v2.id()))
.iterator().next(), "Vertex", "");
addGraphStructureEntry(IteratorUtils.list(IteratorUtils.list(graph.vertices()).stream()
.sorted((v1, v2) -> Integer.compare((Integer)v1.id(), (Integer)v2.id()))
.iterator().next().properties()).stream()
.sorted((p1, p2) -> Long.compare((Long)p1.id(), (Long)p2.id()))
.iterator().next(), "VertexProperty", "");

addGraphProcessEntry(SackFunctions.Barrier.normSack, "Barrier", "");
addGraphProcessEntry(new Bytecode.Binding("x", 1), "Binding", "A \"Binding\" refers to a `Bytecode.Binding`.");
Expand Down Expand Up @@ -153,7 +166,7 @@ private Model() {
// TextP was only added at 3.4.0 and is not supported with untyped GraphSON of any sort
addGraphProcessEntry(TextP.containing("ark"), "TextP", "");
addGraphProcessEntry(createStaticTraversalMetrics(), "TraversalMetrics", "");
addGraphProcessEntry(g.V().hasLabel("person").asAdmin().nextTraverser(), "Traverser", "");
addGraphProcessEntry(g.V().hasLabel("person").order().by(T.id).asAdmin().nextTraverser(), "Traverser", "");

final Map<String,Object> requestBindings = new HashMap<>();
requestBindings.put("x", 1);
Expand Down
Loading