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

Polishing

Browse Source
This commit is contained in:
Juergen Hoeller
2023-08-07 14:51:58 +02:00
parent 156b3696a7
commit 2aae0a4e0c
2 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-jdbc/src/test/java/org/springframework/jdbc/core/BeanPropertyRowMapperTests.java
View File

@@ -50,7 +50,7 @@ class BeanPropertyRowMapperTests extends AbstractRowMapperTests {
void overridingDifferentClassDefinedForMapping() { void overridingDifferentClassDefinedForMapping() {
BeanPropertyRowMapper mapper = new BeanPropertyRowMapper(Person.class); BeanPropertyRowMapper mapper = new BeanPropertyRowMapper(Person.class);
assertThatExceptionOfType(InvalidDataAccessApiUsageException.class) assertThatExceptionOfType(InvalidDataAccessApiUsageException.class)
.isThrownBy(() -> mapper.setMappedClass(Long.class)); .isThrownBy(() -> mapper.setMappedClass(Long.class));
} }
@Test @Test
@@ -104,7 +104,7 @@ class BeanPropertyRowMapperTests extends AbstractRowMapperTests {
BeanPropertyRowMapper<ExtendedPerson> mapper = new BeanPropertyRowMapper<>(ExtendedPerson.class, true); BeanPropertyRowMapper<ExtendedPerson> mapper = new BeanPropertyRowMapper<>(ExtendedPerson.class, true);
Mock mock = new Mock(); Mock mock = new Mock();
assertThatExceptionOfType(InvalidDataAccessApiUsageException.class) assertThatExceptionOfType(InvalidDataAccessApiUsageException.class)
.isThrownBy(() -> mock.getJdbcTemplate().query("select name, age, birth_date, balance from people", mapper)); .isThrownBy(() -> mock.getJdbcTemplate().query("select name, age, birth_date, balance from people", mapper));
} }
@Test @Test
@@ -112,7 +112,7 @@ class BeanPropertyRowMapperTests extends AbstractRowMapperTests {
BeanPropertyRowMapper<Person> mapper = new BeanPropertyRowMapper<>(Person.class); BeanPropertyRowMapper<Person> mapper = new BeanPropertyRowMapper<>(Person.class);
Mock mock = new Mock(MockType.TWO); Mock mock = new Mock(MockType.TWO);
assertThatExceptionOfType(TypeMismatchException.class) assertThatExceptionOfType(TypeMismatchException.class)
.isThrownBy(() -> mock.getJdbcTemplate().query(SELECT_NULL_AS_AGE, mapper)); .isThrownBy(() -> mock.getJdbcTemplate().query(SELECT_NULL_AS_AGE, mapper));
} }
@Test @Test

49
spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java
View File

@@ -23,7 +23,6 @@ import java.sql.SQLException;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.dao.DataAccessException;
import org.springframework.dao.IncorrectResultSizeDataAccessException; import org.springframework.dao.IncorrectResultSizeDataAccessException;
import org.springframework.jdbc.LobRetrievalFailureException; import org.springframework.jdbc.LobRetrievalFailureException;
import org.springframework.jdbc.support.lob.LobCreator; import org.springframework.jdbc.support.lob.LobCreator;
@@ -55,11 +54,9 @@ public class LobSupportTests {
final SetValuesCalled svc = new SetValuesCalled(); final SetValuesCalled svc = new SetValuesCalled();
AbstractLobCreatingPreparedStatementCallback psc = new AbstractLobCreatingPreparedStatementCallback( AbstractLobCreatingPreparedStatementCallback psc = new AbstractLobCreatingPreparedStatementCallback(handler) {
handler) {
@Override @Override
protected void setValues(PreparedStatement ps, LobCreator lobCreator) protected void setValues(PreparedStatement ps, LobCreator lobCreator) {
throws SQLException, DataAccessException {
svc.b = true; svc.b = true;
} }
}; };
@@ -73,46 +70,43 @@ public class LobSupportTests {
@Test @Test
public void testAbstractLobStreamingResultSetExtractorNoRows() throws SQLException { public void testAbstractLobStreamingResultSetExtractorNoRows() throws SQLException {
ResultSet rset = mock(); ResultSet rs = mock();
AbstractLobStreamingResultSetExtractor<Void> lobRse = getResultSetExtractor(false); AbstractLobStreamingResultSetExtractor<Void> lobRse = getResultSetExtractor(false);
assertThatExceptionOfType(IncorrectResultSizeDataAccessException.class).isThrownBy(() -> assertThatExceptionOfType(IncorrectResultSizeDataAccessException.class)
lobRse.extractData(rset)); .isThrownBy(() -> lobRse.extractData(rs));
verify(rset).next(); verify(rs).next();
} }
@Test @Test
public void testAbstractLobStreamingResultSetExtractorOneRow() throws SQLException { public void testAbstractLobStreamingResultSetExtractorOneRow() throws SQLException {
ResultSet rset = mock(); ResultSet rs = mock();
given(rset.next()).willReturn(true, false); given(rs.next()).willReturn(true, false);
AbstractLobStreamingResultSetExtractor<Void> lobRse = getResultSetExtractor(false); AbstractLobStreamingResultSetExtractor<Void> lobRse = getResultSetExtractor(false);
lobRse.extractData(rset); lobRse.extractData(rs);
verify(rset).clearWarnings(); verify(rs).clearWarnings();
} }
@Test @Test
public void testAbstractLobStreamingResultSetExtractorMultipleRows() public void testAbstractLobStreamingResultSetExtractorMultipleRows() throws SQLException {
throws SQLException { ResultSet rs = mock();
ResultSet rset = mock(); given(rs.next()).willReturn(true, true, false);
given(rset.next()).willReturn(true, true, false);
AbstractLobStreamingResultSetExtractor<Void> lobRse = getResultSetExtractor(false); AbstractLobStreamingResultSetExtractor<Void> lobRse = getResultSetExtractor(false);
assertThatExceptionOfType(IncorrectResultSizeDataAccessException.class).isThrownBy(() -> assertThatExceptionOfType(IncorrectResultSizeDataAccessException.class)
lobRse.extractData(rset)); .isThrownBy(() -> lobRse.extractData(rs));
verify(rset).clearWarnings(); verify(rs).clearWarnings();
} }
@Test @Test
public void testAbstractLobStreamingResultSetExtractorCorrectException() public void testAbstractLobStreamingResultSetExtractorCorrectException() throws SQLException {
throws SQLException { ResultSet rs = mock();
ResultSet rset = mock(); given(rs.next()).willReturn(true);
given(rset.next()).willReturn(true);
AbstractLobStreamingResultSetExtractor<Void> lobRse = getResultSetExtractor(true); AbstractLobStreamingResultSetExtractor<Void> lobRse = getResultSetExtractor(true);
assertThatExceptionOfType(LobRetrievalFailureException.class).isThrownBy(() -> assertThatExceptionOfType(LobRetrievalFailureException.class)
lobRse.extractData(rset)); .isThrownBy(() -> lobRse.extractData(rs));
} }
private AbstractLobStreamingResultSetExtractor<Void> getResultSetExtractor(final boolean ex) { private AbstractLobStreamingResultSetExtractor<Void> getResultSetExtractor(final boolean ex) {
AbstractLobStreamingResultSetExtractor<Void> lobRse = new AbstractLobStreamingResultSetExtractor<>() { AbstractLobStreamingResultSetExtractor<Void> lobRse = new AbstractLobStreamingResultSetExtractor<>() {
@Override @Override
protected void streamData(ResultSet rs) throws SQLException, IOException { protected void streamData(ResultSet rs) throws SQLException, IOException {
if (ex) { if (ex) {
@@ -125,4 +119,5 @@ public class LobSupportTests {
}; };
return lobRse; return lobRse;
} }
} }