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

DATACASS-328 - Polish.

Browse Source 
Original pull request: #81.
This commit is contained in:
John Blum
2016-08-09 14:55:28 -07:00
parent fd8e430592
commit c407aad8cf
10 changed files with 155 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,13 +67,13 @@ public class CqlTemplateUnitTests {
private CqlTemplate template;
@Mock private Session mockSession;
@Mock private Insert mockInsert;
@Mock private PreparedStatement mockPreparedStatement;
@Mock private Statement mockStatement;
@Mock private Session mockSession;
@Mock private Insert mockInsert;
@Mock private Statement mockStatement;
@Mock private Update mockUpdate;
@@ -449,8 +449,8 @@ public class CqlTemplateUnitTests {
@Test
public void addPreparedStatementOptionsShouldAddOurQueryOptions() {
QueryOptions queryOptions = QueryOptions.builder() //
.retryPolicy(RetryPolicy.FALLTHROUGH).build();
QueryOptions queryOptions = QueryOptions.builder().retryPolicy(RetryPolicy.FALLTHROUGH).build();
queryOptions.setConsistencyLevel(org.springframework.cassandra.core.ConsistencyLevel.LOCAL_QUOROM);
template.addPreparedStatementOptions(mockPreparedStatement, queryOptions);
@@ -465,7 +465,8 @@ public class CqlTemplateUnitTests {
@Test
public void addStatementQueryOptionsShouldAddDriverQueryOptions() {
QueryOptions queryOptions = QueryOptions.builder().consistencyLevel(ConsistencyLevel.EACH_QUORUM) //
QueryOptions queryOptions = QueryOptions.builder()
.consistencyLevel(ConsistencyLevel.EACH_QUORUM) //
.retryPolicy(FallthroughRetryPolicy.INSTANCE) //
.build();
@@ -481,9 +482,8 @@ public class CqlTemplateUnitTests {
@Test
public void addStatementQueryOptionsShouldAddOurQueryOptions() {
QueryOptions queryOptions = QueryOptions.builder() //
.retryPolicy(RetryPolicy.FALLTHROUGH) //
.build();
QueryOptions queryOptions = QueryOptions.builder().retryPolicy(RetryPolicy.FALLTHROUGH).build();
queryOptions.setConsistencyLevel(org.springframework.cassandra.core.ConsistencyLevel.LOCAL_QUOROM);
template.addQueryOptions(mockStatement, queryOptions);
@@ -512,8 +512,8 @@ public class CqlTemplateUnitTests {
public void addStatementQueryOptionsShouldAddGenericQueryOptions() {
QueryOptions queryOptions = QueryOptions.builder() //
.readTimeout(1, TimeUnit.MINUTES) //
.fetchSize(10) //
.readTimeout(1, TimeUnit.MINUTES) //
.withTracing() //
.build();

12
spring-cql/src/test/java/org/springframework/cassandra/core/QueryOptionsUnitTests.java
View File

@@ -29,7 +29,7 @@ import com.datastax.driver.core.policies.LoggingRetryPolicy;
/**
* Unit tests for {@link QueryOptions}.
*
*
* @author Mark Paluch
*/
public class QueryOptionsUnitTests {
@@ -90,9 +90,7 @@ public class QueryOptionsUnitTests {
*/
@Test(expected = IllegalStateException.class)
public void builderShouldRejectSettingOurAndDriverRetryPolicy() {
QueryOptions.builder() //
.retryPolicy(RetryPolicy.DEFAULT).retryPolicy(FallthroughRetryPolicy.INSTANCE);
QueryOptions.builder().retryPolicy(RetryPolicy.DEFAULT).retryPolicy(FallthroughRetryPolicy.INSTANCE);
}
/**
@@ -100,11 +98,7 @@ public class QueryOptionsUnitTests {
*/
@Test(expected = IllegalStateException.class)
public void builderShouldRejectSettingDriverAndOurRetryPolicy() {
QueryOptions.builder() //
.retryPolicy(FallthroughRetryPolicy.INSTANCE)//
.retryPolicy(RetryPolicy.DEFAULT);
QueryOptions.builder().retryPolicy(FallthroughRetryPolicy.INSTANCE).retryPolicy(RetryPolicy.DEFAULT);
}
/**

24
spring-cql/src/test/java/org/springframework/cassandra/core/WriteOptionsUnitTests.java
View File

@@ -26,7 +26,7 @@ import com.datastax.driver.core.policies.FallthroughRetryPolicy;
/**
* Unit tests for {@link WriteOptions}.
*
*
* @author Mark Paluch
*/
public class WriteOptionsUnitTests {
@@ -61,9 +61,7 @@ public class WriteOptionsUnitTests {
@Test
public void buildReadTimeoutOptionsWriteOptions() {
WriteOptions writeOptions = WriteOptions.builder() //
.readTimeout(1, TimeUnit.MINUTES)//
.build(); //
WriteOptions writeOptions = WriteOptions.builder().readTimeout(1, TimeUnit.MINUTES).build();
assertThat(writeOptions.getReadTimeout(), is(60L * 1000L));
assertThat(writeOptions.getFetchSize(), is(nullValue()));
@@ -76,9 +74,7 @@ public class WriteOptionsUnitTests {
@Test
public void buildQueryOptionsWithDriverRetryPolicy() {
QueryOptions writeOptions = QueryOptions.builder() //
.retryPolicy(FallthroughRetryPolicy.INSTANCE) //
.build(); //
QueryOptions writeOptions = QueryOptions.builder().retryPolicy(FallthroughRetryPolicy.INSTANCE).build();
assertThat(writeOptions.getRetryPolicy(), is(nullValue()));
assertThat(writeOptions.getDriverRetryPolicy(),
@@ -91,9 +87,7 @@ public class WriteOptionsUnitTests {
@Test
public void buildQueryOptionsWithRetryPolicy() {
QueryOptions writeOptions = QueryOptions.builder() //
.retryPolicy(RetryPolicy.DOWNGRADING_CONSISTENCY) //
.build(); //
QueryOptions writeOptions = QueryOptions.builder().retryPolicy(RetryPolicy.DOWNGRADING_CONSISTENCY).build();
assertThat(writeOptions.getRetryPolicy(), is(RetryPolicy.DOWNGRADING_CONSISTENCY));
assertThat(writeOptions.getDriverRetryPolicy(), is(nullValue()));
@@ -104,9 +98,7 @@ public class WriteOptionsUnitTests {
*/
@Test(expected = IllegalStateException.class)
public void builderShouldRejectSettingOurAndDriverRetryPolicy() {
WriteOptions.builder() //
.retryPolicy(RetryPolicy.DEFAULT).retryPolicy(FallthroughRetryPolicy.INSTANCE);
WriteOptions.builder().retryPolicy(RetryPolicy.DEFAULT).retryPolicy(FallthroughRetryPolicy.INSTANCE);
}
/**
@@ -114,10 +106,6 @@ public class WriteOptionsUnitTests {
*/
@Test(expected = IllegalStateException.class)
public void builderShouldRejectSettingDriverAndOurRetryPolicy() {
WriteOptions.builder() //
.retryPolicy(FallthroughRetryPolicy.INSTANCE)//
.retryPolicy(RetryPolicy.DEFAULT);
WriteOptions.builder().retryPolicy(FallthroughRetryPolicy.INSTANCE).retryPolicy(RetryPolicy.DEFAULT);
}
}