Adopt to Mockito changes.

Closes #1203

Author: mp911de

spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/QueryMapperUnitTests.java

@@ -16,7 +16,6 @@
 package org.springframework.data.cassandra.core.convert;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 import static org.springframework.data.domain.Sort.Order.*;
 

spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/ReactiveCqlTemplateUnitTests.java

@@ -117,7 +117,7 @@ void executeCqlShouldExecuteDeferred() {
 
 		Mono<Boolean> mono = template.execute("UPDATE user SET a = 'b';");
 
-		verifyZeroInteractions(session);
+		verifyNoInteractions(session);
 
 		mono.as(StepVerifier::create).expectNext(false).verifyComplete();
 
@@ -209,7 +209,7 @@ void queryCqlShouldExecuteDeferred() {
 
 		Flux<Boolean> flux = template.query("UPDATE user SET a = 'b';", resultSet -> Mono.just(resultSet.wasApplied()));
 
-		verifyZeroInteractions(session);
+		verifyNoInteractions(session);
 
 		flux.as(StepVerifier::create).expectNext(true).verifyComplete();
 
@@ -328,7 +328,7 @@ void executeCqlPublisherShouldReturnWasApplied() {
 
 		Flux<Boolean> flux = template.execute(Flux.just("UPDATE user SET a = 'b';", "UPDATE user SET x = 'y';"));
 
-		verifyZeroInteractions(session);
+		verifyNoInteractions(session);
 
 		flux.as(StepVerifier::create).expectNext(true).expectNext(false).verifyComplete();
 
@@ -419,7 +419,7 @@ void queryStatementShouldExecuteDeferred() {
 		Flux<Boolean> flux = template.query(SimpleStatement.newInstance("UPDATE user SET a = 'b';"),
 				resultSet -> Mono.just(resultSet.wasApplied()));
 
-		verifyZeroInteractions(session);
+		verifyNoInteractions(session);
 		flux.as(StepVerifier::create).expectNext(true).verifyComplete();
 		verify(session).execute(any(Statement.class));
 	}
@@ -591,7 +591,7 @@ void executePreparedStatementCallbackShouldExecuteDeferred() {
 		Flux<ReactiveResultSet> flux = template.execute("UPDATE user SET a = 'b';",
 				(session, ps) -> session.execute(ps.bind()));
 
-		verifyZeroInteractions(session);
+		verifyNoInteractions(session);
 
 		flux.as(StepVerifier::create).expectNext(reactiveResultSet).verifyComplete();
 
@@ -607,7 +607,7 @@ void executePreparedStatementCreatorShouldExecuteDeferred() {
 		Flux<ReactiveResultSet> flux = template.execute(session -> Mono.just(preparedStatement),
 				(session, ps) -> session.execute(boundStatement));
 
-		verifyZeroInteractions(session);
+		verifyNoInteractions(session);
 
 		flux.as(StepVerifier::create).expectNext(reactiveResultSet).verifyComplete();
 
@@ -643,7 +643,7 @@ void queryPreparedStatementCreatorShouldReturnResult() {
 
 		Flux<Row> flux = template.query(session -> Mono.just(preparedStatement), ReactiveResultSet::rows);
 
-		verifyZeroInteractions(session);
+		verifyNoInteractions(session);
 
 		flux.as(StepVerifier::create).expectNext(row).verifyComplete();
 		verify(preparedStatement).bind();
@@ -660,7 +660,7 @@ void queryPreparedStatementCreatorAndBinderShouldReturnResult() {
 			return boundStatement;
 		}, ReactiveResultSet::rows);
 
-		verifyZeroInteractions(session);
+		verifyNoInteractions(session);
 
 		flux.as(StepVerifier::create).expectNext(row).verifyComplete();
 
@@ -678,7 +678,7 @@ void queryPreparedStatementCreatorAndBinderAndMapperShouldReturnResult() {
 			return boundStatement;
 		}, (row, rowNum) -> row);
 
-		verifyZeroInteractions(session);
+		verifyNoInteractions(session);
 
 		flux.as(StepVerifier::create).expectNext(row).verifyComplete();
 

spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntityUnitTests.java

@@ -170,7 +170,7 @@ void shouldNoOpOnDoWithAssociations() {
 		AssociationHandler<CassandraPersistentProperty> handlerMock = mock(AssociationHandler.class);
 		entity.doWithAssociations(handlerMock);
 
-		verifyZeroInteractions(handlerMock);
+		verifyNoInteractions(handlerMock);
 	}
 
 	@Table("messages")

spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentPropertyComparatorUnitTests.java

@@ -46,26 +46,26 @@ void leftAndRightAreNullReturnsZero() {
 
 		assertThat(INSTANCE.compare(null, null)).isEqualTo(0);
 
-		verifyZeroInteractions(left);
-		verifyZeroInteractions(right);
+		verifyNoInteractions(left);
+		verifyNoInteractions(right);
 	}
 
 	@Test // DATACASS-248
 	void leftIsNotNullAndRightIsNullReturnsOne() {
 
 		assertThat(INSTANCE.compare(left, null)).isEqualTo(1);
 
-		verifyZeroInteractions(left);
-		verifyZeroInteractions(right);
+		verifyNoInteractions(left);
+		verifyNoInteractions(right);
 	}
 
 	@Test // DATACASS-248
 	void leftIsNullAndRightIsNotNullReturnsMinusOne() {
 
 		assertThat(INSTANCE.compare(null, right)).isEqualTo(-1);
 
-		verifyZeroInteractions(left);
-		verifyZeroInteractions(right);
+		verifyNoInteractions(left);
+		verifyNoInteractions(right);
 	}
 
 	@Test // DATACASS-248
@@ -74,8 +74,8 @@ void leftAndRightAreEqualReturnsZero() {
 		assertThat(INSTANCE.compare(left, left)).isEqualTo(0);
 		assertThat(INSTANCE.compare(right, right)).isEqualTo(0);
 
-		verifyZeroInteractions(left);
-		verifyZeroInteractions(right);
+		verifyNoInteractions(left);
+		verifyNoInteractions(right);
 	}
 
 	@Test // DATACASS-248