From edfe179291cc3c88ef3bad11ec2b49f9f6f4ab96 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 30 Nov 2023 16:36:45 +0100 Subject: [PATCH] Polishing --- .../datasource/DelegatingDataSourceTests.java | 3 +++ .../DriverManagerDataSourceTests.java | 17 +++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DelegatingDataSourceTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DelegatingDataSourceTests.java index 1d31ddecaca..07bbad255f9 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DelegatingDataSourceTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DelegatingDataSourceTests.java @@ -40,6 +40,7 @@ public class DelegatingDataSourceTests { private DelegatingDataSource dataSource = new DelegatingDataSource(delegate); + @Test public void shouldDelegateGetConnection() throws Exception { Connection connection = mock(); @@ -109,10 +110,12 @@ public class DelegatingDataSourceTests { assertThat(dataSource.isWrapperFor(ExampleWrapper.class)).isTrue(); } + public interface ExampleWrapper { } private static class DelegatingDataSourceWithWrapper extends DelegatingDataSource implements ExampleWrapper { } + } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java index 288d21d5e69..2693341fa40 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java @@ -30,10 +30,11 @@ import static org.mockito.Mockito.mock; */ public class DriverManagerDataSourceTests { - private Connection connection = mock(); + private final Connection connection = mock(); + @Test - public void testStandardUsage() throws Exception { + public void standardUsage() throws Exception { final String jdbcUrl = "url"; final String uname = "uname"; final String pwd = "pwd"; @@ -63,7 +64,7 @@ public class DriverManagerDataSourceTests { } @Test - public void testUsageWithConnectionProperties() throws Exception { + public void usageWithConnectionProperties() throws Exception { final String jdbcUrl = "url"; final Properties connProps = new Properties(); @@ -96,7 +97,7 @@ public class DriverManagerDataSourceTests { } @Test - public void testUsageWithConnectionPropertiesAndUserCredentials() throws Exception { + public void usageWithConnectionPropertiesAndUserCredentials() throws Exception { final String jdbcUrl = "url"; final String uname = "uname"; final String pwd = "pwd"; @@ -135,12 +136,12 @@ public class DriverManagerDataSourceTests { } @Test - public void testInvalidClassName() throws Exception { + public void invalidClassName() { String bogusClassName = "foobar"; DriverManagerDataSource ds = new DriverManagerDataSource(); - assertThatIllegalStateException().isThrownBy(() -> - ds.setDriverClassName(bogusClassName)) - .withCauseInstanceOf(ClassNotFoundException.class); + assertThatIllegalStateException().isThrownBy( + () -> ds.setDriverClassName(bogusClassName)) + .withCauseInstanceOf(ClassNotFoundException.class); } }