JAVA-1887: Forcing acknowledgment of writes in some tests, so that other subsequent tests are not affected.

Author: jyemin

driver-core/src/test/functional/com/mongodb/connection/WriteProtocolCommandEventSpecification.groovy

@@ -29,12 +29,14 @@ import com.mongodb.connection.netty.NettyStreamFactory
 import com.mongodb.event.CommandFailedEvent
 import com.mongodb.event.CommandStartedEvent
 import com.mongodb.event.CommandSucceededEvent
+import com.mongodb.internal.validator.NoOpFieldNameValidator
 import org.bson.BsonArray
 import org.bson.BsonBinary
 import org.bson.BsonBoolean
 import org.bson.BsonDocument
 import org.bson.BsonInt32
 import org.bson.BsonString
+import org.bson.codecs.BsonDocumentCodec
 import spock.lang.IgnoreIf
 import spock.lang.Shared
 
@@ -84,6 +86,10 @@ class WriteProtocolCommandEventSpecification extends OperationFunctionalSpecific
                                                                              [new BsonDocument('_id', new BsonInt32(1))]))),
                                              new CommandSucceededEvent(1, connection.getDescription(), 'insert',
                                                                        new BsonDocument('ok', new BsonInt32(1)), 0)])
+        cleanup:
+        // force acknowledgement
+        new CommandProtocol(getDatabaseName(), new BsonDocument('drop', new BsonString(getCollectionName())),
+                            new NoOpFieldNameValidator(), new BsonDocumentCodec()).execute(connection)
     }
 
     @IgnoreIf({ !serverVersionAtLeast([2, 4, 0]) })
@@ -123,6 +129,10 @@ class WriteProtocolCommandEventSpecification extends OperationFunctionalSpecific
                                                                              .append('documents', new BsonArray([documentFour]))),
                                              new CommandSucceededEvent(1, connection.getDescription(), 'insert',
                                                                        new BsonDocument('ok', new BsonInt32(1)), 0)])
+        cleanup:
+        // force acknowledgement
+        new CommandProtocol(getDatabaseName(), new BsonDocument('drop', new BsonString(getCollectionName())),
+                            new NoOpFieldNameValidator(), new BsonDocumentCodec()).execute(connection)
     }
 
     def 'should deliver started and completed command events when there is a write error'() {
@@ -214,7 +224,11 @@ class WriteProtocolCommandEventSpecification extends OperationFunctionalSpecific
                                                                                       .append('upsert', BsonBoolean.TRUE)]))),
                                              new CommandSucceededEvent(1, connection.getDescription(), 'update',
                                                                        new BsonDocument('ok', new BsonInt32(1)), 0)])
-    }
+
+        cleanup:
+        // force acknowledgement
+        new CommandProtocol(getDatabaseName(), new BsonDocument('drop', new BsonString(getCollectionName())),
+                            new NoOpFieldNameValidator(), new BsonDocumentCodec()).execute(connection)}
 
     def 'should deliver started and completed command events for a single unacknowleded delete'() {
         given:

driver-core/src/test/functional/com/mongodb/connection/WriteProtocolSpecification.groovy

@@ -22,9 +22,12 @@ import com.mongodb.DuplicateKeyException
 import com.mongodb.OperationFunctionalSpecification
 import com.mongodb.bulk.InsertRequest
 import com.mongodb.connection.netty.NettyStreamFactory
+import com.mongodb.internal.validator.NoOpFieldNameValidator
 import org.bson.BsonBinary
 import org.bson.BsonDocument
 import org.bson.BsonInt32
+import org.bson.BsonString
+import org.bson.codecs.BsonDocumentCodec
 import spock.lang.Shared
 
 import static com.mongodb.ClusterFixture.getCredentialList
@@ -66,9 +69,14 @@ class WriteProtocolSpecification extends OperationFunctionalSpecification {
 
         then:
         getCollectionHelper().count() == 1
+
+        cleanup:
+        // force acknowledgement
+        new CommandProtocol(getDatabaseName(), new BsonDocument('drop', new BsonString(getCollectionName())),
+                            new NoOpFieldNameValidator(), new BsonDocumentCodec()).execute(connection)
     }
 
-    def 'should report write errors on unacknowledged inserts'() {
+    def 'should report write errors on acknowledged inserts'() {
         given:
         def documentOne = new BsonDocument('_id', new BsonInt32(1))
         def documentTwo = new BsonDocument('_id', new BsonInt32(2))
@@ -108,6 +116,11 @@ class WriteProtocolSpecification extends OperationFunctionalSpecification {
 
         then:
         getCollectionHelper().count() == 1
+
+        cleanup:
+        // force acknowledgement
+        new CommandProtocol(getDatabaseName(), new BsonDocument('drop', new BsonString(getCollectionName())),
+                            new NoOpFieldNameValidator(), new BsonDocumentCodec()).execute(connection)
     }
 
     def 'should report write errors on split acknowledged inserts'() {
@@ -130,6 +143,5 @@ class WriteProtocolSpecification extends OperationFunctionalSpecification {
         then:
         thrown(DuplicateKeyException)
         getCollectionHelper().count() == 1
-
     }
 }