From 0e83aaa756859be23ecdd9d16602e07d0b6a8064 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Tue, 23 Jun 2020 18:08:24 +0200 Subject: [PATCH] Fix hanging test Partially reverts 1edc08fb8413c84bd08a9d9913c917f882cf7c29 --- .../jdbc/support/DatabaseStartupValidatorTests.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/DatabaseStartupValidatorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/DatabaseStartupValidatorTests.java index 88cdb3d93ca..79c5c2546c1 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/DatabaseStartupValidatorTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/DatabaseStartupValidatorTests.java @@ -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();