Fixing failing mocked tests

Author: Zhen Li

driver/src/main/java/org/neo4j/driver/internal/messaging/request/MultiDatabaseUtil.java

@@ -20,6 +20,7 @@
 
 import org.neo4j.driver.exceptions.ClientException;
 import org.neo4j.driver.internal.DatabaseName;
+import org.neo4j.driver.internal.messaging.v4.BoltProtocolV4;
 import org.neo4j.driver.internal.spi.Connection;
 import org.neo4j.driver.internal.util.ServerVersion;
 
@@ -36,6 +37,6 @@ public static void assertEmptyDatabaseName( DatabaseName databaseName, int boltV
 
     public static boolean supportsMultiDatabase( Connection connection )
     {
-        return connection.serverVersion().greaterThanOrEqual( ServerVersion.v4_0_0 ) && connection.protocol().version() >= 4;
+        return connection.serverVersion().greaterThanOrEqual( ServerVersion.v4_0_0 ) && connection.protocol().version() >= BoltProtocolV4.VERSION;
     }
 }

driver/src/test/java/org/neo4j/driver/internal/cluster/RoutingProcedureClusterCompositionProviderTest.java

@@ -34,6 +34,8 @@
 import org.neo4j.driver.internal.DatabaseName;
 import org.neo4j.driver.internal.InternalBookmark;
 import org.neo4j.driver.internal.InternalRecord;
+import org.neo4j.driver.internal.messaging.v3.BoltProtocolV3;
+import org.neo4j.driver.internal.messaging.v4.BoltProtocolV4;
 import org.neo4j.driver.internal.spi.Connection;
 import org.neo4j.driver.internal.util.Clock;
 import org.neo4j.driver.internal.util.ServerVersion;
@@ -304,18 +306,21 @@ private static RoutingProcedureResponse newRoutingResponse( Throwable error )
     private static RoutingProcedureClusterCompositionProvider newClusterCompositionProvider( RoutingProcedureRunner runner, Connection connection )
     {
         when( connection.serverVersion() ).thenReturn( ServerVersion.v3_5_0 );
+        when( connection.protocol() ).thenReturn( BoltProtocolV3.INSTANCE );
         return new RoutingProcedureClusterCompositionProvider( mock( Clock.class ), runner, newMultiDBProcedureRunnerMock() );
     }
 
     private static RoutingProcedureClusterCompositionProvider newClusterCompositionProvider( MultiDatabasesRoutingProcedureRunner runner, Connection connection )
     {
         when( connection.serverVersion() ).thenReturn( ServerVersion.v4_0_0 );
+        when( connection.protocol() ).thenReturn( BoltProtocolV4.INSTANCE );
         return new RoutingProcedureClusterCompositionProvider( mock( Clock.class ), newProcedureRunnerMock(), runner );
     }
 
     private static RoutingProcedureClusterCompositionProvider newClusterCompositionProvider( MultiDatabasesRoutingProcedureRunner runner, Connection connection, Clock clock )
     {
         when( connection.serverVersion() ).thenReturn( ServerVersion.v4_0_0 );
+        when( connection.protocol() ).thenReturn( BoltProtocolV4.INSTANCE );
         return new RoutingProcedureClusterCompositionProvider( clock, newProcedureRunnerMock(), runner );
     }
 }