Merge branch 'tp32'
Conflicts:
gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/005d2eb4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/005d2eb4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/005d2eb4
Branch: refs/heads/master
Commit: 005d2eb42400d5f286c197f978cc241634956258
Parents: 4247e7d 2704245
Author: Stephen Mallette <[email protected]>
Authored: Tue Jul 18 16:58:46 2017 -0400
Committer: Stephen Mallette <[email protected]>
Committed: Tue Jul 18 16:58:46 2017 -0400
----------------------------------------------------------------------
.../server/GremlinDriverIntegrateTest.java | 26 --------------------
1 file changed, 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/005d2eb4/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
----------------------------------------------------------------------
diff --cc
gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
index 70e939e,6d4f236..4206cf9
---
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
@@@ -800,66 -764,6 +800,40 @@@ public class GremlinDriverIntegrateTes
}
@Test
+ public void shouldWorkWithGraphSONV3Serialization() throws Exception {
+ final Cluster cluster =
TestClientFactory.build().serializer(Serializers.GRAPHSON_V3D0).create();
+ final Client client = cluster.connect();
+
+ final List<Result> r =
client.submit("TinkerFactory.createModern().traversal().V(1)").all().join();
+ assertEquals(1, r.size());
+
+ final Vertex v = r.get(0).get(DetachedVertex.class);
+ assertEquals(1, v.id());
+ assertEquals("person", v.label());
+
+ assertEquals(2, IteratorUtils.count(v.properties()));
+ assertEquals("marko", v.value("name"));
+ assertEquals(29, Integer.parseInt(v.value("age").toString()));
+
+ cluster.close();
+ }
+
+ @Test
+ public void shouldWorkWithGraphSONExtendedV3Serialization() throws
Exception {
+ final Cluster cluster =
TestClientFactory.build().serializer(Serializers.GRAPHSON_V3D0).create();
+ final Client client = cluster.connect();
+
+ final Instant now = Instant.now();
+ final List<Result> r =
client.submit("java.time.Instant.ofEpochMilli(" + now.toEpochMilli() +
")").all().join();
+ assertEquals(1, r.size());
+
+ final Instant then = r.get(0).get(Instant.class);
+ assertEquals(now, then);
+
+ cluster.close();
+ }
+
+ @Test
- @org.junit.Ignore("Can't seem to make this test pass consistently")
- public void shouldHandleRequestSentThatNeverReturns() throws Exception {
- 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'");
-
- stopServer();
-
- // give the server a chance to kill everything
- Thread.sleep(1000);
-
- try {
- results.all().get(10000, TimeUnit.MILLISECONDS);
- fail("Server was stopped before the request could execute");
- } catch (TimeoutException toe) {
- fail("Should not have tossed a TimeOutException getting the
result");
- } catch (Exception ex) {
- final Throwable cause = ExceptionUtils.getCause(ex);
- assertThat(cause.getMessage(), containsString("rejected from
java.util.concurrent.ThreadPoolExecutor"));
- }
-
- cluster.close();
- }
-
- @Test
public void shouldFailClientSideWithTooLargeAResponse() {
final Cluster cluster =
TestClientFactory.build().maxContentLength(1).create();
final Client client = cluster.connect();
