Skip to content

Commit bdb51bf

Browse files
committed
Guard calls of dbms.listQueries() procedure with assumption
Procedure is used for some tests but is only supported by 3.1+ neo4j. Assumption will make tests that rely on the procedure skip gracefully.
1 parent b23a50b commit bdb51bf

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

driver/src/test/java/org/neo4j/driver/v1/integration/SessionResetIT.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ public class SessionResetIT
115115
@Before
116116
public void setUp()
117117
{
118+
assumeTrue( neo4j.version().greaterThanOrEqual( v3_1_0 ) );
118119
executor = Executors.newCachedThreadPool( daemon( getClass().getSimpleName() + "-thread" ) );
119120
}
120121

driver/src/test/java/org/neo4j/driver/v1/util/TestUtil.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,13 @@
4747
import static org.junit.Assert.assertEquals;
4848
import static org.junit.Assert.assertNotNull;
4949
import static org.junit.Assert.fail;
50+
import static org.junit.Assume.assumeTrue;
5051
import static org.mockito.Matchers.any;
5152
import static org.mockito.Matchers.eq;
5253
import static org.mockito.Mockito.doAnswer;
5354
import static org.mockito.Mockito.mock;
55+
import static org.neo4j.driver.internal.util.ServerVersion.v3_1_0;
56+
import static org.neo4j.driver.internal.util.ServerVersion.version;
5457

5558
public final class TestUtil
5659
{
@@ -214,6 +217,9 @@ public static int activeQueryCount( Driver driver )
214217

215218
public static List<String> activeQueryNames( Driver driver )
216219
{
220+
// procedure dbms.listQueries() is only supported starting from 3.1
221+
assumeTrue( version( driver ).greaterThanOrEqual( v3_1_0 ) );
222+
217223
try ( Session session = driver.session() )
218224
{
219225
return session.run( "CALL dbms.listQueries() YIELD query RETURN query" )

0 commit comments

Comments
 (0)