You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/05/12 13:14:28 UTC
[08/13] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/tp31'
Merge remote-tracking branch 'origin/tp31'
Conflicts:
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/c0d65b90
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/c0d65b90
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/c0d65b90
Branch: refs/heads/TINKERPOP-1281
Commit: c0d65b90088fe237f59076988373883237b0c900
Parents: 5c3ca93 bf7c981
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu May 12 06:46:08 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu May 12 06:46:08 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../upgrade/release-3.1.x-incubating.asciidoc | 13 ++++
.../tinkerpop/gremlin/AbstractGremlinTest.java | 6 +-
.../traversal/step/sideEffect/SubgraphTest.java | 5 +-
.../tinkerpop/gremlin/structure/EdgeTest.java | 10 +--
.../structure/GraphConstructionTest.java | 2 +-
.../tinkerpop/gremlin/structure/GraphTest.java | 24 +++----
.../structure/GraphWritePerformanceTest.java | 7 +-
.../gremlin/structure/TransactionTest.java | 76 ++++++++++----------
.../gremlin/structure/VertexPropertyTest.java | 36 +++++-----
.../tinkerpop/gremlin/structure/VertexTest.java | 18 ++---
11 files changed, 98 insertions(+), 100 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c0d65b90/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c0d65b90/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
----------------------------------------------------------------------
diff --cc gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
index 9354c18,2a97cd0..32c792c
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
@@@ -255,7 -254,15 +255,11 @@@ public abstract class AbstractGremlinTe
verifyUniqueStepIds(traversal.asAdmin());
}
- public static Consumer<Graph> assertVertexEdgeCounts(final int expectedVertexCount, final int expectedEdgeCount) {
- public boolean isComputerTest() {
- return this.graphComputerClass.isPresent();
- }
-
+ public static void assertVertexEdgeCounts(final Graph graph, final int expectedVertexCount, final int expectedEdgeCount) {
+ getAssertVertexEdgeCounts(expectedVertexCount, expectedEdgeCount).accept(graph);
+ }
+
+ public static Consumer<Graph> getAssertVertexEdgeCounts(final int expectedVertexCount, final int expectedEdgeCount) {
return (g) -> {
assertEquals(expectedVertexCount, IteratorUtils.count(g.vertices()));
assertEquals(expectedEdgeCount, IteratorUtils.count(g.edges()));
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c0d65b90/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java
----------------------------------------------------------------------
diff --cc gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java
index bbbd2fe,ad4b0cc..b01bcb5
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java
@@@ -96,8 -95,8 +95,8 @@@ public abstract class SubgraphTest exte
final Traversal<Vertex, String> traversal = get_g_V_withSideEffectXsgX_repeatXbothEXcreatedX_subgraphXsgX_outVX_timesX5X_name_dedup(subgraph);
printTraversalForm(traversal);
checkResults(Arrays.asList("marko", "josh", "peter"), traversal);
- final Graph subGraph = traversal.asAdmin().getSideEffects().<Graph>get("sg").get();
- assertVertexEdgeCounts(subgraph, 5, 4);
+ final Graph subGraph = traversal.asAdmin().getSideEffects().<Graph>get("sg");
- assertVertexEdgeCounts(5, 4).accept(subGraph);
++ assertVertexEdgeCounts(subGraph, 5, 4);
graphProvider.clear(subgraph, config);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c0d65b90/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphWritePerformanceTest.java
----------------------------------------------------------------------