Remove org.mongodb.test.mongocryptdSpawnPath support from tests

jyemin · jyemin · commit fb8c85d0741d · 2019-08-07T11:18:40.000-04:00
JAVA-3071
diff --git a/build.gradle b/build.gradle
@@ -137,7 +137,6 @@ 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')
         )
 
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionTest.java b/driver-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionTest.java
@@ -206,10 +206,6 @@ public void setUp() {
             }
         }
 
-        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>>();
 
         for (String kmsProviderKey : kmsProviders.keySet()) {
diff --git a/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideEncryptionTest.java b/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideEncryptionTest.java
@@ -194,10 +194,6 @@ public void setUp() {
             }
         }
 
-        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>>();
 
         for (String kmsProviderKey : kmsProviders.keySet()) {

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,6 @@ configure(javaCodeCheckedProjects) {`
`137`	`137`	`'org.mongodb.async.type': System.getProperty('org.mongodb.async.type', 'nio2'),`
`138`	`138`	`'org.mongodb.test.awsAccessKeyId': System.getProperty('org.mongodb.test.awsAccessKeyId'),`
`139`	`139`	`'org.mongodb.test.awsSecretAccessKey': System.getProperty('org.mongodb.test.awsSecretAccessKey'),`
`140`		`- 'org.mongodb.test.mongocryptdSpawnPath': System.getProperty('org.mongodb.test.mongocryptdSpawnPath'),`
`141`	`140`	`'jna.library.path': System.getProperty('jna.library.path')`
`142`	`141`	`)`
`143`	`142`
Original file line number	Diff line number	Diff line change
`@@ -206,10 +206,6 @@ public void setUp() {`
`206`	`206`	`}`
`207`	`207`	`}`
`208`	`208`
`209`		`- if (System.getProperty("org.mongodb.test.mongocryptdSpawnPath") != null) {`
`210`		`- extraOptions.put("mongocryptdSpawnPath", System.getProperty("org.mongodb.test.mongocryptdSpawnPath"));`
`211`		`- }`
`212`		`-`
`213`	`209`	`Map<String, Map<String, Object>> kmsProvidersMap = new HashMap<String, Map<String, Object>>();`
`214`	`210`
`215`	`211`	`for (String kmsProviderKey : kmsProviders.keySet()) {`
Original file line number	Diff line number	Diff line change
`@@ -194,10 +194,6 @@ public void setUp() {`
`194`	`194`	`}`
`195`	`195`	`}`
`196`	`196`
`197`		`- if (System.getProperty("org.mongodb.test.mongocryptdSpawnPath") != null) {`
`198`		`- extraOptions.put("mongocryptdSpawnPath", System.getProperty("org.mongodb.test.mongocryptdSpawnPath"));`
`199`		`- }`
`200`		`-`
`201`	`197`	`Map<String, Map<String, Object>> kmsProvidersMap = new HashMap<String, Map<String, Object>>();`
`202`	`198`
`203`	`199`	`for (String kmsProviderKey : kmsProviders.keySet()) {`