You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by mi...@apache.org on 2023/01/02 16:46:39 UTC
[tinkerpop] branch TINKERPOP-2850 updated: PR cleanup
This is an automated email from the ASF dual-hosted git repository.
mikepersonick pushed a commit to branch TINKERPOP-2850
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/TINKERPOP-2850 by this push:
new 44d956a6ff PR cleanup
44d956a6ff is described below
commit 44d956a6ff23ecc116373baf99b7476eb675a786
Author: Mike Personick <mi...@supersonick.io>
AuthorDate: Mon Jan 2 09:46:31 2023 -0700
PR cleanup
---
.../test/cucumber/feature-steps.js | 2 +-
gremlin-language/src/main/antlr4/Gremlin.g4 | 2 +-
.../process/ProcessLimitedStandardSuite.java | 54 +++++++++++-----------
.../process/traversal/step/map/MergeEdgeTest.java | 35 ++------------
.../tinkergraph/TinkerGraphFeatureTest.java | 5 +-
5 files changed, 35 insertions(+), 63 deletions(-)
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
index dbfa660ec4..6450ec64a6 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
@@ -359,7 +359,7 @@ function toDirection(value) {
return direction[value.toLowerCase()];
}
-function toDirection(value) {
+function toMerge(value) {
return merge[value.toLowerCase()];
}
diff --git a/gremlin-language/src/main/antlr4/Gremlin.g4 b/gremlin-language/src/main/antlr4/Gremlin.g4
index deff18b36c..b202bdeb6d 100644
--- a/gremlin-language/src/main/antlr4/Gremlin.g4
+++ b/gremlin-language/src/main/antlr4/Gremlin.g4
@@ -1383,7 +1383,7 @@ genericLiteral
| traversalToken
| traversalCardinality
| traversalDirection
- | traversalMerge
+ | traversalMerge
| traversalPick
| structureVertex
| genericLiteralCollection
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessLimitedStandardSuite.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessLimitedStandardSuite.java
index 2b32695ff4..31572b37db 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessLimitedStandardSuite.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessLimitedStandardSuite.java
@@ -61,34 +61,34 @@ public class ProcessLimitedStandardSuite extends AbstractGremlinSuite {
*/
private static final Class<?>[] allTests = new Class<?>[]{
- // MergeVertexTest.Traversals.class,
- MergeEdgeTest.Traversals.class
+ MergeVertexTest.Traversals.class,
+ MergeEdgeTest.Traversals.class,
- // MatchTest.CountMatchTraversals.class,
- // MatchTest.GreedyMatchTraversals.class,
- // ProfileTest.Traversals.class,
- // WriteTest.Traversals.class,
- // ExplainTest.Traversals.class,
- // SideEffectTest.Traversals.class,
- // SubgraphTest.Traversals.class,
- // TreeTest.Traversals.class,
- //
- // // compliance
- // ComplexTest.Traversals.class,
- // CoreTraversalTest.class,
- // TraversalInterruptionTest.class,
- //
- // // creations
- // TranslationStrategyProcessTest.class,
- //
- // // decorations
- // ElementIdStrategyProcessTest.class,
- // EventStrategyProcessTest.class,
- // PartitionStrategyProcessTest.class,
- //
- // // optimizations
- // IncidentToAdjacentStrategyProcessTest.class,
- // EarlyLimitStrategyProcessTest.class,
+ MatchTest.CountMatchTraversals.class,
+ MatchTest.GreedyMatchTraversals.class,
+ ProfileTest.Traversals.class,
+ WriteTest.Traversals.class,
+ ExplainTest.Traversals.class,
+ SideEffectTest.Traversals.class,
+ SubgraphTest.Traversals.class,
+ TreeTest.Traversals.class,
+
+ // compliance
+ ComplexTest.Traversals.class,
+ CoreTraversalTest.class,
+ TraversalInterruptionTest.class,
+
+ // creations
+ TranslationStrategyProcessTest.class,
+
+ // decorations
+ ElementIdStrategyProcessTest.class,
+ EventStrategyProcessTest.class,
+ PartitionStrategyProcessTest.class,
+
+ // optimizations
+ IncidentToAdjacentStrategyProcessTest.class,
+ EarlyLimitStrategyProcessTest.class,
};
/**
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeEdgeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeEdgeTest.java
index aa8a58276f..77498a14fa 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeEdgeTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeEdgeTest.java
@@ -36,6 +36,7 @@ import org.junit.runner.RunWith;
import java.util.Map;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.select;
import static org.apache.tinkerpop.gremlin.util.tools.CollectionFactory.asMap;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.StringEndsWith.endsWith;
@@ -62,10 +63,8 @@ public abstract class MergeEdgeTest extends AbstractGremlinTest {
public abstract Traversal<Map<Object,Object>, Edge> get_g_injectXlabel_knows_out_marko_in_vadasX_mergeE();
- public abstract Traversal<Edge, Edge> get_g_mergeE_ifXxX_returnXxX_else_createXyX();
-
public abstract Traversal<Edge, Edge> get_g_mergeE_with_outV_inV_options();
-/*
+
@Test
@FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
public void g_V_mergeEXlabel_self_weight_05X() {
@@ -196,28 +195,6 @@ public abstract class MergeEdgeTest extends AbstractGremlinTest {
assertEquals(1, IteratorUtils.count(g.V(100).out("knows").hasId(101)));
}
- @Test
- @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_USER_SUPPLIED_IDS)
- @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_USER_SUPPLIED_IDS)
- @FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
- public void g_mergeE_ifXxX_returnXxX_else_createXyX() {
- g.addV("person").property(T.id, 1)
- .addV("person").property(T.id, 2)
- .addV("person").property(T.id, 3)
- .addV("person").property(T.id, 4).iterate();
-
- final Traversal<Edge, Edge> traversal = get_g_mergeE_ifXxX_returnXxX_else_createXyX();
- printTraversalForm(traversal);
-
- assertEquals(1, IteratorUtils.count(traversal));
- assertEquals(4, IteratorUtils.count(g.V()));
- assertEquals(1, IteratorUtils.count(g.E()));
- assertEquals(0, IteratorUtils.count(g.E(101)));
- assertEquals(1, IteratorUtils.count(g.E(201)));
- assertEquals(0, IteratorUtils.count(g.V(1).out("knows").hasId(2)));
- assertEquals(1, IteratorUtils.count(g.V(3).out("likes").hasId(4)));
- }
-*/
@Test
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_USER_SUPPLIED_IDS)
@FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
@@ -237,7 +214,7 @@ public abstract class MergeEdgeTest extends AbstractGremlinTest {
@Override
public Traversal<Vertex, Edge> get_g_V_mergeEXlabel_self_weight_05X() {
- return g.V().mergeE(asMap(T.label, "self", "weight", 0.5d));
+ return g.V().as("v").mergeE(asMap(T.label, "self", "weight", 0.5d, Direction.OUT, Merge.outV, Direction.IN, Merge.inV)).option(Merge.outV, select("v")).option(Merge.inV, select("v"));
}
@Override
@@ -284,12 +261,6 @@ public abstract class MergeEdgeTest extends AbstractGremlinTest {
return g.inject((Map<Object,Object>) asMap(T.label, "knows", Direction.IN, new ReferenceVertex(101), Direction.OUT, new ReferenceVertex(100))).mergeE();
}
- @Override
- public Traversal<Edge, Edge> get_g_mergeE_ifXxX_returnXxX_else_createXyX() {
- return g.mergeE(asMap(T.id, 101, T.label, "knows", Direction.OUT, 1, Direction.IN, 2))
- .option(Merge.onCreate, asMap(T.id, 201, T.label, "likes", Direction.OUT, 3, Direction.IN, 4));
- }
-
@Override
public Traversal<Edge,Edge> get_g_mergeE_with_outV_inV_options() {
return g.mergeE(asMap(T.label, "knows", Direction.OUT, Merge.outV, Direction.IN, Merge.inV))
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphFeatureTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphFeatureTest.java
index 73a7e1ebca..e73761aa50 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphFeatureTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphFeatureTest.java
@@ -33,8 +33,9 @@ import org.junit.runner.RunWith;
tags = "not @RemoteOnly and not @GraphComputerOnly and not @AllowNullPropertyValues",
glue = { "org.apache.tinkerpop.gremlin.features" },
objectFactory = TinkerGraphFeatureTest.TinkerGraphGuiceFactory.class,
- features = { "classpath:/org/apache/tinkerpop/gremlin/test/features/map/MergeEdge.feature"
- //"classpath:/org/apache/tinkerpop/gremlin/test/features/map/MergeVertex.feature"
+ features = { "classpath:/org/apache/tinkerpop/gremlin/test/features"
+ // "classpath:/org/apache/tinkerpop/gremlin/test/features/map/MergeEdge.feature"
+ // "classpath:/org/apache/tinkerpop/gremlin/test/features/map/MergeVertex.feature"
},
plugin = {"progress", "junit:target/cucumber.xml"})
public class TinkerGraphFeatureTest {