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/07 23:33:27 UTC

[6/7] tinkerpop git commit: TINKERPOP-1434 Fixed logic in integration tests given improved approach

TINKERPOP-1434 Fixed logic in integration tests given improved approach


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/03d11098
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/03d11098
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/03d11098

Branch: refs/heads/tp32
Commit: 03d1109865a401ded2453911f7c8648a9741d554
Parents: ed98ee9
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Nov 4 15:46:18 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Nov 4 15:46:18 2016 -0400

----------------------------------------------------------------------
 .../gremlin/server/GremlinServerIntegrateTest.java       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/03d11098/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 26b532b..15db36d 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
@@ -60,6 +60,7 @@ import org.apache.tinkerpop.gremlin.util.Log4jRecordingAppender;
 import org.apache.tinkerpop.gremlin.util.function.Lambda;
 import org.hamcrest.CoreMatchers;
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -865,11 +866,17 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
         se.close();
 
         // Can't get new side effects after close
-        assertNull(se.get("b"));
+        try {
+            se.get("b");
+            fail("The traversal is closed");
+        } catch (Exception ex) {
+            assertThat(ex, instanceOf(IllegalStateException.class));
+            assertEquals("Traversal has been closed - no new side-effects can be retrieved", ex.getMessage());
+        }
 
         // Earlier keys should be cached locally
         final Set<String> localSideEffectKeys = se.keys();
-        assertEquals(1, localSideEffectKeys.size());
+        assertEquals(2, localSideEffectKeys.size());
         final BulkSet localSideEffects = se.get("a");
         assertThat(localSideEffects.isEmpty(), is(false));