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 2015/06/30 17:56:10 UTC
[08/10] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/resultset-refactor'
Merge remote-tracking branch 'origin/resultset-refactor'
Conflicts:
gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/b27be302
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/b27be302
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/b27be302
Branch: refs/heads/master
Commit: b27be3026520fb730ea7ab1027cc4673aeff6947
Parents: 99e0920 f65e6ca
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jun 30 11:52:10 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jun 30 11:52:10 2015 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/driver/Connection.java | 3 +-
.../tinkerpop/gremlin/driver/Handler.java | 5 +
.../tinkerpop/gremlin/driver/ResultQueue.java | 91 ++++++++++-----
.../tinkerpop/gremlin/driver/ResultSet.java | 69 ++++-------
.../driver/handler/WebSocketClientHandler.java | 1 +
.../server/GremlinDriverIntegrateTest.java | 114 +++++++++++++++++--
.../server/GremlinServerIntegrateTest.java | 6 +-
7 files changed, 202 insertions(+), 87 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b27be302/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 21f14b8,1b5f6c5..273b5db
--- 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
@@@ -54,11 -54,9 +55,13 @@@ import java.util.stream.Collectors
import java.util.stream.IntStream;
import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+ import static org.hamcrest.CoreMatchers.is;
+ import static org.hamcrest.core.StringStartsWith.startsWith;
-import static org.junit.Assert.*;
/**
* Integration tests for gremlin-driver configurations and settings.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b27be302/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
----------------------------------------------------------------------