TINKERPOP-1976 Removed some OptOuts on RemoteGraph Some tests needed to use the "process" runner apparently
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f7ccb67b Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f7ccb67b Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f7ccb67b Branch: refs/heads/TINKERPOP-1976 Commit: f7ccb67b13547edba2986f53993d862576db59c4 Parents: 37476a2 Author: Stephen Mallette <sp...@genoprime.com> Authored: Thu Aug 2 19:44:50 2018 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Thu Aug 9 07:28:09 2018 -0400 ---------------------------------------------------------------------- .../tinkerpop/gremlin/process/remote/RemoteGraph.java | 13 ------------- .../process/traversal/step/map/PeerPressureTest.java | 6 ++++-- .../decoration/TranslationStrategyProcessTest.java | 3 +++ 3 files changed, 7 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f7ccb67b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java index 4b23475..1ea7d42 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java @@ -24,7 +24,6 @@ import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; import org.apache.tinkerpop.gremlin.process.remote.traversal.strategy.decoration.RemoteStrategy; import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource; import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies; -import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.Transaction; @@ -53,18 +52,6 @@ import java.util.Iterator; method = "g_V_hasXnoX_groupCountXaX_capXaX", reason = "This test asserts an empty side-effect which reflects as a null rather than an \"empty\" and thus doesn't assert") @Graph.OptOut( - test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.PeerPressureTest", - method = "*", - reason = "https://issues.apache.org/jira/browse/TINKERPOP-1976";) -@Graph.OptOut( - test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.PageRankTest", - method = "*", - reason = "https://issues.apache.org/jira/browse/TINKERPOP-1976";) -@Graph.OptOut( - test = "org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.TranslationStrategyProcessTest", - method = "*", - reason = "hmmmm") -@Graph.OptOut( test = "org.apache.tinkerpop.gremlin.process.traversal.CoreTraversalTest", method = "*", reason = "The test suite does not support profiling or lambdas and for groovy tests: 'Could not locate method: GraphTraversalSource.withStrategies([{traversalCategory=interface org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy$DecorationStrategy}])'") http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f7ccb67b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PeerPressureTest.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PeerPressureTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PeerPressureTest.java index 996be6d..67ed267 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PeerPressureTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PeerPressureTest.java @@ -22,11 +22,13 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.map; import org.apache.tinkerpop.gremlin.LoadGraphWith; import org.apache.tinkerpop.gremlin.TestHelper; import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.GremlinProcessRunner; import org.apache.tinkerpop.gremlin.process.computer.clustering.peerpressure.PeerPressureVertexProgram; import org.apache.tinkerpop.gremlin.process.traversal.Traversal; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; +import org.junit.runner.RunWith; import java.util.HashMap; import java.util.HashSet; @@ -42,6 +44,7 @@ import static org.junit.Assert.assertTrue; /** * @author Marko A. Rodriguez (http://markorodriguez.com) */ +@RunWith(GremlinProcessRunner.class) public abstract class PeerPressureTest extends AbstractGremlinProcessTest { public abstract Traversal<Vertex, Vertex> get_g_V_peerPressure(); @@ -99,8 +102,7 @@ public abstract class PeerPressureTest extends AbstractGremlinProcessTest { assertTrue(ids.contains(convertToVertexId("josh"))); assertTrue(ids.contains(convertToVertexId("peter"))); } - - + public static class Traversals extends PeerPressureTest { @Override http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f7ccb67b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/TranslationStrategyProcessTest.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/TranslationStrategyProcessTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/TranslationStrategyProcessTest.java index a280a9c..0b81cce 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/TranslationStrategyProcessTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/TranslationStrategyProcessTest.java @@ -21,9 +21,11 @@ package org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration; import org.apache.tinkerpop.gremlin.LoadGraphWith; import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; +import org.apache.tinkerpop.gremlin.process.GremlinProcessRunner; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__; import org.junit.Test; +import org.junit.runner.RunWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,6 +35,7 @@ import static org.junit.Assert.assertEquals; /** * @author Marko A. Rodriguez (http://markorodriguez.com) */ +@RunWith(GremlinProcessRunner.class) public class TranslationStrategyProcessTest extends AbstractGremlinProcessTest { private static final Logger logger = LoggerFactory.getLogger(TranslationStrategyProcessTest.class);
