#467 - Migrate tests to JUnit 5.

Migrate also ExternalDatabase from JUnit rule to BeforeAllCallback and RegisterExtension.

Author: mp911de

src/test/java/org/springframework/data/r2dbc/DependencyTests.java

@@ -23,7 +23,7 @@
 import scala.runtime.AbstractFunction1;
 
 import org.junit.Assume;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test package dependencies for violations.

src/test/java/org/springframework/data/r2dbc/config/AuditingUnitTests.java

@@ -22,7 +22,7 @@
 
 import java.time.LocalDateTime;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -41,7 +41,7 @@
  *
  * @author Mark Paluch
  */
-public class AuditingUnitTests {
+class AuditingUnitTests {
 
 	@EnableR2dbcAuditing(auditorAwareRef = "myAuditor")
 	static class AuditingConfiguration {
@@ -58,7 +58,7 @@ R2dbcMappingContext r2dbcMappingContext() {
 	}
 
 	@Test // gh-281
-	public void enablesAuditingAndSetsPropertiesAccordingly() throws Exception {
+	void enablesAuditingAndSetsPropertiesAccordingly() throws Exception {
 
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(AuditingConfiguration.class);
 

src/test/java/org/springframework/data/r2dbc/config/H2IntegrationTests.java

@@ -22,9 +22,9 @@
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.ComponentScan;
@@ -40,24 +40,24 @@
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.r2dbc.core.DatabaseClient;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * Integration test for {@link DatabaseClient} and repositories using H2.
  *
  * @author Mark Paluch
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration
-public class H2IntegrationTests {
+class H2IntegrationTests {
 
-	private JdbcTemplate jdbc = new JdbcTemplate(H2TestSupport.createDataSource());
+	private final JdbcTemplate jdbc = new JdbcTemplate(H2TestSupport.createDataSource());
 
 	@Autowired DatabaseClient databaseClient;
 	@Autowired H2Repository repository;
 
-	@Before
-	public void before() {
+	@BeforeEach
+	void before() {
 
 		try {
 			jdbc.execute("DROP TABLE legoset");
@@ -66,7 +66,7 @@ public void before() {
 	}
 
 	@Test // gh-109
-	public void shouldSelectCountWithDatabaseClient() {
+	void shouldSelectCountWithDatabaseClient() {
 
 		jdbc.execute("INSERT INTO legoset (id, name, manual) VALUES(42055, 'SCHAUFELRADBAGGER', 12)");
 
@@ -79,7 +79,7 @@ public void shouldSelectCountWithDatabaseClient() {
 	}
 
 	@Test // gh-109
-	public void shouldSelectCountWithRepository() {
+	void shouldSelectCountWithRepository() {
 
 		jdbc.execute("INSERT INTO legoset (id, name, manual) VALUES(42055, 'SCHAUFELRADBAGGER', 12)");
 

src/test/java/org/springframework/data/r2dbc/config/R2dbcAuditingRegistrarUnitTests.java

@@ -17,10 +17,12 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.core.type.AnnotationMetadata;
@@ -30,21 +32,22 @@
  *
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
-public class R2dbcAuditingRegistrarUnitTests {
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class R2dbcAuditingRegistrarUnitTests {
 
-	private R2dbcAuditingRegistrar registrar = new R2dbcAuditingRegistrar();
+	private final R2dbcAuditingRegistrar registrar = new R2dbcAuditingRegistrar();
 
 	@Mock AnnotationMetadata metadata;
 	@Mock BeanDefinitionRegistry registry;
 
 	@Test // gh-281
-	public void rejectsNullAnnotationMetadata() {
+	void rejectsNullAnnotationMetadata() {
 		assertThatIllegalArgumentException().isThrownBy(() -> registrar.registerBeanDefinitions(null, registry));
 	}
 
 	@Test // gh-281
-	public void rejectsNullBeanDefinitionRegistry() {
+	void rejectsNullBeanDefinitionRegistry() {
 		assertThatIllegalArgumentException().isThrownBy(() -> registrar.registerBeanDefinitions(metadata, null));
 	}
 }

src/test/java/org/springframework/data/r2dbc/config/R2dbcConfigurationIntegrationTests.java

@@ -22,7 +22,7 @@
 import io.r2dbc.h2.H2ConnectionFactory;
 import io.r2dbc.spi.ConnectionFactory;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -34,10 +34,10 @@
  *
  * @author Mark Paluch
  */
-public class R2dbcConfigurationIntegrationTests {
+class R2dbcConfigurationIntegrationTests {
 
 	@Test // gh-95
-	public void shouldLookupConnectionFactoryThroughLocalCall() {
+	void shouldLookupConnectionFactoryThroughLocalCall() {
 
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
 				NonBeanConnectionFactoryConfiguration.class);
@@ -53,7 +53,7 @@ public void shouldLookupConnectionFactoryThroughLocalCall() {
 	}
 
 	@Test // gh-95
-	public void shouldLookupConnectionFactoryThroughLocalCallForExistingCustomBeans() {
+	void shouldLookupConnectionFactoryThroughLocalCallForExistingCustomBeans() {
 
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
 				CustomConnectionFactoryBeanNameConfiguration.class);
@@ -73,7 +73,7 @@ public void shouldLookupConnectionFactoryThroughLocalCallForExistingCustomBeans(
 	}
 
 	@Test // gh-95
-	public void shouldRegisterConnectionFactory() {
+	void shouldRegisterConnectionFactory() {
 
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
 				BeanConnectionFactoryConfiguration.class);

src/test/java/org/springframework/data/r2dbc/connectionfactory/DelegatingConnectionFactoryUnitTests.java

@@ -22,8 +22,7 @@
 import io.r2dbc.spi.ConnectionFactory;
 import reactor.core.publisher.Mono;
 
-import org.junit.Test;
-import org.springframework.data.r2dbc.connectionfactory.DelegatingConnectionFactory;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for {@link DelegatingConnectionFactory}.

src/test/java/org/springframework/data/r2dbc/connectionfactory/SingleConnectionConnectionFactoryUnitTests.java

@@ -27,7 +27,7 @@
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for {@link SingleConnectionConnectionFactory}.

src/test/java/org/springframework/data/r2dbc/connectionfactory/TransactionAwareConnectionFactoryProxyUnitTests.java

@@ -25,8 +25,8 @@
 
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.transaction.reactive.TransactionalOperator;
 
@@ -45,7 +45,7 @@ public class TransactionAwareConnectionFactoryProxyUnitTests {
 
 	private R2dbcTransactionManager tm;
 
-	@Before
+	@BeforeEach
 	public void before() {
 
 		when(connectionFactoryMock.create()).thenReturn((Mono) Mono.just(connectionMock1),

src/test/java/org/springframework/data/r2dbc/connectionfactory/init/AbstractDatabaseInitializationTests.java

@@ -18,7 +18,7 @@
 import io.r2dbc.spi.ConnectionFactory;
 import reactor.test.StepVerifier;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.core.io.ClassRelativeResourceLoader;
 import org.springframework.core.io.Resource;
@@ -29,13 +29,13 @@
  *
  * @author Mark Paluch
  */
-public abstract class AbstractDatabaseInitializationTests {
+abstract class AbstractDatabaseInitializationTests {
 
-	ClassRelativeResourceLoader resourceLoader = new ClassRelativeResourceLoader(getClass());
+	private final ClassRelativeResourceLoader resourceLoader = new ClassRelativeResourceLoader(getClass());
 	ResourceDatabasePopulator databasePopulator = new ResourceDatabasePopulator();
 
 	@Test
-	public void scriptWithSingleLineCommentsAndFailedDrop() {
+	void scriptWithSingleLineCommentsAndFailedDrop() {
 
 		databasePopulator.addScript(resource("db-schema-failed-drop-comments.sql"));
 		databasePopulator.addScript(resource("db-test-data.sql"));
@@ -53,7 +53,7 @@ private void runPopulator() {
 	}
 
 	@Test
-	public void scriptWithStandardEscapedLiteral() {
+	void scriptWithStandardEscapedLiteral() {
 
 		databasePopulator.addScript(defaultSchema());
 		databasePopulator.addScript(resource("db-test-data-escaped-literal.sql"));
@@ -64,7 +64,7 @@ public void scriptWithStandardEscapedLiteral() {
 	}
 
 	@Test
-	public void scriptWithMySqlEscapedLiteral() {
+	void scriptWithMySqlEscapedLiteral() {
 
 		databasePopulator.addScript(defaultSchema());
 		databasePopulator.addScript(resource("db-test-data-mysql-escaped-literal.sql"));
@@ -75,7 +75,7 @@ public void scriptWithMySqlEscapedLiteral() {
 	}
 
 	@Test
-	public void scriptWithMultipleStatements() {
+	void scriptWithMultipleStatements() {
 
 		databasePopulator.addScript(defaultSchema());
 		databasePopulator.addScript(resource("db-test-data-multiple.sql"));
@@ -86,7 +86,7 @@ public void scriptWithMultipleStatements() {
 	}
 
 	@Test
-	public void scriptWithMultipleStatementsAndLongSeparator() {
+	void scriptWithMultipleStatementsAndLongSeparator() {
 
 		databasePopulator.addScript(defaultSchema());
 		databasePopulator.addScript(resource("db-test-data-endings.sql"));

src/test/java/org/springframework/data/r2dbc/connectionfactory/init/CompositeDatabasePopulatorTests.java

@@ -24,31 +24,31 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for {@link CompositeDatabasePopulator}.
  *
  * @author Mark Paluch
  */
-public class CompositeDatabasePopulatorTests {
+class CompositeDatabasePopulatorTests {
 
-	Connection mockedConnection = mock(Connection.class);
+	private final Connection mockedConnection = mock(Connection.class);
 
-	DatabasePopulator mockedDatabasePopulator1 = mock(DatabasePopulator.class);
+	private final DatabasePopulator mockedDatabasePopulator1 = mock(DatabasePopulator.class);
 
-	DatabasePopulator mockedDatabasePopulator2 = mock(DatabasePopulator.class);
+	private final DatabasePopulator mockedDatabasePopulator2 = mock(DatabasePopulator.class);
 
-	@Before
-	public void before() {
+	@BeforeEach
+	void before() {
 
 		when(mockedDatabasePopulator1.populate(mockedConnection)).thenReturn(Mono.empty());
 		when(mockedDatabasePopulator2.populate(mockedConnection)).thenReturn(Mono.empty());
 	}
 
 	@Test
-	public void addPopulators() {
+	void addPopulators() {
 
 		CompositeDatabasePopulator populator = new CompositeDatabasePopulator();
 		populator.addPopulators(mockedDatabasePopulator1, mockedDatabasePopulator2);
@@ -60,7 +60,7 @@ public void addPopulators() {
 	}
 
 	@Test
-	public void setPopulatorsWithMultiple() {
+	void setPopulatorsWithMultiple() {
 
 		CompositeDatabasePopulator populator = new CompositeDatabasePopulator();
 		populator.setPopulators(mockedDatabasePopulator1, mockedDatabasePopulator2); // multiple
@@ -72,7 +72,7 @@ public void setPopulatorsWithMultiple() {
 	}
 
 	@Test
-	public void setPopulatorsForOverride() {
+	void setPopulatorsForOverride() {
 
 		CompositeDatabasePopulator populator = new CompositeDatabasePopulator();
 		populator.setPopulators(mockedDatabasePopulator1);
@@ -85,7 +85,7 @@ public void setPopulatorsForOverride() {
 	}
 
 	@Test
-	public void constructWithVarargs() {
+	void constructWithVarargs() {
 
 		CompositeDatabasePopulator populator = new CompositeDatabasePopulator(mockedDatabasePopulator1,
 				mockedDatabasePopulator2);
@@ -97,7 +97,7 @@ public void constructWithVarargs() {
 	}
 
 	@Test
-	public void constructWithCollection() {
+	void constructWithCollection() {
 
 		Set<DatabasePopulator> populators = new LinkedHashSet<>();
 		populators.add(mockedDatabasePopulator1);

src/test/java/org/springframework/data/r2dbc/connectionfactory/init/ConnectionFactoryInitializerUnitTests.java

@@ -24,22 +24,23 @@
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for {@link ConnectionFactoryInitializer}.
  *
  * @author Mark Paluch
  */
-public class ConnectionFactoryInitializerUnitTests {
+class ConnectionFactoryInitializerUnitTests {
 
-	AtomicBoolean called = new AtomicBoolean();
-	DatabasePopulator populator = mock(DatabasePopulator.class);
-	MockConnection connection = MockConnection.builder().build();
-	MockConnectionFactory connectionFactory = MockConnectionFactory.builder().connection(connection).build();
+	private final AtomicBoolean called = new AtomicBoolean();
+	private final DatabasePopulator populator = mock(DatabasePopulator.class);
+	private final MockConnection connection = MockConnection.builder().build();
+	private final MockConnectionFactory connectionFactory = MockConnectionFactory.builder().connection(connection)
+			.build();
 
 	@Test // gh-216
-	public void shouldInitializeConnectionFactory() {
+	void shouldInitializeConnectionFactory() {
 
 		when(populator.populate(any())).thenReturn(Mono.<Void> empty().doOnSubscribe(subscription -> called.set(true)));
 
@@ -53,7 +54,7 @@ public void shouldInitializeConnectionFactory() {
 	}
 
 	@Test // gh-216
-	public void shouldCleanConnectionFactory() {
+	void shouldCleanConnectionFactory() {
 
 		when(populator.populate(any())).thenReturn(Mono.<Void> empty().doOnSubscribe(subscription -> called.set(true)));