Repository: tinkerpop Updated Branches: refs/heads/master 534d31416 -> a74fa0a58
Fixed failing tests - assert different exception CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/38289c83 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/38289c83 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/38289c83 Branch: refs/heads/master Commit: 38289c836f33b1b5d97f71f0a9fa0114110a8e09 Parents: 2cb989b Author: Stephen Mallette <[email protected]> Authored: Tue May 9 07:47:05 2017 -0400 Committer: Stephen Mallette <[email protected]> Committed: Tue May 9 07:47:05 2017 -0400 ---------------------------------------------------------------------- .../gremlin/server/GremlinServerAuthIntegrateTest.java | 3 ++- .../gremlin/server/GremlinServerAuthOldIntegrateTest.java | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/38289c83/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 1c5188d..7eefa27 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 @@ -23,6 +23,7 @@ import org.apache.tinkerpop.gremlin.driver.Client; import org.apache.tinkerpop.gremlin.driver.Cluster; import org.apache.tinkerpop.gremlin.driver.exception.ResponseException; import org.apache.tinkerpop.gremlin.server.auth.SimpleAuthenticator; +import org.ietf.jgss.GSSException; import org.junit.Test; import java.util.HashMap; @@ -127,7 +128,7 @@ public class GremlinServerAuthIntegrateTest extends AbstractGremlinServerIntegra fail("This should not succeed as the client did not provide credentials"); } catch(Exception ex) { final Throwable root = ExceptionUtils.getRootCause(ex); - assertEquals(ResponseException.class, root.getClass()); + assertEquals(GSSException.class, root.getClass()); } finally { cluster.close(); } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/38289c83/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 f0e2104..5a0fff7 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,6 +24,7 @@ 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; @@ -130,10 +131,7 @@ public class GremlinServerAuthOldIntegrateTest extends AbstractGremlinServerInte fail("This should not succeed as the client did not provide credentials"); } catch(Exception ex) { final Throwable root = ExceptionUtils.getRootCause(ex); - assertEquals(ResponseException.class, root.getClass()); - - // removed this assert as the text of the message changes based on kerberos config - stupid kerberos - // assertThat(root.getMessage(), startsWith("Invalid name provided")); + assertEquals(GSSException.class, root.getClass()); } finally { cluster.close(); }
