You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2017/07/31 16:03:21 UTC
[1/2] tinkerpop git commit: Fixed test case that ultimately failed in
`master/` (coerced `BigDecimal` to `Double`).
Repository: tinkerpop
Updated Branches:
refs/heads/tp32 d92dd5d37 -> f02fab9c6
Fixed test case that ultimately failed in `master/` (coerced `BigDecimal` to `Double`).
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3d8c03bb
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3d8c03bb
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3d8c03bb
Branch: refs/heads/tp32
Commit: 3d8c03bb2c3cdd09a44e8b163d62db6d18773490
Parents: a612f5f
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Jul 27 18:07:25 2017 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Jul 27 18:07:25 2017 +0200
----------------------------------------------------------------------
.../traversal/step/sideEffect/GroovySackTest.groovy | 2 +-
.../process/traversal/step/sideEffect/SackTest.java | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3d8c03bb/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy
index d1681cb..725e03e 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy
@@ -76,7 +76,7 @@ public abstract class GroovySackTest {
}
@Override
- Traversal<Vertex, BigDecimal> get_g_withSackX2X_V_sackXdivX_byXconstantXBigDecimal_valueOfX3XXX_sack() {
+ Traversal<Vertex, Double> get_g_withSackX2X_V_sackXdivX_byXconstantX3_0XX_sack() {
TraversalScriptHelper.compute("g.withSack(2).V.sack(div).by(constant(3.0)).sack", g)
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3d8c03bb/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
index 63f3649..7903b07 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
@@ -69,7 +69,7 @@ public abstract class SackTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, BigDecimal> get_g_withSackXBigInteger_TEN_powX1000X_assignX_V_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack();
- public abstract Traversal<Vertex, BigDecimal> get_g_withSackX2X_V_sackXdivX_byXconstantXBigDecimal_valueOfX3XXX_sack();
+ public abstract Traversal<Vertex, Double> get_g_withSackX2X_V_sackXdivX_byXconstantX3_0XX_sack();
@Test
@LoadGraphWith(MODERN)
@@ -161,13 +161,13 @@ public abstract class SackTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- public void g_withSackX2X_V_sackXdivX_byXconstantXBigDecimal_valueOfX3XXX_sack() {
- final Traversal<Vertex, BigDecimal> traversal = get_g_withSackX2X_V_sackXdivX_byXconstantXBigDecimal_valueOfX3XXX_sack();
+ public void g_withSackX2X_V_sackXdivX_byXconstantX3_0XX_sack() {
+ final Traversal<Vertex, Double> traversal = get_g_withSackX2X_V_sackXdivX_byXconstantX3_0XX_sack();
printTraversalForm(traversal);
final double expected = 2.0 / 3.0;
for (int i = 0; i < 6; i++) {
assertTrue(traversal.hasNext());
- assertEquals(expected, traversal.next().doubleValue(), 0.0001);
+ assertEquals(expected, ((Number) traversal.next()).doubleValue(), 0.0001);
}
assertFalse(traversal.hasNext());
}
@@ -223,8 +223,8 @@ public abstract class SackTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, BigDecimal> get_g_withSackX2X_V_sackXdivX_byXconstantXBigDecimal_valueOfX3XXX_sack() {
- return g.withSack(2).V().sack(Operator.div).by(constant(BigDecimal.valueOf(3))).sack();
+ public Traversal<Vertex, Double> get_g_withSackX2X_V_sackXdivX_byXconstantX3_0XX_sack() {
+ return g.withSack(2).V().sack(Operator.div).by(constant(3.0)).sack();
}
}
-}
\ No newline at end of file
+}
[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32
Posted by dk...@apache.org.
Merge branch 'tp31' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f02fab9c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f02fab9c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f02fab9c
Branch: refs/heads/tp32
Commit: f02fab9c6f6c7e8f05efc163c03ee9b3313253f0
Parents: d92dd5d 3d8c03b
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Mon Jul 31 18:02:27 2017 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Mon Jul 31 18:02:27 2017 +0200
----------------------------------------------------------------------
.../traversal/step/sideEffect/GroovySackTest.groovy | 2 +-
.../process/traversal/step/sideEffect/SackTest.java | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f02fab9c/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f02fab9c/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
----------------------------------------------------------------------
diff --cc gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
index 3bde60d,7903b07..7012478
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
@@@ -69,11 -67,9 +69,11 @@@ public abstract class SackTest extends
public abstract Traversal<Vertex, Integer> get_g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack();
+ public abstract Traversal<Vertex, Double> get_g_withBulkXfalseX_withSackX1_sumX_VX1X_localXoutEXknowsX_barrierXnormSackX_inVX_inXknowsX_barrier_sack(final Object v1Id);
+
public abstract Traversal<Vertex, BigDecimal> get_g_withSackXBigInteger_TEN_powX1000X_assignX_V_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack();
- public abstract Traversal<Vertex, BigDecimal> get_g_withSackX2X_V_sackXdivX_byXconstantXBigDecimal_valueOfX3XXX_sack();
+ public abstract Traversal<Vertex, Double> get_g_withSackX2X_V_sackXdivX_byXconstantX3_0XX_sack();
@Test
@LoadGraphWith(MODERN)