You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2016/09/20 10:56:38 UTC
[1/4] tinkerpop git commit: Added tests for dedup(Scope,
String...) overload in DedupTest
Repository: tinkerpop
Updated Branches:
refs/heads/master 54ed33df5 -> 554bbb82e
Added tests for dedup(Scope,String...) overload in DedupTest
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9666bb3d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9666bb3d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9666bb3d
Branch: refs/heads/master
Commit: 9666bb3dc2f593b66095b3e764678ccfc35630a5
Parents: 4293eb3
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Sep 16 16:17:33 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Sep 16 16:17:33 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../step/filter/GroovyDedupTest.groovy | 10 ++++
.../traversal/step/filter/DedupTest.java | 48 ++++++++++++++++++++
3 files changed, 59 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9666bb3d/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 7c4178d..92aff5a 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -27,6 +27,7 @@ TinkerPop 3.2.3 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Fixed a bug in Gremlin-Python `P` where predicates reversed the order of the predicates.
+* Added tests to `DedupTest` for the `dedup(Scope, String...)` overload.
* Fixed a naming bug in Gremlin-Python where `P._and` and `P._or` should be `P.and_` and `P.or_`. (*breaking*)
* `where()` predicate-based steps now support `by()`-modulation.
* `TraversalRing` returns a `null` if it does not contain traversals (previously `IdentityTraversal`).
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9666bb3d/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyDedupTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyDedupTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyDedupTest.groovy
index 86c3e15..cfad92b 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyDedupTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyDedupTest.groovy
@@ -19,6 +19,7 @@
package org.apache.tinkerpop.gremlin.process.traversal.step.filter
import org.apache.tinkerpop.gremlin.process.traversal.Path
+import org.apache.tinkerpop.gremlin.process.traversal.Scope
import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.util.ScriptTraversal
import org.apache.tinkerpop.gremlin.structure.Vertex
@@ -30,6 +31,15 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
public abstract class GroovyDedupTest {
public static class Traversals extends DedupTest {
+ @Override
+ public Traversal<Vertex, String> get_g_V_out_in_valuesXnameX_fold_dedupXlocalX_unfold() {
+ return new ScriptTraversal<>(g, "gremlin-groovy", "g.V.out.in.values('name').fold.dedup(Scope.local).unfold;");
+ }
+
+ @Override
+ public Traversal<Vertex, Map<String, String>> get_g_V_out_in_asXxX_in_asXyX_selectXx_yX_byXnameX_fold_dedupXlocal_x_yX_unfold() {
+ return new ScriptTraversal<>(g, "gremlin-groovy", "g.V.out.as('x').in.as('y').select('x','y').by('name').fold.dedup(Scope.local,'x','y').unfold");
+ }
@Override
public Traversal<Vertex, String> get_g_V_both_dedup_name() {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9666bb3d/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupTest.java
index fe1db71..a0cc6e9 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupTest.java
@@ -23,6 +23,7 @@ import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
import org.apache.tinkerpop.gremlin.process.GremlinProcessRunner;
import org.apache.tinkerpop.gremlin.process.traversal.Order;
import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.structure.T;
@@ -38,6 +39,9 @@ import java.util.Set;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.bothE;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.isIn;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -73,6 +77,40 @@ public abstract class DedupTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, String> get_g_V_both_both_dedup_byXoutE_countX_name();
+ public abstract Traversal<Vertex, String> get_g_V_out_in_valuesXnameX_fold_dedupXlocalX_unfold();
+
+ public abstract Traversal<Vertex, Map<String, String>> get_g_V_out_in_asXxX_in_asXyX_selectXx_yX_byXnameX_fold_dedupXlocal_x_yX_unfold();
+
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_V_out_in_valuesXnameX_fold_dedupXlocalX_unfold() {
+ final Traversal<Vertex, String> traversal = get_g_V_out_in_valuesXnameX_fold_dedupXlocalX_unfold();
+ final List<String> names = traversal.toList();
+ assertEquals(3, names.size());
+ assertThat(names, containsInAnyOrder("marko", "josh", "peter"));
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_V_out_in_asXxX_in_asXyX_selectXx_yX_byXnameX_fold_dedupXlocal_x_yX_unfold() {
+ final Traversal<Vertex, Map<String, String>> traversal = get_g_V_out_in_asXxX_in_asXyX_selectXx_yX_byXnameX_fold_dedupXlocal_x_yX_unfold();
+ final List<Map<String,String>> names = traversal.toList();
+ assertEquals(6, names.size());
+ for (final Map<String, String> m : names) {
+ if (m.get("x").equals("lop")) {
+ assertThat(m.get("y"), isIn(Arrays.asList("marko", "josh", "peter")));
+ } else if (m.get("x").equals("vadas")) {
+ assertEquals("marko", m.get("y"));
+ } else if (m.get("x").equals("josh")) {
+ assertEquals("marko", m.get("y"));
+ } else if (m.get("x").equals("ripple")) {
+ assertEquals("josh", m.get("y"));
+ } else {
+ fail("A value was returned that was not expected in the result: " + m.get("x"));
+ }
+ }
+ }
+
@Test
@LoadGraphWith(MODERN)
public void g_V_both_dedup_name() {
@@ -241,6 +279,16 @@ public abstract class DedupTest extends AbstractGremlinProcessTest {
public static class Traversals extends DedupTest {
@Override
+ public Traversal<Vertex, String> get_g_V_out_in_valuesXnameX_fold_dedupXlocalX_unfold() {
+ return g.V().out().in().values("name").fold().dedup(Scope.local).unfold();
+ }
+
+ @Override
+ public Traversal<Vertex, Map<String, String>> get_g_V_out_in_asXxX_in_asXyX_selectXx_yX_byXnameX_fold_dedupXlocal_x_yX_unfold() {
+ return g.V().out().as("x").in().as("y").select("x","y").by("name").fold().dedup(Scope.local,"x","y").unfold();
+ }
+
+ @Override
public Traversal<Vertex, String> get_g_V_both_dedup_name() {
return g.V().both().dedup().values("name");
}
[4/4] tinkerpop git commit: Merge branch 'TINKERPOP-1437'
Posted by sp...@apache.org.
Merge branch 'TINKERPOP-1437'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/554bbb82
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/554bbb82
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/554bbb82
Branch: refs/heads/master
Commit: 554bbb82ee565ca0e170e6a5fa03e70a27e1d9e9
Parents: 54ed33d f931111
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Sep 20 06:56:21 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Sep 20 06:56:21 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../step/filter/GroovyDedupTest.groovy | 10 +++++
.../process/AbstractGremlinProcessTest.java | 16 ++++----
.../traversal/step/filter/DedupTest.java | 40 ++++++++++++++++++++
4 files changed, 60 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[2/4] tinkerpop git commit: Used assertThat for better output on
failure.
Posted by sp...@apache.org.
Used assertThat for better output on failure.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c621154e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c621154e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c621154e
Branch: refs/heads/master
Commit: c621154e2e1f1c7163266148d5591700555a5ac1
Parents: 9666bb3
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Sat Sep 17 03:18:15 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Sat Sep 17 03:18:15 2016 -0400
----------------------------------------------------------------------
.../gremlin/process/AbstractGremlinProcessTest.java | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c621154e/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
index 201822c..1e37478 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
@@ -36,6 +36,8 @@ import java.util.Map;
import java.util.UUID;
import java.util.stream.Collectors;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -92,13 +94,13 @@ public abstract class AbstractGremlinProcessTest extends AbstractGremlinTest {
counter++;
final String key = (String) keysClasses[i];
final Class clazz = (Class) keysClasses[i + 1];
- assertTrue(sideEffects.keys().contains(key));
- assertTrue(sideEffects.exists(key));
+ assertThat(sideEffects.keys().contains(key), is(true));
+ assertThat(sideEffects.exists(key), is(true));
assertEquals(clazz, sideEffects.get((String) keysClasses[i]).getClass());
- assertFalse(sideEffects.exists(UUID.randomUUID().toString()));
+ assertThat(sideEffects.exists(UUID.randomUUID().toString()), is(false));
}
assertEquals(sideEffects.keys().size(), counter);
- assertFalse(sideEffects.keys().contains(UUID.randomUUID().toString()));
+ assertThat(sideEffects.keys().contains(UUID.randomUUID().toString()), is(false));
assertEquals(StringFactory.traversalSideEffectsString(sideEffects), sideEffects.toString());
}
@@ -113,9 +115,9 @@ public abstract class AbstractGremlinProcessTest extends AbstractGremlinTest {
for (T t : results) {
if (t instanceof Map) {
- assertTrue("Checking map result existence: " + t, expectedResults.stream().filter(e -> e instanceof Map).filter(e -> internalCheckMap((Map) e, (Map) t)).findAny().isPresent());
+ assertThat("Checking map result existence: " + t, expectedResults.stream().filter(e -> e instanceof Map).filter(e -> internalCheckMap((Map) e, (Map) t)).findAny().isPresent(), is(true));
} else {
- assertTrue("Checking result existence: " + t, expectedResults.contains(t));
+ assertThat("Checking result existence: " + t, expectedResults.contains(t), is(true));
}
}
final Map<T, Long> expectedResultsCount = new HashMap<>();
@@ -124,7 +126,7 @@ public abstract class AbstractGremlinProcessTest extends AbstractGremlinTest {
expectedResults.forEach(t -> MapHelper.incr(expectedResultsCount, t, 1l));
results.forEach(t -> MapHelper.incr(resultsCount, t, 1l));
expectedResultsCount.forEach((k, v) -> assertEquals("Checking result group counts", v, resultsCount.get(k)));
- assertFalse(traversal.hasNext());
+ assertThat(traversal.hasNext(), is(false));
}
public static <T> void checkResults(final Map<T, Long> expectedResults, final Traversal<?, T> traversal) {
[3/4] tinkerpop git commit: Standardize test assertions a bit for
DedupTest
Posted by sp...@apache.org.
Standardize test assertions a bit for DedupTest
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f9311114
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f9311114
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f9311114
Branch: refs/heads/master
Commit: f9311114108591d7e61a4b0560273c1c092aefef
Parents: c621154
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Sat Sep 17 04:01:34 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Sat Sep 17 04:01:34 2016 -0400
----------------------------------------------------------------------
.../step/filter/GroovyDedupTest.groovy | 4 +--
.../traversal/step/filter/DedupTest.java | 36 ++++++++------------
2 files changed, 16 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f9311114/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyDedupTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyDedupTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyDedupTest.groovy
index cfad92b..d03f526 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyDedupTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyDedupTest.groovy
@@ -33,11 +33,11 @@ public abstract class GroovyDedupTest {
public static class Traversals extends DedupTest {
@Override
public Traversal<Vertex, String> get_g_V_out_in_valuesXnameX_fold_dedupXlocalX_unfold() {
- return new ScriptTraversal<>(g, "gremlin-groovy", "g.V.out.in.values('name').fold.dedup(Scope.local).unfold;");
+ return new ScriptTraversal<>(g, "gremlin-groovy", "g.V.out.in.values('name').fold.dedup(Scope.local).unfold");
}
@Override
- public Traversal<Vertex, Map<String, String>> get_g_V_out_in_asXxX_in_asXyX_selectXx_yX_byXnameX_fold_dedupXlocal_x_yX_unfold() {
+ public Traversal<Vertex, Map<String, String>> get_g_V_out_asXxX_in_asXyX_selectXx_yX_byXnameX_fold_dedupXlocal_x_yX_unfold() {
return new ScriptTraversal<>(g, "gremlin-groovy", "g.V.out.as('x').in.as('y').select('x','y').by('name').fold.dedup(Scope.local,'x','y').unfold");
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f9311114/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupTest.java
index a0cc6e9..fa55c8e 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupTest.java
@@ -79,36 +79,28 @@ public abstract class DedupTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, String> get_g_V_out_in_valuesXnameX_fold_dedupXlocalX_unfold();
- public abstract Traversal<Vertex, Map<String, String>> get_g_V_out_in_asXxX_in_asXyX_selectXx_yX_byXnameX_fold_dedupXlocal_x_yX_unfold();
+ public abstract Traversal<Vertex, Map<String, String>> get_g_V_out_asXxX_in_asXyX_selectXx_yX_byXnameX_fold_dedupXlocal_x_yX_unfold();
@Test
@LoadGraphWith(MODERN)
public void g_V_out_in_valuesXnameX_fold_dedupXlocalX_unfold() {
final Traversal<Vertex, String> traversal = get_g_V_out_in_valuesXnameX_fold_dedupXlocalX_unfold();
- final List<String> names = traversal.toList();
- assertEquals(3, names.size());
- assertThat(names, containsInAnyOrder("marko", "josh", "peter"));
+ printTraversalForm(traversal);
+ checkResults(Arrays.asList("marko", "josh", "peter"), traversal);
}
@Test
@LoadGraphWith(MODERN)
- public void g_V_out_in_asXxX_in_asXyX_selectXx_yX_byXnameX_fold_dedupXlocal_x_yX_unfold() {
- final Traversal<Vertex, Map<String, String>> traversal = get_g_V_out_in_asXxX_in_asXyX_selectXx_yX_byXnameX_fold_dedupXlocal_x_yX_unfold();
- final List<Map<String,String>> names = traversal.toList();
- assertEquals(6, names.size());
- for (final Map<String, String> m : names) {
- if (m.get("x").equals("lop")) {
- assertThat(m.get("y"), isIn(Arrays.asList("marko", "josh", "peter")));
- } else if (m.get("x").equals("vadas")) {
- assertEquals("marko", m.get("y"));
- } else if (m.get("x").equals("josh")) {
- assertEquals("marko", m.get("y"));
- } else if (m.get("x").equals("ripple")) {
- assertEquals("josh", m.get("y"));
- } else {
- fail("A value was returned that was not expected in the result: " + m.get("x"));
- }
- }
+ public void g_V_out_asXxX_in_asXyX_selectXx_yX_byXnameX_fold_dedupXlocal_x_yX_unfold() {
+ final Traversal<Vertex, Map<String, String>> traversal = get_g_V_out_asXxX_in_asXyX_selectXx_yX_byXnameX_fold_dedupXlocal_x_yX_unfold();
+ printTraversalForm(traversal);
+ checkResults(makeMapList(2,
+ "x", "lop", "y", "marko",
+ "x", "lop", "y", "josh",
+ "x", "lop", "y", "peter",
+ "x", "vadas", "y", "marko",
+ "x", "josh", "y", "marko",
+ "x", "ripple", "y", "josh"), traversal);
}
@Test
@@ -284,7 +276,7 @@ public abstract class DedupTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, Map<String, String>> get_g_V_out_in_asXxX_in_asXyX_selectXx_yX_byXnameX_fold_dedupXlocal_x_yX_unfold() {
+ public Traversal<Vertex, Map<String, String>> get_g_V_out_asXxX_in_asXyX_selectXx_yX_byXnameX_fold_dedupXlocal_x_yX_unfold() {
return g.V().out().as("x").in().as("y").select("x","y").by("name").fold().dedup(Scope.local,"x","y").unfold();
}