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 2016/11/15 14:35:41 UTC
[1/3] tinkerpop git commit: TINKERPOP-1538 Use non-default port for
gremlin server tests
Repository: tinkerpop
Updated Branches:
refs/heads/tp31 26db14e7d -> 418fb2a2f
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/569753e3/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 0f0cdae..5ff3adf 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
@@ -38,7 +38,6 @@ import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
import org.apache.tinkerpop.gremlin.driver.simple.NioClient;
import org.apache.tinkerpop.gremlin.driver.simple.SimpleClient;
-import org.apache.tinkerpop.gremlin.driver.simple.WebSocketClient;
import org.apache.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngine;
import org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.CompileStaticCustomizerProvider;
import org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.InterpreterModeCustomizerProvider;
@@ -137,7 +136,10 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
settings.ssl.overrideSslContext(createServerSslContext());
break;
case "shouldStartWithDefaultSettings":
- return new Settings();
+ // test with defaults exception for port because we want to keep testing off of 8182
+ final Settings defaultSettings = new Settings();
+ defaultSettings.port = TestClientFactory.PORT;
+ return settings;
case "shouldHaveTheSessionTimeout":
settings.processors.clear();
final Settings.ProcessorSettings processorSettings = new Settings.ProcessorSettings();
@@ -207,7 +209,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldUseInterpreterMode() throws Exception {
- final Cluster cluster = Cluster.open();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect(name.getMethodName());
client.submit("def subtractAway(x,y){x-y};[]").all().get();
@@ -229,7 +231,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldNotUseInterpreterMode() throws Exception {
- final Cluster cluster = Cluster.open();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect(name.getMethodName());
client.submit("def subtractAway(x,y){x-y};[]").all().get();
@@ -251,7 +253,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldUseSimpleSandbox() throws Exception {
- final Cluster cluster = Cluster.open();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
assertEquals(2, client.submit("1+1").all().get().get(0).getInt());
@@ -271,7 +273,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
public void shouldStartWithDefaultSettings() {
// just quickly validate that results are returning given defaults. no graphs are config'd with defaults
// so just eval a groovy script.
- final Cluster cluster = Cluster.open();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
final ResultSet results = client.submit("[1,2,3,4,5,6,7,8,9]");
@@ -283,7 +285,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldEnableSsl() {
- final Cluster cluster = Cluster.build().enableSsl(true).create();
+ final Cluster cluster = TestClientFactory.build().enableSsl(true).create();
final Client client = cluster.connect();
try {
@@ -301,7 +303,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
builder.trustManager(InsecureTrustManagerFactory.INSTANCE);
builder.sslProvider(SslProvider.JDK);
- final Cluster cluster = Cluster.build().enableSsl(true).sslContext(builder.build()).create();
+ final Cluster cluster = TestClientFactory.build().enableSsl(true).sslContext(builder.build()).create();
final Client client = cluster.connect();
try {
@@ -314,7 +316,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldEnableSslButFailIfClientConnectsWithoutIt() {
- final Cluster cluster = Cluster.build().enableSsl(false).create();
+ final Cluster cluster = TestClientFactory.build().enableSsl(false).create();
final Client client = cluster.connect();
try {
@@ -336,7 +338,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
assumeThat("Set the 'assertNonDeterministic' property to true to execute this test",
System.getProperty("assertNonDeterministic"), is("true"));
- final Cluster cluster = Cluster.open();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
try {
@@ -382,7 +384,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldReturnInvalidRequestArgsWhenGremlinArgIsNotSupplied() throws Exception {
- try (SimpleClient client = new WebSocketClient()) {
+ try (SimpleClient client = TestClientFactory.createWebSocketClient()) {
final RequestMessage request = RequestMessage.build(Tokens.OPS_EVAL).create();
final ResponseMessage result = client.submit(request).get(0);
assertThat(result.getStatus().getCode(), is(not(ResponseStatusCode.PARTIAL_CONTENT)));
@@ -392,7 +394,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldReturnInvalidRequestArgsWhenInvalidReservedBindingKeyIsUsed() throws Exception {
- try (SimpleClient client = new WebSocketClient()) {
+ try (SimpleClient client = TestClientFactory.createWebSocketClient()) {
final Map<String, Object> bindings = new HashMap<>();
bindings.put(T.id.getAccessor(), "123");
final RequestMessage request = RequestMessage.build(Tokens.OPS_EVAL)
@@ -412,7 +414,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
assertTrue(pass.get());
}
- try (SimpleClient client = new WebSocketClient()) {
+ try (SimpleClient client = TestClientFactory.createWebSocketClient()) {
final Map<String, Object> bindings = new HashMap<>();
bindings.put("id", "123");
final RequestMessage request = RequestMessage.build(Tokens.OPS_EVAL)
@@ -435,7 +437,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldReturnInvalidRequestArgsWhenInvalidTypeBindingKeyIsUsed() throws Exception {
- try (SimpleClient client = new WebSocketClient()) {
+ try (SimpleClient client = TestClientFactory.createWebSocketClient()) {
final Map<Object, Object> bindings = new HashMap<>();
bindings.put(1, "123");
final RequestMessage request = RequestMessage.build(Tokens.OPS_EVAL)
@@ -458,7 +460,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldReturnInvalidRequestArgsWhenInvalidNullBindingKeyIsUsed() throws Exception {
- try (SimpleClient client = new WebSocketClient()) {
+ try (SimpleClient client = TestClientFactory.createWebSocketClient()) {
final Map<String, Object> bindings = new HashMap<>();
bindings.put(null, "123");
final RequestMessage request = RequestMessage.build(Tokens.OPS_EVAL)
@@ -482,7 +484,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
@Test
@SuppressWarnings("unchecked")
public void shouldBatchResultsByTwos() throws Exception {
- try (SimpleClient client = new WebSocketClient()) {
+ try (SimpleClient client = TestClientFactory.createWebSocketClient()) {
final RequestMessage request = RequestMessage.build(Tokens.OPS_EVAL)
.addArg(Tokens.ARGS_GREMLIN, "[0,1,2,3,4,5,6,7,8,9]").create();
@@ -504,7 +506,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
@Test
@SuppressWarnings("unchecked")
public void shouldBatchResultsByOnesByOverridingFromClientSide() throws Exception {
- try (SimpleClient client = new WebSocketClient()) {
+ try (SimpleClient client = TestClientFactory.createWebSocketClient()) {
final RequestMessage request = RequestMessage.build(Tokens.OPS_EVAL)
.addArg(Tokens.ARGS_GREMLIN, "[0,1,2,3,4,5,6,7,8,9]")
.addArg(Tokens.ARGS_BATCH_SIZE, 1).create();
@@ -518,7 +520,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
@Test
@SuppressWarnings("unchecked")
public void shouldWorkOverNioTransport() throws Exception {
- try (SimpleClient client = new NioClient()) {
+ try (SimpleClient client = TestClientFactory.createNioClient()) {
final RequestMessage request = RequestMessage.build(Tokens.OPS_EVAL)
.addArg(Tokens.ARGS_GREMLIN, "[0,1,2,3,4,5,6,7,8,9,]").create();
@@ -531,7 +533,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldNotThrowNoSuchElementException() throws Exception {
- try (SimpleClient client = new WebSocketClient()){
+ try (SimpleClient client = TestClientFactory.createWebSocketClient()){
// this should return "nothing" - there should be no exception
final List<ResponseMessage> responses = client.submit("g.V().has('name','kadfjaldjfla')");
assertNull(responses.get(0).getResult().getData());
@@ -541,7 +543,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
@Test
@SuppressWarnings("unchecked")
public void shouldReceiveFailureTimeOutOnScriptEval() throws Exception {
- try (SimpleClient client = new WebSocketClient()){
+ try (SimpleClient client = TestClientFactory.createWebSocketClient()){
final List<ResponseMessage> responses = client.submit("Thread.sleep(3000);'some-stuff-that-should not return'");
assertThat(responses.get(0).getStatus().getMessage(), startsWith("Script evaluation exceeded the configured 'scriptEvaluationTimeout' threshold of 200 ms"));
@@ -553,7 +555,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
@Test
@SuppressWarnings("unchecked")
public void shouldReceiveFailureTimeOutOnScriptEvalUsingOverride() throws Exception {
- try (SimpleClient client = new WebSocketClient()) {
+ try (SimpleClient client = TestClientFactory.createWebSocketClient()) {
final RequestMessage msg = RequestMessage.build("eval")
.addArg(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT, 100)
.addArg(Tokens.ARGS_GREMLIN, "Thread.sleep(3000);'some-stuff-that-should not return'")
@@ -568,7 +570,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldReceiveFailureTimeOutOnScriptEvalOfOutOfControlLoop() throws Exception {
- try (SimpleClient client = new WebSocketClient()){
+ try (SimpleClient client = TestClientFactory.createWebSocketClient()){
// timeout configured for 1 second so the timed interrupt should trigger prior to the
// scriptEvaluationTimeout which is at 30 seconds by default
final List<ResponseMessage> responses = client.submit("while(true){}");
@@ -582,7 +584,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
@Test
@SuppressWarnings("unchecked")
public void shouldReceiveFailureTimeOutOnTotalSerialization() throws Exception {
- try (SimpleClient client = new WebSocketClient()){
+ try (SimpleClient client = TestClientFactory.createWebSocketClient()){
final List<ResponseMessage> responses = client.submit("(0..<100000)");
// the last message should contain the error
@@ -596,14 +598,14 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
@Test
@SuppressWarnings("unchecked")
public void shouldLoadInitScript() throws Exception {
- try (SimpleClient client = new WebSocketClient()){
+ try (SimpleClient client = TestClientFactory.createWebSocketClient()){
assertEquals(2, ((List<Integer>) client.submit("addItUp(1,1)").get(0).getResult().getData()).get(0).intValue());
}
}
@Test
public void shouldGarbageCollectPhantomButNotHard() throws Exception {
- final Cluster cluster = Cluster.open();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
assertEquals(2, client.submit("addItUp(1,1)").all().join().get(0).getInt());
@@ -626,7 +628,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldReceiveFailureOnBadGraphSONSerialization() throws Exception {
- final Cluster cluster = Cluster.build("localhost").serializer(Serializers.GRAPHSON_V1D0).create();
+ final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V1D0).create();
final Client client = cluster.connect();
try {
@@ -645,7 +647,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldReceiveFailureOnBadGryoSerialization() throws Exception {
- final Cluster cluster = Cluster.build("localhost").serializer(Serializers.GRYO_V1D0).create();
+ final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRYO_V1D0).create();
final Client client = cluster.connect();
try {
@@ -665,7 +667,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
@SuppressWarnings("ThrowableResultOfMethodCallIgnored")
@Test
public void shouldBlockRequestWhenTooBig() throws Exception {
- final Cluster cluster = Cluster.open();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
try {
@@ -692,7 +694,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldFailOnDeadHost() throws Exception {
- final Cluster cluster = Cluster.build("localhost").create();
+ final Cluster cluster = TestClientFactory.build().create();
final Client client = cluster.connect();
// ensure that connection to server is good
@@ -728,7 +730,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldNotHavePartialContentWithOneResult() throws Exception {
- try (SimpleClient client = new WebSocketClient()) {
+ try (SimpleClient client = TestClientFactory.createWebSocketClient()) {
final RequestMessage request = RequestMessage.build(Tokens.OPS_EVAL)
.addArg(Tokens.ARGS_GREMLIN, "10").create();
final List<ResponseMessage> responses = client.submit(request);
@@ -739,7 +741,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldFailWithBadScriptEval() throws Exception {
- try (SimpleClient client = new WebSocketClient()) {
+ try (SimpleClient client = TestClientFactory.createWebSocketClient()) {
final RequestMessage request = RequestMessage.build(Tokens.OPS_EVAL)
.addArg(Tokens.ARGS_GREMLIN, "new String().doNothingAtAllBecauseThis is a syntax error").create();
final List<ResponseMessage> responses = client.submit(request);
@@ -752,7 +754,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
@SuppressWarnings("unchecked")
public void shouldStillSupportDeprecatedRebindingsParameterOnServer() throws Exception {
// this test can be removed when the rebindings arg is removed
- try (SimpleClient client = new WebSocketClient()) {
+ try (SimpleClient client = TestClientFactory.createWebSocketClient()) {
final Map<String,String> rebindings = new HashMap<>();
rebindings.put("xyz", "graph");
final RequestMessage request = RequestMessage.build(Tokens.OPS_EVAL)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/569753e3/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java
index 3c1fef9..1c27c51 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java
@@ -31,7 +31,6 @@ import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
import org.apache.tinkerpop.gremlin.driver.simple.SimpleClient;
-import org.apache.tinkerpop.gremlin.driver.simple.WebSocketClient;
import org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor;
import org.apache.tinkerpop.gremlin.util.Log4jRecordingAppender;
import org.junit.After;
@@ -114,10 +113,10 @@ public class GremlinServerSessionIntegrateTest extends AbstractGremlinServerInt
// basically, we need one to submit the long run job and one to do the close operation that will cancel the
// long run job. it is probably possible to do this with some low-level message manipulation but that's
// probably not necessary
- final Cluster cluster1 = Cluster.build().create();
+ final Cluster cluster1 = TestClientFactory.open();
final Client client1 = cluster1.connect(name.getMethodName());
client1.submit("1+1").all().join();
- final Cluster cluster2 = Cluster.build().create();
+ final Cluster cluster2 = TestClientFactory.open();
final Client client2 = cluster2.connect(name.getMethodName());
client2.submit("1+1").all().join();
@@ -144,7 +143,7 @@ public class GremlinServerSessionIntegrateTest extends AbstractGremlinServerInt
public void shouldRollbackOnEvalExceptionForManagedTransaction() throws Exception {
assumeNeo4jIsPresent();
- final Cluster cluster = Cluster.build().create();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect(name.getMethodName(), true);
try {
@@ -165,7 +164,7 @@ public class GremlinServerSessionIntegrateTest extends AbstractGremlinServerInt
@Test
public void shouldCloseSessionOnceOnRequest() throws Exception {
- final Cluster cluster = Cluster.build().create();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect(name.getMethodName());
final ResultSet results1 = client.submit("x = [1,2,3,4,5,6,7,8,9]");
@@ -199,7 +198,7 @@ public class GremlinServerSessionIntegrateTest extends AbstractGremlinServerInt
@Test
public void shouldHaveTheSessionTimeout() throws Exception {
- final Cluster cluster = Cluster.build().create();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect(name.getMethodName());
final ResultSet results1 = client.submit("x = [1,2,3,4,5,6,7,8,9]");
@@ -235,7 +234,7 @@ public class GremlinServerSessionIntegrateTest extends AbstractGremlinServerInt
@Test
public void shouldEnsureSessionBindingsAreThreadSafe() throws Exception {
- final Cluster cluster = Cluster.build().minInProcessPerConnection(16).maxInProcessPerConnection(64).create();
+ final Cluster cluster = TestClientFactory.build().minInProcessPerConnection(16).maxInProcessPerConnection(64).create();
final Client client = cluster.connect(name.getMethodName());
client.submitAsync("a=100;b=1000;c=10000;null");
@@ -268,7 +267,7 @@ public class GremlinServerSessionIntegrateTest extends AbstractGremlinServerInt
public void shouldExecuteInSessionAndSessionlessWithoutOpeningTransactionWithSingleClient() throws Exception {
assumeNeo4jIsPresent();
- try (final SimpleClient client = new WebSocketClient()) {
+ try (final SimpleClient client = TestClientFactory.createWebSocketClient()) {
//open a transaction, create a vertex, commit
final RequestMessage openRequest = RequestMessage.build(Tokens.OPS_EVAL)
@@ -335,7 +334,7 @@ public class GremlinServerSessionIntegrateTest extends AbstractGremlinServerInt
public void shouldExecuteInSessionWithTransactionManagement() throws Exception {
assumeNeo4jIsPresent();
- try (final SimpleClient client = new WebSocketClient()) {
+ try (final SimpleClient client = TestClientFactory.createWebSocketClient()) {
final RequestMessage addRequest = RequestMessage.build(Tokens.OPS_EVAL)
.processor("session")
.addArg(Tokens.ARGS_SESSION, name.getMethodName())
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/569753e3/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 27e3d39..0c1ed0b 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
@@ -56,7 +56,7 @@ public class GremlinTraversalPerformanceTest extends AbstractGremlinServerPerfor
public final static int DEFAULT_CONCURRENT_BENCHMARK_ROUNDS = 500;
public final static int DEFAULT_CONCURRENT_WARMUP_ROUNDS = 10;
- private final static Cluster cluster = Cluster.build("localhost").maxConnectionPoolSize(32).maxWaitForConnection(30000).create();
+ private final static Cluster cluster = TestClientFactory.build().maxConnectionPoolSize(32).maxWaitForConnection(30000).create();
private final static AtomicReference<Client> client = new AtomicReference<>();
@Rule
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/569753e3/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/TestClientFactory.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/TestClientFactory.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/TestClientFactory.java
new file mode 100644
index 0000000..bfbb40b
--- /dev/null
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/TestClientFactory.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.server;
+
+import org.apache.tinkerpop.gremlin.driver.Cluster;
+import org.apache.tinkerpop.gremlin.driver.simple.NioClient;
+import org.apache.tinkerpop.gremlin.driver.simple.WebSocketClient;
+
+import java.net.URI;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public final class TestClientFactory {
+
+ public static final int PORT = 45940;
+ public static final URI WEBSOCKET_URI = URI.create("ws://localhost:" + PORT);
+ public static final URI NIO_URI = URI.create("gs://localhost:" + PORT);
+ public static final String HTTP = "http://localhost:" + PORT;
+
+ public static Cluster.Builder build() {
+ return Cluster.build("localhost").port(45940);
+ }
+
+ public static Cluster open() {
+ return build().create();
+ }
+
+ public static WebSocketClient createWebSocketClient() {
+ return new WebSocketClient(WEBSOCKET_URI);
+ }
+
+ public static NioClient createNioClient() {
+ return new NioClient(NIO_URI);
+ }
+
+ public static String createURLString() {
+ return createURLString("");
+ }
+
+ public static String createURLString(final String suffix) {
+ return HTTP + suffix;
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/569753e3/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
index 88c95b7..cee377d 100644
--- a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
+++ b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
@@ -16,7 +16,7 @@
# under the License.
host: localhost
-port: 8182
+port: 45940
threadPoolWorker: 1
gremlinPool: 8
scriptEvaluationTimeout: 30000
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/569753e3/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-performance.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-performance.yaml b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-performance.yaml
index ed7444c..03be730 100644
--- a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-performance.yaml
+++ b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-performance.yaml
@@ -16,7 +16,7 @@
# under the License.
host: localhost
-port: 8182
+port: 45940
threadPoolWorker: 1
gremlinPool: 8
scriptEvaluationTimeout: 30000
[3/3] tinkerpop git commit: Merge branch 'TINKERPOP-1538' into tp31
Posted by sp...@apache.org.
Merge branch 'TINKERPOP-1538' into tp31
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/418fb2a2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/418fb2a2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/418fb2a2
Branch: refs/heads/tp31
Commit: 418fb2a2f358be9fa31afe9c04cdc3e374683506
Parents: 26db14e 569753e
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Nov 15 09:34:34 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Nov 15 09:34:34 2016 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../src/main/java/Service.java | 2 +-
.../src/test/java/ServiceTest.java | 2 +-
.../src/test/resources/gremlin-server.yaml | 2 +-
.../plugin/gremlin-server-integration.yaml | 2 +-
.../gremlin/console/groovy/plugin/remote.yaml | 2 +-
.../AbstractGremlinServerPerformanceTest.java | 2 +-
.../server/GremlinAdditionPerformanceTest.java | 2 +-
.../server/GremlinDriverIntegrateTest.java | 92 ++++++++++----------
.../server/GremlinResultSetIntegrateTest.java | 2 +-
.../server/GremlinServerAuthIntegrateTest.java | 24 ++---
.../GremlinServerAuthOldIntegrateTest.java | 25 +++---
.../server/GremlinServerHttpIntegrateTest.java | 92 ++++++++++----------
.../server/GremlinServerIntegrateTest.java | 66 +++++++-------
.../GremlinServerSessionIntegrateTest.java | 17 ++--
.../server/GremlinTraversalPerformanceTest.java | 2 +-
.../gremlin/server/TestClientFactory.java | 60 +++++++++++++
.../server/gremlin-server-integration.yaml | 2 +-
.../server/gremlin-server-performance.yaml | 2 +-
19 files changed, 234 insertions(+), 165 deletions(-)
----------------------------------------------------------------------
[2/3] tinkerpop git commit: TINKERPOP-1538 Use non-default port for
gremlin server tests
Posted by sp...@apache.org.
TINKERPOP-1538 Use non-default port for gremlin server tests
Used something other than 8182 to run the gremlin server tests to avoid port conflicts if gremlin server happens to be running in the background.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/569753e3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/569753e3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/569753e3
Branch: refs/heads/tp31
Commit: 569753e3be41828887cdfa8085d4744ff955bb0d
Parents: 1e554ca
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Sun Nov 13 09:03:13 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Sun Nov 13 16:51:06 2016 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../src/main/java/Service.java | 2 +-
.../src/test/java/ServiceTest.java | 2 +-
.../src/test/resources/gremlin-server.yaml | 2 +-
.../plugin/gremlin-server-integration.yaml | 2 +-
.../gremlin/console/groovy/plugin/remote.yaml | 2 +-
.../AbstractGremlinServerPerformanceTest.java | 2 +-
.../server/GremlinAdditionPerformanceTest.java | 2 +-
.../server/GremlinDriverIntegrateTest.java | 92 ++++++++++----------
.../server/GremlinResultSetIntegrateTest.java | 2 +-
.../server/GremlinServerAuthIntegrateTest.java | 24 ++---
.../GremlinServerAuthOldIntegrateTest.java | 25 +++---
.../server/GremlinServerHttpIntegrateTest.java | 92 ++++++++++----------
.../server/GremlinServerIntegrateTest.java | 66 +++++++-------
.../GremlinServerSessionIntegrateTest.java | 17 ++--
.../server/GremlinTraversalPerformanceTest.java | 2 +-
.../gremlin/server/TestClientFactory.java | 60 +++++++++++++
.../server/gremlin-server-integration.yaml | 2 +-
.../server/gremlin-server-performance.yaml | 2 +-
19 files changed, 234 insertions(+), 165 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/569753e3/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index a8006d4..14ee66d 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -27,6 +27,7 @@ TinkerPop 3.1.6 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Returned a confirmation on session close from Gremlin Server.
+* Use non-default port for running tests on Gremlin Server.
* Fully shutdown metrics services in Gremlin Server on shutdown.
* Deprecated `tryRandomCommit()` in `AbstractGremlinTest` - the annotation was never added in 3.1.1, and was only deprecated via javadoc.
* Minor fixes to various test feature requirements in `gremlin-test`.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/569753e3/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/main/java/Service.java
----------------------------------------------------------------------
diff --git a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/main/java/Service.java b/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/main/java/Service.java
index b2e9de6..2561d39 100644
--- a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/main/java/Service.java
+++ b/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/main/java/Service.java
@@ -32,7 +32,7 @@ public class Service implements AutoCloseable {
/**
* There typically needs to be only one Cluster instance in an application.
*/
- private final Cluster cluster = Cluster.open();
+ private final Cluster cluster = Cluster.build().port(45940).create();
/**
* Use the Cluster instance to construct different Client instances (e.g. one for sessionless communication
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/569753e3/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/java/ServiceTest.java
----------------------------------------------------------------------
diff --git a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/java/ServiceTest.java b/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/java/ServiceTest.java
index 6f7d5c3..d888f46 100644
--- a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/java/ServiceTest.java
+++ b/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/java/ServiceTest.java
@@ -78,7 +78,7 @@ public class ServiceTest {
@Test
public void shouldCreateGraph() throws Exception {
- List<String> result = service.findCreatorsOfSoftware("lop");
+ final List<String> result = service.findCreatorsOfSoftware("lop");
assertThat(result, is(Arrays.asList("marko", "josh", "peter")));
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/569753e3/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/resources/gremlin-server.yaml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/resources/gremlin-server.yaml b/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/resources/gremlin-server.yaml
index 5744d29..d1f91ef 100644
--- a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/resources/gremlin-server.yaml
+++ b/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/resources/gremlin-server.yaml
@@ -16,7 +16,7 @@
# under the License.
host: localhost
-port: 8182
+port: 45940
threadPoolWorker: 1
gremlinPool: 8
scriptEvaluationTimeout: 30000
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/569753e3/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/groovy/plugin/gremlin-server-integration.yaml
----------------------------------------------------------------------
diff --git a/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/groovy/plugin/gremlin-server-integration.yaml b/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/groovy/plugin/gremlin-server-integration.yaml
index ad50a30..a14e27b 100644
--- a/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/groovy/plugin/gremlin-server-integration.yaml
+++ b/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/groovy/plugin/gremlin-server-integration.yaml
@@ -16,7 +16,7 @@
# under the License.
host: localhost
-port: 8182
+port: 45940
threadPoolWorker: 1
gremlinPool: 8
scriptEvaluationTimeout: 30000
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/569753e3/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/groovy/plugin/remote.yaml
----------------------------------------------------------------------
diff --git a/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/groovy/plugin/remote.yaml b/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/groovy/plugin/remote.yaml
index 7b23779..373934b 100644
--- a/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/groovy/plugin/remote.yaml
+++ b/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/groovy/plugin/remote.yaml
@@ -16,5 +16,5 @@
# under the License.
hosts: [localhost]
-port: 8182
+port: 45940
serializer: { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true }}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/569753e3/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerPerformanceTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerPerformanceTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerPerformanceTest.java
index f69bb06..9e2efaf 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerPerformanceTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerPerformanceTest.java
@@ -80,7 +80,7 @@ public abstract class AbstractGremlinServerPerformanceTest {
logger.info("Gremlin Server is started and ready for performance test to execute");
host = System.getProperty("host", "localhost");
- port = System.getProperty("port", "8182");
+ port = System.getProperty("port", "45940");
}
@AfterClass
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/569753e3/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinAdditionPerformanceTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinAdditionPerformanceTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinAdditionPerformanceTest.java
index d066c65..1237c3a 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinAdditionPerformanceTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinAdditionPerformanceTest.java
@@ -81,7 +81,7 @@ public class GremlinAdditionPerformanceTest extends AbstractGremlinServerPerform
final Serializers[] mimes = new Serializers[]{Serializers.GRAPHSON, Serializers.GRAPHSON_V1D0, Serializers.GRYO_V1D0};
final Serializers mimeType = mimes[rand.nextInt(3)];
logger.info(mimeType.toString());
- final Cluster cluster = Cluster.build("localhost")
+ final Cluster cluster = TestClientFactory.build()
.serializer(mimeType)
.create();
final Client client = cluster.connect();
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/569753e3/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 bf66b0d..685b7d4 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
@@ -134,7 +134,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldEventuallySucceedAfterChannelLevelError() throws Exception {
- final Cluster cluster = Cluster.build().addContactPoint("localhost")
+ final Cluster cluster = TestClientFactory.build()
.reconnectIntialDelay(500)
.reconnectInterval(500)
.maxContentLength(1024).create();
@@ -155,7 +155,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldEventuallySucceedAfterMuchFailure() throws Exception {
- final Cluster cluster = Cluster.build().addContactPoint("localhost").create();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
// tested independently to 10000 iterations but for speed, bumped back to 1000
@@ -178,7 +178,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
public void shouldEventuallySucceedOnSameServer() throws Exception {
stopServer();
- final Cluster cluster = Cluster.build().addContactPoint("localhost").create();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
try {
@@ -202,7 +202,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldEventuallySucceedWithRoundRobin() throws Exception {
final String noGremlinServer = "74.125.225.19";
- final Cluster cluster = Cluster.build(noGremlinServer).addContactPoint("localhost").create();
+ final Cluster cluster = TestClientFactory.build().addContactPoint(noGremlinServer).create();
final Client client = cluster.connect();
// the first host is dead on init. request should succeed on localhost
@@ -217,7 +217,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldHandleResultsOfAllSizes() throws Exception {
- final Cluster cluster = Cluster.open();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
final String script = "g.V().drop().iterate();\n" +
@@ -256,7 +256,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldFailWithBadClientSideSerialization() throws Exception {
- final Cluster cluster = Cluster.open();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
final ResultSet results = client.submit("java.awt.Color.RED");
@@ -279,7 +279,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldFailWithScriptExecutionException() throws Exception {
- final Cluster cluster = Cluster.open();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
final ResultSet results = client.submit("1/0");
@@ -302,7 +302,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldProcessRequestsOutOfOrder() throws Exception {
- final Cluster cluster = Cluster.open();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
final ResultSet rsFive = client.submit("Thread.sleep(5000);'five'");
@@ -325,7 +325,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldProcessSessionRequestsInOrder() throws Exception {
- final Cluster cluster = Cluster.open();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect(name.getMethodName());
final ResultSet rsFive = client.submit("Thread.sleep(5000);'five'");
@@ -351,7 +351,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldWaitForAllResultsToArrive() throws Exception {
- final Cluster cluster = Cluster.open();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
final AtomicInteger checked = new AtomicInteger(0);
@@ -369,7 +369,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldWorkOverNioTransport() throws Exception {
- final Cluster cluster = Cluster.build().channelizer(Channelizer.NioChannelizer.class.getName()).create();
+ final Cluster cluster = TestClientFactory.build().channelizer(Channelizer.NioChannelizer.class.getName()).create();
final Client client = cluster.connect();
final AtomicInteger checked = new AtomicInteger(0);
@@ -387,7 +387,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldStream() throws Exception {
- final Cluster cluster = Cluster.open();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
final ResultSet results = client.submit("[1,2,3,4,5,6,7,8,9]");
@@ -404,7 +404,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldIterate() throws Exception {
- final Cluster cluster = Cluster.open();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
final ResultSet results = client.submit("[1,2,3,4,5,6,7,8,9]");
@@ -426,7 +426,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldGetSomeThenSomeMore() throws Exception {
- final Cluster cluster = Cluster.open();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
final ResultSet results = client.submit("[1,2,3,4,5,6,7,8,9]");
@@ -454,7 +454,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldGetOneThenSomeThenSomeMore() throws Exception {
- final Cluster cluster = Cluster.open();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
final ResultSet results = client.submit("[1,2,3,4,5,6,7,8,9]");
@@ -502,7 +502,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
// that the client doesn't timeout waiting for an available connection. obviously this can also be fixed
// by increasing the maxConnectionPoolSize.
final int requests = workerPoolSizeForDriver * 4;
- final Cluster cluster = Cluster.build()
+ final Cluster cluster = TestClientFactory.build()
.workerPoolSize(workerPoolSizeForDriver)
.maxWaitForConnection(300000)
.create();
@@ -526,7 +526,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldCloseWithServerDown() throws Exception {
- final Cluster cluster = Cluster.open();
+ final Cluster cluster = TestClientFactory.open();
cluster.connect().init();
stopServer();
@@ -536,7 +536,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldMarkHostDeadSinceServerIsDown() throws Exception {
- final Cluster cluster = Cluster.open();
+ final Cluster cluster = TestClientFactory.open();
assertEquals(0, cluster.availableHosts().size());
cluster.connect().init();
assertEquals(1, cluster.availableHosts().size());
@@ -551,7 +551,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldFailWithBadServerSideSerialization() throws Exception {
- final Cluster cluster = Cluster.open();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
final ResultSet results = client.submit("TinkerGraph.open().variables()");
@@ -579,7 +579,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
final GryoMessageSerializerV1d0 serializer = new GryoMessageSerializerV1d0();
serializer.configure(m, null);
- final Cluster cluster = Cluster.build().serializer(serializer).create();
+ final Cluster cluster = TestClientFactory.build().serializer(serializer).create();
final Client client = cluster.connect();
final ResultSet resultSet = client.submit("TinkerFactory.createClassic()");
@@ -597,7 +597,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
final GryoMessageSerializerV1d0 serializer = new GryoMessageSerializerV1d0();
serializer.configure(m, null);
- final Cluster cluster = Cluster.build().serializer(serializer).create();
+ final Cluster cluster = TestClientFactory.build().serializer(serializer).create();
final Client client = cluster.connect();
final List<Result> json = client.submit("b = new JsonBuilder();b.people{person {fname 'stephen'\nlname 'mallette'}};b").all().join();
@@ -607,7 +607,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldWorkWithGraphSONSerialization() throws Exception {
- final Cluster cluster = Cluster.build("localhost").serializer(Serializers.GRAPHSON_V1D0).create();
+ final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V1D0).create();
final Client client = cluster.connect();
final List<Result> r = client.submit("TinkerFactory.createModern().traversal().V(1)").all().join();
@@ -644,7 +644,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
@org.junit.Ignore("Can't seem to make this test pass consistently")
public void shouldHandleRequestSentThatNeverReturns() throws Exception {
- final Cluster cluster = Cluster.open();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
final ResultSet results = client.submit("Thread.sleep(10000); 'should-not-ever-get-back-coz-we-killed-the-server'");
@@ -669,7 +669,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldFailClientSideWithTooLargeAResponse() {
- final Cluster cluster = Cluster.build().maxContentLength(1).create();
+ final Cluster cluster = TestClientFactory.build().maxContentLength(1).create();
final Client client = cluster.connect();
try {
@@ -686,7 +686,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldReturnNiceMessageFromOpSelector() {
- final Cluster cluster = Cluster.build().create();
+ final Cluster cluster = TestClientFactory.build().create();
final Client client = cluster.connect();
try {
@@ -704,7 +704,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldExecuteScriptInSession() throws Exception {
- final Cluster cluster = Cluster.build().create();
+ final Cluster cluster = TestClientFactory.build().create();
final Client client = cluster.connect(name.getMethodName());
final ResultSet results1 = client.submit("x = [1,2,3,4,5,6,7,8,9]");
@@ -721,7 +721,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldNotThrowNoSuchElementException() throws Exception {
- final Cluster cluster = Cluster.open();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
try {
@@ -734,7 +734,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldCloseSession() throws Exception {
- final Cluster cluster = Cluster.build().create();
+ final Cluster cluster = TestClientFactory.build().create();
final Client client = cluster.connect(name.getMethodName());
final ResultSet results1 = client.submit("x = [1,2,3,4,5,6,7,8,9]");
@@ -757,7 +757,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldExecuteScriptInSessionAssumingDefaultedImports() throws Exception {
- final Cluster cluster = Cluster.build().create();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect(name.getMethodName());
final ResultSet results1 = client.submit("TinkerFactory.class.name");
@@ -770,7 +770,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
public void shouldExecuteScriptInSessionOnTransactionalGraph() throws Exception {
assumeNeo4jIsPresent();
- final Cluster cluster = Cluster.build().create();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect(name.getMethodName());
final Vertex vertexBeforeTx = client.submit("v=graph.addVertex(\"name\",\"stephen\")").all().get().get(0).getVertex();
@@ -793,7 +793,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
public void shouldExecuteScriptInSessionOnTransactionalWithManualTransactionsGraph() throws Exception {
assumeNeo4jIsPresent();
- final Cluster cluster = Cluster.build().create();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect(name.getMethodName());
final Client sessionlessClient = cluster.connect();
client.submit("graph.tx().onReadWrite(Transaction.READ_WRITE_BEHAVIOR.MANUAL);null").all().get();
@@ -830,7 +830,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
public void shouldExecuteInSessionAndSessionlessWithoutOpeningTransaction() throws Exception {
assumeNeo4jIsPresent();
- final Cluster cluster = Cluster.build().create();
+ final Cluster cluster = TestClientFactory.open();
final Client sessionClient = cluster.connect(name.getMethodName());
final Client sessionlessClient = cluster.connect();
@@ -857,7 +857,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
public void shouldExecuteSessionlessScriptOnTransactionalGraph() throws Exception {
assumeNeo4jIsPresent();
- final Cluster cluster = Cluster.build().create();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
// this line is important because it tests GraphTraversal which has a certain transactional path
@@ -878,7 +878,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldExecuteScriptInSessionWithBindingsSavedOnServerBetweenRequests() throws Exception {
- final Cluster cluster = Cluster.build().create();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect(name.getMethodName());
final Map<String, Object> bindings1 = new HashMap<>();
@@ -906,7 +906,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldExecuteScriptsInMultipleSession() throws Exception {
- final Cluster cluster = Cluster.build().create();
+ final Cluster cluster = TestClientFactory.open();
final Client client1 = cluster.connect(name.getMethodName() + "1");
final Client client2 = cluster.connect(name.getMethodName() + "2");
final Client client3 = cluster.connect(name.getMethodName() + "3");
@@ -930,7 +930,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldNotHaveKnowledgeOfBindingsBetweenRequestsWhenSessionless() throws Exception {
- final Cluster cluster = Cluster.build().create();
+ final Cluster cluster = TestClientFactory.open();
final Client client1 = cluster.connect();
final Client client2 = cluster.connect();
final Client client3 = cluster.connect();
@@ -974,7 +974,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldBeThreadSafeToUseOneClient() throws Exception {
- final Cluster cluster = Cluster.build().workerPoolSize(2)
+ final Cluster cluster = TestClientFactory.build().workerPoolSize(2)
.maxInProcessPerConnection(64)
.minInProcessPerConnection(32)
.maxConnectionPoolSize(16)
@@ -1009,7 +1009,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldRequireAliasedGraphVariablesInStrictTransactionMode() throws Exception {
- final Cluster cluster = Cluster.build().create();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
try {
@@ -1029,7 +1029,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
public void shouldAliasGraphVariablesInStrictTransactionMode() throws Exception {
assumeNeo4jIsPresent();
- final Cluster cluster = Cluster.build().create();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
try {
@@ -1056,7 +1056,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldAliasGraphVariables() throws Exception {
- final Cluster cluster = Cluster.build().create();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
try {
@@ -1083,7 +1083,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldAliasTraversalSourceVariables() throws Exception {
- final Cluster cluster = Cluster.build().create();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
try {
@@ -1110,7 +1110,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldAliasGraphVariablesInSession() throws Exception {
- final Cluster cluster = Cluster.build().create();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect(name.getMethodName());
try {
@@ -1139,7 +1139,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldAliasTraversalSourceVariablesInSession() throws Exception {
- final Cluster cluster = Cluster.build().create();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect(name.getMethodName());
try {
@@ -1170,7 +1170,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
public void shouldManageTransactionsInSession() throws Exception {
assumeNeo4jIsPresent();
- final Cluster cluster = Cluster.build().create();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
final Client sessionWithManagedTx = cluster.connect(name.getMethodName() + "-managed", true);
final Client sessionWithoutManagedTx = cluster.connect(name.getMethodName() + "-not-managed");
@@ -1208,7 +1208,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldProcessSessionRequestsInOrderAfterTimeout() throws Exception {
- final Cluster cluster = Cluster.open();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect(name.getMethodName());
for(int index = 0; index < 50; index++)
@@ -1251,7 +1251,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldCloseAllClientsOnCloseOfCluster() throws Exception {
- final Cluster cluster = Cluster.open();
+ final Cluster cluster = TestClientFactory.open();
final Client sessionlessOne = cluster.connect();
final Client session = cluster.connect("session");
final Client sessionlessTwo = cluster.connect();
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/569753e3/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java
index d8be42e..b0b1e54 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java
@@ -77,7 +77,7 @@ public class GremlinResultSetIntegrateTest extends AbstractGremlinServerIntegrat
c.put("custom", Arrays.asList("groovy.json.JsonBuilder;org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderGryoSerializer"));
serializer.configure(c, null);
- cluster = Cluster.build().serializer(serializer).create();
+ cluster = TestClientFactory.build().serializer(serializer).create();
client = cluster.connect();
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/569753e3/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java
index 887d408..1c5188d 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java
@@ -72,7 +72,7 @@ public class GremlinServerAuthIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void shouldFailIfSslEnabledOnServerButNotClient() throws Exception {
- final Cluster cluster = Cluster.build().create();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
try {
@@ -89,7 +89,7 @@ public class GremlinServerAuthIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void shouldAuthenticateWithPlainText() throws Exception {
- final Cluster cluster = Cluster.build().credentials("stephen", "password").create();
+ final Cluster cluster = TestClientFactory.build().credentials("stephen", "password").create();
final Client client = cluster.connect();
try {
@@ -103,7 +103,7 @@ public class GremlinServerAuthIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void shouldAuthenticateOverSslWithPlainText() throws Exception {
- final Cluster cluster = Cluster.build()
+ final Cluster cluster = TestClientFactory.build()
.enableSsl(true)
.credentials("stephen", "password").create();
final Client client = cluster.connect();
@@ -119,7 +119,7 @@ public class GremlinServerAuthIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void shouldFailAuthenticateWithPlainTextNoCredentials() throws Exception {
- final Cluster cluster = Cluster.build().create();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
try {
@@ -135,7 +135,7 @@ public class GremlinServerAuthIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void shouldFailAuthenticateWithPlainTextBadPassword() throws Exception {
- final Cluster cluster = Cluster.build().credentials("stephen", "bad").create();
+ final Cluster cluster = TestClientFactory.build().credentials("stephen", "bad").create();
final Client client = cluster.connect();
try {
@@ -152,7 +152,7 @@ public class GremlinServerAuthIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void shouldFailAuthenticateWithPlainTextBadUsername() throws Exception {
- final Cluster cluster = Cluster.build().credentials("marko", "password").create();
+ final Cluster cluster = TestClientFactory.build().credentials("marko", "password").create();
final Client client = cluster.connect();
try {
@@ -168,7 +168,8 @@ public class GremlinServerAuthIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void shouldAuthenticateWithPlainTextOverJSONSerialization() throws Exception {
- final Cluster cluster = Cluster.build().serializer(Serializers.GRAPHSON).credentials("stephen", "password").create();
+ final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON)
+ .credentials("stephen", "password").create();
final Client client = cluster.connect();
try {
@@ -182,7 +183,8 @@ public class GremlinServerAuthIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void shouldAuthenticateWithPlainTextOverGraphSONSerialization() throws Exception {
- final Cluster cluster = Cluster.build().serializer(Serializers.GRAPHSON_V1D0).credentials("stephen", "password").create();
+ final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V1D0)
+ .credentials("stephen", "password").create();
final Client client = cluster.connect();
try {
@@ -196,7 +198,8 @@ public class GremlinServerAuthIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void shouldAuthenticateAndWorkWithVariablesOverJsonSerialization() throws Exception {
- final Cluster cluster = Cluster.build().serializer(Serializers.GRAPHSON).credentials("stephen", "password").create();
+ final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON)
+ .credentials("stephen", "password").create();
final Client client = cluster.connect(name.getMethodName());
try {
@@ -213,7 +216,8 @@ public class GremlinServerAuthIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void shouldAuthenticateAndWorkWithVariablesOverGraphSONSerialization() throws Exception {
- final Cluster cluster = Cluster.build().serializer(Serializers.GRAPHSON_V1D0).credentials("stephen", "password").create();
+ final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V1D0)
+ .credentials("stephen", "password").create();
final Client client = cluster.connect(name.getMethodName());
try {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/569753e3/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthOldIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthOldIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthOldIntegrateTest.java
index 2f332be..f0e2104 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthOldIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthOldIntegrateTest.java
@@ -24,7 +24,6 @@ import org.apache.tinkerpop.gremlin.driver.Cluster;
import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
import org.apache.tinkerpop.gremlin.server.auth.SimpleAuthenticator;
-import org.ietf.jgss.GSSException;
import org.junit.Test;
import java.util.HashMap;
@@ -76,7 +75,7 @@ public class GremlinServerAuthOldIntegrateTest extends AbstractGremlinServerInte
@Test
public void shouldFailIfSslEnabledOnServerButNotClient() throws Exception {
- final Cluster cluster = Cluster.build().create();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
try {
@@ -93,7 +92,7 @@ public class GremlinServerAuthOldIntegrateTest extends AbstractGremlinServerInte
@Test
public void shouldAuthenticateWithPlainText() throws Exception {
- final Cluster cluster = Cluster.build().credentials("stephen", "password").create();
+ final Cluster cluster = TestClientFactory.build().credentials("stephen", "password").create();
final Client client = cluster.connect();
try {
@@ -107,7 +106,7 @@ public class GremlinServerAuthOldIntegrateTest extends AbstractGremlinServerInte
@Test
public void shouldAuthenticateOverSslWithPlainText() throws Exception {
- final Cluster cluster = Cluster.build()
+ final Cluster cluster = TestClientFactory.build()
.enableSsl(true)
.credentials("stephen", "password").create();
final Client client = cluster.connect();
@@ -123,7 +122,7 @@ public class GremlinServerAuthOldIntegrateTest extends AbstractGremlinServerInte
@Test
public void shouldFailAuthenticateWithPlainTextNoCredentials() throws Exception {
- final Cluster cluster = Cluster.build().create();
+ final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
try {
@@ -142,7 +141,7 @@ public class GremlinServerAuthOldIntegrateTest extends AbstractGremlinServerInte
@Test
public void shouldFailAuthenticateWithPlainTextBadPassword() throws Exception {
- final Cluster cluster = Cluster.build().credentials("stephen", "bad").create();
+ final Cluster cluster = TestClientFactory.build().credentials("stephen", "bad").create();
final Client client = cluster.connect();
try {
@@ -159,7 +158,7 @@ public class GremlinServerAuthOldIntegrateTest extends AbstractGremlinServerInte
@Test
public void shouldFailAuthenticateWithPlainTextBadUsername() throws Exception {
- final Cluster cluster = Cluster.build().credentials("marko", "password").create();
+ final Cluster cluster = TestClientFactory.build().credentials("marko", "password").create();
final Client client = cluster.connect();
try {
@@ -175,7 +174,8 @@ public class GremlinServerAuthOldIntegrateTest extends AbstractGremlinServerInte
@Test
public void shouldAuthenticateWithPlainTextOverJSONSerialization() throws Exception {
- final Cluster cluster = Cluster.build().serializer(Serializers.GRAPHSON).credentials("stephen", "password").create();
+ final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON)
+ .credentials("stephen", "password").create();
final Client client = cluster.connect();
try {
@@ -189,7 +189,8 @@ public class GremlinServerAuthOldIntegrateTest extends AbstractGremlinServerInte
@Test
public void shouldAuthenticateWithPlainTextOverGraphSONSerialization() throws Exception {
- final Cluster cluster = Cluster.build().serializer(Serializers.GRAPHSON_V1D0).credentials("stephen", "password").create();
+ final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V1D0)
+ .credentials("stephen", "password").create();
final Client client = cluster.connect();
try {
@@ -203,7 +204,8 @@ public class GremlinServerAuthOldIntegrateTest extends AbstractGremlinServerInte
@Test
public void shouldAuthenticateAndWorkWithVariablesOverJsonSerialization() throws Exception {
- final Cluster cluster = Cluster.build().serializer(Serializers.GRAPHSON).credentials("stephen", "password").create();
+ final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON)
+ .credentials("stephen", "password").create();
final Client client = cluster.connect(name.getMethodName());
try {
@@ -220,7 +222,8 @@ public class GremlinServerAuthOldIntegrateTest extends AbstractGremlinServerInte
@Test
public void shouldAuthenticateAndWorkWithVariablesOverGraphSONSerialization() throws Exception {
- final Cluster cluster = Cluster.build().serializer(Serializers.GRAPHSON_V1D0).credentials("stephen", "password").create();
+ final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V1D0)
+ .credentials("stephen", "password").create();
final Client client = cluster.connect(name.getMethodName());
try {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/569753e3/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 f8efda9..df47775 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
@@ -125,7 +125,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should401OnGETWithNoAuthorizationHeader() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet("http://localhost:8182?gremlin=1-1");
+ final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=1-1"));
try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
assertEquals(401, response.getStatusLine().getStatusCode());
@@ -135,7 +135,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should401OnPOSTWithNoAuthorizationHeader() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpPost httppost = new HttpPost("http://localhost:8182");
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
httppost.setEntity(new StringEntity("{\"gremlin\":\"1-1\"}", Consts.UTF_8));
@@ -147,7 +147,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should401OnGETWithBadAuthorizationHeader() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet("http://localhost:8182?gremlin=1-1");
+ final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=1-1"));
httpget.addHeader("Authorization", "not-base-64-encoded");
try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
@@ -158,7 +158,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should401OnPOSTWithBadAuthorizationHeader() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpPost httppost = new HttpPost("http://localhost:8182");
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
httppost.addHeader("Authorization", "not-base-64-encoded");
httppost.setEntity(new StringEntity("{\"gremlin\":\"1-1\"}", Consts.UTF_8));
@@ -171,7 +171,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should401OnGETWithBadEncodedAuthorizationHeader() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet("http://localhost:8182?gremlin=1-1");
+ final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=1-1"));
httpget.addHeader("Authorization", "Basic: not-base-64-encoded");
try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
@@ -182,7 +182,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should401OnPOSTWithBadEncodedAuthorizationHeader() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpPost httppost = new HttpPost("http://localhost:8182");
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
httppost.addHeader("Authorization", "Basic: not-base-64-encoded");
httppost.setEntity(new StringEntity("{\"gremlin\":\"1-1\"}", Consts.UTF_8));
@@ -195,7 +195,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should401OnGETWithInvalidPasswordAuthorizationHeader() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet("http://localhost:8182?gremlin=1-1");
+ final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=1-1"));
httpget.addHeader("Authorization", "Basic " + encoder.encodeToString("stephen:not-my-password".getBytes()));
try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
@@ -206,7 +206,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should401OnPOSTWithInvalidPasswordAuthorizationHeader() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpPost httppost = new HttpPost("http://localhost:8182");
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
httppost.addHeader("Authorization", "Basic " + encoder.encodeToString("stephen:not-my-password".getBytes()));
httppost.setEntity(new StringEntity("{\"gremlin\":\"1-1\"}", Consts.UTF_8));
@@ -220,7 +220,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Deprecated
public void should401OnPOSTWithInvalidPasswordAuthorizationHeaderOld() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpPost httppost = new HttpPost("http://localhost:8182");
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
httppost.addHeader("Authorization", "Basic " + encoder.encodeToString("stephen:not-my-password".getBytes()));
httppost.setEntity(new StringEntity("{\"gremlin\":\"1-1\"}", Consts.UTF_8));
@@ -233,7 +233,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should200OnGETWithAuthorizationHeader() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet("http://localhost:8182?gremlin=1-1");
+ final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=1-1"));
httpget.addHeader("Authorization", "Basic " + encoder.encodeToString("stephen:password".getBytes()));
try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
@@ -248,7 +248,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should200OnPOSTWithAuthorizationHeader() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpPost httppost = new HttpPost("http://localhost:8182");
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
httppost.addHeader("Authorization", "Basic " + encoder.encodeToString("stephen:password".getBytes()));
httppost.setEntity(new StringEntity("{\"gremlin\":\"1-1\"}", Consts.UTF_8));
@@ -266,7 +266,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Deprecated
public void should200OnPOSTWithAuthorizationHeaderOld() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpPost httppost = new HttpPost("http://localhost:8182");
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
httppost.addHeader("Authorization", "Basic " + encoder.encodeToString("stephen:password".getBytes()));
httppost.setEntity(new StringEntity("{\"gremlin\":\"1-1\"}", Consts.UTF_8));
@@ -283,7 +283,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should200OnGETWithGremlinQueryStringArgumentWithBindingsAndFunction() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet("http://localhost:8182?gremlin=addItUp(Integer.parseInt(x),Integer.parseInt(y))&bindings.x=10&bindings.y=10");
+ final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=addItUp(Integer.parseInt(x),Integer.parseInt(y))&bindings.x=10&bindings.y=10"));
try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
assertEquals(200, response.getStatusLine().getStatusCode());
@@ -297,7 +297,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(TestClientFactory.createURLString("?gremlin=g.V()"));
try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
assertEquals(200, response.getStatusLine().getStatusCode());
@@ -312,7 +312,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
public void should200OnGETWithGremlinQueryStringArgumentWithIteratorResultAndAliases() throws Exception {
// we can remove this first test when rebindings are completely removed
final CloseableHttpClient httpclientLegacy = HttpClients.createDefault();
- final HttpGet httpgetLegacy = new HttpGet("http://localhost:8182?gremlin=g1.V()&rebindings.g1=g");
+ final HttpGet httpgetLegacy = new HttpGet(TestClientFactory.createURLString("?gremlin=g1.V()&rebindings.g1=g"));
try (final CloseableHttpResponse response = httpclientLegacy.execute(httpgetLegacy)) {
assertEquals(200, response.getStatusLine().getStatusCode());
@@ -323,7 +323,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
}
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet("http://localhost:8182?gremlin=g1.V()&aliases.g1=g");
+ final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=g1.V()&aliases.g1=g"));
try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
assertEquals(200, response.getStatusLine().getStatusCode());
@@ -337,7 +337,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should200OnGETWithGremlinQueryStringArgument() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet("http://localhost:8182?gremlin=1-1");
+ final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=1-1"));
try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
assertEquals(200, response.getStatusLine().getStatusCode());
@@ -351,7 +351,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should200OnGETWithGremlinQueryStringArgumentReturningVertex() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet("http://localhost:8182?gremlin=graph.addVertex('name','stephen')");
+ final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=graph.addVertex('name','stephen')"));
try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
assertEquals(200, response.getStatusLine().getStatusCode());
@@ -365,7 +365,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should200OnGETWithGremlinQueryStringArgumentWithBindings() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet("http://localhost:8182?gremlin=Integer.parseInt(x)%2BInteger.parseInt(y)&bindings.x=10&bindings.y=10");
+ final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=Integer.parseInt(x)%2BInteger.parseInt(y)&bindings.x=10&bindings.y=10"));
try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
assertEquals(200, response.getStatusLine().getStatusCode());
@@ -379,7 +379,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should400OnGETWithNoGremlinQueryStringArgument() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet("http://localhost:8182");
+ final HttpGet httpget = new HttpGet(TestClientFactory.createURLString());
try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
assertEquals(400, response.getStatusLine().getStatusCode());
@@ -389,7 +389,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should200OnGETWithAnyAcceptHeaderDefaultResultToJson() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet("http://localhost:8182?gremlin=1-1");
+ final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=1-1"));
httpget.addHeader("Accept", "*/*");
try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
@@ -404,7 +404,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should400OnGETWithBadAcceptHeader() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet("http://localhost:8182?gremlin=1-1");
+ final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=1-1"));
httpget.addHeader("Accept", "application/json+something-else-that-does-not-exist");
try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
@@ -415,7 +415,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should200OnPOSTWithGremlinJsonEndcodedBody() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpPost httppost = new HttpPost("http://localhost:8182");
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
httppost.setEntity(new StringEntity("{\"gremlin\":\"1-1\"}", Consts.UTF_8));
@@ -433,7 +433,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
// basic test of java.time.* serialization over JSON from the server perspective. more complete tests
// exist in gremlin-core
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpPost httppost = new HttpPost("http://localhost:8182");
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
httppost.setEntity(new StringEntity("{\"gremlin\":\"java.time.Instant.MAX\"}", Consts.UTF_8));
@@ -451,7 +451,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
assumeNeo4jIsPresent();
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpPost httppost = new HttpPost("http://localhost:8182");
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
httppost.setEntity(new StringEntity("{\"gremlin\":\"graph.addVertex('name','stephen');g.V().count()\"}", Consts.UTF_8));
@@ -463,7 +463,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
assertEquals(1, node.get("result").get("data").get(0).intValue());
}
- final HttpGet httpget = new HttpGet("http://localhost:8182?gremlin=g.V().count()");
+ final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=g.V().count()"));
httpget.addHeader("Accept", "application/json");
// execute this a bunch of times so that there's a good chance a different thread on the server processes
@@ -485,7 +485,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
// we can remove this first test when rebindings are completely removed
final CloseableHttpClient httpclientLegacy = HttpClients.createDefault();
- final HttpPost httppostLegacy = new HttpPost("http://localhost:8182");
+ final HttpPost httppostLegacy = new HttpPost(TestClientFactory.createURLString());
httppostLegacy.addHeader("Content-Type", "application/json");
httppostLegacy.setEntity(new StringEntity("{\"gremlin\":\"g1.addV()\",\"rebindings\":{\"g1\":\"g\"}}", Consts.UTF_8));
@@ -498,7 +498,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
}
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpPost httppost = new HttpPost("http://localhost:8182");
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
httppost.setEntity(new StringEntity("{\"gremlin\":\"g1.addV()\",\"aliases\":{\"g1\":\"g\"}}", Consts.UTF_8));
@@ -514,7 +514,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should200OnPOSTWithGremlinJsonEndcodedBodyWithIteratorResult() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpPost httppost = new HttpPost("http://localhost:8182");
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
httppost.setEntity(new StringEntity("{\"gremlin\":\"g.V()\"}", Consts.UTF_8));
@@ -530,7 +530,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should200OnPOSTWithGremlinJsonEndcodedBodyWithTinkerGraphResult() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpPost httppost = new HttpPost("http://localhost:8182");
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
httppost.setEntity(new StringEntity("{\"gremlin\":\"org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory.createModern()\"}", Consts.UTF_8));
@@ -554,7 +554,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
public void should200OnPOSTWithGremlinJsonEndcodedBodyWithIteratorResultAndAliases() throws Exception {
// we can remove this first test when rebindings are completely removed
final CloseableHttpClient httpclientLegacy = HttpClients.createDefault();
- final HttpPost httppostLegacy = new HttpPost("http://localhost:8182");
+ final HttpPost httppostLegacy = new HttpPost(TestClientFactory.createURLString());
httppostLegacy.addHeader("Content-Type", "application/json");
httppostLegacy.setEntity(new StringEntity("{\"gremlin\":\"g1.V()\",\"rebindings\":{\"g1\":\"g\"}}", Consts.UTF_8));
@@ -567,7 +567,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
}
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpPost httppost = new HttpPost("http://localhost:8182");
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
httppost.setEntity(new StringEntity("{\"gremlin\":\"g1.V()\",\"aliases\":{\"g1\":\"g\"}}", Consts.UTF_8));
@@ -583,7 +583,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should200OnPOSTWithGremlinJsonEndcodedBodyAndBindings() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpPost httppost = new HttpPost("http://localhost:8182");
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
httppost.setEntity(new StringEntity("{\"gremlin\":\"x+y\", \"bindings\":{\"x\":10, \"y\":10}}", Consts.UTF_8));
@@ -599,7 +599,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should200OnPOSTWithGremlinJsonEndcodedBodyAndLongBindings() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpPost httppost = new HttpPost("http://localhost:8182");
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
httppost.setEntity(new StringEntity("{\"gremlin\":\"x\", \"bindings\":{\"x\":10}}", Consts.UTF_8));
@@ -615,7 +615,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should200OnPOSTWithGremlinJsonEndcodedBodyAndDoubleBindings() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpPost httppost = new HttpPost("http://localhost:8182");
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
httppost.setEntity(new StringEntity("{\"gremlin\":\"x\", \"bindings\":{\"x\":10.5}}", Consts.UTF_8));
@@ -631,7 +631,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should200OnPOSTWithGremlinJsonEndcodedBodyAndStringBindings() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpPost httppost = new HttpPost("http://localhost:8182");
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
httppost.setEntity(new StringEntity("{\"gremlin\":\"x\", \"bindings\":{\"x\":\"10\"}}", Consts.UTF_8));
@@ -647,7 +647,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should200OnPOSTWithGremlinJsonEndcodedBodyAndBooleanBindings() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpPost httppost = new HttpPost("http://localhost:8182");
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
httppost.setEntity(new StringEntity("{\"gremlin\":\"x\", \"bindings\":{\"x\":true}}", Consts.UTF_8));
@@ -663,7 +663,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should200OnPOSTWithGremlinJsonEndcodedBodyAndNullBindings() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpPost httppost = new HttpPost("http://localhost:8182");
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
httppost.setEntity(new StringEntity("{\"gremlin\":\"x\", \"bindings\":{\"x\":null}}", Consts.UTF_8));
@@ -679,7 +679,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should200OnPOSTWithGremlinJsonEndcodedBodyAndArrayBindings() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpPost httppost = new HttpPost("http://localhost:8182");
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
httppost.setEntity(new StringEntity("{\"gremlin\":\"x\", \"bindings\":{\"x\":[1,2,3]}}", Consts.UTF_8));
@@ -698,7 +698,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should200OnPOSTWithGremlinJsonEndcodedBodyAndMapBindings() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpPost httppost = new HttpPost("http://localhost:8182");
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
httppost.setEntity(new StringEntity("{\"gremlin\":\"x\", \"bindings\":{\"x\":{\"y\":1}}}", Consts.UTF_8));
@@ -715,7 +715,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should400OnPOSTWithGremlinJsonEndcodedBodyAndBadBindings() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpPost httppost = new HttpPost("http://localhost:8182");
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
httppost.setEntity(new StringEntity("{\"gremlin\":\"x+y\", \"bindings\":10}}", Consts.UTF_8));
@@ -727,7 +727,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should400OnPOSTWithGremlinJsonEndcodedBodyWithNoGremlinKey() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpPost httppost = new HttpPost("http://localhost:8182");
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
httppost.setEntity(new StringEntity("{\"gremadfadflin\":\"1-1\"}", Consts.UTF_8));
@@ -739,7 +739,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should400OnPOSTWithBadAcceptHeader() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpPost httppost = new HttpPost("http://localhost:8182");
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
httppost.addHeader("Accept", "application/json+something-else-that-does-not-exist");
httppost.setEntity(new StringEntity("{\"gremlin\":\"1-1\"}", Consts.UTF_8));
@@ -752,7 +752,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should200OnPOSTWithAnyAcceptHeaderDefaultResultToJson() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpPost httppost = new HttpPost("http://localhost:8182");
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
httppost.addHeader("Accept", "*/*");
httppost.setEntity(new StringEntity("{\"gremlin\":\"1-1\"}", Consts.UTF_8));
@@ -769,7 +769,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should200OnPOSTWithComplexAcceptHeaderDefaultResultToJson() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpPost httppost = new HttpPost("http://localhost:8182");
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "*.*;q=0.8,application/xhtml");
httppost.addHeader("Accept", "*/*");
httppost.setEntity(new StringEntity("{\"gremlin\":\"1-1\"}", Consts.UTF_8));
@@ -786,7 +786,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should500OnGETWithGremlinEvalFailure() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpPost httppost = new HttpPost("http://localhost:8182");
+ final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
httppost.addHeader("Content-Type", "application/json");
httppost.setEntity(new StringEntity("{\"gremlin\":\"1/0\"}", Consts.UTF_8));