From 92b513dc8d6c482e8c52aafd92b980f05cdf2ec4 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 25 Oct 2022 16:01:58 -0700 Subject: [PATCH] Polish --- .../h2/H2ConsoleAutoConfigurationTests.java | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfigurationTests.java index e3c37195496..6553477b2e7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfigurationTests.java @@ -26,8 +26,6 @@ import javax.sql.DataSource; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; import org.springframework.beans.factory.BeanCreationException; import org.springframework.boot.autoconfigure.AutoConfigurations; @@ -184,18 +182,13 @@ class H2ConsoleAutoConfigurationTests { private DataSource mockDataSource(String url) throws SQLException { DataSource dataSource = mock(DataSource.class); - given(dataSource.getConnection()).will(new Answer() { - - @Override - public Connection answer(InvocationOnMock invocation) throws Throwable { - assertThat(Thread.currentThread().getContextClassLoader()).isEqualTo(getClass().getClassLoader()); - Connection connection = mock(Connection.class); - DatabaseMetaData metadata = mock(DatabaseMetaData.class); - given(connection.getMetaData()).willReturn(metadata); - given(metadata.getURL()).willReturn(url); - return connection; - } - + given(dataSource.getConnection()).will((invocation) -> { + assertThat(Thread.currentThread().getContextClassLoader()).isEqualTo(getClass().getClassLoader()); + Connection connection = mock(Connection.class); + DatabaseMetaData metadata = mock(DatabaseMetaData.class); + given(connection.getMetaData()).willReturn(metadata); + given(metadata.getURL()).willReturn(url); + return connection; }); return dataSource;