Update

Author: injectives

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

@@ -25,6 +25,8 @@
 
 import org.neo4j.driver.Record;
 import org.neo4j.driver.exceptions.ClientException;
+import org.neo4j.driver.internal.messaging.BoltProtocol;
+import org.neo4j.driver.internal.messaging.BoltProtocolVersion;
 import org.neo4j.driver.internal.spi.Connection;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -101,6 +103,10 @@ static Connection connection()
     static Connection connection( CompletionStage<Void> releaseStage )
     {
         Connection connection = mock( Connection.class );
+        BoltProtocol boltProtocol = mock( BoltProtocol.class );
+        BoltProtocolVersion protocolVersion = new BoltProtocolVersion( 4, 4 );
+        when( boltProtocol.version() ).thenReturn( protocolVersion );
+        when( connection.protocol() ).thenReturn( boltProtocol );
         when( connection.release() ).thenReturn( releaseStage );
         return connection;
     }

driver/src/test/java/org/neo4j/driver/internal/handlers/HelloResponseHandlerTest.java

@@ -110,13 +110,13 @@ void shouldThrowWhenServerVersionIsNull()
     }
 
     @Test
-    void shouldThrowWhenServerVersionCantBeParsed()
+    void shouldThrowWhenServerAgentIsUnrecognised()
     {
         ChannelPromise channelPromise = channel.newPromise();
         HelloResponseHandler handler = new HelloResponseHandler( channelPromise );
 
         Map<String,Value> metadata = metadata( "WrongServerVersion", "bolt-x" );
-        assertThrows( IllegalArgumentException.class, () -> handler.onSuccess( metadata ) );
+        assertThrows( UntrustedServerException.class, () -> handler.onSuccess( metadata ) );
 
         assertFalse( channelPromise.isSuccess() ); // initialization failed
         assertTrue( channel.closeFuture().isDone() ); // channel was closed

driver/src/test/java/org/neo4j/driver/internal/messaging/v3/BoltProtocolV3Test.java

@@ -149,6 +149,7 @@ void shouldInitializeChannel()
         assertFalse( promise.isDone() );
 
         Map<String,Value> metadata = new HashMap<>();
+        metadata.put( "server", value( "Neo4j/3.5.0" ) );
         metadata.put( "connection_id", value( "bolt-42" ) );
 
         messageDispatcher.handleSuccessMessage( metadata );

driver/src/test/java/org/neo4j/driver/internal/messaging/v4/BoltProtocolV4Test.java

@@ -142,6 +142,7 @@ void shouldInitializeChannel()
         assertFalse( promise.isDone() );
 
         Map<String,Value> metadata = new HashMap<>();
+        metadata.put( "server", value( "Neo4j/4.0.0" ) );
         metadata.put( "connection_id", value( "bolt-42" ) );
 
         messageDispatcher.handleSuccessMessage( metadata );

driver/src/test/java/org/neo4j/driver/internal/messaging/v41/BoltProtocolV41Test.java

@@ -147,6 +147,7 @@ void shouldInitializeChannel()
         assertFalse( promise.isDone() );
 
         Map<String,Value> metadata = new HashMap<>();
+        metadata.put( "server", value( "Neo4j/4.1.0" ) );
         metadata.put( "connection_id", value( "bolt-42" ) );
 
         messageDispatcher.handleSuccessMessage( metadata );

driver/src/test/java/org/neo4j/driver/internal/messaging/v42/BoltProtocolV42Test.java

@@ -147,6 +147,7 @@ void shouldInitializeChannel()
         assertFalse( promise.isDone() );
 
         Map<String,Value> metadata = new HashMap<>();
+        metadata.put( "server", value( "Neo4j/4.2.0" ) );
         metadata.put( "connection_id", value( "bolt-42" ) );
 
         messageDispatcher.handleSuccessMessage( metadata );

driver/src/test/java/org/neo4j/driver/internal/messaging/v43/BoltProtocolV43Test.java

@@ -146,6 +146,7 @@ void shouldInitializeChannel()
         assertFalse( promise.isDone() );
 
         Map<String,Value> metadata = new HashMap<>();
+        metadata.put( "server", value( "Neo4j/4.3.0" ) );
         metadata.put( "connection_id", value( "bolt-42" ) );
 
         messageDispatcher.handleSuccessMessage( metadata );

driver/src/test/java/org/neo4j/driver/internal/messaging/v44/BoltProtocolV44Test.java

@@ -146,6 +146,7 @@ void shouldInitializeChannel()
         assertFalse( promise.isDone() );
 
         Map<String,Value> metadata = new HashMap<>();
+        metadata.put( "server", value( "Neo4j/4.4.0" ) );
         metadata.put( "connection_id", value( "bolt-42" ) );
 
         messageDispatcher.handleSuccessMessage( metadata );