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

Merge branch '5.3.x'

Browse Source
This commit is contained in:
Sam Brannen
2022-07-13 16:36:01 +02:00
parent 8242897c81 bd3499671c
commit 0fb9de5d0e
19 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookupTests.java
View File

@@ -73,9 +73,9 @@ public class MapDataSourceLookupTests {
@Test
public void addingDataSourcePermitsOverride() throws Exception {
Map<String, DataSource> dataSources = new HashMap<>();
StubDataSource overridenDataSource = new StubDataSource();
StubDataSource overriddenDataSource = new StubDataSource();
StubDataSource expectedDataSource = new StubDataSource();
dataSources.put(DATA_SOURCE_NAME, overridenDataSource);
dataSources.put(DATA_SOURCE_NAME, overriddenDataSource);
MapDataSourceLookup lookup = new MapDataSourceLookup();
lookup.setDataSources(dataSources);
lookup.addDataSource(DATA_SOURCE_NAME, expectedDataSource); // must override existing entry

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

@@ -80,7 +80,7 @@ class DatabaseStartupValidatorTests {
}
@Test
void shouldCallValidatonTwiceWhenNotValid() throws Exception {
void shouldCallValidationTwiceWhenNotValid() throws Exception {
given(connection.isValid(1)).willReturn(false, true);
validator.afterPropertiesSet();
@@ -90,7 +90,7 @@ class DatabaseStartupValidatorTests {
}
@Test
void shouldCallValidatonTwiceInCaseOfException() throws Exception {
void shouldCallValidationTwiceInCaseOfException() throws Exception {
given(connection.isValid(1)).willThrow(new SQLException("Test")).willReturn(true);
validator.afterPropertiesSet();
@@ -118,7 +118,7 @@ class DatabaseStartupValidatorTests {
@Test
@SuppressWarnings("deprecation")
void shouldExecuteValidatonTwiceOnError() throws Exception {
void shouldExecuteValidationTwiceOnError() throws Exception {
String validationQuery = "SELECT NOW() FROM DUAL";
Statement statement = mock(Statement.class);
given(connection.createStatement()).willReturn(statement);