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

DATACASS-587 - Adapt tests to AssertJ changes.

Browse Source 
Update stubbing to call interface default methods for a mocked ResultSet to allow spliterator()/Stream usage.
This commit is contained in:
Mark Paluch
2018-08-16 12:24:22 +02:00
parent 8055890ac5
commit 99ddd0c367
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/AsyncCqlTemplateUnitTests.java
View File

@@ -43,16 +43,7 @@ import org.springframework.data.cassandra.CassandraInvalidQueryException;
import org.springframework.scheduling.annotation.AsyncResult;
import org.springframework.util.concurrent.ListenableFuture;
import com.datastax.driver.core.BoundStatement;
import com.datastax.driver.core.ColumnDefinitions;
import com.datastax.driver.core.ConsistencyLevel;
import com.datastax.driver.core.PreparedStatement;
import com.datastax.driver.core.ResultSet;
import com.datastax.driver.core.ResultSetFuture;
import com.datastax.driver.core.Row;
import com.datastax.driver.core.Session;
import com.datastax.driver.core.SimpleStatement;
import com.datastax.driver.core.Statement;
import com.datastax.driver.core.*;
import com.datastax.driver.core.exceptions.InvalidQueryException;
import com.datastax.driver.core.exceptions.NoHostAvailableException;
import com.datastax.driver.core.policies.DowngradingConsistencyRetryPolicy;
@@ -578,6 +569,7 @@ public class AsyncCqlTemplateUnitTests {
when(session.executeAsync(boundStatement)).thenReturn(new TestResultSetFuture(resultSet));
when(resultSet.iterator()).thenReturn(Collections.singleton(row).iterator());
when(resultSet.spliterator()).thenCallRealMethod();
ListenableFuture<ResultSet> future = template
.query(session -> new AsyncResult<PreparedStatement>(preparedStatement), ps -> {
@@ -773,6 +765,7 @@ public class AsyncCqlTemplateUnitTests {
when(this.session.executeAsync((Statement) any())).thenReturn(new TestResultSetFuture(resultSet));
when(this.resultSet.iterator()).thenReturn(Arrays.asList(row, row, row).iterator());
when(this.resultSet.spliterator()).thenCallRealMethod();
when(this.row.getString(0)).thenReturn(results[0], results[1], results[2]);

2
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/CqlTemplateUnitTests.java
View File

@@ -513,6 +513,7 @@ public class CqlTemplateUnitTests {
when(session.execute(boundStatement)).thenReturn(resultSet);
when(resultSet.iterator()).thenReturn(Collections.singleton(row).iterator());
when(resultSet.spliterator()).thenCallRealMethod();
ResultSet resultSet = template.query(session -> preparedStatement, ps -> {
ps.bind("a", "b");
@@ -684,6 +685,7 @@ public class CqlTemplateUnitTests {
when(this.session.execute((Statement) any())).thenReturn(resultSet);
when(this.resultSet.iterator()).thenReturn(Arrays.asList(row, row, row).iterator());
when(this.resultSet.spliterator()).thenCallRealMethod();
when(this.row.getString(0)).thenReturn(results[0], results[1], results[2]);
when(this.session.prepare(anyString())).thenReturn(preparedStatement);