Test: Always set cryptSharedLibPath if available

Author: rozza

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

@@ -191,6 +191,10 @@ public void setUp() {
         }
 
         Map<String, Object> extraOptions = new HashMap<>();
+        String cryptSharedLibPath = System.getProperty("org.mongodb.test.crypt.shared.lib.path", "");
+        if (!cryptSharedLibPath.isEmpty()) {
+            extraOptions.put("cryptSharedLibPath", cryptSharedLibPath);
+        }
         if (cryptOptions.containsKey("extraOptions")) {
             BsonDocument extraOptionsDocument = cryptOptions.getDocument("extraOptions");
             if (extraOptionsDocument.containsKey("mongocryptdSpawnArgs")) {
@@ -206,11 +210,6 @@ public void setUp() {
             if (extraOptionsDocument.containsKey("mongocryptdURI")) {
                 extraOptions.put("mongocryptdURI", extraOptionsDocument.getString("mongocryptdURI").getValue());
             }
-
-            String cryptSharedLibPath = System.getProperty("org.mongodb.test.crypt.shared.lib.path", "");
-            if (!cryptSharedLibPath.isEmpty()) {
-                extraOptions.put("cryptSharedLibPath", cryptSharedLibPath);
-            }
         }
 
         Map<String, Map<String, Object>> kmsProvidersMap = new HashMap<>();