Fix flaky test #JAVA-6016 (#1845)

* Fix flaky test #JAVA-6016

The test shouldUseConnectTimeoutMsWhenEstablishingConnectionInBackground only fails
with a variant tests-require-api-version
The reason is that this variant passes  -Dorg.mongodb.test.api.version=1 which makes an API version to be V1
In this version the hello command is `hello` but this test case assumes it's `isMaster`

* remove unused import

---------

Co-authored-by: Almas Abdrazak <abdrazak.almas@mongodb.com>

Author: strogiyotec

driver-core/src/main/com/mongodb/internal/connection/CommandHelper.java

@@ -20,6 +20,10 @@
 import com.mongodb.ServerApi;
 import com.mongodb.connection.ClusterConnectionMode;
 import com.mongodb.internal.TimeoutContext;
+import com.mongodb.internal.VisibleForTesting;
+
+import static com.mongodb.internal.VisibleForTesting.AccessModifier.PRIVATE;
+
 import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.validator.NoOpFieldNameValidator;
 import com.mongodb.lang.Nullable;
@@ -38,8 +42,10 @@
  */
 public final class CommandHelper {
 
-    static final String HELLO = "hello";
-    static final String LEGACY_HELLO = "isMaster";
+    @VisibleForTesting(otherwise = PRIVATE)
+    public static final String HELLO = "hello";
+    @VisibleForTesting(otherwise = PRIVATE)
+    public static final String LEGACY_HELLO = "isMaster";
     static final String LEGACY_HELLO_LOWER = LEGACY_HELLO.toLowerCase(Locale.ROOT);
 
     static BsonDocument executeCommand(final String database, final BsonDocument command, final ClusterConnectionMode clusterConnectionMode,

driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideOperationsTimeoutProseTest.java

@@ -47,6 +47,10 @@
 import com.mongodb.event.ConnectionClosedEvent;
 import com.mongodb.event.ConnectionCreatedEvent;
 import com.mongodb.event.ConnectionReadyEvent;
+
+import static com.mongodb.internal.connection.CommandHelper.HELLO;
+import static com.mongodb.internal.connection.CommandHelper.LEGACY_HELLO;
+
 import com.mongodb.internal.connection.InternalStreamConnection;
 import com.mongodb.internal.connection.ServerHelper;
 import com.mongodb.internal.connection.TestCommandListener;
@@ -1051,8 +1055,7 @@ public void shouldUseConnectTimeoutMsWhenEstablishingConnectionInBackground() {
         } finally {
             InternalStreamConnection.setRecordEverything(false);
         }
-
-        List<CommandFailedEvent> commandFailedEvents = commandListener.getCommandFailedEvents("isMaster");
+        List<CommandFailedEvent> commandFailedEvents = commandListener.getCommandFailedEvents(getHandshakeCommandName());
         assertFalse(commandFailedEvents.isEmpty());
         assertInstanceOf(MongoOperationTimeoutException.class, commandFailedEvents.get(0).getThrowable());
     }
@@ -1136,8 +1139,15 @@ private MongoClient createMongoClient(final MongoClientSettings.Builder builder)
         return createMongoClient(builder.build());
     }
 
-   private long msElapsedSince(final long t1) {
+    private long msElapsedSince(final long t1) {
         return TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - t1);
     }
 
+    /**
+     * Get the handshake command name based on the server API version.
+     * @return the handshake command name
+     */
+    private String getHandshakeCommandName() {
+        return ClusterFixture.getServerApi() == null ? LEGACY_HELLO : HELLO;
+    }
 }