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 2015/03/11 18:55:28 UTC

incubator-tinkerpop git commit: Get gremlin-server tests compiling after GraphTraversalContext work.

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/newapi 1209663db -> 95ec36787


Get gremlin-server tests compiling after GraphTraversalContext work.


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

Branch: refs/heads/newapi
Commit: 95ec3678741700f152002d22cb73fb12f401b1d4
Parents: 1209663
Author: Stephen Mallette <sp...@apache.org>
Authored: Wed Mar 11 13:55:12 2015 -0400
Committer: Stephen Mallette <sp...@apache.org>
Committed: Wed Mar 11 13:55:12 2015 -0400

----------------------------------------------------------------------
 .../apache/tinkerpop/gremlin/server/GraphsTest.java   |  2 ++
 .../gremlin/server/GremlinDriverIntegrateTest.java    | 14 +++++++-------
 .../server/GremlinServerHttpIntegrateTest.java        |  4 ++--
 .../gremlin/server/GremlinServerIntegrateTest.java    |  2 +-
 .../server/GremlinTraversalPerformanceTest.java       | 10 +++++-----
 5 files changed, 17 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/95ec3678/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GraphsTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GraphsTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GraphsTest.java
index 0e06345..6400d2a 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GraphsTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GraphsTest.java
@@ -32,9 +32,11 @@ import static org.junit.Assert.assertTrue;
  * @author Stephen Mallette (http://stephen.genoprime.com)
  */
 public class GraphsTest {
+
     @Test
     @Ignore("Does not work on marko's local machine for some reason -- good for stephen and travis-ci")
     public void shouldReturnGraphs() {
+        // todo: why doesn't this test work?
         final Settings settings = Settings.read(GraphsTest.class.getResourceAsStream("gremlin-server-integration.yaml"));
         final Graphs graphs = new Graphs(settings);
         final Map<String, Graph> m = graphs.getGraphs();

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/95ec3678/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
index 3d9e258..0cc1c9b 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
@@ -173,7 +173,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
         final Cluster cluster = Cluster.open();
         final Client client = cluster.connect();
 
-        final ResultSet results = client.submit("g.V().remove()");
+        final ResultSet results = client.submit("h=g.traversal();h.V().remove()");
         assertNull(results.all().get().get(0).getObject());
 
         cluster.close();
@@ -338,17 +338,17 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
         final Client client = cluster.connect(name.getMethodName());
 
         final Vertex vertexBeforeTx = client.submit("v=g.addVertex(\"name\",\"stephen\")").all().get().get(0).getVertex();
-        assertEquals("stephen", vertexBeforeTx.iterators().valueIterator("name").next());
+        assertEquals("stephen", vertexBeforeTx.values("name").next());
 
-        final Vertex vertexFromV = client.submit("g.V().next()").all().get().get(0).getVertex();
-        assertEquals("stephen", vertexFromV.iterators().valueIterator("name").next());
+        final Vertex vertexFromV = client.submit("g.vertices().next()").all().get().get(0).getVertex();
+        assertEquals("stephen", vertexFromV.values("name").next());
 
         final Vertex vertexFromBinding = client.submit("v").all().get().get(0).getVertex();
-        assertEquals("stephen", vertexFromBinding.iterators().valueIterator("name").next());
+        assertEquals("stephen", vertexFromBinding.values("name").next());
 
         final Vertex vertexAfterTx = client.submit("v.property(\"color\",\"blue\"); g.tx().commit(); v").all().get().get(0).getVertex();
-        assertEquals("stephen", vertexAfterTx.iterators().valueIterator("name").next());
-        assertEquals("blue", vertexAfterTx.iterators().valueIterator("color").next());
+        assertEquals("stephen", vertexAfterTx.values("name").next());
+        assertEquals("blue", vertexAfterTx.values("color").next());
 
         cluster.close();
     }

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/95ec3678/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
index b560bf3..4062f0d 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
@@ -81,7 +81,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
     @Test
     public void should200OnGETWithGremlinQueryStringArgumentWithIteratorResult() throws Exception {
         final CloseableHttpClient httpclient = HttpClients.createDefault();
-        final HttpGet httpget = new HttpGet("http://localhost:8182?gremlin=g.V()");
+        final HttpGet httpget = new HttpGet("http://localhost:8182?gremlin=g.traversal().V()");
 
         try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
             assertEquals(200, response.getStatusLine().getStatusCode());
@@ -191,7 +191,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
         final CloseableHttpClient httpclient = HttpClients.createDefault();
         final HttpPost httppost = new HttpPost("http://localhost:8182");
         httppost.addHeader("Content-Type", "application/json");
-        httppost.setEntity(new StringEntity("{\"gremlin\":\"g.V()\"}", Consts.UTF_8));
+        httppost.setEntity(new StringEntity("{\"gremlin\":\"h=g.traversal();h.V()\"}", Consts.UTF_8));
 
         try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
             assertEquals(200, response.getStatusLine().getStatusCode());

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/95ec3678/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
index 3cb59de..306f6d3 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
@@ -188,7 +188,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
 
         try {
             // this should return "nothing" - there should be no exception
-            assertNull(client.submit("g.V().has('name','kadfjaldjfla')").one());
+            assertNull(client.submit("h=g.traversal();h.V().has('name','kadfjaldjfla')").one());
         } finally {
             cluster.close();
         }

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/95ec3678/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinTraversalPerformanceTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinTraversalPerformanceTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinTraversalPerformanceTest.java
index a29208d..7c88f4f 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinTraversalPerformanceTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinTraversalPerformanceTest.java
@@ -90,11 +90,11 @@ public class GremlinTraversalPerformanceTest extends AbstractGremlinServerPerfor
         final Map<String, Object> params = new HashMap<>();
         params.put("x", 16384l);
 
-        final CompletableFuture<ResultSet> future1 = client.get().submitAsync("g.V(x).out().out().next(512)", params);
-        final CompletableFuture<ResultSet> future2 = client.get().submitAsync("g.V(x).out().next(7)", params);
-        final CompletableFuture<ResultSet> future3 = client.get().submitAsync("g.V(16384l).out().out().next(10)");
-        final CompletableFuture<ResultSet> future4 = client.get().submitAsync("g.V(16432l).out().out().next(10)");
-        final CompletableFuture<ResultSet> future5 = client.get().submitAsync("g.V(14l).out().next(1)");
+        final CompletableFuture<ResultSet> future1 = client.get().submitAsync("h=g.traversal();h.V(x).out().out().next(512)", params);
+        final CompletableFuture<ResultSet> future2 = client.get().submitAsync("h=g.traversal();h.V(x).out().next(7)", params);
+        final CompletableFuture<ResultSet> future3 = client.get().submitAsync("h=g.traversal();h.V(16384l).out().out().next(10)");
+        final CompletableFuture<ResultSet> future4 = client.get().submitAsync("h=g.traversal();h.V(16432l).out().out().next(10)");
+        final CompletableFuture<ResultSet> future5 = client.get().submitAsync("h=g.traversal();h.V(14l).out().next(1)");
 
         assertEquals(512, future1.get().stream().count());
         assertEquals(7, future2.get().stream().count());