From 1edc08fb8413c84bd08a9d9913c917f882cf7c29 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 23 Jun 2020 17:45:23 +0200
Subject: [PATCH] Polishing

---
 .../DatabaseStartupValidatorTests.java        | 66 +++++++++----------
 1 file changed, 30 insertions(+), 36 deletions(-)

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 93dba6e5f6..88cdb3d93c 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
@@ -25,81 +25,75 @@ import javax.sql.DataSource;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
 /**
- * Mock object based test for {@code DatabaseStartupValidator}.
+ * Mock object based tests for {@code DatabaseStartupValidator}.
  *
- * @author Marten Deinum,
+ * @author Marten Deinum
  */
 class DatabaseStartupValidatorTests {
 
-	private Connection connection;
-	private DataSource dataSource;
+	private final DataSource dataSource = mock(DataSource.class);
+
+	private final Connection connection = mock(Connection.class);
+
+	private final DatabaseStartupValidator validator = new DatabaseStartupValidator();
+
 
 	@BeforeEach
-	public void setUp() throws Exception {
-		connection = mock(Connection.class);
-		dataSource = mock(DataSource.class);
+	void setUp() throws Exception {
 		given(dataSource.getConnection()).willReturn(connection);
-	}
-
-	@Test
-	public void properSetupForDataSource() {
-		DatabaseStartupValidator validator = new DatabaseStartupValidator();
-		assertThatThrownBy(validator::afterPropertiesSet)
-				.isInstanceOf(IllegalArgumentException.class);
-	}
-
-	@Test
-	public void shouldUseJdbc4IsValidByDefault() throws Exception {
-		given(connection.isValid(1)).willReturn(true);
-		DatabaseStartupValidator validator = new DatabaseStartupValidator();
 		validator.setDataSource(dataSource);
+	}
+
+	@Test
+	void properSetupForDataSource() {
+		assertThatIllegalArgumentException().isThrownBy(validator::afterPropertiesSet);
+	}
+
+	@Test
+	void shouldUseJdbc4IsValidByDefault() throws Exception {
+		given(connection.isValid(1)).willReturn(true);
+
 		validator.afterPropertiesSet();
 
 		verify(connection, times(1)).isValid(1);
 		verify(connection, times(1)).close();
-
 	}
 
 	@Test
-	public void shouldCallValidatonTwiceWhenNotValid() throws Exception {
+	void shouldCallValidatonTwiceWhenNotValid() throws Exception {
 		given(connection.isValid(1)).willReturn(false, true);
-		DatabaseStartupValidator validator = new DatabaseStartupValidator();
-		validator.setDataSource(dataSource);
+
 		validator.afterPropertiesSet();
 
 		verify(connection, times(2)).isValid(1);
 		verify(connection, times(2)).close();
-
 	}
 
 	@Test
-	public void shouldCallValidatonTwiceInCaseOfException() throws Exception {
+	void shouldCallValidatonTwiceInCaseOfException() throws Exception {
 		given(connection.isValid(1)).willThrow(new SQLException("Test")).willReturn(true);
-		DatabaseStartupValidator validator = new DatabaseStartupValidator();
-		validator.setDataSource(dataSource);
+
 		validator.afterPropertiesSet();
 
 		verify(connection, times(2)).isValid(1);
 		verify(connection, times(2)).close();
-
 	}
 
 	@Test
-	public void useValidationQueryInsteadOfIsValid() throws Exception {
+	@SuppressWarnings("deprecation")
+	void useValidationQueryInsteadOfIsValid() throws Exception {
 		String validationQuery = "SELECT NOW() FROM DUAL";
 		Statement statement = mock(Statement.class);
 		given(connection.createStatement()).willReturn(statement);
 		given(statement.execute(validationQuery)).willReturn(true);
 
-		DatabaseStartupValidator validator = new DatabaseStartupValidator();
-		validator.setDataSource(dataSource);
 		validator.setValidationQuery(validationQuery);
 		validator.afterPropertiesSet();
 
@@ -110,7 +104,8 @@ class DatabaseStartupValidatorTests {
 	}
 
 	@Test
-	public void shouldExecuteValidatonTwiceOnError() throws Exception {
+	@SuppressWarnings("deprecation")
+	void shouldExecuteValidatonTwiceOnError() throws Exception {
 		String validationQuery = "SELECT NOW() FROM DUAL";
 		Statement statement = mock(Statement.class);
 		given(connection.createStatement()).willReturn(statement);
@@ -118,8 +113,6 @@ class DatabaseStartupValidatorTests {
 				.willThrow(new SQLException("Test"))
 				.willReturn(true);
 
-		DatabaseStartupValidator validator = new DatabaseStartupValidator();
-		validator.setDataSource(dataSource);
 		validator.setValidationQuery(validationQuery);
 		validator.afterPropertiesSet();
 
@@ -128,4 +121,5 @@ class DatabaseStartupValidatorTests {
 		verify(connection, times(2)).close();
 		verify(statement, times(2)).close();
 	}
+
 }