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/83ac6832 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/83ac6832 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/83ac6832 Branch: refs/heads/TINKERPOP-1502 Commit: 83ac683266418343684f35300eb088af23143fcc Parents: ad01fa1 Author: Stephen Mallette <sp...@genoprime.com> Authored: Sun Nov 13 09:03:13 2016 -0500 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Mon Nov 14 18:49:28 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 | 94 ++++++++++---------- .../server/GremlinResultSetIntegrateTest.java | 2 +- .../server/GremlinServerAuthIntegrateTest.java | 24 ++--- .../GremlinServerAuthOldIntegrateTest.java | 25 +++--- .../server/GremlinServerHttpIntegrateTest.java | 92 +++++++++---------- .../server/GremlinServerIntegrateTest.java | 68 +++++++------- .../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, 236 insertions(+), 167 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/83ac6832/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index ccbbc89..7041489 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -540,6 +540,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/83ac6832/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/83ac6832/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/83ac6832/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/83ac6832/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 1c7c666..a7ef1a9 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/83ac6832/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/83ac6832/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 7808c7e..14750bd 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 @@ -82,7 +82,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/83ac6832/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 d2d9d97..c562756 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 @@ -83,7 +83,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/83ac6832/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 d8aff4a..daf4df6 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 @@ -206,7 +206,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(); @@ -227,7 +227,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 @@ -250,7 +250,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 { @@ -274,7 +274,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 @@ -289,7 +289,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" + @@ -328,7 +328,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"); @@ -351,7 +351,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"); @@ -374,7 +374,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'"); @@ -397,7 +397,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'"); @@ -423,7 +423,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); @@ -441,7 +441,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); @@ -459,7 +459,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]"); @@ -476,7 +476,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]"); @@ -498,7 +498,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]"); @@ -526,7 +526,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]"); @@ -574,7 +574,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(); @@ -598,7 +598,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(); @@ -608,7 +608,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()); @@ -623,7 +623,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()"); @@ -651,7 +651,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()"); @@ -669,7 +669,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(); @@ -679,7 +679,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration @Test public void shouldWorkWithGraphSONV1Serialization() 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(); @@ -715,7 +715,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration @Test public void shouldWorkWithGraphSONV2Serialization() throws Exception { - final Cluster cluster = Cluster.build("localhost").serializer(Serializers.GRAPHSON_V2D0).create(); + final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V2D0).create(); final Client client = cluster.connect(); final List<Result> r = client.submit("TinkerFactory.createModern().traversal().V(1)").all().join(); @@ -750,7 +750,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'"); @@ -775,7 +775,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 { @@ -792,7 +792,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 { @@ -810,7 +810,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]"); @@ -827,7 +827,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 { @@ -840,7 +840,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]"); @@ -863,7 +863,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"); @@ -876,7 +876,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(); @@ -899,7 +899,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(); @@ -936,7 +936,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(); @@ -963,7 +963,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 @@ -984,7 +984,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<>(); @@ -1012,7 +1012,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"); @@ -1036,7 +1036,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(); @@ -1080,7 +1080,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) @@ -1115,7 +1115,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 { @@ -1135,7 +1135,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 { @@ -1162,7 +1162,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 { @@ -1189,7 +1189,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 { @@ -1216,7 +1216,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 { @@ -1245,7 +1245,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 { @@ -1276,7 +1276,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"); @@ -1314,7 +1314,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++) @@ -1357,7 +1357,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/83ac6832/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 3c1efef..9916f73 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 @@ -83,7 +83,7 @@ public class GremlinResultSetIntegrateTest extends AbstractGremlinServerIntegrat c.put("custom", Collections.singletonList("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/83ac6832/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/83ac6832/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/83ac6832/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 6d5fc7c..cefe0df 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 @@ -132,7 +132,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()); @@ -142,7 +142,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)); @@ -154,7 +154,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)) { @@ -165,7 +165,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)); @@ -178,7 +178,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)) { @@ -189,7 +189,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)); @@ -202,7 +202,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)) { @@ -213,7 +213,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)); @@ -227,7 +227,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)); @@ -240,7 +240,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)) { @@ -255,7 +255,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)); @@ -273,7 +273,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)); @@ -290,7 +290,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()); @@ -304,7 +304,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()); @@ -319,7 +319,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()); @@ -330,7 +330,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()); @@ -344,7 +344,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()); @@ -358,7 +358,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()); @@ -372,7 +372,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()); @@ -386,7 +386,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()); @@ -396,7 +396,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)) { @@ -411,7 +411,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)) { @@ -422,7 +422,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)); @@ -440,7 +440,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)); @@ -458,7 +458,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)); @@ -470,7 +470,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 @@ -492,7 +492,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)); @@ -505,7 +505,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)); @@ -521,7 +521,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)); @@ -537,7 +537,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)); @@ -561,7 +561,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)); @@ -574,7 +574,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)); @@ -590,7 +590,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)); @@ -606,7 +606,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)); @@ -622,7 +622,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)); @@ -638,7 +638,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)); @@ -654,7 +654,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)); @@ -670,7 +670,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)); @@ -686,7 +686,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)); @@ -705,7 +705,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)); @@ -722,7 +722,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)); @@ -734,7 +734,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)); @@ -746,7 +746,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)); @@ -759,7 +759,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)); @@ -776,7 +776,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)); @@ -793,7 +793,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));
