From 7c760d37d8b3c3766abafcc410c2f87a076c1cbb Mon Sep 17 00:00:00 2001 From: Praveena G Date: Wed, 14 Jun 2017 11:50:13 +0100 Subject: [PATCH] update java driver to 1.4 --- build.gradle | 2 +- .../org/neo4j/shell/state/BoltStateHandlerTest.java | 7 ++++--- .../java/org/neo4j/shell/test/bolt/FakeDriver.java | 10 ++++++++++ .../test/java/org/neo4j/shell/test/bolt/FakeValue.java | 5 +++++ 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 68f42418..c4de7296 100644 --- a/build.gradle +++ b/build.gradle @@ -72,7 +72,7 @@ ext { argparse4jVersion = '0.7.0' junitVersion = '4.12' - neo4jJavaVersion = '1.2.1' + neo4jJavaVersion = '1.4.0' findbugsVersion = '3.0.0' jansiVersion = '1.13' jlineVersion = '2.14.2' diff --git a/cypher-shell/src/test/java/org/neo4j/shell/state/BoltStateHandlerTest.java b/cypher-shell/src/test/java/org/neo4j/shell/state/BoltStateHandlerTest.java index b7d97c22..bffcbb21 100644 --- a/cypher-shell/src/test/java/org/neo4j/shell/state/BoltStateHandlerTest.java +++ b/cypher-shell/src/test/java/org/neo4j/shell/state/BoltStateHandlerTest.java @@ -38,6 +38,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.anyObject; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; @@ -56,7 +57,7 @@ public class BoltStateHandlerTest { @Before public void setup() { - when(mockDriver.session(any(), any())).thenReturn(new FakeSession()); + when(mockDriver.session(any(), anyString())).thenReturn(new FakeSession()); doReturn(System.out).when(logger).getOutputStream(); } @@ -303,7 +304,7 @@ public void triesAgainOnSessionExpired() throws Exception { BoltResult boltResult = boltStateHandler.runCypher("RETURN 999", new HashMap<>()).get(); - verify(driverMock, times(2)).session(any(), any()); + verify(driverMock, times(2)).session(any(), anyString()); verify(sessionMock, times(2)).run(any(Statement.class)); assertEquals("999", boltResult.getRecords().get(0).get(0).toString()); @@ -396,7 +397,7 @@ private Driver stubVersionInAnOpenSession(StatementResult versionMock, Session s when(sessionMock.isOpen()).thenReturn(true); when(sessionMock.run("RETURN 1")).thenReturn(versionMock); - when(driverMock.session(any(), any())).thenReturn(sessionMock); + when(driverMock.session(any(), anyString())).thenReturn(sessionMock); return driverMock; } diff --git a/cypher-shell/src/test/java/org/neo4j/shell/test/bolt/FakeDriver.java b/cypher-shell/src/test/java/org/neo4j/shell/test/bolt/FakeDriver.java index 8953b458..5432d112 100644 --- a/cypher-shell/src/test/java/org/neo4j/shell/test/bolt/FakeDriver.java +++ b/cypher-shell/src/test/java/org/neo4j/shell/test/bolt/FakeDriver.java @@ -33,6 +33,16 @@ public Session session( AccessMode mode, String bookmark ) return new FakeSession(); } + @Override + public Session session(Iterable bookmarks) { + return new FakeSession(); + } + + @Override + public Session session(AccessMode mode, Iterable bookmarks) { + return new FakeSession(); + } + @Override public void close() throws Neo4jException { } diff --git a/cypher-shell/src/test/java/org/neo4j/shell/test/bolt/FakeValue.java b/cypher-shell/src/test/java/org/neo4j/shell/test/bolt/FakeValue.java index ccf23a22..1c0b6daf 100644 --- a/cypher-shell/src/test/java/org/neo4j/shell/test/bolt/FakeValue.java +++ b/cypher-shell/src/test/java/org/neo4j/shell/test/bolt/FakeValue.java @@ -103,6 +103,11 @@ public boolean asBoolean() { throw new Uncoercible(getClass().getSimpleName(), "Bool"); } + @Override + public byte[] asByteArray() { + throw new Uncoercible(getClass().getSimpleName(), "Byte[]"); + } + @Override public String asString() { throw new Uncoercible(getClass().getSimpleName(), "String");