forked from apache/tinkerpop
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
TINKERPOP-2946 Detect ordering issues in Gherkin tests
This commit addresses part 1. of TINKERPOP-2946 by introducing TinkerShuffleGraph and running feature tests against an embedded instance of this graph. TinkerShuffleGraph is derived from TinkerGraph and intended for test purposes only. It's only differentiation from TinkerGraph is that it will returned shuffled results when getting any of the following: vertices from the graph, edges from the graph, vertices from a vertex, edges from a vertex, vertices from an edge, properties from a vertex, properties from an edge, and properties from a VertexProperty
- Loading branch information
1 parent
c456e94
commit 782c175
Showing
12 changed files
with
625 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
52 changes: 52 additions & 0 deletions
52
...src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerShuffleGraphFeatureTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.tinkerpop.gremlin.tinkergraph; | ||
|
|
||
| import com.google.inject.AbstractModule; | ||
| import com.google.inject.Guice; | ||
| import com.google.inject.Stage; | ||
| import io.cucumber.guice.CucumberModules; | ||
| import io.cucumber.junit.Cucumber; | ||
| import io.cucumber.junit.CucumberOptions; | ||
| import org.apache.tinkerpop.gremlin.features.AbstractGuiceFactory; | ||
| import org.apache.tinkerpop.gremlin.features.World; | ||
| import org.junit.runner.RunWith; | ||
|
|
||
| @RunWith(Cucumber.class) | ||
| @CucumberOptions( | ||
| tags = "not @RemoteOnly and not @GraphComputerOnly and not @AllowNullPropertyValues", | ||
| glue = { "org.apache.tinkerpop.gremlin.features" }, | ||
| objectFactory = TinkerShuffleGraphFeatureTest.TinkerShuffleGraphGuiceFactory.class, | ||
| features = { "classpath:/org/apache/tinkerpop/gremlin/test/features" }, | ||
| plugin = {"progress", "junit:target/cucumber.xml"}) | ||
| public class TinkerShuffleGraphFeatureTest { | ||
|
|
||
| public static class TinkerShuffleGraphGuiceFactory extends AbstractGuiceFactory { | ||
| public TinkerShuffleGraphGuiceFactory() { | ||
| super(Guice.createInjector(Stage.PRODUCTION, CucumberModules.createScenarioModule(), new ServiceModule())); | ||
| } | ||
| } | ||
|
|
||
| public static final class ServiceModule extends AbstractModule { | ||
| @Override | ||
| protected void configure() { | ||
| bind(World.class).to(TinkerWorld.TinkerShuffleGraphWorld.class); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
...n/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerShuffleEdge.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.tinkerpop.gremlin.tinkergraph.structure; | ||
|
|
||
| import org.apache.tinkerpop.gremlin.structure.Direction; | ||
| import org.apache.tinkerpop.gremlin.structure.Property; | ||
| import org.apache.tinkerpop.gremlin.structure.Vertex; | ||
|
|
||
| import java.util.Iterator; | ||
|
|
||
| import static org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerShuffleGraph.shuffleIterator; | ||
|
|
||
| /** | ||
| * @author Cole Greer (https://github.com/Cole-Greer) | ||
| */ | ||
| public final class TinkerShuffleEdge extends TinkerEdge { | ||
| protected TinkerShuffleEdge(final Object id, final Vertex outVertex, final String label, final Vertex inVertex) { | ||
| this(id, outVertex, label, inVertex, 0); | ||
| } | ||
|
|
||
| protected TinkerShuffleEdge(final Object id, final Vertex outVertex, final String label, final Vertex inVertex, final long currentVersion) { | ||
| super(id, outVertex, label, inVertex, currentVersion); | ||
| } | ||
|
|
||
| @Override | ||
| public Iterator<Vertex> vertices(final Direction direction) { | ||
| return shuffleIterator(super.vertices(direction)); | ||
| } | ||
|
|
||
| @Override | ||
| public <V> Iterator<Property<V>> properties(final String... propertyKeys) { | ||
| return shuffleIterator(super.properties(propertyKeys)); | ||
| } | ||
| } |
86 changes: 86 additions & 0 deletions
86
.../src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerShuffleGraph.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.tinkerpop.gremlin.tinkergraph.structure; | ||
|
|
||
| import org.apache.commons.collections.IteratorUtils; | ||
| import org.apache.commons.configuration2.BaseConfiguration; | ||
| import org.apache.commons.configuration2.Configuration; | ||
| import org.apache.tinkerpop.gremlin.structure.Edge; | ||
| import org.apache.tinkerpop.gremlin.structure.Graph; | ||
| import org.apache.tinkerpop.gremlin.structure.Vertex; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.Iterator; | ||
| import java.util.List; | ||
|
|
||
| /** | ||
| * @author Cole Greer (https://github.com/Cole-Greer) | ||
| */ | ||
| public class TinkerShuffleGraph extends TinkerGraph { | ||
|
|
||
| private static final Configuration EMPTY_CONFIGURATION = new BaseConfiguration() {{ | ||
| this.setProperty(Graph.GRAPH, TinkerShuffleGraph.class.getName()); | ||
| }}; | ||
|
|
||
| private TinkerShuffleGraph(Configuration configuration) { | ||
| super(configuration); | ||
| } | ||
|
|
||
| public static TinkerShuffleGraph open() { | ||
| return open(EMPTY_CONFIGURATION); | ||
| } | ||
|
|
||
| public static TinkerShuffleGraph open(Configuration configuration) { | ||
| return new TinkerShuffleGraph(configuration); | ||
| } | ||
|
|
||
| @Override | ||
| public Iterator<Vertex> vertices(final Object... vertexIds) { | ||
| return shuffleIterator(super.vertices(vertexIds)); | ||
| } | ||
|
|
||
| @Override | ||
| public Iterator<Edge> edges(final Object... edgeIds) { | ||
| return shuffleIterator(super.edges(edgeIds)); | ||
| } | ||
|
|
||
| @Override | ||
| protected TinkerVertex createTinkerVertex(final Object id, final String label, final AbstractTinkerGraph graph) { | ||
| return new TinkerShuffleVertex(id, label, graph); | ||
| } | ||
|
|
||
| protected TinkerVertex createTinkerVertex(final Object id, final String label, final AbstractTinkerGraph graph, final long currentVersion) { | ||
| return new TinkerShuffleVertex(id, label, graph, currentVersion); | ||
| } | ||
|
|
||
| protected TinkerEdge createTinkerEdge(final Object id, final Vertex outVertex, final String label, final Vertex inVertex) { | ||
| return new TinkerShuffleEdge(id, outVertex, label, inVertex); | ||
| } | ||
|
|
||
| protected TinkerEdge createTinkerEdge(final Object id, final Vertex outVertex, final String label, final Vertex inVertex, final long currentVersion) { | ||
| return new TinkerShuffleEdge(id, outVertex, label, inVertex, currentVersion); | ||
| } | ||
|
|
||
| static Iterator shuffleIterator(Iterator iter) { | ||
| List list = IteratorUtils.toList(iter); | ||
| Collections.shuffle(list); | ||
| return list.iterator(); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.