DATAMONGO-2491 - Adapt to Mockito 3.3 changes.

Mockito reports falsely unnecessary stubbings so we're switching to the silent runner for these cases.
This commit is contained in:
Mark Paluch
2020-03-11 09:14:53 +01:00
parent df43d7fcdb
commit d0eb76946e
2 changed files with 6 additions and 2 deletions

View File

@@ -69,6 +69,7 @@ import com.mongodb.WriteConcern;
import com.mongodb.WriteError;
import com.mongodb.client.MongoCollection;
import com.mongodb.client.MongoDatabase;
import com.mongodb.client.model.BulkWriteOptions;
import com.mongodb.client.model.DeleteManyModel;
import com.mongodb.client.model.InsertOneModel;
import com.mongodb.client.model.ReplaceOneModel;
@@ -281,7 +282,7 @@ class DefaultBulkOperationsUnitTests {
void noAfterSaveEventOnFailure() {
ApplicationEventPublisher eventPublisher = mock(ApplicationEventPublisher.class);
when(collection.bulkWrite(anyList(), any())).thenThrow(new MongoWriteException(
when(collection.bulkWrite(anyList(), any(BulkWriteOptions.class))).thenThrow(new MongoWriteException(
new WriteError(89, "NetworkTimeout", new BsonDocument("hi", new BsonString("there!"))), null));
ops = new DefaultBulkOperations(template, "collection-1",
@@ -294,12 +295,12 @@ class DefaultBulkOperationsUnitTests {
try {
ops.execute();
fail("Missing MongoWriteException");
} catch (MongoWriteException expected) {
}
verify(eventPublisher).publishEvent(any(BeforeSaveEvent.class));
verify(eventPublisher, never()).publishEvent(any(AfterSaveEvent.class));
}
@Test // DATAMONGO-2330

View File

@@ -30,6 +30,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;
import org.springframework.dao.DataAccessResourceFailureException;
import org.springframework.data.mongodb.ReactiveMongoDatabaseFactory;
@@ -50,6 +52,7 @@ import com.mongodb.reactivestreams.client.MongoDatabase;
* @author Mark Paluch
*/
@ExtendWith(MockitoExtension.class)
@MockitoSettings(strictness = Strictness.LENIENT)
public class ReactiveMongoPersistentEntityIndexCreatorUnitTests {
private ReactiveIndexOperations indexOperations;