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/05/06 12:16:07 UTC
[1/2] incubator-tinkerpop git commit: Fixed a badly named test.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 7a98d2c85 -> 09b87ea80
Fixed a badly named test.
The test didn't reflect the exact nature of the traversal being tested. CTR
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/25c94c8e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/25c94c8e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/25c94c8e
Branch: refs/heads/master
Commit: 25c94c8eabd423ab2f8aad881042102e195e5068
Parents: d239a5a
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri May 6 08:13:39 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 6 08:13:39 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.1.x-incubating.asciidoc | 9 +++++++++
.../process/traversal/step/filter/GroovyAndTest.groovy | 2 +-
.../gremlin/process/traversal/step/filter/AndTest.java | 6 +++---
4 files changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/25c94c8e/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 4b282de..88820b3 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/
TinkerPop 3.1.3 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Renamed `AndTest.get_g_V_andXhasXage_gt_27X__outE_count_gt_2X_name` to `get_g_V_andXhasXage_gt_27X__outE_count_gte_2X_name` to match the traversal being tested.
* Fixed a self-loop bug in `StarGraph`.
* Added configuration option for disabling `:remote` timeout with `:remote config timeout none`.
* Added `init-tp-spark.sh` to Gremlin Console binary distribution.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/25c94c8e/docs/src/upgrade/release-3.1.x-incubating.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.1.x-incubating.asciidoc b/docs/src/upgrade/release-3.1.x-incubating.asciidoc
index 4de6dbd..ba192eb 100644
--- a/docs/src/upgrade/release-3.1.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.1.x-incubating.asciidoc
@@ -60,6 +60,15 @@ Upgrading for Providers
IMPORTANT: It is recommended that providers also review all the upgrade instructions specified for users. Many of the
changes there may prove important for the provider's implementation.
+Graph Language Providers
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+AndTest Renaming
+^^^^^^^^^^^^^^^^
+
+The `get_g_V_andXhasXage_gt_27X__outE_count_gt_2X_name` test in `AndTest` was improperly named and did not match the
+nature of the traversal it was providing. It has been renamed to: `get_g_V_andXhasXage_gt_27X__outE_count_gte_2X_name`.
+
Driver Providers
^^^^^^^^^^^^^^^^
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/25c94c8e/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyAndTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyAndTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyAndTest.groovy
index 7567a15..af444a8 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyAndTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyAndTest.groovy
@@ -30,7 +30,7 @@ public abstract class GroovyAndTest {
public static class Traversals extends AndTest {
@Override
- public Traversal<Vertex, String> get_g_V_andXhasXage_gt_27X__outE_count_gt_2X_name() {
+ public Traversal<Vertex, String> get_g_V_andXhasXage_gt_27X__outE_count_gte_2X_name() {
TraversalScriptHelper.compute("g.V.and(has('age',gt(27)), outE().count.is(gte(2l))).name", g)
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/25c94c8e/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AndTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AndTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AndTest.java
index 4a9fae3..863b602 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AndTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AndTest.java
@@ -44,7 +44,7 @@ import static org.junit.Assert.assertEquals;
@RunWith(GremlinProcessRunner.class)
public abstract class AndTest extends AbstractGremlinProcessTest {
- public abstract Traversal<Vertex, String> get_g_V_andXhasXage_gt_27X__outE_count_gt_2X_name();
+ public abstract Traversal<Vertex, String> get_g_V_andXhasXage_gt_27X__outE_count_gte_2X_name();
public abstract Traversal<Vertex, String> get_g_V_andXoutE__hasXlabel_personX_and_hasXage_gte_32XX_name();
@@ -55,7 +55,7 @@ public abstract class AndTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_andXhasXage_gt_27X__outE_count_gt_2X_name() {
- final Traversal<Vertex, String> traversal = get_g_V_andXhasXage_gt_27X__outE_count_gt_2X_name();
+ final Traversal<Vertex, String> traversal = get_g_V_andXhasXage_gt_27X__outE_count_gte_2X_name();
printTraversalForm(traversal);
checkResults(Arrays.asList("marko", "josh"), traversal);
}
@@ -88,7 +88,7 @@ public abstract class AndTest extends AbstractGremlinProcessTest {
public static class Traversals extends AndTest {
@Override
- public Traversal<Vertex, String> get_g_V_andXhasXage_gt_27X__outE_count_gt_2X_name() {
+ public Traversal<Vertex, String> get_g_V_andXhasXage_gt_27X__outE_count_gte_2X_name() {
return g.V().and(has("age", P.gt(27)), outE().count().is(P.gte(2l))).values("name");
}
[2/2] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/tp31'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/tp31'
Conflicts:
gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyAndTest.groovy
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/09b87ea8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/09b87ea8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/09b87ea8
Branch: refs/heads/master
Commit: 09b87ea806ddaa2bb182fb85213e5f171b58fcd1
Parents: 7a98d2c 25c94c8
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri May 6 08:15:53 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 6 08:15:53 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.1.x-incubating.asciidoc | 9 +++++++++
.../process/traversal/step/filter/GroovyAndTest.groovy | 2 +-
.../gremlin/process/traversal/step/filter/AndTest.java | 6 +++---
4 files changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/09b87ea8/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/09b87ea8/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyAndTest.groovy
----------------------------------------------------------------------
diff --cc gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyAndTest.groovy
index 08db43a,af444a8..fb9d356
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyAndTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyAndTest.groovy
@@@ -30,8 -30,8 +30,8 @@@ public abstract class GroovyAndTest
public static class Traversals extends AndTest {
@Override
- public Traversal<Vertex, String> get_g_V_andXhasXage_gt_27X__outE_count_gt_2X_name() {
+ public Traversal<Vertex, String> get_g_V_andXhasXage_gt_27X__outE_count_gte_2X_name() {
- TraversalScriptHelper.compute("g.V.and(has('age',gt(27)), outE().count.is(gte(2l))).name", g)
+ new ScriptTraversal<>(g, "gremlin-groovy", "g.V.and(has('age',gt(27)), outE().count.is(gte(2l))).name")
}
@Override