tinkerpop git commit: bla

2018-03-11 Thread dkuppitz 
Repository: tinkerpop
Updated Branches:
  refs/heads/TRAVIS-TEST 232c9987f -> da252989e


bla


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/da252989
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/da252989
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/da252989

Branch: refs/heads/TRAVIS-TEST
Commit: da252989e2d507d6e77116311789dda643f57ed2
Parents: 232c998
Author: Daniel Kuppitz 
Authored: Sun Mar 11 10:31:32 2018 -0700
Committer: Daniel Kuppitz 
Committed: Sun Mar 11 10:31:32 2018 -0700

--
 .../strategy/decoration/SubgraphStrategyProcessTest.java | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/da252989/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
index 1cc6222..e7b6534 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
@@ -289,12 +289,20 @@ public class SubgraphStrategyProcessTest extends 
AbstractGremlinProcessTest {
 assertEquals(3, 
g.V(convertToVertexId("josh")).bothE().count().next().longValue());
 assertEquals(2, 
sg.V(convertToVertexId("josh")).bothE().count().next().longValue());
 assertEquals(3, 
g.V(convertToVertexId("josh")).both().count().next().longValue());*/
+/*
 final Traversal t = 
sg.V(convertToVertexId("josh")).both().count();
 try {
 assertEquals(2, t.next().longValue());
 } catch (IllegalStateException ex) {
   throw new IllegalStateException(t.toString(), ex);
 }
+*/
+final Traversal t = sg.V(convertToVertexId("josh")).both();
+try {
+assertEquals(2, t.toList().size());
+} catch (IllegalStateException ex) {
+  throw new IllegalStateException(t.toString(), ex);
+}
 // marko not present directly because of vertexCriterion - only 
accessible via vertices in the subgraph
 assertEquals(1, 
g.V(convertToVertexId("marko")).count().next().longValue());
 assertEquals(0, 
sg.V(convertToVertexId("marko")).count().next().longValue());

tinkerpop git commit: bla

2018-03-09 Thread dkuppitz 
Repository: tinkerpop
Updated Branches:
  refs/heads/TRAVIS-TEST 730eb293a -> 232c9987f


bla


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/232c9987
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/232c9987
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/232c9987

Branch: refs/heads/TRAVIS-TEST
Commit: 232c9987f09f1ecd1db13a8df41700efa5bcf1a5
Parents: 730eb29
Author: Daniel Kuppitz 
Authored: Fri Mar 9 20:18:11 2018 -0700
Committer: Daniel Kuppitz 
Committed: Fri Mar 9 20:18:11 2018 -0700

--
 .../strategy/decoration/SubgraphStrategyProcessTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/232c9987/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
index b62396f..1cc6222 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
@@ -267,7 +267,7 @@ public class SubgraphStrategyProcessTest extends 
AbstractGremlinProcessTest {
 final GraphTraversalSource sg = g.withStrategies(strategy);
 
 // three vertices are included in the subgraph
-assertEquals(6, g.V().count().next().longValue());
+/*assertEquals(6, g.V().count().next().longValue());
 assertEquals(3, sg.V().count().next().longValue());
 
 // three edges are explicitly included as we ignore checking of 
adjacent vertices
@@ -288,7 +288,7 @@ public class SubgraphStrategyProcessTest extends 
AbstractGremlinProcessTest {
 
 assertEquals(3, 
g.V(convertToVertexId("josh")).bothE().count().next().longValue());
 assertEquals(2, 
sg.V(convertToVertexId("josh")).bothE().count().next().longValue());
-assertEquals(3, 
g.V(convertToVertexId("josh")).both().count().next().longValue());
+assertEquals(3, 
g.V(convertToVertexId("josh")).both().count().next().longValue());*/
 final Traversal t = 
sg.V(convertToVertexId("josh")).both().count();
 try {
 assertEquals(2, t.next().longValue());

tinkerpop git commit: bla

2018-03-09 Thread dkuppitz 
Repository: tinkerpop
Updated Branches:
  refs/heads/TRAVIS-TEST 531932715 -> 730eb293a


bla


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/730eb293
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/730eb293
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/730eb293

Branch: refs/heads/TRAVIS-TEST
Commit: 730eb293a7e9b4b0dc011ab5cb3d4d31dff6cad4
Parents: 5319327
Author: Daniel Kuppitz 
Authored: Fri Mar 9 11:49:54 2018 -0700
Committer: Daniel Kuppitz 
Committed: Fri Mar 9 11:49:54 2018 -0700

--
 .../strategy/decoration/SubgraphStrategyProcessTest.java | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/730eb293/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
index 2565770..b62396f 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
@@ -289,8 +289,12 @@ public class SubgraphStrategyProcessTest extends 
AbstractGremlinProcessTest {
 assertEquals(3, 
g.V(convertToVertexId("josh")).bothE().count().next().longValue());
 assertEquals(2, 
sg.V(convertToVertexId("josh")).bothE().count().next().longValue());
 assertEquals(3, 
g.V(convertToVertexId("josh")).both().count().next().longValue());
-assertEquals(2, 
sg.V(convertToVertexId("josh")).both().count().next().longValue());
-
+final Traversal t = 
sg.V(convertToVertexId("josh")).both().count();
+try {
+assertEquals(2, t.next().longValue());
+} catch (IllegalStateException ex) {
+  throw new IllegalStateException(t.toString(), ex);
+}
 // marko not present directly because of vertexCriterion - only 
accessible via vertices in the subgraph
 assertEquals(1, 
g.V(convertToVertexId("marko")).count().next().longValue());
 assertEquals(0, 
sg.V(convertToVertexId("marko")).count().next().longValue());

tinkerpop git commit: bla

2018-03-09 Thread dkuppitz 
Repository: tinkerpop
Updated Branches:
  refs/heads/TRAVIS-TEST c8741e562 -> 531932715


bla


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/53193271
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/53193271
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/53193271

Branch: refs/heads/TRAVIS-TEST
Commit: 53193271596caecf3384c278772fc35210df8473
Parents: c8741e5
Author: Daniel Kuppitz 
Authored: Fri Mar 9 11:26:10 2018 -0700
Committer: Daniel Kuppitz 
Committed: Fri Mar 9 11:26:10 2018 -0700

--
 .../process/traversal/strategy/decoration/SubgraphStrategy.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/53193271/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
index 548e14e..241129b 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
@@ -93,8 +93,8 @@ public final class SubgraphStrategy extends 
AbstractTraversalStrategy vertexPredicate;
 vertexPredicate = __.and(
-__.inV().filter(this.vertexCriterion.clone()),
-__.outV().filter(this.vertexCriterion).clone()).asAdmin();
+__.inV().filter(this.vertexCriterion.asAdmin().clone()),
+
__.outV().filter(this.vertexCriterion).asAdmin().clone()).asAdmin();
 
 // if there is a vertex predicate then there is an implied edge 
filter on vertices even if there is no
 // edge predicate provided by the user.