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/07/22 14:03:34 UTC
[2/2] incubator-tinkerpop git commit: Add test for clear operation on
gephi plugin.
Add test for clear operation on gephi plugin.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/50c26906
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/50c26906
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/50c26906
Branch: refs/heads/gephi
Commit: 50c269068ed0b0e7a262577d28b609544870b4db
Parents: 746b266
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jul 22 08:03:13 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jul 22 08:03:13 2015 -0400
----------------------------------------------------------------------
.../console/plugin/GephiRemoteAcceptor.groovy | 2 +-
.../GephiRemoteAcceptorIntegrateTest.java | 20 ++++++++++++++++++--
2 files changed, 19 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/50c26906/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/plugin/GephiRemoteAcceptor.groovy
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/plugin/GephiRemoteAcceptor.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/plugin/GephiRemoteAcceptor.groovy
index 7f73a64..17b2481 100644
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/plugin/GephiRemoteAcceptor.groovy
+++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/plugin/GephiRemoteAcceptor.groovy
@@ -122,7 +122,7 @@ class GephiRemoteAcceptor implements RemoteAcceptor {
if (!(graphVar instanceof Graph))
throw new RemoteException("Invalid argument to 'visualTraversal' - first parameter must be a Graph instance")
- def gVar = args.size() == 3 ? args[2] : "g"
+ def gVar = args.size() == 3 ? args[2] : "vg"
def theG = GraphTraversalSource.build().with(new GephiTraversalVisualizationStrategy(this)).create(graphVar)
shell.interp.context.setVariable(gVar, theG)
} else
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/50c26906/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/GephiRemoteAcceptorIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/GephiRemoteAcceptorIntegrateTest.java b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/GephiRemoteAcceptorIntegrateTest.java
index 451453b..279530a 100644
--- a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/GephiRemoteAcceptorIntegrateTest.java
+++ b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/GephiRemoteAcceptorIntegrateTest.java
@@ -41,8 +41,10 @@ import java.net.ServerSocket;
import java.util.Arrays;
import java.util.Collections;
+import static com.github.tomakehurst.wiremock.client.WireMock.equalToJson;
import static com.github.tomakehurst.wiremock.client.WireMock.get;
import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.matchingJsonPath;
import static com.github.tomakehurst.wiremock.client.WireMock.post;
import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;
import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
@@ -116,7 +118,7 @@ public class GephiRemoteAcceptorIntegrateTest {
// call iterate() as groovysh isn't rigged to auto-iterate
acceptor.submit(Arrays.asList(
- "g.V(2).in('knows').out('knows').has('age',org.apache.tinkerpop.gremlin.process.traversal.P.gt(30)).outE('created').has('weight',org.apache.tinkerpop.gremlin.process.traversal.P.gt(0.5d)).inV().iterate()"));
+ "vg.V(2).in('knows').out('knows').has('age',org.apache.tinkerpop.gremlin.process.traversal.P.gt(30)).outE('created').has('weight',org.apache.tinkerpop.gremlin.process.traversal.P.gt(0.5d)).inV().iterate()"));
wireMockRule.verify(13, postRequestedFor(urlPathEqualTo("/workspace0")));
}
@@ -150,11 +152,25 @@ public class GephiRemoteAcceptorIntegrateTest {
// call iterate() as groovysh isn't rigged to auto-iterate
acceptor.submit(Arrays.asList(
- "g.V(1).repeat(org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.__().out()).times(2).iterate()"));
+ "vg.V(1).repeat(org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.__().out()).times(2).iterate()"));
wireMockRule.verify(21, postRequestedFor(urlPathEqualTo("/workspace0")));
}
+ @Test
+ public void shouldClearGraph() throws RemoteException {
+ stubFor(post(urlPathEqualTo("/workspace0"))
+ .withQueryParam("format", equalTo("JSON"))
+ .withQueryParam("operation", equalTo("updateGraph"))
+ .withRequestBody(equalToJson("{\"dn\":{\"filter\":\"ALL\"}}"))
+ .willReturn(aResponse()
+ .withStatus(200)));
+
+ acceptor.submit(Arrays.asList("clear"));
+
+ wireMockRule.verify(1, postRequestedFor(urlPathEqualTo("/workspace0")));
+ }
+
private static int pickOpenPort() {
try (final ServerSocket socket = new ServerSocket(0)) {
return socket.getLocalPort();