DATAJPA-1783 - Migrate tests to JUnit 5.

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

@@ -37,12 +37,14 @@ import javax.persistence.metamodel.ManagedType;
 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 @@ import org.springframework.util.ObjectUtils;
  * @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 java.time.temporal.ChronoUnit;
 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 java.util.Arrays;
 
 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 class Jsr310JpaConvertersUnitTests {
 				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 static org.springframework.data.jpa.support.EntityManagerTestUtils.*;
 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.EntityManagerFactory;
 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.MailSender_;
 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 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @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.CriteriaQuery;
 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 @@ import org.mockito.junit.MockitoJUnitRunner;
  * @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 class SpecificationUnitTests implements Serializable {
 		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 @@ package org.springframework.data.jpa.domain.support;
 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.LocalContainerEntityManagerFactoryBean;
 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 @@ import org.springframework.transaction.PlatformTransactionManager;
  * @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 static org.assertj.core.api.Assertions.*;
 
 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 static org.assertj.core.api.Assertions.*;
 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.AnnotatedAuditableUserRepo
 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 @@ import org.springframework.transaction.annotation.Transactional;
  * @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 @@ public class AuditingEntityListenerTests {
 		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 @@ package org.springframework.data.jpa.domain.support;
 
 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;
 

src/test/java/org/springframework/data/jpa/infrastructure/EclipseLinkMetamodelIntegrationTests.java

@@ -15,8 +15,8 @@
  */
 package org.springframework.data.jpa.infrastructure;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.springframework.test.context.ContextConfiguration;
 
 /**
@@ -31,7 +31,7 @@ public class EclipseLinkMetamodelIntegrationTests extends MetamodelIntegrationTe
 	 * TODO: Remove, once https://bugs.eclipse.org/bugs/show_bug.cgi?id=427892 is fixed.
 	 */
 	@Test
-	@Ignore
+	@Disabled
 	@Override
 	public void canAccessParametersByIndexForNativeQueries() {}
 
@@ -39,7 +39,7 @@ public class EclipseLinkMetamodelIntegrationTests extends MetamodelIntegrationTe
 	 * TODO: Remove, once https://bugs.eclipse.org/bugs/show_bug.cgi?id=463663 is fixed.
 	 */
 	@Test
-	@Ignore
+	@Disabled
 	@Override
 	public void pathToEntityIsOfBindableTypeEntityType() {}
 
@@ -47,7 +47,7 @@ public class EclipseLinkMetamodelIntegrationTests extends MetamodelIntegrationTe
 	 * TODO: Remove, once https://bugs.eclipse.org/bugs/show_bug.cgi?id=289141 is fixed.
 	 */
 	@Test
-	@Ignore
+	@Disabled
 	@Override
 	public void doesNotExposeAliasForTupleIfNoneDefined() {}
 
@@ -55,7 +55,7 @@ public class EclipseLinkMetamodelIntegrationTests extends MetamodelIntegrationTe
 	 * TODO: Remove, once https://bugs.eclipse.org/bugs/show_bug.cgi?id=289141 is fixed.
 	 */
 	@Test
-	@Ignore
+	@Disabled
 	@Override
 	public void returnsAliasesInTuple() {}
 }

src/test/java/org/springframework/data/jpa/infrastructure/HibernateMetamodelIntegrationTests.java

@@ -15,8 +15,8 @@
  */
 package org.springframework.data.jpa.infrastructure;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  * Hibernate-specific integration test using the JPA metamodel.
@@ -27,12 +27,12 @@ import org.junit.Test;
 public class HibernateMetamodelIntegrationTests extends MetamodelIntegrationTests {
 
 	@Test
-	@Ignore
+	@Disabled
 	@Override
 	public void pathToEntityIsOfBindableTypeEntityType() {}
 
 	@Test
-	@Ignore
+	@Disabled
 	@Override
 	public void considersOneToOneAttributeAnAssociation() {}
 
@@ -40,7 +40,7 @@ public class HibernateMetamodelIntegrationTests extends MetamodelIntegrationTest
 	 * @see <a href="https://hibernate.atlassian.net/browse/HHH-10341">HHH-10341</a>
 	 */
 	@Test
-	@Ignore
+	@Disabled
 	@Override
 	public void doesNotExposeAliasForTupleIfNoneDefined() {}
 }

src/test/java/org/springframework/data/jpa/infrastructure/MetamodelIntegrationTests.java

@@ -34,18 +34,19 @@ import javax.persistence.metamodel.Bindable.BindableType;
 import javax.persistence.metamodel.ManagedType;
 import javax.persistence.metamodel.Metamodel;
 
-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.jpa.domain.sample.User;
 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;
 
 /**
  * @author Oliver Gierke
  * @author Jens Schauder
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration({ "classpath:infrastructure.xml" })
 public abstract class MetamodelIntegrationTests {
 

src/test/java/org/springframework/data/jpa/infrastructure/OpenJpaMetamodelIntegrationTests.java

@@ -15,8 +15,8 @@
  */
 package org.springframework.data.jpa.infrastructure;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.springframework.test.context.ContextConfiguration;
 
 /**
@@ -28,7 +28,7 @@ import org.springframework.test.context.ContextConfiguration;
 public class OpenJpaMetamodelIntegrationTests extends MetamodelIntegrationTests {
 
 	@Test
-	@Ignore
+	@Disabled
 	@Override
 	public void canAccessParametersByIndexForNativeQueries() {}
 
@@ -36,7 +36,7 @@ public class OpenJpaMetamodelIntegrationTests extends MetamodelIntegrationTests
 	 * TODO: Remove once https://issues.apache.org/jira/browse/OPENJPA-2618 is fixed.
 	 */
 	@Test
-	@Ignore
+	@Disabled
 	@Override
 	public void doesNotExposeAliasForTupleIfNoneDefined() {}
 }

src/test/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContextIntegrationTests.java

@@ -22,9 +22,10 @@ import java.util.Collections;
 import javax.persistence.EntityManager;
 
 import org.hibernate.proxy.HibernateProxy;
-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.Filter;
 import org.springframework.context.annotation.Configuration;
@@ -40,7 +41,7 @@ import org.springframework.data.jpa.repository.sample.ProductRepository;
 import org.springframework.data.mapping.IdentifierAccessor;
 import org.springframework.data.mapping.PersistentPropertyPaths;
 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.PlatformTransactionManager;
 import org.springframework.transaction.support.TransactionTemplate;
 
@@ -52,7 +53,7 @@ import org.springframework.transaction.support.TransactionTemplate;
  * @author Jens Schauder
  * @since 1.3
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration
 public class JpaMetamodelMappingContextIntegrationTests {
 
@@ -62,7 +63,7 @@ public class JpaMetamodelMappingContextIntegrationTests {
 	@Autowired EntityManager em;
 	@Autowired PlatformTransactionManager transactionManager;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		context = new JpaMetamodelMappingContext(Collections.singleton(em.getMetamodel()));
 	}

src/test/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContextUnitTests.java

@@ -21,7 +21,7 @@ import java.util.Collections;
 
 import javax.persistence.metamodel.Metamodel;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.data.annotation.Version;
 
 /**

src/test/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImplUnitTests.java

@@ -31,11 +31,14 @@ import javax.persistence.Transient;
 import javax.persistence.metamodel.ManagedType;
 import javax.persistence.metamodel.Metamodel;
 
-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;
+
 import org.springframework.data.annotation.AccessType.Type;
 import org.springframework.data.annotation.Version;
 import org.springframework.data.util.ClassTypeInformation;
@@ -48,7 +51,8 @@ import org.springframework.data.util.TypeInformation;
  * @author Greg Turnquist
  * @author Jens Schauder
  */
-@RunWith(MockitoJUnitRunner.Silent.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class JpaPersistentPropertyImplUnitTests {
 
 	@Mock Metamodel model;
@@ -56,7 +60,7 @@ public class JpaPersistentPropertyImplUnitTests {
 	JpaMetamodelMappingContext context;
 	JpaPersistentEntity<?> entity;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
 		context = new JpaMetamodelMappingContext(Collections.singleton(model));

src/test/java/org/springframework/data/jpa/provider/PersistenceProviderIntegrationTests.java

@@ -19,9 +19,10 @@ import static org.assertj.core.api.Assertions.*;
 
 import javax.persistence.EntityManager;
 
-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.Filter;
 import org.springframework.context.annotation.Configuration;
@@ -33,7 +34,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.data.jpa.repository.sample.CategoryRepository;
 import org.springframework.data.jpa.repository.sample.ProductRepository;
 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.PlatformTransactionManager;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.TransactionCallback;
@@ -45,7 +46,7 @@ import org.springframework.transaction.support.TransactionTemplate;
  * @author Oliver Gierke
  * @author Jens Schauder
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration
 public class PersistenceProviderIntegrationTests {
 
@@ -56,7 +57,7 @@ public class PersistenceProviderIntegrationTests {
 	Product product;
 	Category category;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		this.product = products.save(new Product());
 		this.category = categories.save(new Category(product));

src/test/java/org/springframework/data/jpa/provider/PersistenceProviderUnitTests.java

@@ -26,8 +26,8 @@ import javax.persistence.EntityManager;
 
 import org.assertj.core.api.Assumptions;
 import org.hibernate.Version;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 import org.springframework.asm.ClassWriter;
 import org.springframework.asm.Opcodes;
@@ -45,7 +45,7 @@ public class PersistenceProviderUnitTests {
 
 	ShadowingClassLoader shadowingClassLoader;
 
-	@Before
+	@BeforeEach
 	public void setup() {
 
 		PersistenceProvider.CACHE.clear();

src/test/java/org/springframework/data/jpa/repository/AbstractPersistableIntegrationTests.java

@@ -19,14 +19,15 @@ import static org.assertj.core.api.Assertions.*;
 
 import javax.persistence.EntityManager;
 
-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.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.domain.AbstractPersistable;
 import org.springframework.data.jpa.domain.sample.CustomAbstractPersistable;
 import org.springframework.data.jpa.repository.sample.CustomAbstractPersistableRepository;
 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;
 
 /**
@@ -37,7 +38,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @author Jens Schauder
  */
 @Transactional
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = { "classpath:config/namespace-autoconfig-context.xml" })
 public class AbstractPersistableIntegrationTests {
 

src/test/java/org/springframework/data/jpa/repository/CrudMethodMetadataUnitTests.java

@@ -29,11 +29,14 @@ import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.metamodel.Metamodel;
 
-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;
+
 import org.springframework.data.jpa.domain.sample.QRole;
 import org.springframework.data.jpa.domain.sample.Role;
 import org.springframework.data.jpa.repository.sample.RoleRepository;
@@ -46,7 +49,8 @@ import org.springframework.data.jpa.repository.support.JpaRepositoryFactory;
  * @author Oliver Gierke
  * @author Thomas Darimont
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class CrudMethodMetadataUnitTests {
 
 	@Mock EntityManager em;
@@ -60,7 +64,7 @@ public class CrudMethodMetadataUnitTests {
 
 	RoleRepository repository;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
 		when(information.getJavaType()).thenReturn(Role.class);

src/test/java/org/springframework/data/jpa/repository/CustomAbstractPersistableIntegrationTests.java

@@ -17,13 +17,14 @@ package org.springframework.data.jpa.repository;
 
 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.domain.sample.CustomAbstractPersistable;
 import org.springframework.data.jpa.repository.sample.CustomAbstractPersistableRepository;
 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;
 
 /**
@@ -32,7 +33,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @author Jens Schauder
  */
 @Transactional
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = { "classpath:config/namespace-autoconfig-context.xml" })
 public class CustomAbstractPersistableIntegrationTests {
 

src/test/java/org/springframework/data/jpa/repository/EclipseLinkEntityGraphRepositoryMethodsIntegrationTests.java

@@ -15,8 +15,8 @@
  */
 package org.springframework.data.jpa.repository;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.springframework.test.context.ContextConfiguration;
 
 /**
@@ -27,42 +27,42 @@ import org.springframework.test.context.ContextConfiguration;
 public class EclipseLinkEntityGraphRepositoryMethodsIntegrationTests
 		extends EntityGraphRepositoryMethodsIntegrationTests {
 
-	@Ignore("Bug 510627 - https://bugs.eclipse.org/bugs/show_bug.cgi?id=510627")
+	@Disabled("Bug 510627 - https://bugs.eclipse.org/bugs/show_bug.cgi?id=510627")
 	@Test
 	@Override
 	public void shouldRespectNamedEntitySubGraph() {}
 
-	@Ignore("Bug 510627 - https://bugs.eclipse.org/bugs/show_bug.cgi?id=510627")
+	@Disabled("Bug 510627 - https://bugs.eclipse.org/bugs/show_bug.cgi?id=510627")
 	@Test
 	@Override
 	public void shouldRespectMultipleSubGraphForSameAttributeWithDynamicFetchGraph() {}
 
-	@Ignore("Bug 510627 - https://bugs.eclipse.org/bugs/show_bug.cgi?id=510627")
+	@Disabled("Bug 510627 - https://bugs.eclipse.org/bugs/show_bug.cgi?id=510627")
 	@Test
 	@Override
 	public void shouldRespectDynamicFetchGraphForGetOneWithAttributeNamesById() {}
 
-	@Ignore("Bug 510627 - https://bugs.eclipse.org/bugs/show_bug.cgi?id=510627")
+	@Disabled("Bug 510627 - https://bugs.eclipse.org/bugs/show_bug.cgi?id=510627")
 	@Test
 	@Override
 	public void shouldRespectConfiguredJpaEntityGraphWithPaginationAndQueryDslPredicates() {}
 
-	@Ignore("Bug 510627 - https://bugs.eclipse.org/bugs/show_bug.cgi?id=510627")
+	@Disabled("Bug 510627 - https://bugs.eclipse.org/bugs/show_bug.cgi?id=510627")
 	@Test
 	@Override
 	public void shouldRespectConfiguredJpaEntityGraphWithPaginationAndSpecification() {}
 
-	@Ignore("Bug 510627 - https://bugs.eclipse.org/bugs/show_bug.cgi?id=510627")
+	@Disabled("Bug 510627 - https://bugs.eclipse.org/bugs/show_bug.cgi?id=510627")
 	@Test
 	@Override
 	public void shouldCreateDynamicGraphWithMultipleLevelsOfSubgraphs() {}
 
-	@Ignore("Bug 510627 - https://bugs.eclipse.org/bugs/show_bug.cgi?id=510627")
+	@Disabled("Bug 510627 - https://bugs.eclipse.org/bugs/show_bug.cgi?id=510627")
 	@Test
 	@Override
 	public void shouldRespectConfiguredJpaEntityGraphInFindOne() {}
 
-	@Ignore("Bug 510627 - https://bugs.eclipse.org/bugs/show_bug.cgi?id=510627")
+	@Disabled("Bug 510627 - https://bugs.eclipse.org/bugs/show_bug.cgi?id=510627")
 	@Test
 	@Override
 	public void shouldRespectInferFetchGraphFromMethodName() {}

src/test/java/org/springframework/data/jpa/repository/EclipseLinkNamespaceUserRepositoryTests.java

@@ -16,15 +16,13 @@
 package org.springframework.data.jpa.repository;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.eclipse.persistence.Version.*;
 
 import javax.persistence.Query;
 
-import org.junit.Assume;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
 import org.springframework.data.jpa.repository.sample.UserRepository;
-import org.springframework.data.util.Version;
 import org.springframework.test.context.ContextConfiguration;
 
 /**
@@ -74,7 +72,7 @@ public class EclipseLinkNamespaceUserRepositoryTests extends NamespaceUserReposi
 	/**
 	 * Ignored until https://bugs.eclipse.org/bugs/show_bug.cgi?id=525319 is fixed.
 	 */
-	@Ignore
+	@Disabled
 	@Override
 	@Test // DATAJPA-980
 	public void supportsProjectionsWithNativeQueries() {}
@@ -82,7 +80,7 @@ public class EclipseLinkNamespaceUserRepositoryTests extends NamespaceUserReposi
 	/**
 	 * Ignored until https://bugs.eclipse.org/bugs/show_bug.cgi?id=525319 is fixed.
 	 */
-	@Ignore
+	@Disabled
 	@Override
 	@Test // DATAJPA-1248
 	public void supportsProjectionsWithNativeQueriesAndCamelCaseProperty() {}
@@ -90,7 +88,7 @@ public class EclipseLinkNamespaceUserRepositoryTests extends NamespaceUserReposi
 	/**
 	 * Ignored until https://bugs.eclipse.org/bugs/show_bug.cgi?id=525319 is fixed.
 	 */
-	@Ignore
+	@Disabled
 	@Override
 	@Test // DATAJPA-1301
 	public void returnsNullValueInMap() {}
@@ -98,7 +96,7 @@ public class EclipseLinkNamespaceUserRepositoryTests extends NamespaceUserReposi
 	/**
 	 * TODO: Remove, once https://bugs.eclipse.org/bugs/show_bug.cgi?id=289141 is fixed.
 	 */
-	@Ignore
+	@Disabled
 	@Override
 	@Test
 	public void bindsNativeQueryResultsToProjectionByName() {}
@@ -133,13 +131,13 @@ public class EclipseLinkNamespaceUserRepositoryTests extends NamespaceUserReposi
 	 */
 	@Override
 	@Test
-	@Ignore
+	@Disabled
 	public void savingUserThrowsAnException() {}
 
 	/**
 	 * Ignored until https://bugs.eclipse.org/bugs/show_bug.cgi?id=349477 is resolved.
 	 */
-	@Ignore
+	@Disabled
 	@Override
 	@Test // DATAJPA-1303
 	public void findByElementCollectionInAttributeIgnoreCase() {}
@@ -147,7 +145,7 @@ public class EclipseLinkNamespaceUserRepositoryTests extends NamespaceUserReposi
 	/**
 	 * Ignored until https://bugs.eclipse.org/bugs/show_bug.cgi?id=349477 is resolved.
 	 */
-	@Ignore
+	@Disabled
 	@Override
 	@Test // DATAJPA-1303
 	public void findByElementCollectionNotInAttributeIgnoreCase() {}
@@ -155,7 +153,7 @@ public class EclipseLinkNamespaceUserRepositoryTests extends NamespaceUserReposi
 	/**
 	 * Ignored until https://bugs.eclipse.org/bugs/show_bug.cgi?id=349477 is resolved.
 	 */
-	@Ignore
+	@Disabled
 	@Override
 	@Test // DATAJPA-1303
 	public void findByElementVarargInAttributeIgnoreCase() {}
@@ -163,7 +161,7 @@ public class EclipseLinkNamespaceUserRepositoryTests extends NamespaceUserReposi
 	/**
 	 * Ignored until https://bugs.eclipse.org/bugs/show_bug.cgi?id=349477 is resolved.
 	 */
-	@Ignore
+	@Disabled
 	@Override
 	@Test // DATAJPA-1303
 	public void findByElementCollectionInAttributeIgnoreCaseWithNulls() {}

src/test/java/org/springframework/data/jpa/repository/EclipseLinkUserRepositoryFinderTests.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.data.jpa.repository;
 
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
 import org.springframework.test.context.ContextConfiguration;
 
 /**
@@ -27,11 +27,11 @@ import org.springframework.test.context.ContextConfiguration;
 @ContextConfiguration("classpath:eclipselink.xml")
 public class EclipseLinkUserRepositoryFinderTests extends UserRepositoryFinderTests {
 
-	@Ignore
+	@Disabled
 	@Override
 	public void executesNotInQueryCorrectly() throws Exception {}
 
-	@Ignore
+	@Disabled
 	@Override
 	public void executesInKeywordForPageCorrectly() {}
 }

src/test/java/org/springframework/data/jpa/repository/EntityGraphRepositoryMethodsIntegrationTests.java

@@ -30,9 +30,10 @@ import javax.persistence.criteria.Root;
 
 import org.assertj.core.api.SoftAssertions;
 import org.junit.Assume;
-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.Page;
 import org.springframework.data.domain.PageRequest;
@@ -43,7 +44,7 @@ import org.springframework.data.jpa.domain.sample.User;
 import org.springframework.data.jpa.domain.sample.User_;
 import org.springframework.data.jpa.repository.sample.RepositoryMethodsWithEntityGraphConfigRepository;
 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;
 
 /**
@@ -55,7 +56,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @author Christoph Strobl
  * @author Jens Schauder
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration("classpath:config/namespace-autoconfig-context.xml")
 @Transactional
 public class EntityGraphRepositoryMethodsIntegrationTests {
@@ -70,7 +71,7 @@ public class EntityGraphRepositoryMethodsIntegrationTests {
 
 	PersistenceUtil util = Persistence.getPersistenceUtil();
 
-	@Before
+	@BeforeEach
 	public void setup() {
 
 		tom = new User("Thomas", "Darimont", "tdarimont@example.org");

src/test/java/org/springframework/data/jpa/repository/EntityWithAssignedIdIntegrationTests.java

@@ -17,19 +17,20 @@ package org.springframework.data.jpa.repository;
 
 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.domain.sample.EntityWithAssignedId;
 import org.springframework.data.jpa.repository.sample.EntityWithAssignedIdRepository;
 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;
 
 /**
  * @author Oliver Drotbohm
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration("classpath:config/namespace-application-context.xml")
 @Transactional
 public class EntityWithAssignedIdIntegrationTests {

src/test/java/org/springframework/data/jpa/repository/JavaConfigUserRepositoryTests.java

@@ -22,7 +22,7 @@ import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 
 import org.assertj.core.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.PropertiesFactoryBean;

src/test/java/org/springframework/data/jpa/repository/MappedTypeRepositoryIntegrationTests.java

@@ -21,8 +21,9 @@ import java.util.List;
 
 import javax.persistence.EntityManager;
 
-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.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -37,7 +38,7 @@ import org.springframework.data.jpa.repository.sample.SampleConfig;
 import org.springframework.data.jpa.repository.support.JpaRepositoryFactory;
 import org.springframework.data.repository.CrudRepository;
 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;
 
 /**
@@ -47,7 +48,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @author Jens Schauder
  */
 @Transactional
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = SampleConfig.class)
 public class MappedTypeRepositoryIntegrationTests {
 

src/test/java/org/springframework/data/jpa/repository/NamespaceUserRepositoryTests.java

@@ -19,7 +19,7 @@ import static org.junit.Assert.*;
 
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.orm.jpa.support.PersistenceAnnotationBeanPostProcessor;

src/test/java/org/springframework/data/jpa/repository/ORMInfrastructureTests.java

@@ -17,12 +17,13 @@ package org.springframework.data.jpa.repository;
 
 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * Simple test case launching an {@code ApplicationContext} to test infrastructure configuration.
@@ -30,7 +31,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Oliver Gierke
  * @author Jens Schauder
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = "classpath:infrastructure.xml")
 public class ORMInfrastructureTests {
 

src/test/java/org/springframework/data/jpa/repository/OpenJpaNamespaceUserRepositoryTests.java

@@ -29,8 +29,8 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.ParameterExpression;
 import javax.persistence.criteria.Root;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.springframework.data.jpa.domain.sample.User;
 import org.springframework.data.jpa.repository.sample.UserRepository;
 import org.springframework.test.context.ContextConfiguration;
@@ -62,7 +62,7 @@ public class OpenJpaNamespaceUserRepositoryTests extends NamespaceUserRepository
 	 */
 	@SuppressWarnings({ "rawtypes" })
 	@Test
-	@Ignore
+	@Disabled
 	public void queryUsingIn() {
 
 		flushTestUsers();

src/test/java/org/springframework/data/jpa/repository/OpenJpaParentRepositoryIntegrationTests.java

@@ -15,13 +15,13 @@
  */
 package org.springframework.data.jpa.repository;
 
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
 import org.springframework.test.context.ContextConfiguration;
 
 @ContextConfiguration("classpath:openjpa.xml")
 public class OpenJpaParentRepositoryIntegrationTests extends ParentRepositoryIntegrationTests {
 
 	@Override
-	@Ignore
+	@Disabled
 	public void testWithJoin() throws Exception {}
 }

src/test/java/org/springframework/data/jpa/repository/OpenJpaStoredProcedureIntegrationTests.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.data.jpa.repository;
 
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
 import org.springframework.context.annotation.ImportResource;
 import org.springframework.test.context.ContextConfiguration;
 
@@ -26,7 +26,7 @@ import org.springframework.test.context.ContextConfiguration;
  * @author Thomas Darimont
  * @author Oliver Gierke
  */
-@Ignore
+@Disabled
 @ContextConfiguration(classes = { StoredProcedureIntegrationTests.Config.class })
 public class OpenJpaStoredProcedureIntegrationTests extends StoredProcedureIntegrationTests {
 

src/test/java/org/springframework/data/jpa/repository/OpenJpaUserRepositoryFinderTests.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.data.jpa.repository;
 
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
 import org.springframework.test.context.ContextConfiguration;
 
 /**
@@ -27,7 +27,7 @@ import org.springframework.test.context.ContextConfiguration;
 @ContextConfiguration("classpath:openjpa.xml")
 public class OpenJpaUserRepositoryFinderTests extends UserRepositoryFinderTests {
 
-	@Ignore
+	@Disabled
 	@Override
 	public void findsByLastnameIgnoringCaseLike() throws Exception {}
 }

src/test/java/org/springframework/data/jpa/repository/ParentRepositoryIntegrationTests.java

@@ -15,6 +15,8 @@
  */
 package org.springframework.data.jpa.repository;
 
+import static org.assertj.core.api.Assertions.*;
+
 import java.util.List;
 import java.util.Set;
 
@@ -24,9 +26,10 @@ import javax.persistence.criteria.Path;
 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -36,22 +39,20 @@ import org.springframework.data.jpa.domain.sample.Child;
 import org.springframework.data.jpa.domain.sample.Parent;
 import org.springframework.data.jpa.repository.sample.ParentRepository;
 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;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 /**
  * @author Jens Schauder
  */
 @Transactional
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration("classpath:config/namespace-application-context.xml")
 public class ParentRepositoryIntegrationTests {
 
 	@Autowired ParentRepository repository;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
 		repository.save(new Parent().add(new Child()));

src/test/java/org/springframework/data/jpa/repository/RedeclaringRepositoryMethodsTests.java

@@ -19,9 +19,10 @@ import static org.assertj.core.api.Assertions.*;
 
 import java.util.List;
 
-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.Page;
 import org.springframework.data.domain.PageRequest;
@@ -29,14 +30,14 @@ import org.springframework.data.jpa.domain.sample.User;
 import org.springframework.data.jpa.repository.sample.RedeclaringRepositoryMethodsRepository;
 import org.springframework.data.jpa.repository.sample.SampleConfig;
 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;
 
 /**
  * @author Thomas Darimont
  * @author Jens Schauder
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = SampleConfig.class)
 @Transactional
 public class RedeclaringRepositoryMethodsTests {
@@ -45,7 +46,7 @@ public class RedeclaringRepositoryMethodsTests {
 
 	User ollie, tom;
 
-	@Before
+	@BeforeEach
 	public void setup() {
 
 		ollie = new User("Oliver", "Gierke", "ogierke@gopivotal.com");

src/test/java/org/springframework/data/jpa/repository/RepositoryWithCompositeKeyTests.java

@@ -20,8 +20,8 @@ import static org.assertj.core.api.Assertions.*;
 import java.util.Arrays;
 import java.util.List;
 
-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.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -38,7 +38,7 @@ import org.springframework.data.jpa.repository.sample.EmployeeRepositoryWithEmbe
 import org.springframework.data.jpa.repository.sample.EmployeeRepositoryWithIdClass;
 import org.springframework.data.jpa.repository.sample.SampleConfig;
 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;
 
 /**
@@ -48,7 +48,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @author Mark Paluch
  * @author Jens Schauder
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = SampleConfig.class)
 @Transactional
 public class RepositoryWithCompositeKeyTests {

src/test/java/org/springframework/data/jpa/repository/RepositoryWithIdClassKeyTests.java

@@ -19,8 +19,8 @@ import static org.assertj.core.api.Assertions.*;
 
 import java.util.Optional;
 
-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.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
@@ -36,7 +36,7 @@ import org.springframework.data.jpa.repository.sample.ItemSiteRepository;
 import org.springframework.data.jpa.repository.sample.SampleConfig;
 import org.springframework.data.jpa.repository.sample.SiteRepository;
 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;
 
 /**
@@ -45,7 +45,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @author Mark Paluch
  * @author Jens Schauder
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = RepositoryWithIdClassKeyTests.TestConfig.class)
 @Transactional
 public class RepositoryWithIdClassKeyTests {

src/test/java/org/springframework/data/jpa/repository/RoleRepositoryIntegrationTests.java

@@ -19,13 +19,14 @@ import static org.assertj.core.api.Assertions.*;
 
 import java.util.Optional;
 
-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.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.domain.sample.Role;
 import org.springframework.data.jpa.repository.sample.RoleRepository;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -36,7 +37,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @author Thomas Darimont
  * @author Jens Schauder
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = { "classpath:application-context.xml" })
 @Transactional
 public class RoleRepositoryIntegrationTests {

src/test/java/org/springframework/data/jpa/repository/SPR8954Tests.java

@@ -20,19 +20,20 @@ import static org.assertj.core.api.Assertions.*;
 import java.util.Arrays;
 import java.util.Map;
 
-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.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.data.jpa.repository.sample.UserRepository;
 import org.springframework.data.jpa.repository.support.JpaRepositoryFactoryBean;
 import org.springframework.data.repository.core.support.RepositoryFactoryInformation;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 /**
  * @author Jens Schauder
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration("classpath:config/namespace-application-context.xml")
 public class SPR8954Tests {
 

src/test/java/org/springframework/data/jpa/repository/SimpleJpaParameterBindingTests.java

@@ -29,19 +29,20 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.ParameterExpression;
 import javax.persistence.criteria.Root;
 
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
 import org.springframework.data.jpa.domain.sample.User;
 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;
 
 /**
  * @author Oliver Gierke
  * @author Jens Schauder
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration({ "classpath:application-context.xml"
 		// , "classpath:eclipselink.xml"
 		// , "classpath:openjpa.xml"
@@ -52,7 +53,7 @@ public class SimpleJpaParameterBindingTests {
 	@PersistenceContext EntityManager em;
 
 	@Test
-	@Ignore
+	@Disabled
 	public void bindArray() {
 
 		User user = new User("Dave", "Matthews", "foo@bar.de");

src/test/java/org/springframework/data/jpa/repository/StoredProcedureIntegrationTests.java

@@ -24,10 +24,11 @@ import java.util.List;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+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.Filter;
 import org.springframework.context.annotation.Configuration;
@@ -37,7 +38,7 @@ import org.springframework.data.jpa.domain.sample.Dummy;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.data.jpa.repository.sample.DummyRepository;
 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;
 
 /**
@@ -50,7 +51,7 @@ import org.springframework.transaction.annotation.Transactional;
  */
 @Transactional
 @ContextConfiguration(classes = StoredProcedureIntegrationTests.TestConfig.class)
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 public class StoredProcedureIntegrationTests {
 
 	private static final String NOT_SUPPORTED = "Stored procedures with ResultSets are currently not supported for any JPA provider";
@@ -58,7 +59,7 @@ public class StoredProcedureIntegrationTests {
 	@PersistenceContext EntityManager em;
 	@Autowired DummyRepository repository;
 
-	@Before
+	@BeforeEach
 	public void setup() {
 		assumeTrue(currentEntityManagerIsAJpa21EntityManager(em));
 	}
@@ -79,7 +80,7 @@ public class StoredProcedureIntegrationTests {
 	}
 
 	@Test // DATAJPA-652
-	@Ignore(NOT_SUPPORTED)
+	@Disabled(NOT_SUPPORTED)
 	public void shouldExecuteAdHocProcedureWith1InputAnd1OutputParameterWithResultSet() {
 
 		List<Dummy> dummies = repository.adHocProcedureWith1InputAnd1OutputParameterWithResultSet("FOO");
@@ -89,7 +90,7 @@ public class StoredProcedureIntegrationTests {
 	}
 
 	@Test // DATAJPA-652
-	@Ignore(NOT_SUPPORTED)
+	@Disabled(NOT_SUPPORTED)
 	public void shouldExecuteAdHocProcedureWith1InputAnd1OutputParameterWithResultSetWithUpdate() {
 
 		List<Dummy> dummies = repository.adHocProcedureWith1InputAnd1OutputParameterWithResultSetWithUpdate("FOO");
@@ -119,7 +120,7 @@ public class StoredProcedureIntegrationTests {
 	}
 
 	@Test // DATAJPA-652
-	@Ignore(NOT_SUPPORTED)
+	@Disabled(NOT_SUPPORTED)
 	public void shouldExecuteProcedureWith1InputAnd1OutputParameterWithResultSet() {
 
 		List<Dummy> dummies = repository.procedureWith1InputAnd1OutputParameterWithResultSet("FOO");
@@ -129,7 +130,7 @@ public class StoredProcedureIntegrationTests {
 	}
 
 	@Test // DATAJPA-652
-	@Ignore(NOT_SUPPORTED)
+	@Disabled(NOT_SUPPORTED)
 	public void shouldExecuteProcedureWith1InputAnd1OutputParameterWithResultSetWithUpdate() {
 
 		List<Dummy> dummies = repository.procedureWith1InputAnd1OutputParameterWithResultSetWithUpdate("FOO");

src/test/java/org/springframework/data/jpa/repository/UserRepositoryFinderTests.java

@@ -21,10 +21,11 @@ import static org.springframework.data.domain.Sort.Direction.*;
 import java.util.Arrays;
 import java.util.List;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+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.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.domain.Page;
@@ -38,7 +39,7 @@ import org.springframework.data.jpa.repository.sample.RoleRepository;
 import org.springframework.data.jpa.repository.sample.UserRepository;
 import org.springframework.data.repository.query.QueryLookupStrategy;
 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.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -48,7 +49,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @author Oliver Gierke
  * @see QueryLookupStrategy
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = "classpath:config/namespace-application-context.xml")
 @Transactional
 public class UserRepositoryFinderTests {
@@ -59,7 +60,7 @@ public class UserRepositoryFinderTests {
 	User dave, carter, oliver;
 	Role drummer, guitarist, singer;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
 		drummer = roleRepository.save(new Role("DRUMMER"));
@@ -71,7 +72,7 @@ public class UserRepositoryFinderTests {
 		oliver = userRepository.save(new User("Oliver August", "Matthews", "oliver@dmband.com"));
 	}
 
-	@After
+	@AfterEach
 	public void clearUp() {
 
 		userRepository.deleteAll();

src/test/java/org/springframework/data/jpa/repository/UserRepositoryStoredProcedureIntegrationTests.java

@@ -24,13 +24,14 @@ import javax.persistence.ParameterMode;
 import javax.persistence.PersistenceContext;
 import javax.persistence.StoredProcedureQuery;
 
-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.beans.factory.annotation.Autowired;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.jpa.repository.sample.UserRepository;
 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;
 
 /**
@@ -43,7 +44,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @author JyotirmoyVS
  * @since 1.6
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration("classpath:application-context.xml")
 @Transactional
 public class UserRepositoryStoredProcedureIntegrationTests {

src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java

@@ -42,10 +42,11 @@ import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
 import org.assertj.core.api.SoftAssertions;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataIntegrityViolationException;
@@ -71,7 +72,7 @@ import org.springframework.data.jpa.repository.sample.SampleEvaluationContextExt
 import org.springframework.data.jpa.repository.sample.UserRepository;
 import org.springframework.data.jpa.repository.sample.UserRepository.NameOnly;
 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;
 
 import com.google.common.base.Optional;
@@ -91,7 +92,7 @@ import com.google.common.base.Optional;
  * @author Jens Schauder
  * @author Andrey Kovalev
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration("classpath:application-context.xml")
 @Transactional
 public class UserRepositoryTests {
@@ -106,7 +107,7 @@ public class UserRepositoryTests {
 	Integer id;
 	Role adminRole;
 
-	@Before
+	@BeforeEach
 	public void setUp() throws Exception {
 
 		firstUser = new User("Oliver", "Gierke", "gierke@synyx.de");
@@ -1225,7 +1226,7 @@ public class UserRepositoryTests {
 	 * @see <a href="https://issues.apache.org/jira/browse/OPENJPA-2484">OPENJPA-2484</a>
 	 */
 	@Test // DATAJPA-505
-	@Ignore
+	@Disabled
 	public void findBinaryDataByIdJpaQl() throws Exception {
 
 		byte[] data = "Woho!!".getBytes("UTF-8");

src/test/java/org/springframework/data/jpa/repository/cdi/CdiExtensionIntegrationTests.java

@@ -24,8 +24,8 @@ import javax.enterprise.inject.se.SeContainer;
 import javax.enterprise.inject.se.SeContainerInitializer;
 import javax.enterprise.inject.spi.Bean;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -42,7 +42,7 @@ public class CdiExtensionIntegrationTests {
 	static SeContainer container;
 	private static Logger LOGGER = LoggerFactory.getLogger(CdiExtensionIntegrationTests.class);
 
-	@BeforeClass
+	@BeforeAll
 	public static void setUp() {
 
 		container = SeContainerInitializer.newInstance() //

src/test/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryExtensionUnitTests.java

@@ -28,8 +28,8 @@ import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.ProcessBean;
 import javax.persistence.EntityManager;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.test.util.ReflectionTestUtils;
 
 /**
@@ -60,7 +60,7 @@ public class JpaRepositoryExtensionUnitTests {
 		return mock;
 	}
 
-	@Before
+	@BeforeEach
 	@SuppressWarnings("unchecked")
 	public void setUp() {
 

src/test/java/org/springframework/data/jpa/repository/config/AbstractAuditingViaJavaConfigRepositoriesTests.java

@@ -27,11 +27,12 @@ import java.util.concurrent.TimeUnit;
 
 import javax.persistence.EntityManager;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -44,7 +45,7 @@ import org.springframework.data.jpa.repository.sample.SampleEvaluationContextExt
 import org.springframework.data.jpa.util.FixedDate;
 import org.springframework.data.spel.spi.EvaluationContextExtension;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
@@ -54,7 +55,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @author Oliver Gierke
  * @author Jens Schauder
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @Transactional
 @DirtiesContext
 public abstract class AbstractAuditingViaJavaConfigRepositoriesTests {
@@ -65,7 +66,7 @@ public abstract class AbstractAuditingViaJavaConfigRepositoriesTests {
 
 	@Autowired EntityManager em;
 
-	@Before
+	@BeforeEach
 	public void setup() {
 
 		AuditableUser auditor = new AuditableUser(null);
@@ -76,7 +77,7 @@ public abstract class AbstractAuditingViaJavaConfigRepositoriesTests {
 		when(this.auditorAware.getCurrentAuditor()).thenReturn(Optional.of(this.auditor));
 	}
 
-	@After
+	@AfterEach
 	public void teardown() {
 		Mockito.reset(this.auditorAware);
 	}

src/test/java/org/springframework/data/jpa/repository/config/AbstractRepositoryConfigTests.java

@@ -17,21 +17,22 @@ package org.springframework.data.jpa.repository.config;
 
 import static org.junit.Assert.*;
 
-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.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.mapping.JpaMetamodelMappingContext;
 import org.springframework.data.jpa.repository.sample.AuditableUserRepository;
 import org.springframework.data.jpa.repository.sample.RoleRepository;
 import org.springframework.data.jpa.repository.sample.UserRepository;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * Abstract base class for integration test for namespace configuration.
  *
  * @author Oliver Gierke
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 public abstract class AbstractRepositoryConfigTests {
 
 	@Autowired(required = false) UserRepository userRepository;

src/test/java/org/springframework/data/jpa/repository/config/AllowNestedRepositoriesRepositoryConfigTests.java

@@ -17,7 +17,7 @@ package org.springframework.data.jpa.repository.config;
 
 import static org.assertj.core.api.Assertions.*;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.repository.sample.ClassWithNestedRepository.NestedUserRepository;
 import org.springframework.test.context.ContextConfiguration;

src/test/java/org/springframework/data/jpa/repository/config/AuditingBeanDefinitionParserTests.java

@@ -17,7 +17,7 @@ package org.springframework.data.jpa.repository.config;
 
 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.BeanFactory;
 import org.springframework.beans.factory.config.BeanDefinition;

src/test/java/org/springframework/data/jpa/repository/config/CustomRepositoryFactoryConfigTests.java

@@ -17,14 +17,15 @@ package org.springframework.data.jpa.repository.config;
 
 import static org.assertj.core.api.Assertions.*;
 
-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.jpa.repository.custom.UserCustomExtendedRepository;
 import org.springframework.data.jpa.repository.support.TransactionalRepositoryTests.DelegatingTransactionManager;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * Annotation to exclude repository interfaces from being picked up and thus in consequence getting an instance being
@@ -39,7 +40,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Mark Paluch
  * @author Jens Schauder
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = "classpath:config/namespace-customfactory-context.xml")
 public class CustomRepositoryFactoryConfigTests {
 
@@ -47,7 +48,7 @@ public class CustomRepositoryFactoryConfigTests {
 
 	@Autowired DelegatingTransactionManager transactionManager;
 
-	@Before
+	@BeforeEach
 	public void setup() {
 
 		transactionManager.resetCount();

src/test/java/org/springframework/data/jpa/repository/config/InspectionClassLoaderUnitTests.java

@@ -17,7 +17,7 @@ package org.springframework.data.jpa.repository.config;
 
 import static org.assertj.core.api.Assertions.*;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for {@link InspectionClassLoader}.

src/test/java/org/springframework/data/jpa/repository/config/JpaAuditingRegistrarUnitTests.java

@@ -19,10 +19,13 @@ import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
-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;
 import org.springframework.core.type.classreading.MetadataReader;
@@ -34,7 +37,8 @@ import org.springframework.data.jpa.domain.support.AuditingBeanFactoryPostProces
  *
  * @author Oliver Gierke
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class JpaAuditingRegistrarUnitTests {
 
 	JpaAuditingRegistrar registrar = new JpaAuditingRegistrar();

src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoriesRegistrarIntegrationTests.java

@@ -23,8 +23,9 @@ import java.util.List;
 import javax.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 
-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.aop.Advisor;
 import org.springframework.aop.framework.Advised;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,7 +41,7 @@ import org.springframework.orm.jpa.vendor.HibernateJpaDialect;
 import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.stereotype.Repository;
 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.PlatformTransactionManager;
 import org.springframework.util.ClassUtils;
 
@@ -50,7 +51,7 @@ import org.springframework.util.ClassUtils;
  * @author Oliver Gierke
  * @author Jens Schauder
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration
 public class JpaRepositoriesRegistrarIntegrationTests {
 

src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoriesRegistrarUnitTests.java

@@ -19,8 +19,8 @@ import static org.assertj.core.api.Assertions.*;
 
 import java.util.Arrays;
 
-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.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.core.env.StandardEnvironment;
@@ -40,7 +40,7 @@ public class JpaRepositoriesRegistrarUnitTests {
 	BeanDefinitionRegistry registry;
 	AnnotationMetadata metadata;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
 		metadata = new StandardAnnotationMetadata(Config.class, true);

src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigDefinitionParserTests.java

@@ -17,7 +17,7 @@ package org.springframework.data.jpa.repository.config;
 
 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;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;

src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigExtensionUnitTests.java

@@ -24,10 +24,12 @@ import java.util.Collections;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.metamodel.Metamodel;
 
-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.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
@@ -48,7 +50,8 @@ import org.springframework.orm.jpa.support.PersistenceAnnotationBeanPostProcesso
  * @author Mark Paluch
  * @author Jens Schauder
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class JpaRepositoryConfigExtensionUnitTests {
 
 	@Mock RepositoryConfigurationSource configSource;

src/test/java/org/springframework/data/jpa/repository/config/NestedRepositoriesJavaConfigTests.java

@@ -17,8 +17,9 @@ package org.springframework.data.jpa.repository.config;
 
 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;
@@ -26,7 +27,7 @@ import org.springframework.data.jpa.repository.sample.ClassWithNestedRepository.
 import org.springframework.data.jpa.repository.sample.UserRepository;
 import org.springframework.data.repository.support.Repositories;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * Integration test for the combination of JavaConfig and an {@link Repositories} wrapper.
@@ -35,7 +36,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Oliver Gierke
  * @author Jens Schauder
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration
 public class NestedRepositoriesJavaConfigTests {
 

src/test/java/org/springframework/data/jpa/repository/config/QueryLookupStrategyTests.java

@@ -18,15 +18,16 @@ package org.springframework.data.jpa.repository.config;
 import static org.assertj.core.api.Assertions.*;
 import static org.springframework.test.util.ReflectionTestUtils.*;
 
-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.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.data.jpa.repository.support.JpaRepositoryFactoryBean;
 import org.springframework.data.repository.query.QueryLookupStrategy;
 import org.springframework.data.repository.query.QueryLookupStrategy.Key;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * Integration test for XML configuration of {@link QueryLookupStrategy.Key}s.
@@ -35,7 +36,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Thomas Darimont
  * @author Jens Schauder
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = "classpath:config/lookup-strategies-context.xml")
 public class QueryLookupStrategyTests {
 

src/test/java/org/springframework/data/jpa/repository/config/RepositoriesJavaConfigTests.java

@@ -17,8 +17,9 @@ package org.springframework.data.jpa.repository.config;
 
 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -28,7 +29,7 @@ import org.springframework.data.jpa.domain.sample.User;
 import org.springframework.data.jpa.repository.sample.UserRepository;
 import org.springframework.data.repository.support.Repositories;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * Integration test for the combination of JavaConfig and an {@link Repositories} wrapper.
@@ -36,7 +37,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Oliver Gierke
  * @author Jens Schauder
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration
 public class RepositoriesJavaConfigTests {
 

src/test/java/org/springframework/data/jpa/repository/projections/ProjectionJoinIntegrationTests.java

@@ -29,19 +29,20 @@ import javax.persistence.Id;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
-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.beans.factory.annotation.Autowired;
 import org.springframework.data.repository.CrudRepository;
 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;
 
 /**
  * @author Reda.Housni-Alaoui
  */
 @Transactional
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = ProjectionsIntegrationTests.Config.class)
 public class ProjectionJoinIntegrationTests {
 

src/test/java/org/springframework/data/jpa/repository/projections/ProjectionsIntegrationTests.java

@@ -17,6 +17,8 @@ package org.springframework.data.jpa.repository.projections;
 
 import static org.assertj.core.api.Assertions.*;
 
+import lombok.Data;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
@@ -31,9 +33,10 @@ import javax.persistence.OneToMany;
 import javax.persistence.Table;
 import javax.sql.DataSource;
 
-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.Bean;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -46,26 +49,24 @@ import org.springframework.orm.jpa.JpaTransactionManager;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 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.PlatformTransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.transaction.annotation.Transactional;
 
-import lombok.Data;
-
 /**
  * Integration tests for the behavior of projections.
  *
  * @author Jens Schauder
  */
 @Transactional
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = Config.class)
 public class ProjectionsIntegrationTests {
 
 	@Autowired DummyEntityWithCollectionRepository repository;
 
-	@Before
+	@BeforeEach
 	public void setup() {
 
 		DummyEntityWithCollection entity = new DummyEntityWithCollection();

src/test/java/org/springframework/data/jpa/repository/query/AbstractJpaQueryTests.java

@@ -30,9 +30,10 @@ import javax.persistence.QueryHint;
 import javax.persistence.TypedQuery;
 
 import org.junit.Assume;
-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.data.jpa.domain.sample.User;
 import org.springframework.data.jpa.provider.PersistenceProvider;
 import org.springframework.data.jpa.repository.EntityGraph;
@@ -43,7 +44,7 @@ import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
 import org.springframework.data.repository.Repository;
 import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
 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;
 
 /**
@@ -53,7 +54,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @author Thomas Darimont
  * @author Mark Paluch
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration("classpath:infrastructure.xml")
 public class AbstractJpaQueryTests {
 
@@ -62,7 +63,7 @@ public class AbstractJpaQueryTests {
 	Query query;
 	TypedQuery<Long> countQuery;
 
-	@Before
+	@BeforeEach
 	@SuppressWarnings("unchecked")
 	public void setUp() {
 		query = mock(Query.class);

src/test/java/org/springframework/data/jpa/repository/query/AbstractStringBasedJpaQueryIntegrationTests.java

@@ -25,8 +25,9 @@ import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Tuple;
 
-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.jpa.domain.sample.Role;
 import org.springframework.data.jpa.domain.sample.User;
 import org.springframework.data.jpa.provider.PersistenceProvider;
@@ -36,7 +37,7 @@ import org.springframework.data.repository.core.support.DefaultRepositoryMetadat
 import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 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 AbstractStringBasedJpaQuery}.
@@ -44,7 +45,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Oliver Gierke
  * @soundtrack Henrik Freischlader Trio - Nobody Else To Blame (Openness)
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration("classpath:infrastructure.xml")
 public class AbstractStringBasedJpaQueryIntegrationTests {
 

src/test/java/org/springframework/data/jpa/repository/query/CustomNonBindableJpaParametersIntegrationTests.java

@@ -20,8 +20,9 @@ import static org.assertj.core.api.Assertions.*;
 import java.lang.reflect.Method;
 import java.util.Optional;
 
-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.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -37,15 +38,15 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.data.projection.ProjectionFactory;
 import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * Tests that the requirement of binding an argument to a query can get controlled by a module extending Spring Data
  * JPA.
- * 
+ *
  * @author Réda Housni Alaoui
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration
 public class CustomNonBindableJpaParametersIntegrationTests {
 

src/test/java/org/springframework/data/jpa/repository/query/EscapeCharacterUnitTests.java

@@ -17,7 +17,7 @@ package org.springframework.data.jpa.repository.query;
 
 import static org.assertj.core.api.Assertions.*;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for {@link EscapeCharacter}.

src/test/java/org/springframework/data/jpa/repository/query/ExpressionBasedStringQueryUnitTests.java

@@ -18,10 +18,13 @@ package org.springframework.data.jpa.repository.query;
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
-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.expression.spel.standard.SpelExpressionParser;
 
 /**
@@ -32,7 +35,8 @@ import org.springframework.expression.spel.standard.SpelExpressionParser;
  * @author Jens Schauder
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class ExpressionBasedStringQueryUnitTests {
 
 	static final SpelExpressionParser SPEL_PARSER = new SpelExpressionParser();

src/test/java/org/springframework/data/jpa/repository/query/Jpa21UtilsTests.java

@@ -33,14 +33,15 @@ import javax.persistence.Subgraph;
 import org.assertj.core.api.AbstractAssert;
 import org.assertj.core.api.Assertions;
 import org.assertj.core.api.SoftAssertions;
-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.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.domain.sample.User;
 import org.springframework.data.jpa.repository.EntityGraph.EntityGraphType;
 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;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
@@ -50,7 +51,7 @@ import org.springframework.util.ObjectUtils;
  * @author Mark Paluch
  * @author Jens Schauder
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration("classpath:application-context.xml")
 @Transactional
 public class Jpa21UtilsTests {

src/test/java/org/springframework/data/jpa/repository/query/Jpa21UtilsUnitTests.java

@@ -21,7 +21,7 @@ import static org.mockito.Mockito.*;
 import javax.persistence.EntityGraph;
 import javax.persistence.Subgraph;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.data.jpa.repository.EntityGraph.EntityGraphType;
 
 /**

src/test/java/org/springframework/data/jpa/repository/query/JpaCountQueryCreatorIntegrationTests.java

@@ -24,8 +24,9 @@ import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
 
-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.jpa.domain.sample.Role;
 import org.springframework.data.jpa.domain.sample.User;
 import org.springframework.data.jpa.provider.HibernateUtils;
@@ -35,7 +36,7 @@ import org.springframework.data.repository.Repository;
 import org.springframework.data.repository.core.support.AbstractRepositoryMetadata;
 import org.springframework.data.repository.query.parser.PartTree;
 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 JpaCountQueryCreator}.
@@ -43,7 +44,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Oliver Gierke
  * @author Jens Schauder
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration("classpath:infrastructure.xml")
 public class JpaCountQueryCreatorIntegrationTests {
 

src/test/java/org/springframework/data/jpa/repository/query/JpaParametersUnitTests.java

@@ -23,7 +23,7 @@ import java.util.Date;
 
 import javax.persistence.TemporalType;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.data.jpa.repository.Temporal;
 import org.springframework.data.jpa.repository.query.JpaParameters.JpaParameter;
 

src/test/java/org/springframework/data/jpa/repository/query/JpaQueryExecutionUnitTests.java

@@ -27,12 +27,14 @@ import javax.persistence.EntityManager;
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 
-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.Mockito;
-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.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -48,7 +50,8 @@ import org.springframework.data.jpa.repository.query.JpaQueryExecution.PagedExec
  * @author Nicolas Cirigliano
  * @author Jens Schauder
  */
-@RunWith(MockitoJUnitRunner.Silent.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class JpaQueryExecutionUnitTests {
 
 	@Mock EntityManager em;
@@ -61,7 +64,7 @@ public class JpaQueryExecutionUnitTests {
 
 	public static void sampleMethod(Pageable pageable) {}
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
 		when(query.executeUpdate()).thenReturn(0);

src/test/java/org/springframework/data/jpa/repository/query/JpaQueryLookupStrategyUnitTests.java

@@ -26,11 +26,14 @@ import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.metamodel.Metamodel;
 
-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;
+
 import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.sample.User;
 import org.springframework.data.jpa.provider.QueryExtractor;
@@ -52,7 +55,8 @@ import org.springframework.data.repository.query.QueryMethodEvaluationContextPro
  * @author Jens Schauder
  * @author Réda Housni Alaoui
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class JpaQueryLookupStrategyUnitTests {
 
 	private static final QueryMethodEvaluationContextProvider EVALUATION_CONTEXT_PROVIDER = QueryMethodEvaluationContextProvider.DEFAULT;
@@ -66,7 +70,7 @@ public class JpaQueryLookupStrategyUnitTests {
 
 	JpaQueryMethodFactory queryMethodFactory;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
 		when(em.getMetamodel()).thenReturn(metamodel);

src/test/java/org/springframework/data/jpa/repository/query/JpaQueryMethodUnitTests.java

@@ -28,11 +28,13 @@ import java.util.Optional;
 import javax.persistence.LockModeType;
 import javax.persistence.QueryHint;
 
-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;
 
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.data.domain.Page;
@@ -66,7 +68,8 @@ import org.springframework.data.util.ClassTypeInformation;
  * @author Jens Schauder
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class JpaQueryMethodUnitTests {
 
 	static final String METHOD_NAME = "findByFirstname";
@@ -81,7 +84,7 @@ public class JpaQueryMethodUnitTests {
 	/**
 	 * @throws Exception
 	 */
-	@Before
+	@BeforeEach
 	public void setUp() throws Exception {
 
 		invalidReturnType = InvalidRepository.class.getMethod(METHOD_NAME, String.class, Pageable.class);

src/test/java/org/springframework/data/jpa/repository/query/LikeBindingUnitTests.java

@@ -17,7 +17,7 @@ package org.springframework.data.jpa.repository.query;
 
 import static org.assertj.core.api.Assertions.*;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.data.jpa.repository.query.StringQuery.LikeParameterBinding;
 import org.springframework.data.repository.query.parser.Part.Type;
 

src/test/java/org/springframework/data/jpa/repository/query/NamedOrIndexedQueryParameterSetterUnitTests.java

@@ -35,8 +35,8 @@ import javax.persistence.TemporalType;
 import javax.persistence.criteria.ParameterExpression;
 
 import org.assertj.core.api.SoftAssertions;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.data.jpa.repository.query.QueryParameterSetter.NamedOrIndexedQueryParameterSetter;
 
 /**
@@ -61,7 +61,7 @@ public class NamedOrIndexedQueryParameterSetterUnitTests {
 
 	SoftAssertions softly = new SoftAssertions();
 
-	@Before
+	@BeforeEach
 	public void before() {
 
 		JpaParametersParameterAccessor accessor = mock(JpaParametersParameterAccessor.class);

src/test/java/org/springframework/data/jpa/repository/query/NamedQueryUnitTests.java

@@ -26,11 +26,13 @@ import javax.persistence.EntityManagerFactory;
 import javax.persistence.TypedQuery;
 import javax.persistence.metamodel.Metamodel;
 
-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;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -48,7 +50,8 @@ import org.springframework.data.util.ClassTypeInformation;
  * @author Thomas Darimont
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class NamedQueryUnitTests {
 
 	@Mock RepositoryMetadata metadata;
@@ -61,7 +64,7 @@ public class NamedQueryUnitTests {
 
 	Method method;
 
-	@Before
+	@BeforeEach
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public void setUp() throws SecurityException, NoSuchMethodException {
 

src/test/java/org/springframework/data/jpa/repository/query/ParameterBinderUnitTests.java

@@ -32,12 +32,14 @@ import javax.persistence.Parameter;
 import javax.persistence.Query;
 import javax.persistence.TemporalType;
 
-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.Answers;
 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.Pageable;
 import org.springframework.data.domain.Sort;
@@ -52,7 +54,8 @@ import org.springframework.data.repository.query.Param;
  * @author Jens Schauder
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class ParameterBinderUnitTests {
 
 	public static final int MAX_PARAMETERS = 1;
@@ -61,7 +64,7 @@ public class ParameterBinderUnitTests {
 	@Mock(answer = Answers.RETURNS_DEEP_STUBS) private Query query;
 	private Method useIndexedParameters;
 
-	@Before
+	@BeforeEach
 	public void setUp() throws SecurityException, NoSuchMethodException {
 
 		valid = SampleRepository.class.getMethod("valid", String.class);

src/test/java/org/springframework/data/jpa/repository/query/ParameterBindingParserUnitTests.java

@@ -16,7 +16,7 @@
 package org.springframework.data.jpa.repository.query;
 
 import org.assertj.core.api.SoftAssertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.data.jpa.repository.query.StringQuery.ParameterBindingParser;
 
 /**

src/test/java/org/springframework/data/jpa/repository/query/ParameterExpressionProviderTests.java

@@ -24,15 +24,16 @@ import javax.persistence.PersistenceContext;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.ParameterExpression;
 
-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.jpa.domain.sample.User;
 import org.springframework.data.repository.query.DefaultParameters;
 import org.springframework.data.repository.query.Parameters;
 import org.springframework.data.repository.query.ParametersParameterAccessor;
 import org.springframework.data.repository.query.parser.Part;
 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 ParameterMetadataProvider}.
@@ -40,7 +41,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Oliver Gierke
  * @author Jens Schauder
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration("classpath:infrastructure.xml")
 public class ParameterExpressionProviderTests {
 

src/test/java/org/springframework/data/jpa/repository/query/ParameterMetadataProviderIntegrationTests.java

@@ -23,15 +23,16 @@ import java.util.List;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 
-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.jpa.domain.sample.User;
 import org.springframework.data.jpa.repository.query.ParameterMetadataProvider.ParameterMetadata;
 import org.springframework.data.repository.query.Param;
 import org.springframework.data.repository.query.Parameters;
 import org.springframework.data.repository.query.parser.Part;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.util.ReflectionTestUtils;
 
 /**
@@ -41,7 +42,7 @@ import org.springframework.test.util.ReflectionTestUtils;
  * @author Jens Schauder
  * @soundtrack Elephants Crossing - We are (Irrelephant)
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration("classpath:infrastructure.xml")
 public class ParameterMetadataProviderIntegrationTests {
 

src/test/java/org/springframework/data/jpa/repository/query/ParameterMetadataProviderUnitTests.java

@@ -22,7 +22,7 @@ import java.util.Collections;
 
 import javax.persistence.criteria.CriteriaBuilder;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.data.repository.query.Parameters;
 import org.springframework.data.repository.query.parser.Part;
 

src/test/java/org/springframework/data/jpa/repository/query/PartTreeJpaQueryIntegrationTests.java

@@ -33,9 +33,9 @@ import javax.persistence.Query;
 import javax.persistence.TemporalType;
 
 import org.hibernate.Version;
-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.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -49,7 +49,7 @@ import org.springframework.data.repository.Repository;
 import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
 import org.springframework.data.repository.query.Param;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.util.Assert;
 
 /**
@@ -60,7 +60,7 @@ import org.springframework.util.Assert;
  * @author Michael Cramer
  * @author Jens Schauder
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration("classpath:infrastructure.xml")
 public class PartTreeJpaQueryIntegrationTests {
 
@@ -70,7 +70,7 @@ public class PartTreeJpaQueryIntegrationTests {
 
 	PersistenceProvider provider;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		this.provider = PersistenceProvider.fromEntityManager(entityManager);
 	}

src/test/java/org/springframework/data/jpa/repository/query/QueryParameterSetterFactoryUnitTests.java

@@ -22,8 +22,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.stream.Stream;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import org.springframework.data.jpa.repository.query.JpaParameters.JpaParameter;
@@ -42,7 +42,7 @@ public class QueryParameterSetterFactoryUnitTests {
 
 	QueryParameterSetterFactory setterFactory;
 
-	@Before
+	@BeforeEach
 	public void before() {
 
 		// we have one bindable parameter

src/test/java/org/springframework/data/jpa/repository/query/QueryUtilsIntegrationTests.java

@@ -42,9 +42,10 @@ import javax.persistence.spi.PersistenceProvider;
 import javax.persistence.spi.PersistenceProviderResolver;
 import javax.persistence.spi.PersistenceProviderResolverHolder;
 
-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.Mockito;
+
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.jpa.domain.sample.Category;
@@ -53,7 +54,7 @@ import org.springframework.data.jpa.domain.sample.User;
 import org.springframework.data.jpa.infrastructure.HibernateTestUtils;
 import org.springframework.data.mapping.PropertyPath;
 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 QueryUtils}.
@@ -61,7 +62,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Oliver Gierke
  * @author Sébastien Péralta
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration("classpath:infrastructure.xml")
 public class QueryUtilsIntegrationTests {
 

src/test/java/org/springframework/data/jpa/repository/query/QueryUtilsUnitTests.java

@@ -22,7 +22,7 @@ import java.util.Collections;
 import java.util.Set;
 
 import org.assertj.core.api.SoftAssertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Order;

src/test/java/org/springframework/data/jpa/repository/query/SimpleJpaQueryUnitTests.java

@@ -29,12 +29,14 @@ import javax.persistence.Tuple;
 import javax.persistence.TypedQuery;
 import javax.persistence.metamodel.Metamodel;
 
-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.Mockito;
-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.Page;
 import org.springframework.data.domain.PageRequest;
@@ -61,7 +63,8 @@ import org.springframework.expression.spel.standard.SpelExpressionParser;
  * @author Tom Hombergs
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.Silent.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class SimpleJpaQueryUnitTests {
 
 	static final String USER_QUERY = "select u from User u";
@@ -81,7 +84,7 @@ public class SimpleJpaQueryUnitTests {
 
 	ProjectionFactory factory = new SpelAwareProxyProjectionFactory();
 
-	@Before
+	@BeforeEach
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	public void setUp() throws SecurityException, NoSuchMethodException {
 

src/test/java/org/springframework/data/jpa/repository/query/StoredProcedureAttributeSourceUnitTests.java

@@ -15,24 +15,28 @@
  */
 package org.springframework.data.jpa.repository.query;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.springframework.core.annotation.AliasFor;
-import org.springframework.data.jpa.domain.sample.User;
-import org.springframework.data.repository.query.Param;
-import org.springframework.util.ReflectionUtils;
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
 
-import javax.persistence.EntityManager;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.reflect.Method;
 import java.util.Map;
 
-import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import javax.persistence.EntityManager;
+
+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.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
+import org.springframework.core.annotation.AliasFor;
+import org.springframework.data.jpa.domain.sample.User;
+import org.springframework.data.repository.query.Param;
+import org.springframework.util.ReflectionUtils;
 
 /**
  * Unit tests for {@link StoredProcedureAttributeSource}.
@@ -45,14 +49,15 @@ import static org.mockito.Mockito.*;
  * @author Jens Schauder
  * @since 1.6
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class StoredProcedureAttributeSourceUnitTests {
 
 	StoredProcedureAttributeSource creator;
 	@Mock
 	JpaEntityMetadata<User> entityMetadata;
 
-	@Before
+	@BeforeEach
 	public void setup() {
 
 		creator = StoredProcedureAttributeSource.INSTANCE;

src/test/java/org/springframework/data/jpa/repository/query/StoredProcedureAttributesUnitTests.java

@@ -18,7 +18,7 @@ package org.springframework.data.jpa.repository.query;
 import static org.assertj.core.api.Assertions.*;
 import static org.springframework.data.jpa.repository.query.StoredProcedureAttributes.*;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for {@link StoredProcedureAttributes}.

src/test/java/org/springframework/data/jpa/repository/query/StringQueryUnitTests.java

@@ -22,7 +22,7 @@ import java.util.List;
 
 import org.assertj.core.api.Assertions;
 import org.assertj.core.api.SoftAssertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.data.jpa.repository.query.StringQuery.InParameterBinding;
 import org.springframework.data.jpa.repository.query.StringQuery.LikeParameterBinding;

src/test/java/org/springframework/data/jpa/repository/query/TupleConverterUnitTests.java

@@ -27,11 +27,14 @@ import javax.persistence.Tuple;
 import javax.persistence.TupleElement;
 
 import org.assertj.core.api.SoftAssertions;
-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;
+
 import org.springframework.data.jpa.repository.query.AbstractJpaQuery.TupleConverter;
 import org.springframework.data.projection.ProjectionFactory;
 import org.springframework.data.repository.CrudRepository;
@@ -47,7 +50,8 @@ import org.springframework.data.repository.query.ReturnedType;
  * @author Jens Schauder
  * @soundtrack James Bay - Let it go (Chaos and the Calm)
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class TupleConverterUnitTests {
 
 	@Mock Tuple tuple;
@@ -56,7 +60,7 @@ public class TupleConverterUnitTests {
 
 	ReturnedType type;
 
-	@Before
+	@BeforeEach
 	public void setUp() throws Exception {
 
 		RepositoryMetadata metadata = new DefaultRepositoryMetadata(SampleRepository.class);

src/test/java/org/springframework/data/jpa/repository/support/CrudMethodMetadataPopulatingMethodInterceptorUnitTests.java

@@ -24,10 +24,13 @@ import javax.persistence.LockModeType;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
-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.aop.framework.ProxyFactory;
 import org.springframework.data.jpa.repository.Lock;
 import org.springframework.data.jpa.repository.support.CrudMethodMetadataPostProcessor.CrudMethodMetadataPopulatingMethodInterceptor;
@@ -41,7 +44,8 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
  * @author Mark Paluch
  * @author Jens Schauder
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class CrudMethodMetadataPopulatingMethodInterceptorUnitTests {
 
 	@Mock MethodInvocation invocation;

src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaContextIntegrationTests.java

@@ -26,9 +26,9 @@ import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -64,7 +64,7 @@ public class DefaultJpaContextIntegrationTests {
 	EntityManager firstEm, secondEm;
 	JpaContext jpaContext;
 
-	@BeforeClass
+	@BeforeAll
 	public static void bootstrapJpa() {
 
 		firstEmf = createEntityManagerFactory("spring-data-jpa");
@@ -91,7 +91,7 @@ public class DefaultJpaContextIntegrationTests {
 		return factoryBean.getObject();
 	}
 
-	@Before
+	@BeforeEach
 	public void createEntityManagers() {
 
 		this.firstEm = firstEmf.createEntityManager();

src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaContextUnitTests.java

@@ -21,7 +21,7 @@ import java.util.Collections;
 
 import javax.persistence.EntityManager;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for {@link DefaultJpaContext}.

src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaEntityMetadataUnitTest.java

@@ -22,7 +22,7 @@ import java.lang.annotation.RetentionPolicy;
 
 import javax.persistence.Entity;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.data.jpa.repository.query.DefaultJpaEntityMetadata;
 

src/test/java/org/springframework/data/jpa/repository/support/DefaultQueryHintsTest.java

@@ -21,8 +21,8 @@ import static org.mockito.Mockito.*;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for {@link DefaultQueryHints}.
@@ -34,7 +34,7 @@ public class DefaultQueryHintsTest {
 	JpaEntityInformation<?, ?> information = mock(JpaEntityInformation.class);
 	CrudMethodMetadata metadata = mock(CrudMethodMetadata.class);
 
-	@Before
+	@BeforeEach
 	public void before() {
 
 		setupMainHints();

src/test/java/org/springframework/data/jpa/repository/support/DefaultTransactionDisablingIntegrationTests.java

@@ -19,8 +19,8 @@ import static org.assertj.core.api.Assertions.*;
 
 import javax.persistence.TransactionRequiredException;
 
-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.beans.factory.annotation.Autowired;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
@@ -28,7 +28,7 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.jpa.domain.sample.User;
 import org.springframework.data.jpa.repository.sample.UserRepository;
 import org.springframework.data.jpa.repository.support.TransactionalRepositoryTests.DelegatingTransactionManager;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * Integration tests for disabling default transactions using JavaConfig.
@@ -37,7 +37,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Jens Schauder
  * @soundtrack The Intersphere - Live in Mannheim
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 public abstract class DefaultTransactionDisablingIntegrationTests {
 
 	@Autowired UserRepository repository;

src/test/java/org/springframework/data/jpa/repository/support/EclipseLinkJpaMetamodelEntityInformationIntegrationTests.java

@@ -19,8 +19,8 @@ import static org.assertj.core.api.Assertions.*;
 
 import java.io.Serializable;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.springframework.data.jpa.domain.AbstractPersistable;
 import org.springframework.test.context.ContextConfiguration;
 
@@ -48,18 +48,18 @@ public class EclipseLinkJpaMetamodelEntityInformationIntegrationTests
 	 * Ignored due to https://bugs.eclipse.org/bugs/show_bug.cgi?id=411231.
 	 */
 	@Override
-	@Ignore
+	@Disabled
 	public void findsIdClassOnMappedSuperclass() {}
 
 	/**
 	 * Ignored due to https://bugs.eclipse.org/bugs/show_bug.cgi?id=415027
 	 */
 	@Override
-	@Ignore
+	@Disabled
 	public void detectsNewStateForEntityWithPrimitiveId() {}
 
 	@Override
-	@Ignore
+	@Disabled
 	public void considersEntityWithUnsetCompundIdNew() {}
 
 	/**
@@ -75,7 +75,7 @@ public class EclipseLinkJpaMetamodelEntityInformationIntegrationTests
 	 * This test fails due to https://bugs.eclipse.org/bugs/show_bug.cgi?id=531528 IdentifiableType.hasSingleIdAttribute()
 	 * returns true when IdClass references an inner class. This bug is supposedly fixed, but the test still fails.
 	 */
-	@Ignore
+	@Disabled
 	@Test
 	@Override
 	public void correctlyDeterminesIdValueForNestedIdClassesWithNonPrimitiveNonManagedType() {
@@ -86,7 +86,7 @@ public class EclipseLinkJpaMetamodelEntityInformationIntegrationTests
 	 * This test fails due to https://bugs.eclipse.org/bugs/show_bug.cgi?id=531528 IdentifiableType.hasSingleIdAttribute()
 	 * returns true when IdClass references an inner class. This bug is supposedly fixed, but the test still fails.
 	 */
-	@Ignore
+	@Disabled
 	@Test
 	@Override
 	public void proxiedIdClassElement() {