Fix ErrorIT to use correct message format

It always used V1 message format before.

Author: lutovich

driver/src/test/java/org/neo4j/driver/internal/util/ChannelPipelineBuilderWithMessageFormat.java renamed to driver/src/test/java/org/neo4j/driver/internal/util/ChannelPipelineBuilderWithFailingMessageFormat.java

@@ -25,18 +25,22 @@
 import org.neo4j.driver.internal.messaging.MessageFormat;
 import org.neo4j.driver.v1.Logging;
 
-public class ChannelPipelineBuilderWithMessageFormat implements ChannelPipelineBuilder
+public class ChannelPipelineBuilderWithFailingMessageFormat implements ChannelPipelineBuilder
 {
-    private final MessageFormat messageFormat;
+    private volatile FailingMessageFormat failingMessageFormat;
 
-    public ChannelPipelineBuilderWithMessageFormat( MessageFormat messageFormat )
+    @Override
+    public void build( MessageFormat messageFormat, ChannelPipeline pipeline, Logging logging )
     {
-        this.messageFormat = messageFormat;
+        if ( failingMessageFormat == null )
+        {
+            failingMessageFormat = new FailingMessageFormat( messageFormat );
+        }
+        new ChannelPipelineBuilderImpl().build( failingMessageFormat, pipeline, logging );
     }
 
-    @Override
-    public void build( MessageFormat ignored, ChannelPipeline pipeline, Logging logging )
+    FailingMessageFormat getFailingMessageFormat()
     {
-        new ChannelPipelineBuilderImpl().build( messageFormat, pipeline, logging );
+        return failingMessageFormat;
     }
 }

driver/src/test/java/org/neo4j/driver/internal/util/ChannelTrackingDriverFactoryWithMessageFormat.java renamed to driver/src/test/java/org/neo4j/driver/internal/util/ChannelTrackingDriverFactoryWithFailingMessageFormat.java

@@ -21,27 +21,27 @@
 import org.neo4j.driver.internal.ConnectionSettings;
 import org.neo4j.driver.internal.async.ChannelConnector;
 import org.neo4j.driver.internal.async.ChannelConnectorImpl;
-import org.neo4j.driver.internal.async.ChannelPipelineBuilder;
-import org.neo4j.driver.internal.messaging.MessageFormat;
 import org.neo4j.driver.internal.security.SecurityPlan;
 import org.neo4j.driver.v1.Config;
 
-public class ChannelTrackingDriverFactoryWithMessageFormat extends ChannelTrackingDriverFactory
+public class ChannelTrackingDriverFactoryWithFailingMessageFormat extends ChannelTrackingDriverFactory
 {
-    private final MessageFormat messageFormat;
+    private final ChannelPipelineBuilderWithFailingMessageFormat pipelineBuilder = new ChannelPipelineBuilderWithFailingMessageFormat();
 
-    public ChannelTrackingDriverFactoryWithMessageFormat( MessageFormat messageFormat, Clock clock )
+    public ChannelTrackingDriverFactoryWithFailingMessageFormat( Clock clock )
     {
         super( clock );
-        this.messageFormat = messageFormat;
     }
 
     @Override
-    protected ChannelConnector createRealConnector( ConnectionSettings settings, SecurityPlan securityPlan,
-            Config config, Clock clock )
+    protected ChannelConnector createRealConnector( ConnectionSettings settings, SecurityPlan securityPlan, Config config, Clock clock )
     {
-        ChannelPipelineBuilder pipelineBuilder = new ChannelPipelineBuilderWithMessageFormat( messageFormat );
         return new ChannelConnectorImpl( settings, securityPlan, pipelineBuilder, config.logging(), clock );
     }
+
+    public FailingMessageFormat getFailingMessageFormat()
+    {
+        return pipelineBuilder.getFailingMessageFormat();
+    }
 }
 

driver/src/test/java/org/neo4j/driver/internal/util/FailingMessageFormat.java

@@ -27,7 +27,6 @@
 import org.neo4j.driver.internal.messaging.MessageFormat;
 import org.neo4j.driver.internal.messaging.ResponseMessageHandler;
 import org.neo4j.driver.internal.messaging.response.FailureMessage;
-import org.neo4j.driver.internal.messaging.v1.MessageFormatV1;
 import org.neo4j.driver.internal.packstream.PackInput;
 import org.neo4j.driver.internal.packstream.PackOutput;
 
@@ -38,11 +37,6 @@ public class FailingMessageFormat implements MessageFormat
     private final AtomicReference<Throwable> readerThrowableRef = new AtomicReference<>();
     private final AtomicReference<FailureMessage> readerFailureRef = new AtomicReference<>();
 
-    public FailingMessageFormat()
-    {
-        this( new MessageFormatV1() );
-    }
-
     public FailingMessageFormat( MessageFormat delegate )
     {
         this.delegate = delegate;

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

@@ -32,7 +32,7 @@
 import org.neo4j.driver.internal.messaging.response.FailureMessage;
 import org.neo4j.driver.internal.retry.RetrySettings;
 import org.neo4j.driver.internal.util.ChannelTrackingDriverFactory;
-import org.neo4j.driver.internal.util.ChannelTrackingDriverFactoryWithMessageFormat;
+import org.neo4j.driver.internal.util.ChannelTrackingDriverFactoryWithFailingMessageFormat;
 import org.neo4j.driver.internal.util.FailingMessageFormat;
 import org.neo4j.driver.internal.util.FakeClock;
 import org.neo4j.driver.v1.AuthToken;
@@ -230,10 +230,7 @@ void shouldCloseChannelOnInboundFatalFailureMessage() throws InterruptedExceptio
     private Throwable testChannelErrorHandling( Consumer<FailingMessageFormat> messageFormatSetup )
             throws InterruptedException
     {
-        FailingMessageFormat messageFormat = new FailingMessageFormat();
-
-        ChannelTrackingDriverFactoryWithMessageFormat driverFactory = new ChannelTrackingDriverFactoryWithMessageFormat(
-                messageFormat, new FakeClock() );
+        ChannelTrackingDriverFactoryWithFailingMessageFormat driverFactory = new ChannelTrackingDriverFactoryWithFailingMessageFormat( new FakeClock() );
 
         URI uri = session.uri();
         AuthToken authToken = session.authToken();
@@ -245,7 +242,7 @@ private Throwable testChannelErrorHandling( Consumer<FailingMessageFormat> messa
         try ( Driver driver = driverFactory.newInstance( uri, authToken, routingSettings, retrySettings, config );
               Session session = driver.session() )
         {
-            messageFormatSetup.accept( messageFormat );
+            messageFormatSetup.accept( driverFactory.getFailingMessageFormat() );
 
             try
             {