DATAJPA-1783 - Migrate tests to JUnit 5.

Author: mp911de

src/test/java/org/springframework/data/jpa/convert/QueryByExamplePredicateBuilderUnitTests.java

@@ -37,12 +37,14 @@
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.Type;
 
-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.mockito.ArgumentMatchers;
 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.data.domain.Example;
 import org.springframework.data.domain.ExampleMatcher;
@@ -58,7 +60,8 @@
  * @author Oliver Gierke
  * @author Jens Schauder
  */
-@RunWith(MockitoJUnitRunner.Silent.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class QueryByExamplePredicateBuilderUnitTests {
 
@@ -83,7 +86,7 @@ public class QueryByExamplePredicateBuilderUnitTests {
 	SingularAttribute<? super Skill, String> skillNameAttribute;
 	SingularAttribute<? super Skill, Skill> skillNestedAttribute;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
 		personIdAttribute = new SingularAttributeStub<>("id", PersistentAttributeType.BASIC, Long.class);

src/test/java/org/springframework/data/jpa/convert/threeten/Jsr310JpaConvertersIntegrationTests.java

@@ -29,7 +29,7 @@
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.domain.support.AbstractAttributeConverterIntegrationTests;
 import org.springframework.test.context.ContextConfiguration;

src/test/java/org/springframework/data/jpa/convert/threeten/Jsr310JpaConvertersUnitTests.java

@@ -21,22 +21,17 @@
 
 import javax.persistence.AttributeConverter;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Unit tests for {@link Jsr310JpaConverters}.
  *
  * @author Oliver Gierke
  */
-@RunWith(Parameterized.class)
-public class Jsr310JpaConvertersUnitTests {
+class Jsr310JpaConvertersUnitTests {
 
-	@Parameters
-	public static Iterable<? extends Object> data() {
+	static Iterable<? extends Object> data() {
 
 		return Arrays.asList(new Jsr310JpaConverters.InstantConverter(), //
 				new Jsr310JpaConverters.LocalDateConverter(), //
@@ -45,10 +40,10 @@ public static Iterable<? extends Object> data() {
 				new Jsr310JpaConverters.ZoneIdConverter());
 	}
 
-	public @Parameter AttributeConverter<?, ?> converter;
 
-	@Test // DATAJPA-
-	public void convertersHandleNullValuesCorrectly() {
+	@ParameterizedTest
+	@MethodSource("data")
+	void convertersHandleNullValuesCorrectly(AttributeConverter<?, ?> converter) {
 
 		assertThat(converter.convertToDatabaseColumn(null)).isNull();
 		assertThat(converter.convertToEntityAttribute(null)).isNull();

src/test/java/org/springframework/data/jpa/convert/threetenbp/ThreeTenBackPortJpaConvertersIntegrationTests.java

@@ -22,7 +22,7 @@
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.domain.support.AbstractAttributeConverterIntegrationTests;
 import org.springframework.test.context.ContextConfiguration;

src/test/java/org/springframework/data/jpa/domain/JpaSortTests.java

@@ -23,8 +23,8 @@
 import javax.persistence.metamodel.Attribute;
 import javax.persistence.metamodel.PluralAttribute;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.data.domain.Sort.Order;
 import org.springframework.data.jpa.domain.JpaSort.*;
@@ -34,7 +34,7 @@
 import org.springframework.data.jpa.domain.sample.User_;
 import org.springframework.lang.Nullable;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * Integration tests for {@link JpaSort}. This has to be an integration test due to the design of the statically
@@ -47,7 +47,7 @@
  * @author Christoph Strobl
  * @author Jens Schauder
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration("classpath:infrastructure.xml")
 public class JpaSortTests {
 

src/test/java/org/springframework/data/jpa/domain/SpecificationUnitTests.java

@@ -27,11 +27,13 @@
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-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.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 
 /**
  * Unit tests for {@link Specification}.
@@ -42,17 +44,18 @@
  * @author Jens Schauder
  */
 @SuppressWarnings("serial")
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class SpecificationUnitTests implements Serializable {
 
 	Specification<Object> spec;
-	@Mock(extraInterfaces = Serializable.class) Root<Object> root;
-	@Mock(extraInterfaces = Serializable.class) CriteriaQuery<?> query;
-	@Mock(extraInterfaces = Serializable.class) CriteriaBuilder builder;
+	@Mock(serializable = true) Root<Object> root;
+	@Mock(serializable = true) CriteriaQuery<?> query;
+	@Mock(serializable = true) CriteriaBuilder builder;
 
-	@Mock(extraInterfaces = Serializable.class) Predicate predicate;
+	@Mock(serializable = true) Predicate predicate;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
 		spec = (root, query, cb) -> predicate;
@@ -142,7 +145,7 @@ public void complexSpecificationsShouldBeSerializable() {
 		assertThat(transferredSpecification).isNotNull();
 	}
 
-	public class SerializableSpecification implements Serializable, Specification<Object> {
+	public static class SerializableSpecification implements Serializable, Specification<Object> {
 
 		@Override
 		public Predicate toPredicate(Root<Object> root, CriteriaQuery<?> query, CriteriaBuilder cb) {

src/test/java/org/springframework/data/jpa/domain/support/AbstractAttributeConverterIntegrationTests.java

@@ -18,7 +18,8 @@
 import javax.persistence.AttributeConverter;
 import javax.sql.DataSource;
 
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.extension.ExtendWith;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.jpa.domain.sample.User;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
@@ -28,7 +29,7 @@
 import org.springframework.orm.jpa.vendor.AbstractJpaVendorAdapter;
 import org.springframework.orm.jpa.vendor.Database;
 import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.transaction.PlatformTransactionManager;
 
 /**
@@ -37,7 +38,7 @@
  * @author Oliver Gierke
  * @author Jens Schauder
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 public abstract class AbstractAttributeConverterIntegrationTests {
 
 	protected abstract static class InfrastructureConfig {

src/test/java/org/springframework/data/jpa/domain/support/AuditingBeanFactoryPostProcessorUnitTests.java

@@ -19,8 +19,8 @@
 
 import javax.persistence.EntityManagerFactory;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
@@ -38,7 +38,7 @@ public class AuditingBeanFactoryPostProcessorUnitTests {
 	DefaultListableBeanFactory beanFactory;
 	AuditingBeanFactoryPostProcessor processor;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
 		this.beanFactory = getBeanFactory();

src/test/java/org/springframework/data/jpa/domain/support/AuditingEntityListenerTests.java

@@ -20,9 +20,10 @@
 import java.time.LocalDateTime;
 import java.util.Optional;
 
-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.data.domain.Auditable;
 import org.springframework.data.jpa.domain.sample.AnnotatedAuditableUser;
@@ -33,7 +34,7 @@
 import org.springframework.data.jpa.repository.sample.AuditableUserRepository;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
@@ -42,7 +43,7 @@
  * @author Oliver Gierke
  * @author Jens Schauder
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration("classpath:auditing/auditing-entity-listener.xml")
 @Transactional
 @DirtiesContext
@@ -67,7 +68,7 @@ private static void assertUserIsAuditor(AuditableUser user, Auditable<AuditableU
 		assertThat(auditable.getLastModifiedBy()).isEqualTo(Optional.of(user));
 	}
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
 		user = new AuditableUser();

src/test/java/org/springframework/data/jpa/domain/support/AuditingNamespaceUnitTests.java

@@ -17,7 +17,7 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.PropertyValue;
 import org.springframework.beans.factory.config.BeanDefinition;