Skip to content

Commit c3f156f

Browse files
Cole-GreerCole-Greer
committed
update test configs
1 parent c3ec80c commit c3f156f

10 files changed

Lines changed: 82 additions & 257 deletions

File tree

‎docker/gremlin-server/gremlin-server-integration-krb5.yaml‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,21 @@ graphs: {
2727
sink: conf/tinkergraph-empty.properties,
2828
tx: conf/tinkertransactiongraph-empty.properties
2929
}
30-
scriptEngines: {
31-
gremlin-lang : {},
32-
gremlin-groovy: {
33-
plugins: { org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
34-
org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
35-
org.apache.tinkerpop.gremlin.groovy.jsr223.GroovyCompilerGremlinPlugin: {expectedCompilationTime: 30000},
36-
org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
37-
org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/generate-all.groovy]}}}}
30+
traversalSources: {
31+
gclassic: {graph: classic},
32+
gmodern: {graph: modern},
33+
g: {graph: graph},
34+
gcrew: {graph: crew},
35+
ggraph: {graph: graph},
36+
ggrateful: {graph: grateful},
37+
gsink: {graph: sink},
38+
gtx: {graph: tx}}
39+
lifecycleHooks:
40+
- { className: org.apache.tinkerpop.gremlin.server.util.TinkerFactoryDataLoader, config: {graph: classic, dataset: classic}}
41+
- { className: org.apache.tinkerpop.gremlin.server.util.TinkerFactoryDataLoader, config: {graph: modern, dataset: modern}}
42+
- { className: org.apache.tinkerpop.gremlin.server.util.TinkerFactoryDataLoader, config: {graph: crew, dataset: crew}}
43+
- { className: org.apache.tinkerpop.gremlin.server.util.TinkerFactoryDataLoader, config: {graph: grateful, dataset: grateful}}
44+
- { className: org.apache.tinkerpop.gremlin.server.util.TinkerFactoryDataLoader, config: {graph: sink, dataset: sink}}
3845
serializers:
3946
- { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }}
4047
- { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV2, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2] }}

‎docker/gremlin-server/gremlin-server-integration-secure.yaml‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,21 @@ graphs: {
2727
sink: conf/tinkergraph-empty.properties,
2828
tx: conf/tinkertransactiongraph-empty.properties
2929
}
30-
scriptEngines: {
31-
gremlin-lang : {},
32-
gremlin-groovy: {
33-
plugins: { org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
34-
org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
35-
org.apache.tinkerpop.gremlin.groovy.jsr223.GroovyCompilerGremlinPlugin: {expectedCompilationTime: 30000},
36-
org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
37-
org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/generate-all.groovy]}}}}
30+
traversalSources: {
31+
gclassic: {graph: classic},
32+
gmodern: {graph: modern},
33+
g: {graph: graph},
34+
gcrew: {graph: crew},
35+
ggraph: {graph: graph},
36+
ggrateful: {graph: grateful},
37+
gsink: {graph: sink},
38+
gtx: {graph: tx}}
39+
lifecycleHooks:
40+
- { className: org.apache.tinkerpop.gremlin.server.util.TinkerFactoryDataLoader, config: {graph: classic, dataset: classic}}
41+
- { className: org.apache.tinkerpop.gremlin.server.util.TinkerFactoryDataLoader, config: {graph: modern, dataset: modern}}
42+
- { className: org.apache.tinkerpop.gremlin.server.util.TinkerFactoryDataLoader, config: {graph: crew, dataset: crew}}
43+
- { className: org.apache.tinkerpop.gremlin.server.util.TinkerFactoryDataLoader, config: {graph: grateful, dataset: grateful}}
44+
- { className: org.apache.tinkerpop.gremlin.server.util.TinkerFactoryDataLoader, config: {graph: sink, dataset: sink}}
3845
serializers:
3946
- { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV4, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }} # application/json
4047
- { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4 } # application/vnd.graphbinary-v1.0

‎docker/gremlin-server/gremlin-server-integration.yaml‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,22 @@ graphs: {
2929
sink: conf/tinkergraph-service.properties,
3030
tx: conf/tinkertransactiongraph-service.properties
3131
}
32-
scriptEngines: {
33-
gremlin-lang : {},
34-
gremlin-groovy: {
35-
plugins: { org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
36-
org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
37-
org.apache.tinkerpop.gremlin.groovy.jsr223.GroovyCompilerGremlinPlugin: {expectedCompilationTime: 30000},
38-
org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
39-
org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/generate-all.groovy]}}}}
32+
traversalSources: {
33+
gclassic: {graph: classic},
34+
gmodern: {graph: modern},
35+
g: {graph: graph},
36+
gcrew: {graph: crew},
37+
ggraph: {graph: graph},
38+
ggrateful: {graph: grateful},
39+
gsink: {graph: sink},
40+
gtx: {graph: tx},
41+
gimmutable: {graph: immutable}}
42+
lifecycleHooks:
43+
- { className: org.apache.tinkerpop.gremlin.server.util.TinkerFactoryDataLoader, config: {graph: classic, dataset: classic}}
44+
- { className: org.apache.tinkerpop.gremlin.server.util.TinkerFactoryDataLoader, config: {graph: modern, dataset: modern}}
45+
- { className: org.apache.tinkerpop.gremlin.server.util.TinkerFactoryDataLoader, config: {graph: crew, dataset: crew}}
46+
- { className: org.apache.tinkerpop.gremlin.server.util.TinkerFactoryDataLoader, config: {graph: grateful, dataset: grateful}}
47+
- { className: org.apache.tinkerpop.gremlin.server.util.TinkerFactoryDataLoader, config: {graph: sink, dataset: sink}}
4048
serializers:
4149
- { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV4, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }} # application/json
4250
- { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4 } # application/vnd.graphbinary-v1.0

‎gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/AbstractGremlinServerIntegrationTest.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
import java.io.InputStream;
2727
import java.nio.file.Paths;
28-
import java.util.Collections;
2928

3029
/**
3130
* Starts and stops an instance for each executed test.
@@ -51,10 +50,6 @@ public void setUp() throws Exception {
5150
final Settings overridenSettings = overrideSettings(settings);
5251
final String prop = Paths.get(AbstractGremlinServerIntegrationTest.class.getResource("tinkergraph-empty.properties").toURI()).toString();
5352
overridenSettings.graphs.put("graph", prop);
54-
final String script = Paths.get(AbstractGremlinServerIntegrationTest.class.getResource("generate.groovy").toURI()).toString();
55-
overridenSettings.scriptEngines.get("gremlin-groovy").plugins
56-
.get("org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin")
57-
.put("files", Collections.singletonList(script));
5853

5954
this.server = new GremlinServer(overridenSettings);
6055

‎gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/jsr223/gremlin-server-integration.yaml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,10 @@ host: localhost
1919
port: 45940
2020
evaluationTimeout: 30000
2121
channelizer: org.apache.tinkerpop.gremlin.server.channel.HttpChannelizer
22-
scriptEngines: {
23-
gremlin-groovy: {
24-
plugins: { org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
25-
org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
26-
org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
27-
org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {}}}}
22+
graphs: {
23+
graph: conf/tinkergraph-empty.properties}
24+
lifecycleHooks:
25+
- { className: org.apache.tinkerpop.gremlin.server.util.TinkerFactoryDataLoader, config: {graph: graph, dataset: modern}}
2826
serializers:
2927
- { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV4} # application/vnd.graphbinary-v4.0
3028
metrics: {

‎gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ServerTestHelper.java‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,24 +38,25 @@ public class ServerTestHelper {
3838
* If an overriden path is determined to be absolute then the path is not re-written.
3939
*/
4040
public static void rewritePathsInGremlinServerSettings(final Settings overridenSettings) {
41-
final Map<String, Map<String, Object>> plugins;
42-
final Map<String, Object> scriptFileGremlinPlugin;
4341
final File homeDir;
4442

4543
homeDir = new File( getBuildDir(), "../src/test/scripts" );
4644

47-
plugins = overridenSettings.scriptEngines.get("gremlin-groovy").plugins;
48-
scriptFileGremlinPlugin = plugins.get(ScriptFileGremlinPlugin.class.getName());
45+
final Settings.ScriptEngineSettings groovyEngine = overridenSettings.scriptEngines.get("gremlin-groovy");
46+
if (groovyEngine != null) {
47+
final Map<String, Map<String, Object>> plugins = groovyEngine.plugins;
48+
final Map<String, Object> scriptFileGremlinPlugin = plugins.get(ScriptFileGremlinPlugin.class.getName());
4949

50-
if (scriptFileGremlinPlugin != null) {
51-
scriptFileGremlinPlugin
52-
.put("files",
53-
((List<String>) scriptFileGremlinPlugin.get("files")).stream()
54-
.map(s -> new File(s))
55-
.map(f -> f.isAbsolute() ? f
56-
: new File(relocateFile( homeDir, f)))
57-
.map(f -> Storage.toPath(f))
58-
.collect(Collectors.toList()));
50+
if (scriptFileGremlinPlugin != null) {
51+
scriptFileGremlinPlugin
52+
.put("files",
53+
((List<String>) scriptFileGremlinPlugin.get("files")).stream()
54+
.map(s -> new File(s))
55+
.map(f -> f.isAbsolute() ? f
56+
: new File(relocateFile( homeDir, f)))
57+
.map(f -> Storage.toPath(f))
58+
.collect(Collectors.toList()));
59+
}
5960
}
6061

6162
overridenSettings.graphs = overridenSettings.graphs.entrySet().stream()

‎gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
# - docker/gremlin-server/gremlin-server-integration-secure.yaml
2626
#
2727
# Without such changes, the test docker server can't be started for independent
28-
# testing with Gremlin Language Variants. Note this file's relation to
29-
# gremlin-server/src/test/resources/scripts/test-server-start.groovy
28+
# testing with Gremlin Language Variants.
3029
###############################################################################
3130

3231
host: 0.0.0.0
@@ -41,14 +40,29 @@ graphs: {
4140
sink: conf/tinkergraph-empty.properties,
4241
tx: conf/tinkertransactiongraph-empty.properties
4342
}
43+
traversalSources: {
44+
gclassic: {graph: classic},
45+
gmodern: {graph: modern},
46+
g: {graph: graph},
47+
gcrew: {graph: crew},
48+
ggraph: {graph: graph},
49+
ggrateful: {graph: grateful},
50+
gsink: {graph: sink},
51+
gtx: {graph: tx}}
52+
lifecycleHooks:
53+
- { className: org.apache.tinkerpop.gremlin.server.util.TinkerFactoryDataLoader, config: {graph: classic, dataset: classic}}
54+
- { className: org.apache.tinkerpop.gremlin.server.util.TinkerFactoryDataLoader, config: {graph: modern, dataset: modern}}
55+
- { className: org.apache.tinkerpop.gremlin.server.util.TinkerFactoryDataLoader, config: {graph: crew, dataset: crew}}
56+
- { className: org.apache.tinkerpop.gremlin.server.util.TinkerFactoryDataLoader, config: {graph: grateful, dataset: grateful}}
57+
- { className: org.apache.tinkerpop.gremlin.server.util.TinkerFactoryDataLoader, config: {graph: sink, dataset: sink}}
4458
scriptEngines: {
4559
gremlin-lang : {},
4660
gremlin-groovy: {
4761
plugins: { org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
4862
org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
4963
org.apache.tinkerpop.gremlin.groovy.jsr223.GroovyCompilerGremlinPlugin: {expectedCompilationTime: 30000},
5064
org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
51-
org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/generate-all.groovy]}}}}
65+
org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/init-functions.groovy]}}}}
5266
serializers:
5367
- { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV4, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }}
5468
- { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }}

‎gremlin-server/src/test/scripts/generate-all.groovy‎

Lines changed: 0 additions & 72 deletions
This file was deleted.

gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/jsr223/generate.groovy renamed to gremlin-server/src/test/scripts/init-functions.groovy

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,4 @@
1717
* under the License.
1818
*/
1919

20-
// an init script that returns a Map allows explicit setting of global bindings.
21-
def globals = [:]
22-
23-
// Generates the modern graph into an "empty" TinkerGraph via LifeCycleHook.
24-
// Note that the name of the key in the "global" map is unimportant.
25-
globals << [hook : [
26-
onStartUp: { ctx ->
27-
ctx.logger.info("Loading 'modern' graph data.")
28-
org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory.generateModern(graph)
29-
}
30-
] as LifeCycleHook]
31-
32-
// define the default TraversalSource to bind queries to - this one will be named "g".
33-
globals << [g : traversal().withEmbedded(graph)]
20+
def addItUp(x, y) { x + y }

0 commit comments

Comments
 (0)