[12/15] tinkerpop git commit: TINKERPOP-1612 Reconfigure some tests for new plugins.
TINKERPOP-1612 Reconfigure some tests for new plugins.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f40c0287
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f40c0287
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f40c0287
Branch: refs/heads/TINKERPOP-1612-wip
Commit: f40c02876fe1e01d5db5f22600ee6b399648d574
Parents: 2bfe41f
Author: Stephen Mallette
Authored: Wed Jan 25 12:34:09 2017 -0500
Committer: Stephen Mallette
Committed: Thu Jan 26 14:55:45 2017 -0500
--
.../python/driver/gremlin-server-modern-secure-py.yaml| 3 +--
.../tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java | 7 +--
.../gremlin/server/GremlinResultSetIntegrateTest.java | 5 -
.../gremlin/server/GremlinServerHttpIntegrateTest.java| 5 -
4 files changed, 14 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f40c0287/gremlin-python/src/test/resources/org/apache/tinkerpop/gremlin/python/driver/gremlin-server-modern-secure-py.yaml
--
diff --git
a/gremlin-python/src/test/resources/org/apache/tinkerpop/gremlin/python/driver/gremlin-server-modern-secure-py.yaml
b/gremlin-python/src/test/resources/org/apache/tinkerpop/gremlin/python/driver/gremlin-server-modern-secure-py.yaml
index c846cf4..3f23946 100644
---
a/gremlin-python/src/test/resources/org/apache/tinkerpop/gremlin/python/driver/gremlin-server-modern-secure-py.yaml
+++
b/gremlin-python/src/test/resources/org/apache/tinkerpop/gremlin/python/driver/gremlin-server-modern-secure-py.yaml
@@ -32,10 +32,9 @@ graphs: {
graph:
src/test/resources/org/apache/tinkerpop/gremlin/python/driver/tinkergraph-empty.properties}
scriptEngines: {
gremlin-groovy: {
-imports: [java.lang.Math],
-staticImports: [java.lang.Math.PI],
plugins: {
org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
+ org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin:
{classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin:
{files:
[src/test/resources/org/apache/tinkerpop/gremlin/python/driver/generate-modern.groovy]}}},
gremlin-jython: {},
gremlin-python: {}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f40c0287/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 a8164b5..658244d 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
@@ -32,6 +32,7 @@ import
org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
import org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderGryoSerializer;
import org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0;
import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
+import org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin;
import org.apache.tinkerpop.gremlin.server.channel.NioChannelizer;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
@@ -134,7 +135,9 @@ public class GremlinDriverIntegrateTest extends
AbstractGremlinServerIntegration
try {
final String p = TestHelper.generateTempFileFromResource(
GremlinDriverIntegrateTest.class,
"generate-shouldRebindTraversalSourceVariables.groovy", "").getAbsolutePath();
-settings.scriptEngines.get("gremlin-groovy").scripts =
Collections.singletonList(p);
+final Map m = new HashMap<>();
+m.put("files", Collections.singletonList(p));
+
settings.scriptEngines.get("gremlin-groovy").plugins.put(ScriptFileGremlinPlugin.class.getName(),
m);
} catch (Exception ex) {
throw new RuntimeException(ex);
}
@@ -672,7 +675,7 @@ public class GremlinDriverIntegrateTest extends
AbstractGremlinServerIntegration
final Cluster cluster =
TestClientFactory.build().serializer(serializer).create();
final Client client = cluster.connect();
-final List json = client.submit("b = new
JsonBuilder(
[12/15] tinkerpop git commit: TINKERPOP-1612 Reconfigure some tests for new plugins.
TINKERPOP-1612 Reconfigure some tests for new plugins.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/57bfb8dc
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/57bfb8dc
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/57bfb8dc
Branch: refs/heads/TINKERPOP-1612-wip
Commit: 57bfb8dc6a7305bd43fa7e57776bb4839a6b53d9
Parents: d751e3d
Author: Stephen Mallette
Authored: Wed Jan 25 12:34:09 2017 -0500
Committer: Stephen Mallette
Committed: Thu Jan 26 10:52:14 2017 -0500
--
.../python/driver/gremlin-server-modern-secure-py.yaml| 3 +--
.../tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java | 7 +--
.../gremlin/server/GremlinResultSetIntegrateTest.java | 5 -
.../gremlin/server/GremlinServerHttpIntegrateTest.java| 5 -
4 files changed, 14 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/57bfb8dc/gremlin-python/src/test/resources/org/apache/tinkerpop/gremlin/python/driver/gremlin-server-modern-secure-py.yaml
--
diff --git
a/gremlin-python/src/test/resources/org/apache/tinkerpop/gremlin/python/driver/gremlin-server-modern-secure-py.yaml
b/gremlin-python/src/test/resources/org/apache/tinkerpop/gremlin/python/driver/gremlin-server-modern-secure-py.yaml
index c846cf4..3f23946 100644
---
a/gremlin-python/src/test/resources/org/apache/tinkerpop/gremlin/python/driver/gremlin-server-modern-secure-py.yaml
+++
b/gremlin-python/src/test/resources/org/apache/tinkerpop/gremlin/python/driver/gremlin-server-modern-secure-py.yaml
@@ -32,10 +32,9 @@ graphs: {
graph:
src/test/resources/org/apache/tinkerpop/gremlin/python/driver/tinkergraph-empty.properties}
scriptEngines: {
gremlin-groovy: {
-imports: [java.lang.Math],
-staticImports: [java.lang.Math.PI],
plugins: {
org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
+ org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin:
{classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin:
{files:
[src/test/resources/org/apache/tinkerpop/gremlin/python/driver/generate-modern.groovy]}}},
gremlin-jython: {},
gremlin-python: {}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/57bfb8dc/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 a8164b5..658244d 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
@@ -32,6 +32,7 @@ import
org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
import org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderGryoSerializer;
import org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0;
import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
+import org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin;
import org.apache.tinkerpop.gremlin.server.channel.NioChannelizer;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
@@ -134,7 +135,9 @@ public class GremlinDriverIntegrateTest extends
AbstractGremlinServerIntegration
try {
final String p = TestHelper.generateTempFileFromResource(
GremlinDriverIntegrateTest.class,
"generate-shouldRebindTraversalSourceVariables.groovy", "").getAbsolutePath();
-settings.scriptEngines.get("gremlin-groovy").scripts =
Collections.singletonList(p);
+final Map m = new HashMap<>();
+m.put("files", Collections.singletonList(p));
+
settings.scriptEngines.get("gremlin-groovy").plugins.put(ScriptFileGremlinPlugin.class.getName(),
m);
} catch (Exception ex) {
throw new RuntimeException(ex);
}
@@ -672,7 +675,7 @@ public class GremlinDriverIntegrateTest extends
AbstractGremlinServerIntegration
final Cluster cluster =
TestClientFactory.build().serializer(serializer).create();
final Client client = cluster.connect();
-final List json = client.submit("b = new
JsonBuilder(
