Expect mongocryptdSpawnPath in extraOptions instead of mongocryptdPath

JAVA-3071

Author: jyemin

build.gradle

@@ -137,6 +137,7 @@ configure(javaCodeCheckedProjects) {
                 'org.mongodb.async.type': System.getProperty('org.mongodb.async.type', 'nio2'),
                 'org.mongodb.test.awsAccessKeyId': System.getProperty('org.mongodb.test.awsAccessKeyId'),
                 'org.mongodb.test.awsSecretAccessKey': System.getProperty('org.mongodb.test.awsSecretAccessKey'),
+                'org.mongodb.test.mongocryptdSpawnPath': System.getProperty('org.mongodb.test.mongocryptdSpawnPath'),
                 'jna.library.path': System.getProperty('jna.library.path')
         )
 

driver-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionTest.java

@@ -204,9 +204,10 @@ public void setUp() {
             if (extraOptionsDocument.containsKey("mongocryptdURI")) {
                 extraOptions.put("mongocryptdURI", extraOptionsDocument.getString("mongocryptdURI").getValue());
             }
-            if (System.getProperty("org.mongodb.test.mongocryptdPath") != null) {
-                extraOptions.put("mongocryptdPath", System.getProperty("org.mongodb.test.mongocryptdPath"));
-            }
+        }
+
+        if (System.getProperty("org.mongodb.test.mongocryptdSpawnPath") != null) {
+            extraOptions.put("mongocryptdSpawnPath", System.getProperty("org.mongodb.test.mongocryptdSpawnPath"));
         }
 
         Map<String, Map<String, Object>> kmsProvidersMap = new HashMap<String, Map<String, Object>>();

driver-core/src/main/com/mongodb/internal/capi/MongoCryptOptionsHelper.java

@@ -59,8 +59,8 @@ public static MongoCryptOptions createMongoCryptOptions(final Map<String, Map<St
     public static List<String> createMongocryptdSpawnArgs(final Map<String, Object> options) {
         List<String> spawnArgs = new ArrayList<String>();
 
-        String path = options.containsKey("mongocryptdPath")
-                ? (String) options.get("mongocryptdPath")
+        String path = options.containsKey("mongocryptdSpawnPath")
+                ? (String) options.get("mongocryptdSpawnPath")
                 : "mongocryptd";
 
         spawnArgs.add(path);

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

@@ -192,9 +192,10 @@ public void setUp() {
             if (extraOptionsDocument.containsKey("mongocryptdURI")) {
                 extraOptions.put("mongocryptdURI", extraOptionsDocument.getString("mongocryptdURI").getValue());
             }
-            if (System.getProperty("org.mongodb.test.mongocryptdPath") != null) {
-                extraOptions.put("mongocryptdPath", System.getProperty("org.mongodb.test.mongocryptdPath"));
-            }
+        }
+
+        if (System.getProperty("org.mongodb.test.mongocryptdSpawnPath") != null) {
+            extraOptions.put("mongocryptdSpawnPath", System.getProperty("org.mongodb.test.mongocryptdSpawnPath"));
         }
 
         Map<String, Map<String, Object>> kmsProvidersMap = new HashMap<String, Map<String, Object>>();