Spring/spring-data-cassandra
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adopt to Mockito changes.

Browse Source 
Closes #1203
This commit is contained in:
Mark Paluch
2022-01-04 14:22:25 +01:00
parent 61f30591d9
commit ac0ca35a7f
4 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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.*;

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

@@ -117,7 +117,7 @@ class ReactiveCqlTemplateUnitTests {
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 @@ class ReactiveCqlTemplateUnitTests {
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 @@ class ReactiveCqlTemplateUnitTests {
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 @@ class ReactiveCqlTemplateUnitTests {
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 @@ class ReactiveCqlTemplateUnitTests {
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 @@ class ReactiveCqlTemplateUnitTests {
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 @@ class ReactiveCqlTemplateUnitTests {
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 @@ class ReactiveCqlTemplateUnitTests {
return boundStatement;
}, ReactiveResultSet::rows);
verifyZeroInteractions(session);
verifyNoInteractions(session);
flux.as(StepVerifier::create).expectNext(row).verifyComplete();
@@ -678,7 +678,7 @@ class ReactiveCqlTemplateUnitTests {
return boundStatement;
}, (row, rowNum) -> row);
verifyZeroInteractions(session);
verifyNoInteractions(session);
flux.as(StepVerifier::create).expectNext(row).verifyComplete();

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

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

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

@@ -46,8 +46,8 @@ class CassandraPersistentPropertyComparatorUnitTests {
assertThat(INSTANCE.compare(null, null)).isEqualTo(0);
verifyZeroInteractions(left);
verifyZeroInteractions(right);
verifyNoInteractions(left);
verifyNoInteractions(right);
}
@Test // DATACASS-248
@@ -55,8 +55,8 @@ class CassandraPersistentPropertyComparatorUnitTests {
assertThat(INSTANCE.compare(left, null)).isEqualTo(1);
verifyZeroInteractions(left);
verifyZeroInteractions(right);
verifyNoInteractions(left);
verifyNoInteractions(right);
}
@Test // DATACASS-248
@@ -64,8 +64,8 @@ class CassandraPersistentPropertyComparatorUnitTests {
assertThat(INSTANCE.compare(null, right)).isEqualTo(-1);
verifyZeroInteractions(left);
verifyZeroInteractions(right);
verifyNoInteractions(left);
verifyNoInteractions(right);
}
@Test // DATACASS-248
@@ -74,8 +74,8 @@ class CassandraPersistentPropertyComparatorUnitTests {
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