Browse Source

Polishing

pull/31736/head
Juergen Hoeller 2 years ago
parent
commit
edfe179291
  1. 3
      spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DelegatingDataSourceTests.java
  2. 15
      spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java

3
spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DelegatingDataSourceTests.java

@ -40,6 +40,7 @@ public class DelegatingDataSourceTests { @@ -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 { @@ -109,10 +110,12 @@ public class DelegatingDataSourceTests {
assertThat(dataSource.isWrapperFor(ExampleWrapper.class)).isTrue();
}
public interface ExampleWrapper {
}
private static class DelegatingDataSourceWithWrapper extends DelegatingDataSource
implements ExampleWrapper {
}
}

15
spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java

@ -30,10 +30,11 @@ import static org.mockito.Mockito.mock; @@ -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 { @@ -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 { @@ -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,11 +136,11 @@ public class DriverManagerDataSourceTests { @@ -135,11 +136,11 @@ public class DriverManagerDataSourceTests {
}
@Test
public void testInvalidClassName() throws Exception {
public void invalidClassName() {
String bogusClassName = "foobar";
DriverManagerDataSource ds = new DriverManagerDataSource();
assertThatIllegalStateException().isThrownBy(() ->
ds.setDriverClassName(bogusClassName))
assertThatIllegalStateException().isThrownBy(
() -> ds.setDriverClassName(bogusClassName))
.withCauseInstanceOf(ClassNotFoundException.class);
}

Loading…
Cancel
Save