root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fix hanging test 

Partially reverts 1edc08fb84
This commit is contained in:
Sam Brannen 2020-06-23 18:08:24 +02:00
parent 1edc08fb84
commit 0e83aaa756
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-jdbc/src/test/java/org/springframework/jdbc/support/DatabaseStartupValidatorTests.java
View File

@ -48,7 +48,6 @@ class DatabaseStartupValidatorTests {
@BeforeEach
void setUp() throws Exception {
given(dataSource.getConnection()).willReturn(connection);
validator.setDataSource(dataSource);
}
@Test
@ -60,6 +59,7 @@ class DatabaseStartupValidatorTests {
void shouldUseJdbc4IsValidByDefault() throws Exception {
given(connection.isValid(1)).willReturn(true);
validator.setDataSource(dataSource);
validator.afterPropertiesSet();
verify(connection, times(1)).isValid(1);
@ -70,6 +70,7 @@ class DatabaseStartupValidatorTests {
void shouldCallValidatonTwiceWhenNotValid() throws Exception {
given(connection.isValid(1)).willReturn(false, true);
validator.setDataSource(dataSource);
validator.afterPropertiesSet();
verify(connection, times(2)).isValid(1);
@ -80,6 +81,7 @@ class DatabaseStartupValidatorTests {
void shouldCallValidatonTwiceInCaseOfException() throws Exception {
given(connection.isValid(1)).willThrow(new SQLException("Test")).willReturn(true);
validator.setDataSource(dataSource);
validator.afterPropertiesSet();
verify(connection, times(2)).isValid(1);
@ -94,6 +96,7 @@ class DatabaseStartupValidatorTests {
given(connection.createStatement()).willReturn(statement);
given(statement.execute(validationQuery)).willReturn(true);
validator.setDataSource(dataSource);
validator.setValidationQuery(validationQuery);
validator.afterPropertiesSet();
@ -113,6 +116,7 @@ class DatabaseStartupValidatorTests {
.willThrow(new SQLException("Test"))
.willReturn(true);
validator.setDataSource(dataSource);
validator.setValidationQuery(validationQuery);
validator.afterPropertiesSet();