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

DATACASS-310 - Fix CqlTemplate and CassandraTemplate returning null for data access operations returning a Collection.

Browse Source
This commit is contained in:
John Blum
2016-07-01 17:26:04 -07:00
parent 931e777498
commit ab73021187
8 changed files with 755 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,12 +28,18 @@ import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.springframework.cassandra.support.CassandraExceptionTranslator;
import org.springframework.cassandra.support.exception.CassandraReadTimeoutException;
import org.springframework.dao.DataAccessException;
import org.springframework.dao.IncorrectResultSizeDataAccessException;
import com.datastax.driver.core.ColumnDefinitions;
import com.datastax.driver.core.ConsistencyLevel;
import com.datastax.driver.core.ResultSet;
import com.datastax.driver.core.Row;
import com.datastax.driver.core.Session;
import com.datastax.driver.core.exceptions.ReadTimeoutException;
import com.datastax.driver.core.querybuilder.Select;
/**
* The CqlTemplateUnitTests class is a test suite of test cases testing the contract and functionality of the
@@ -46,19 +52,86 @@ import com.datastax.driver.core.Session;
@SuppressWarnings("unchecked")
public class CqlTemplateUnitTests {
@Rule public ExpectedException exception = ExpectedException.none();
@Rule
public ExpectedException exception = ExpectedException.none();
private CqlTemplate template;
@Mock private Session mockSession;
@Mock
private Session mockSession;
@Before
public void setup() {
template = new CqlTemplate(mockSession);
template.setExceptionTranslator(new CassandraExceptionTranslator());
}
@Test
public void doExecuteInSessionCallbackIsCalled() {
String result = template.doExecute(new SessionCallback<String>() {
@Override public String doInSession(Session session) throws DataAccessException {
session.execute("test");
return "test";
}
});
assertThat(result, is(equalTo("test")));
verify(mockSession, times(1)).execute(eq("test"));
}
@Test
public void doExecuteInSessionCallbackTranslatesException() {
exception.expect(CassandraReadTimeoutException.class);
exception.expectCause(org.hamcrest.Matchers.isA(ReadTimeoutException.class));
template.doExecute(new SessionCallback<String>() {
@Override public String doInSession(Session session) throws DataAccessException {
throw new ReadTimeoutException(ConsistencyLevel.ALL, 0, 1, true);
}
});
}
@Test
public void doExecuteWithNullSessionCallbackThrowsIllegalArgumentException() {
exception.expect(IllegalArgumentException.class);
exception.expectCause(is(nullValue(Throwable.class)));
exception.expectMessage("SessionCallback must not be null");
template.doExecute((SessionCallback) null);
}
@Test
public void doExecuteQueryReturnsResultSetForOqlQueryString() {
ResultSet mockResultSet = mock(ResultSet.class);
when(mockSession.execute(eq("SELECT * FROM Customers"))).thenReturn(mockResultSet);
ResultSet resultSet = template.doExecuteQueryReturnResultSet("SELECT * FROM Customers");
assertThat(resultSet, is(equalTo(mockResultSet)));
verify(mockSession, times(1)).execute(eq("SELECT * FROM Customers"));
verifyZeroInteractions(mockResultSet);
}
@Test
public void doExecuteSelectReturnsResultSetForOqlQueryString() {
Select mockSelect = mock(Select.class);
ResultSet mockResultSet = mock(ResultSet.class);
when(mockSession.execute(eq(mockSelect))).thenReturn(mockResultSet);
ResultSet resultSet = template.doExecuteQueryReturnResultSet(mockSelect);
assertThat(resultSet, is(equalTo(mockResultSet)));
verify(mockSession, times(1)).execute(eq(mockSelect));
verifyZeroInteractions(mockResultSet);
}
/**
* @see DATACASS-286
* @see <a href="https://jira.spring.io/browse/DATACASS-286">DATACASS-286</a>
*/
@Test
public void firstColumnToObjectReturnsColumnValue() {
@@ -74,12 +147,11 @@ public class CqlTemplateUnitTests {
when(mockIterator.next()).thenReturn(mockColumnDefinition);
template = new CqlTemplate() {
@Override
<T> T columnToObject(Row row, ColumnDefinitions.Definition columnDefinition) {
assertThat(row, is(sameInstance(mockRow)));
assertThat(columnDefinition, is(sameInstance(mockColumnDefinition)));
return (T) "test";
}
};
@@ -94,7 +166,7 @@ public class CqlTemplateUnitTests {
}
/**
* @see DATACASS-286
* @see <a href="https://jira.spring.io/browse/DATACASS-286">DATACASS-286</a>
*/
@Test
public void firstColumnToObjectReturnsNull() {
@@ -116,7 +188,7 @@ public class CqlTemplateUnitTests {
}
/**
* @see DATACASS-286
* @see <a href="https://jira.spring.io/browse/DATACASS-286">DATACASS-286</a>
*/
@Test
public void processOneIsSuccessful() {
@@ -138,7 +210,7 @@ public class CqlTemplateUnitTests {
}
/**
* @see DATACASS-286
* @see <a href="https://jira.spring.io/browse/DATACASS-286">DATACASS-286</a>
*/
@Test
public void processOneThrowsIncorrectResultSetSizeDataAccessExceptionWhenNoRowsFound() {
@@ -149,7 +221,6 @@ public class CqlTemplateUnitTests {
when(mockResultSet.one()).thenReturn(null);
try {
exception.expect(IncorrectResultSizeDataAccessException.class);
exception.expectCause(is(nullValue(Throwable.class)));
exception.expectMessage(containsString("expected 1, actual 0"));
@@ -164,7 +235,7 @@ public class CqlTemplateUnitTests {
}
/**
* @see DATACASS-286
* @see <a href="https://jira.spring.io/browse/DATACASS-286">DATACASS-286</a>
*/
@Test
public void processOneThrowsIncorrectResultSetSizeDataAccessExceptionWhenTooManyRowsFound() {
@@ -177,7 +248,6 @@ public class CqlTemplateUnitTests {
when(mockResultSet.isExhausted()).thenReturn(false);
try {
exception.expect(IncorrectResultSizeDataAccessException.class);
exception.expectCause(is(nullValue(Throwable.class)));
exception.expectMessage("ResultSet size exceeds 1");
@@ -193,7 +263,7 @@ public class CqlTemplateUnitTests {
}
/**
* @see DATACASS-286
* @see <a href="https://jira.spring.io/browse/DATACASS-286">DATACASS-286</a>
*/
@Test
public void processOnePassingNullResultSetThrowsIllegalArgumentException() {
@@ -201,7 +271,6 @@ public class CqlTemplateUnitTests {
RowMapper mockRowMapper = mock(RowMapper.class);
try {
exception.expect(IllegalArgumentException.class);
exception.expectCause(is(nullValue(Throwable.class)));
@@ -212,7 +281,7 @@ public class CqlTemplateUnitTests {
}
/**
* @see DATACASS-286
* @see <a href="https://jira.spring.io/browse/DATACASS-286">DATACASS-286</a>
*/
@Test
public void processOneWithRequiredTypeIsSuccessful() {
@@ -242,7 +311,7 @@ public class CqlTemplateUnitTests {
}
/**
* @see DATACASS-286
* @see <a href="https://jira.spring.io/browse/DATACASS-286">DATACASS-286</a>
*/
@Test
public void processOneWithRequiredTypeThrowsIncorrectResultSetSizeDataAccessExceptionWhenNoRowsFound() {
@@ -252,7 +321,6 @@ public class CqlTemplateUnitTests {
when(mockResultSet.one()).thenReturn(null);
try {
exception.expect(IncorrectResultSizeDataAccessException.class);
exception.expectCause(is(nullValue(Throwable.class)));
exception.expectMessage(containsString("expected 1, actual 0"));
@@ -266,7 +334,7 @@ public class CqlTemplateUnitTests {
}
/**
* @see DATACASS-286
* @see <a href="https://jira.spring.io/browse/DATACASS-286">DATACASS-286</a>
*/
@Test
public void processOneWithRequiredTypeThrowsIncorrectResultSetSizeDataAccessExceptionWhenTooManyRowsFound() {
@@ -278,7 +346,6 @@ public class CqlTemplateUnitTests {
when(mockResultSet.isExhausted()).thenReturn(false);
try {
exception.expect(IncorrectResultSizeDataAccessException.class);
exception.expectCause(is(nullValue(Throwable.class)));
exception.expectMessage(containsString("ResultSet size exceeds 1"));
@@ -293,11 +360,10 @@ public class CqlTemplateUnitTests {
}
/**
* @see DATACASS-286
* @see <a href="https://jira.spring.io/browse/DATACASS-286">DATACASS-286</a>
*/
@Test
public void processOneWithRequiredTypePassingNullResultSetThrowsIllegalArgumentException() {
exception.expect(IllegalArgumentException.class);
exception.expectCause(is(nullValue(Throwable.class)));

109
spring-cql/src/test/java/org/springframework/cassandra/core/support/EmptyResultSetUnitTests.java Normal file
View File

@@ -0,0 +1,109 @@
/*
* Copyright 2013-2016 the original author or authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.cassandra.core.support;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import static org.mockito.Mockito.*;
import java.util.Collections;
import java.util.Iterator;
import org.junit.Test;
import com.datastax.driver.core.ExecutionInfo;
import com.datastax.driver.core.ResultSet;
import com.datastax.driver.core.Row;
/**
* Test suite of test cases testing the contract and functionality of the {@link EmptyResultSet}.
*
* @author John Blum
* @see org.springframework.cassandra.core.support.EmptyResultSet
* @since 1.5.0
*/
public class EmptyResultSetUnitTests {
@Test
public void nullSafeResultSetReturnsGivenResultSet() {
ResultSet mockResultSet = mock(ResultSet.class);
ResultSet theResultSet = EmptyResultSet.nullSafeResultSet(mockResultSet);
assertThat(theResultSet, is(sameInstance(mockResultSet)));
}
@Test
public void nullSAfeResultSetReturnsEmptyResultSetForNull() {
ResultSet resultSet = EmptyResultSet.nullSafeResultSet(null);
assertThat(resultSet, is(instanceOf(EmptyResultSet.class)));
}
@Test
public void isExhaustedForEmptyResultIsTrue() {
assertThat(EmptyResultSet.nullSafeResultSet(null).isExhausted(), is(true));
}
@Test
public void isFullyFetchedForEmptyResultSetIsTrue() {
assertThat(EmptyResultSet.nullSafeResultSet(null).isFullyFetched(), is(true));
}
@Test
public void getAllExecutionInfoForEmptyResultSetIsEmptyList() {
assertThat(EmptyResultSet.nullSafeResultSet(null).getAllExecutionInfo(),
is(equalTo(Collections.<ExecutionInfo>emptyList())));
}
@Test(expected = UnsupportedOperationException.class)
public void getColumnDefinitionsForEmptyResultSetThrowsUnsupportedOperationException() {
EmptyResultSet.nullSafeResultSet(null).getColumnDefinitions();
}
@Test
public void getExecutionInfoForEmptyResultSetIsNull() {
assertThat(EmptyResultSet.nullSafeResultSet(null).getExecutionInfo(), is(nullValue(ExecutionInfo.class)));
}
@Test
public void allForEmptyResultSetIsEmptyList() {
assertThat(EmptyResultSet.nullSafeResultSet(null).all(), is(equalTo(Collections.<Row>emptyList())));
}
@Test(expected = UnsupportedOperationException.class)
public void fetchMoreResultsFromEmptyResultSetThrowsUnsupportedOperationException() {
EmptyResultSet.nullSafeResultSet(null).fetchMoreResults();
}
@Test
public void iteratorForEmptyResultSetIsEmptyIterator() {
Iterator<Row> iterator = EmptyResultSet.nullSafeResultSet(null).iterator();
assertThat(iterator, is(notNullValue(Iterator.class)));
assertThat(iterator.hasNext(), is(false));
}
@Test
public void oneForEmptyResultSetIsNull() {
assertThat(EmptyResultSet.nullSafeResultSet(null).one(), is(nullValue(Row.class)));
}
@Test(expected = UnsupportedOperationException.class)
public void wasAppliedOnEmptyResultSetThrowsUnsupportedOperationException() {
EmptyResultSet.nullSafeResultSet(null).wasApplied();
}
}