From d4597d1c2da7c5902563646a3311bbf9b8f6a6e9 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 23 Sep 2020 10:29:58 +0200 Subject: [PATCH] DATAJPA-1783 - Migrate tests to JUnit 5. --- ...eryByExamplePredicateBuilderUnitTests.java | 15 +++++---- .../Jsr310JpaConvertersIntegrationTests.java | 2 +- .../Jsr310JpaConvertersUnitTests.java | 19 ++++------- ...BackPortJpaConvertersIntegrationTests.java | 2 +- .../data/jpa/domain/JpaSortTests.java | 8 ++--- .../jpa/domain/SpecificationUnitTests.java | 25 +++++++------- ...actAttributeConverterIntegrationTests.java | 7 ++-- ...tingBeanFactoryPostProcessorUnitTests.java | 6 ++-- .../support/AuditingEntityListenerTests.java | 13 ++++---- .../support/AuditingNamespaceUnitTests.java | 2 +- .../EclipseLinkMetamodelIntegrationTests.java | 12 +++---- .../HibernateMetamodelIntegrationTests.java | 10 +++--- .../MetamodelIntegrationTests.java | 9 ++--- .../OpenJpaMetamodelIntegrationTests.java | 8 ++--- ...tamodelMappingContextIntegrationTests.java | 13 ++++---- .../JpaMetamodelMappingContextUnitTests.java | 2 +- .../JpaPersistentPropertyImplUnitTests.java | 16 +++++---- .../PersistenceProviderIntegrationTests.java | 13 ++++---- .../PersistenceProviderUnitTests.java | 6 ++-- .../AbstractPersistableIntegrationTests.java | 9 ++--- .../CrudMethodMetadataUnitTests.java | 16 +++++---- ...omAbstractPersistableIntegrationTests.java | 9 ++--- ...raphRepositoryMethodsIntegrationTests.java | 20 +++++------ ...lipseLinkNamespaceUserRepositoryTests.java | 26 +++++++-------- .../EclipseLinkUserRepositoryFinderTests.java | 6 ++-- ...raphRepositoryMethodsIntegrationTests.java | 13 ++++---- .../EntityWithAssignedIdIntegrationTests.java | 9 ++--- .../JavaConfigUserRepositoryTests.java | 2 +- .../MappedTypeRepositoryIntegrationTests.java | 9 ++--- .../NamespaceUserRepositoryTests.java | 2 +- .../repository/ORMInfrastructureTests.java | 9 ++--- .../OpenJpaNamespaceUserRepositoryTests.java | 6 ++-- ...enJpaParentRepositoryIntegrationTests.java | 4 +-- ...penJpaStoredProcedureIntegrationTests.java | 4 +-- .../OpenJpaUserRepositoryFinderTests.java | 4 +-- .../ParentRepositoryIntegrationTests.java | 17 +++++----- .../RedeclaringRepositoryMethodsTests.java | 13 ++++---- .../RepositoryWithCompositeKeyTests.java | 8 ++--- .../RepositoryWithIdClassKeyTests.java | 8 ++--- .../RoleRepositoryIntegrationTests.java | 9 ++--- .../data/jpa/repository/SPR8954Tests.java | 9 ++--- .../SimpleJpaParameterBindingTests.java | 13 ++++---- .../StoredProcedureIntegrationTests.java | 23 ++++++------- .../repository/UserRepositoryFinderTests.java | 17 +++++----- ...sitoryStoredProcedureIntegrationTests.java | 9 ++--- .../jpa/repository/UserRepositoryTests.java | 17 +++++----- .../cdi/CdiExtensionIntegrationTests.java | 6 ++-- .../cdi/JpaRepositoryExtensionUnitTests.java | 6 ++-- ...uditingViaJavaConfigRepositoriesTests.java | 17 +++++----- .../config/AbstractRepositoryConfigTests.java | 9 ++--- ...stedRepositoriesRepositoryConfigTests.java | 2 +- .../AuditingBeanDefinitionParserTests.java | 2 +- .../CustomRepositoryFactoryConfigTests.java | 13 ++++---- .../InspectionClassLoaderUnitTests.java | 2 +- .../config/JpaAuditingRegistrarUnitTests.java | 12 ++++--- ...RepositoriesRegistrarIntegrationTests.java | 9 ++--- .../JpaRepositoriesRegistrarUnitTests.java | 6 ++-- ...RepositoryConfigDefinitionParserTests.java | 2 +- ...JpaRepositoryConfigExtensionUnitTests.java | 11 ++++--- .../NestedRepositoriesJavaConfigTests.java | 9 ++--- .../config/QueryLookupStrategyTests.java | 9 ++--- .../config/RepositoriesJavaConfigTests.java | 9 ++--- .../ProjectionJoinIntegrationTests.java | 9 ++--- .../ProjectionsIntegrationTests.java | 17 +++++----- .../query/AbstractJpaQueryTests.java | 13 ++++---- ...ctStringBasedJpaQueryIntegrationTests.java | 9 ++--- ...BindableJpaParametersIntegrationTests.java | 11 ++++--- .../query/EscapeCharacterUnitTests.java | 2 +- .../ExpressionBasedStringQueryUnitTests.java | 12 ++++--- .../jpa/repository/query/Jpa21UtilsTests.java | 9 ++--- .../repository/query/Jpa21UtilsUnitTests.java | 2 +- .../JpaCountQueryCreatorIntegrationTests.java | 9 ++--- .../query/JpaParametersUnitTests.java | 2 +- .../query/JpaQueryExecutionUnitTests.java | 15 +++++---- .../JpaQueryLookupStrategyUnitTests.java | 16 +++++---- .../query/JpaQueryMethodUnitTests.java | 15 +++++---- .../query/LikeBindingUnitTests.java | 2 +- ...rIndexedQueryParameterSetterUnitTests.java | 6 ++-- .../repository/query/NamedQueryUnitTests.java | 15 +++++---- .../query/ParameterBinderUnitTests.java | 15 +++++---- .../ParameterBindingParserUnitTests.java | 2 +- .../ParameterExpressionProviderTests.java | 9 ++--- ...meterMetadataProviderIntegrationTests.java | 9 ++--- .../ParameterMetadataProviderUnitTests.java | 2 +- .../PartTreeJpaQueryIntegrationTests.java | 12 +++---- .../QueryParameterSetterFactoryUnitTests.java | 6 ++-- .../query/QueryUtilsIntegrationTests.java | 9 ++--- .../repository/query/QueryUtilsUnitTests.java | 2 +- .../query/SimpleJpaQueryUnitTests.java | 15 +++++---- ...oredProcedureAttributeSourceUnitTests.java | 33 +++++++++++-------- .../StoredProcedureAttributesUnitTests.java | 2 +- .../query/StringQueryUnitTests.java | 2 +- .../query/TupleConverterUnitTests.java | 16 +++++---- ...aPopulatingMethodInterceptorUnitTests.java | 12 ++++--- .../DefaultJpaContextIntegrationTests.java | 10 +++--- .../support/DefaultJpaContextUnitTests.java | 2 +- .../DefaultJpaEntityMetadataUnitTest.java | 2 +- .../support/DefaultQueryHintsTest.java | 6 ++-- ...tTransactionDisablingIntegrationTests.java | 8 ++--- ...odelEntityInformationIntegrationTests.java | 14 ++++---- .../EclipseLinkProxyIdAccessorTests.java | 4 +-- ...egistrarPostProcessorIntegrationTests.java | 9 ++--- ...nitionRegistrarPostProcessorUnitTests.java | 2 +- .../support/EntityManagerFactoryRefTests.java | 9 ++--- .../EntityManagerFactoryRefUnitTests.java | 2 +- .../JpaEntityInformationSupportUnitTests.java | 11 ++++--- ...odelEntityInformationIntegrationTests.java | 17 +++++----- ...paMetamodelEntityInformationUnitTests.java | 16 +++++---- ...PersistableEntityInformationUnitTests.java | 16 +++++---- ...eanEntityPathResolverIntegrationTests.java | 2 +- .../JpaRepositoryFactoryBeanUnitTests.java | 16 +++++---- .../JpaRepositoryFactoryUnitTests.java | 16 +++++---- .../support/JpaRepositoryTests.java | 13 ++++---- ...MailMessageRepositoryIntegrationTests.java | 9 ++--- .../support/MutableQueryHintsUnitTests.java | 2 +- .../support/OpenJpaJpaRepositoryTests.java | 4 +-- ...odelEntityInformationIntegrationTests.java | 6 ++-- .../support/QuerydslIntegrationTests.java | 12 +++---- ...QuerydslJpaPredicateExecutorUnitTests.java | 13 ++++---- .../support/QuerydslJpaRepositoryTests.java | 13 ++++---- ...ydslRepositorySupportIntegrationTests.java | 9 ++--- .../QuerydslRepositorySupportTests.java | 13 ++++---- .../support/SimpleJpaRepositoryUnitTests.java | 15 +++++---- .../support/TransactionalRepositoryTests.java | 17 ++++++---- ...PersistenceUnitPostProcessorUnitTests.java | 12 ++++--- ...ergingPersistenceUnitManagerUnitTests.java | 12 ++++--- ...MetamodelCacheCleanupIntegrationTests.java | 14 +++++--- .../data/jpa/util/JpaMetamodelUnitTests.java | 13 +++++--- 128 files changed, 694 insertions(+), 558 deletions(-) diff --git a/src/test/java/org/springframework/data/jpa/convert/QueryByExamplePredicateBuilderUnitTests.java b/src/test/java/org/springframework/data/jpa/convert/QueryByExamplePredicateBuilderUnitTests.java index a7bbd0ec9..afcb9eef9 100644 --- a/src/test/java/org/springframework/data/jpa/convert/QueryByExamplePredicateBuilderUnitTests.java +++ b/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 skillNameAttribute; SingularAttribute skillNestedAttribute; - @Before + @BeforeEach public void setUp() { personIdAttribute = new SingularAttributeStub<>("id", PersistentAttributeType.BASIC, Long.class); diff --git a/src/test/java/org/springframework/data/jpa/convert/threeten/Jsr310JpaConvertersIntegrationTests.java b/src/test/java/org/springframework/data/jpa/convert/threeten/Jsr310JpaConvertersIntegrationTests.java index c8e37eb18..2cf724cba 100644 --- a/src/test/java/org/springframework/data/jpa/convert/threeten/Jsr310JpaConvertersIntegrationTests.java +++ b/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; diff --git a/src/test/java/org/springframework/data/jpa/convert/threeten/Jsr310JpaConvertersUnitTests.java b/src/test/java/org/springframework/data/jpa/convert/threeten/Jsr310JpaConvertersUnitTests.java index 683f8f35e..77dad03fe 100644 --- a/src/test/java/org/springframework/data/jpa/convert/threeten/Jsr310JpaConvertersUnitTests.java +++ b/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 data() { + static Iterable 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(); diff --git a/src/test/java/org/springframework/data/jpa/convert/threetenbp/ThreeTenBackPortJpaConvertersIntegrationTests.java b/src/test/java/org/springframework/data/jpa/convert/threetenbp/ThreeTenBackPortJpaConvertersIntegrationTests.java index f22010f4e..098da9193 100644 --- a/src/test/java/org/springframework/data/jpa/convert/threetenbp/ThreeTenBackPortJpaConvertersIntegrationTests.java +++ b/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; diff --git a/src/test/java/org/springframework/data/jpa/domain/JpaSortTests.java b/src/test/java/org/springframework/data/jpa/domain/JpaSortTests.java index f70fee40d..78712f292 100644 --- a/src/test/java/org/springframework/data/jpa/domain/JpaSortTests.java +++ b/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 { diff --git a/src/test/java/org/springframework/data/jpa/domain/SpecificationUnitTests.java b/src/test/java/org/springframework/data/jpa/domain/SpecificationUnitTests.java index 5a3c03c5c..5d38ee935 100644 --- a/src/test/java/org/springframework/data/jpa/domain/SpecificationUnitTests.java +++ b/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 spec; - @Mock(extraInterfaces = Serializable.class) Root root; - @Mock(extraInterfaces = Serializable.class) CriteriaQuery query; - @Mock(extraInterfaces = Serializable.class) CriteriaBuilder builder; + @Mock(serializable = true) Root 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 { + public static class SerializableSpecification implements Serializable, Specification { @Override public Predicate toPredicate(Root root, CriteriaQuery query, CriteriaBuilder cb) { diff --git a/src/test/java/org/springframework/data/jpa/domain/support/AbstractAttributeConverterIntegrationTests.java b/src/test/java/org/springframework/data/jpa/domain/support/AbstractAttributeConverterIntegrationTests.java index 6cce98408..a0ea08daf 100644 --- a/src/test/java/org/springframework/data/jpa/domain/support/AbstractAttributeConverterIntegrationTests.java +++ b/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 { diff --git a/src/test/java/org/springframework/data/jpa/domain/support/AuditingBeanFactoryPostProcessorUnitTests.java b/src/test/java/org/springframework/data/jpa/domain/support/AuditingBeanFactoryPostProcessorUnitTests.java index a4432d047..35d7abb2b 100644 --- a/src/test/java/org/springframework/data/jpa/domain/support/AuditingBeanFactoryPostProcessorUnitTests.java +++ b/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(); diff --git a/src/test/java/org/springframework/data/jpa/domain/support/AuditingEntityListenerTests.java b/src/test/java/org/springframework/data/jpa/domain/support/AuditingEntityListenerTests.java index ce9990aa5..930ce44fe 100644 --- a/src/test/java/org/springframework/data/jpa/domain/support/AuditingEntityListenerTests.java +++ b/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(); diff --git a/src/test/java/org/springframework/data/jpa/domain/support/AuditingNamespaceUnitTests.java b/src/test/java/org/springframework/data/jpa/domain/support/AuditingNamespaceUnitTests.java index 02e604924..4efb43af2 100644 --- a/src/test/java/org/springframework/data/jpa/domain/support/AuditingNamespaceUnitTests.java +++ b/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; diff --git a/src/test/java/org/springframework/data/jpa/infrastructure/EclipseLinkMetamodelIntegrationTests.java b/src/test/java/org/springframework/data/jpa/infrastructure/EclipseLinkMetamodelIntegrationTests.java index 52243711d..e66a024c6 100644 --- a/src/test/java/org/springframework/data/jpa/infrastructure/EclipseLinkMetamodelIntegrationTests.java +++ b/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() {} } diff --git a/src/test/java/org/springframework/data/jpa/infrastructure/HibernateMetamodelIntegrationTests.java b/src/test/java/org/springframework/data/jpa/infrastructure/HibernateMetamodelIntegrationTests.java index ce995b8ab..008759735 100644 --- a/src/test/java/org/springframework/data/jpa/infrastructure/HibernateMetamodelIntegrationTests.java +++ b/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 HHH-10341 */ @Test - @Ignore + @Disabled @Override public void doesNotExposeAliasForTupleIfNoneDefined() {} } diff --git a/src/test/java/org/springframework/data/jpa/infrastructure/MetamodelIntegrationTests.java b/src/test/java/org/springframework/data/jpa/infrastructure/MetamodelIntegrationTests.java index 79800fdfa..c23eff165 100644 --- a/src/test/java/org/springframework/data/jpa/infrastructure/MetamodelIntegrationTests.java +++ b/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 { diff --git a/src/test/java/org/springframework/data/jpa/infrastructure/OpenJpaMetamodelIntegrationTests.java b/src/test/java/org/springframework/data/jpa/infrastructure/OpenJpaMetamodelIntegrationTests.java index 860f50cbf..64b683e96 100644 --- a/src/test/java/org/springframework/data/jpa/infrastructure/OpenJpaMetamodelIntegrationTests.java +++ b/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() {} } diff --git a/src/test/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContextIntegrationTests.java b/src/test/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContextIntegrationTests.java index 4d2615b4d..b03cf01c1 100644 --- a/src/test/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContextIntegrationTests.java +++ b/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())); } diff --git a/src/test/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContextUnitTests.java b/src/test/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContextUnitTests.java index b7eed0f6b..3ec93588c 100644 --- a/src/test/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContextUnitTests.java +++ b/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; /** diff --git a/src/test/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImplUnitTests.java b/src/test/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImplUnitTests.java index d1bc9f413..5ece8e6a4 100644 --- a/src/test/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImplUnitTests.java +++ b/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)); diff --git a/src/test/java/org/springframework/data/jpa/provider/PersistenceProviderIntegrationTests.java b/src/test/java/org/springframework/data/jpa/provider/PersistenceProviderIntegrationTests.java index c769c6e19..cc2b67198 100644 --- a/src/test/java/org/springframework/data/jpa/provider/PersistenceProviderIntegrationTests.java +++ b/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)); diff --git a/src/test/java/org/springframework/data/jpa/provider/PersistenceProviderUnitTests.java b/src/test/java/org/springframework/data/jpa/provider/PersistenceProviderUnitTests.java index b783d08c1..e06ff626e 100644 --- a/src/test/java/org/springframework/data/jpa/provider/PersistenceProviderUnitTests.java +++ b/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(); diff --git a/src/test/java/org/springframework/data/jpa/repository/AbstractPersistableIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/AbstractPersistableIntegrationTests.java index 88c7ae3b1..94e4a5cef 100644 --- a/src/test/java/org/springframework/data/jpa/repository/AbstractPersistableIntegrationTests.java +++ b/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 { diff --git a/src/test/java/org/springframework/data/jpa/repository/CrudMethodMetadataUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/CrudMethodMetadataUnitTests.java index 05624035d..f91c62d8f 100644 --- a/src/test/java/org/springframework/data/jpa/repository/CrudMethodMetadataUnitTests.java +++ b/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); diff --git a/src/test/java/org/springframework/data/jpa/repository/CustomAbstractPersistableIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/CustomAbstractPersistableIntegrationTests.java index e07725e73..8c1edd655 100644 --- a/src/test/java/org/springframework/data/jpa/repository/CustomAbstractPersistableIntegrationTests.java +++ b/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 { diff --git a/src/test/java/org/springframework/data/jpa/repository/EclipseLinkEntityGraphRepositoryMethodsIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/EclipseLinkEntityGraphRepositoryMethodsIntegrationTests.java index 07791e6af..6b9692b34 100644 --- a/src/test/java/org/springframework/data/jpa/repository/EclipseLinkEntityGraphRepositoryMethodsIntegrationTests.java +++ b/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() {} diff --git a/src/test/java/org/springframework/data/jpa/repository/EclipseLinkNamespaceUserRepositoryTests.java b/src/test/java/org/springframework/data/jpa/repository/EclipseLinkNamespaceUserRepositoryTests.java index ac4d8e404..aedb2b81b 100644 --- a/src/test/java/org/springframework/data/jpa/repository/EclipseLinkNamespaceUserRepositoryTests.java +++ b/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() {} diff --git a/src/test/java/org/springframework/data/jpa/repository/EclipseLinkUserRepositoryFinderTests.java b/src/test/java/org/springframework/data/jpa/repository/EclipseLinkUserRepositoryFinderTests.java index ebce597b5..9205dfbf1 100644 --- a/src/test/java/org/springframework/data/jpa/repository/EclipseLinkUserRepositoryFinderTests.java +++ b/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() {} } diff --git a/src/test/java/org/springframework/data/jpa/repository/EntityGraphRepositoryMethodsIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/EntityGraphRepositoryMethodsIntegrationTests.java index 9d9b5860f..c78fe4243 100644 --- a/src/test/java/org/springframework/data/jpa/repository/EntityGraphRepositoryMethodsIntegrationTests.java +++ b/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"); diff --git a/src/test/java/org/springframework/data/jpa/repository/EntityWithAssignedIdIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/EntityWithAssignedIdIntegrationTests.java index c35d6e766..1f89b7984 100644 --- a/src/test/java/org/springframework/data/jpa/repository/EntityWithAssignedIdIntegrationTests.java +++ b/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 { diff --git a/src/test/java/org/springframework/data/jpa/repository/JavaConfigUserRepositoryTests.java b/src/test/java/org/springframework/data/jpa/repository/JavaConfigUserRepositoryTests.java index a588d3f5f..c0ef61523 100644 --- a/src/test/java/org/springframework/data/jpa/repository/JavaConfigUserRepositoryTests.java +++ b/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; diff --git a/src/test/java/org/springframework/data/jpa/repository/MappedTypeRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/MappedTypeRepositoryIntegrationTests.java index bc0dc7a66..47e8eb70e 100644 --- a/src/test/java/org/springframework/data/jpa/repository/MappedTypeRepositoryIntegrationTests.java +++ b/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 { diff --git a/src/test/java/org/springframework/data/jpa/repository/NamespaceUserRepositoryTests.java b/src/test/java/org/springframework/data/jpa/repository/NamespaceUserRepositoryTests.java index 89f00fdb2..4097429ae 100644 --- a/src/test/java/org/springframework/data/jpa/repository/NamespaceUserRepositoryTests.java +++ b/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; diff --git a/src/test/java/org/springframework/data/jpa/repository/ORMInfrastructureTests.java b/src/test/java/org/springframework/data/jpa/repository/ORMInfrastructureTests.java index 49e33450b..f812bce11 100644 --- a/src/test/java/org/springframework/data/jpa/repository/ORMInfrastructureTests.java +++ b/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 { diff --git a/src/test/java/org/springframework/data/jpa/repository/OpenJpaNamespaceUserRepositoryTests.java b/src/test/java/org/springframework/data/jpa/repository/OpenJpaNamespaceUserRepositoryTests.java index 057d5b8a4..7339764d4 100644 --- a/src/test/java/org/springframework/data/jpa/repository/OpenJpaNamespaceUserRepositoryTests.java +++ b/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(); diff --git a/src/test/java/org/springframework/data/jpa/repository/OpenJpaParentRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/OpenJpaParentRepositoryIntegrationTests.java index 54abf39ea..ba9692220 100644 --- a/src/test/java/org/springframework/data/jpa/repository/OpenJpaParentRepositoryIntegrationTests.java +++ b/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 {} } diff --git a/src/test/java/org/springframework/data/jpa/repository/OpenJpaStoredProcedureIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/OpenJpaStoredProcedureIntegrationTests.java index 0a75dfd01..acb6a2c9c 100644 --- a/src/test/java/org/springframework/data/jpa/repository/OpenJpaStoredProcedureIntegrationTests.java +++ b/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 { diff --git a/src/test/java/org/springframework/data/jpa/repository/OpenJpaUserRepositoryFinderTests.java b/src/test/java/org/springframework/data/jpa/repository/OpenJpaUserRepositoryFinderTests.java index b95ec072a..0e20f2f4a 100644 --- a/src/test/java/org/springframework/data/jpa/repository/OpenJpaUserRepositoryFinderTests.java +++ b/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 {} } diff --git a/src/test/java/org/springframework/data/jpa/repository/ParentRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/ParentRepositoryIntegrationTests.java index d303d4af8..d697bc1dd 100644 --- a/src/test/java/org/springframework/data/jpa/repository/ParentRepositoryIntegrationTests.java +++ b/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())); diff --git a/src/test/java/org/springframework/data/jpa/repository/RedeclaringRepositoryMethodsTests.java b/src/test/java/org/springframework/data/jpa/repository/RedeclaringRepositoryMethodsTests.java index 46b43138d..5b6ec5950 100644 --- a/src/test/java/org/springframework/data/jpa/repository/RedeclaringRepositoryMethodsTests.java +++ b/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"); diff --git a/src/test/java/org/springframework/data/jpa/repository/RepositoryWithCompositeKeyTests.java b/src/test/java/org/springframework/data/jpa/repository/RepositoryWithCompositeKeyTests.java index 834e4131d..0c349390e 100644 --- a/src/test/java/org/springframework/data/jpa/repository/RepositoryWithCompositeKeyTests.java +++ b/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 { diff --git a/src/test/java/org/springframework/data/jpa/repository/RepositoryWithIdClassKeyTests.java b/src/test/java/org/springframework/data/jpa/repository/RepositoryWithIdClassKeyTests.java index bedc849c7..96f6d140c 100644 --- a/src/test/java/org/springframework/data/jpa/repository/RepositoryWithIdClassKeyTests.java +++ b/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 { diff --git a/src/test/java/org/springframework/data/jpa/repository/RoleRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/RoleRepositoryIntegrationTests.java index 4c4f47837..626a7d12d 100644 --- a/src/test/java/org/springframework/data/jpa/repository/RoleRepositoryIntegrationTests.java +++ b/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 { diff --git a/src/test/java/org/springframework/data/jpa/repository/SPR8954Tests.java b/src/test/java/org/springframework/data/jpa/repository/SPR8954Tests.java index b53b0f360..cda468655 100644 --- a/src/test/java/org/springframework/data/jpa/repository/SPR8954Tests.java +++ b/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 { diff --git a/src/test/java/org/springframework/data/jpa/repository/SimpleJpaParameterBindingTests.java b/src/test/java/org/springframework/data/jpa/repository/SimpleJpaParameterBindingTests.java index dfca5c3f6..e5025c610 100644 --- a/src/test/java/org/springframework/data/jpa/repository/SimpleJpaParameterBindingTests.java +++ b/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"); diff --git a/src/test/java/org/springframework/data/jpa/repository/StoredProcedureIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/StoredProcedureIntegrationTests.java index 1901d7107..eef4be918 100644 --- a/src/test/java/org/springframework/data/jpa/repository/StoredProcedureIntegrationTests.java +++ b/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 dummies = repository.adHocProcedureWith1InputAnd1OutputParameterWithResultSet("FOO"); @@ -89,7 +90,7 @@ public class StoredProcedureIntegrationTests { } @Test // DATAJPA-652 - @Ignore(NOT_SUPPORTED) + @Disabled(NOT_SUPPORTED) public void shouldExecuteAdHocProcedureWith1InputAnd1OutputParameterWithResultSetWithUpdate() { List dummies = repository.adHocProcedureWith1InputAnd1OutputParameterWithResultSetWithUpdate("FOO"); @@ -119,7 +120,7 @@ public class StoredProcedureIntegrationTests { } @Test // DATAJPA-652 - @Ignore(NOT_SUPPORTED) + @Disabled(NOT_SUPPORTED) public void shouldExecuteProcedureWith1InputAnd1OutputParameterWithResultSet() { List dummies = repository.procedureWith1InputAnd1OutputParameterWithResultSet("FOO"); @@ -129,7 +130,7 @@ public class StoredProcedureIntegrationTests { } @Test // DATAJPA-652 - @Ignore(NOT_SUPPORTED) + @Disabled(NOT_SUPPORTED) public void shouldExecuteProcedureWith1InputAnd1OutputParameterWithResultSetWithUpdate() { List dummies = repository.procedureWith1InputAnd1OutputParameterWithResultSetWithUpdate("FOO"); diff --git a/src/test/java/org/springframework/data/jpa/repository/UserRepositoryFinderTests.java b/src/test/java/org/springframework/data/jpa/repository/UserRepositoryFinderTests.java index 95ba8df0d..f4ddcf44a 100644 --- a/src/test/java/org/springframework/data/jpa/repository/UserRepositoryFinderTests.java +++ b/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(); diff --git a/src/test/java/org/springframework/data/jpa/repository/UserRepositoryStoredProcedureIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/UserRepositoryStoredProcedureIntegrationTests.java index c3ead8eb7..53a948868 100644 --- a/src/test/java/org/springframework/data/jpa/repository/UserRepositoryStoredProcedureIntegrationTests.java +++ b/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 { diff --git a/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java b/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java index f1906c004..da67b4b3b 100644 --- a/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java +++ b/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 OPENJPA-2484 */ @Test // DATAJPA-505 - @Ignore + @Disabled public void findBinaryDataByIdJpaQl() throws Exception { byte[] data = "Woho!!".getBytes("UTF-8"); diff --git a/src/test/java/org/springframework/data/jpa/repository/cdi/CdiExtensionIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/cdi/CdiExtensionIntegrationTests.java index 1d8d88e06..4205cdf92 100644 --- a/src/test/java/org/springframework/data/jpa/repository/cdi/CdiExtensionIntegrationTests.java +++ b/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() // diff --git a/src/test/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryExtensionUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryExtensionUnitTests.java index 8d6b732cf..985eec79b 100644 --- a/src/test/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryExtensionUnitTests.java +++ b/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() { diff --git a/src/test/java/org/springframework/data/jpa/repository/config/AbstractAuditingViaJavaConfigRepositoriesTests.java b/src/test/java/org/springframework/data/jpa/repository/config/AbstractAuditingViaJavaConfigRepositoriesTests.java index 70315b31b..be9282f3b 100644 --- a/src/test/java/org/springframework/data/jpa/repository/config/AbstractAuditingViaJavaConfigRepositoriesTests.java +++ b/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); } diff --git a/src/test/java/org/springframework/data/jpa/repository/config/AbstractRepositoryConfigTests.java b/src/test/java/org/springframework/data/jpa/repository/config/AbstractRepositoryConfigTests.java index 63b7ce084..e0f28375d 100644 --- a/src/test/java/org/springframework/data/jpa/repository/config/AbstractRepositoryConfigTests.java +++ b/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; diff --git a/src/test/java/org/springframework/data/jpa/repository/config/AllowNestedRepositoriesRepositoryConfigTests.java b/src/test/java/org/springframework/data/jpa/repository/config/AllowNestedRepositoriesRepositoryConfigTests.java index a77b46965..f7f053e32 100644 --- a/src/test/java/org/springframework/data/jpa/repository/config/AllowNestedRepositoriesRepositoryConfigTests.java +++ b/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; diff --git a/src/test/java/org/springframework/data/jpa/repository/config/AuditingBeanDefinitionParserTests.java b/src/test/java/org/springframework/data/jpa/repository/config/AuditingBeanDefinitionParserTests.java index cc3cbffc4..0cc12e531 100644 --- a/src/test/java/org/springframework/data/jpa/repository/config/AuditingBeanDefinitionParserTests.java +++ b/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; diff --git a/src/test/java/org/springframework/data/jpa/repository/config/CustomRepositoryFactoryConfigTests.java b/src/test/java/org/springframework/data/jpa/repository/config/CustomRepositoryFactoryConfigTests.java index 5adb4cbed..0a9540274 100644 --- a/src/test/java/org/springframework/data/jpa/repository/config/CustomRepositoryFactoryConfigTests.java +++ b/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(); diff --git a/src/test/java/org/springframework/data/jpa/repository/config/InspectionClassLoaderUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/config/InspectionClassLoaderUnitTests.java index 8fd613555..bc516398e 100644 --- a/src/test/java/org/springframework/data/jpa/repository/config/InspectionClassLoaderUnitTests.java +++ b/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}. diff --git a/src/test/java/org/springframework/data/jpa/repository/config/JpaAuditingRegistrarUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/config/JpaAuditingRegistrarUnitTests.java index f693b2b83..938793619 100644 --- a/src/test/java/org/springframework/data/jpa/repository/config/JpaAuditingRegistrarUnitTests.java +++ b/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(); diff --git a/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoriesRegistrarIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoriesRegistrarIntegrationTests.java index 8b35cc552..325c22051 100644 --- a/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoriesRegistrarIntegrationTests.java +++ b/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 { diff --git a/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoriesRegistrarUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoriesRegistrarUnitTests.java index 89e0b5d37..1ac16507e 100644 --- a/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoriesRegistrarUnitTests.java +++ b/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); diff --git a/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigDefinitionParserTests.java b/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigDefinitionParserTests.java index fe13f9415..7ef65678f 100644 --- a/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigDefinitionParserTests.java +++ b/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; diff --git a/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigExtensionUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigExtensionUnitTests.java index 7312f016d..a7b02336a 100644 --- a/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigExtensionUnitTests.java +++ b/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; diff --git a/src/test/java/org/springframework/data/jpa/repository/config/NestedRepositoriesJavaConfigTests.java b/src/test/java/org/springframework/data/jpa/repository/config/NestedRepositoriesJavaConfigTests.java index 0933f9b77..c29fc8511 100644 --- a/src/test/java/org/springframework/data/jpa/repository/config/NestedRepositoriesJavaConfigTests.java +++ b/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 { diff --git a/src/test/java/org/springframework/data/jpa/repository/config/QueryLookupStrategyTests.java b/src/test/java/org/springframework/data/jpa/repository/config/QueryLookupStrategyTests.java index 3f0912968..e1a6d4df1 100644 --- a/src/test/java/org/springframework/data/jpa/repository/config/QueryLookupStrategyTests.java +++ b/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 { diff --git a/src/test/java/org/springframework/data/jpa/repository/config/RepositoriesJavaConfigTests.java b/src/test/java/org/springframework/data/jpa/repository/config/RepositoriesJavaConfigTests.java index a1ac9aa29..6b5b29e7c 100644 --- a/src/test/java/org/springframework/data/jpa/repository/config/RepositoriesJavaConfigTests.java +++ b/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 { diff --git a/src/test/java/org/springframework/data/jpa/repository/projections/ProjectionJoinIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/projections/ProjectionJoinIntegrationTests.java index 0982dc440..a029f0dff 100644 --- a/src/test/java/org/springframework/data/jpa/repository/projections/ProjectionJoinIntegrationTests.java +++ b/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 { diff --git a/src/test/java/org/springframework/data/jpa/repository/projections/ProjectionsIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/projections/ProjectionsIntegrationTests.java index a1b132823..57a946718 100644 --- a/src/test/java/org/springframework/data/jpa/repository/projections/ProjectionsIntegrationTests.java +++ b/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(); diff --git a/src/test/java/org/springframework/data/jpa/repository/query/AbstractJpaQueryTests.java b/src/test/java/org/springframework/data/jpa/repository/query/AbstractJpaQueryTests.java index 82a6dc79a..9840d8a7f 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/AbstractJpaQueryTests.java +++ b/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 countQuery; - @Before + @BeforeEach @SuppressWarnings("unchecked") public void setUp() { query = mock(Query.class); diff --git a/src/test/java/org/springframework/data/jpa/repository/query/AbstractStringBasedJpaQueryIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/query/AbstractStringBasedJpaQueryIntegrationTests.java index 94d9252a2..357c75668 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/AbstractStringBasedJpaQueryIntegrationTests.java +++ b/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 { diff --git a/src/test/java/org/springframework/data/jpa/repository/query/CustomNonBindableJpaParametersIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/query/CustomNonBindableJpaParametersIntegrationTests.java index f7b5928f6..177f2c379 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/CustomNonBindableJpaParametersIntegrationTests.java +++ b/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 { diff --git a/src/test/java/org/springframework/data/jpa/repository/query/EscapeCharacterUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/EscapeCharacterUnitTests.java index fbbf86587..6df24e62e 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/EscapeCharacterUnitTests.java +++ b/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}. diff --git a/src/test/java/org/springframework/data/jpa/repository/query/ExpressionBasedStringQueryUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/ExpressionBasedStringQueryUnitTests.java index 87ad98f80..8e63a37ab 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/ExpressionBasedStringQueryUnitTests.java +++ b/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(); diff --git a/src/test/java/org/springframework/data/jpa/repository/query/Jpa21UtilsTests.java b/src/test/java/org/springframework/data/jpa/repository/query/Jpa21UtilsTests.java index c9f5e0e97..241767325 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/Jpa21UtilsTests.java +++ b/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 { diff --git a/src/test/java/org/springframework/data/jpa/repository/query/Jpa21UtilsUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/Jpa21UtilsUnitTests.java index 25f32ab5c..a9aa273ca 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/Jpa21UtilsUnitTests.java +++ b/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; /** diff --git a/src/test/java/org/springframework/data/jpa/repository/query/JpaCountQueryCreatorIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/query/JpaCountQueryCreatorIntegrationTests.java index 0eff10864..4ad270aa1 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/JpaCountQueryCreatorIntegrationTests.java +++ b/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 { diff --git a/src/test/java/org/springframework/data/jpa/repository/query/JpaParametersUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/JpaParametersUnitTests.java index eee07fe3b..a87dc1895 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/JpaParametersUnitTests.java +++ b/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; diff --git a/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryExecutionUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryExecutionUnitTests.java index 4f787ca4f..3a70dfb83 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryExecutionUnitTests.java +++ b/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); diff --git a/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryLookupStrategyUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryLookupStrategyUnitTests.java index 116f6f2fc..dcb99bfbd 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryLookupStrategyUnitTests.java +++ b/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); diff --git a/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryMethodUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryMethodUnitTests.java index 8a66b2afe..e1980fb33 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryMethodUnitTests.java +++ b/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); diff --git a/src/test/java/org/springframework/data/jpa/repository/query/LikeBindingUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/LikeBindingUnitTests.java index 2e5a3a366..776914d4b 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/LikeBindingUnitTests.java +++ b/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; diff --git a/src/test/java/org/springframework/data/jpa/repository/query/NamedOrIndexedQueryParameterSetterUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/NamedOrIndexedQueryParameterSetterUnitTests.java index 6c9ae9e3b..f6f4a99e8 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/NamedOrIndexedQueryParameterSetterUnitTests.java +++ b/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); diff --git a/src/test/java/org/springframework/data/jpa/repository/query/NamedQueryUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/NamedQueryUnitTests.java index 8d639a44e..625e8968b 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/NamedQueryUnitTests.java +++ b/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 { diff --git a/src/test/java/org/springframework/data/jpa/repository/query/ParameterBinderUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/ParameterBinderUnitTests.java index 11c431ce1..09b360389 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/ParameterBinderUnitTests.java +++ b/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); diff --git a/src/test/java/org/springframework/data/jpa/repository/query/ParameterBindingParserUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/ParameterBindingParserUnitTests.java index b88650f80..1e9001d6d 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/ParameterBindingParserUnitTests.java +++ b/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; /** diff --git a/src/test/java/org/springframework/data/jpa/repository/query/ParameterExpressionProviderTests.java b/src/test/java/org/springframework/data/jpa/repository/query/ParameterExpressionProviderTests.java index 5a557d4fe..d10cbc583 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/ParameterExpressionProviderTests.java +++ b/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 { diff --git a/src/test/java/org/springframework/data/jpa/repository/query/ParameterMetadataProviderIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/query/ParameterMetadataProviderIntegrationTests.java index 6a78f2133..ec77b7426 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/ParameterMetadataProviderIntegrationTests.java +++ b/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 { diff --git a/src/test/java/org/springframework/data/jpa/repository/query/ParameterMetadataProviderUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/ParameterMetadataProviderUnitTests.java index 80b403ba3..0e2d64d9e 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/ParameterMetadataProviderUnitTests.java +++ b/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; diff --git a/src/test/java/org/springframework/data/jpa/repository/query/PartTreeJpaQueryIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/query/PartTreeJpaQueryIntegrationTests.java index 6f13eb986..e230ac574 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/PartTreeJpaQueryIntegrationTests.java +++ b/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); } diff --git a/src/test/java/org/springframework/data/jpa/repository/query/QueryParameterSetterFactoryUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/QueryParameterSetterFactoryUnitTests.java index 4e9101d21..948a66f10 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/QueryParameterSetterFactoryUnitTests.java +++ b/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 diff --git a/src/test/java/org/springframework/data/jpa/repository/query/QueryUtilsIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/query/QueryUtilsIntegrationTests.java index 9f1babf6f..18fbbe11f 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/QueryUtilsIntegrationTests.java +++ b/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 { diff --git a/src/test/java/org/springframework/data/jpa/repository/query/QueryUtilsUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/QueryUtilsUnitTests.java index ceebdeefa..2359b064f 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/QueryUtilsUnitTests.java +++ b/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; diff --git a/src/test/java/org/springframework/data/jpa/repository/query/SimpleJpaQueryUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/SimpleJpaQueryUnitTests.java index 027c0d951..7283a5357 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/SimpleJpaQueryUnitTests.java +++ b/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 { diff --git a/src/test/java/org/springframework/data/jpa/repository/query/StoredProcedureAttributeSourceUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/StoredProcedureAttributeSourceUnitTests.java index 347249b77..1c4111751 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/StoredProcedureAttributeSourceUnitTests.java +++ b/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 entityMetadata; - @Before + @BeforeEach public void setup() { creator = StoredProcedureAttributeSource.INSTANCE; diff --git a/src/test/java/org/springframework/data/jpa/repository/query/StoredProcedureAttributesUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/StoredProcedureAttributesUnitTests.java index 257b2b67e..54a7d3ac9 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/StoredProcedureAttributesUnitTests.java +++ b/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}. diff --git a/src/test/java/org/springframework/data/jpa/repository/query/StringQueryUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/StringQueryUnitTests.java index 1eb62a8e5..a8b7f6b98 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/StringQueryUnitTests.java +++ b/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; diff --git a/src/test/java/org/springframework/data/jpa/repository/query/TupleConverterUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/TupleConverterUnitTests.java index 325cc1b9b..4eb4264f2 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/TupleConverterUnitTests.java +++ b/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); diff --git a/src/test/java/org/springframework/data/jpa/repository/support/CrudMethodMetadataPopulatingMethodInterceptorUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/support/CrudMethodMetadataPopulatingMethodInterceptorUnitTests.java index 139bd472d..952c84191 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/CrudMethodMetadataPopulatingMethodInterceptorUnitTests.java +++ b/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; diff --git a/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaContextIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaContextIntegrationTests.java index 0232726f6..93cc72db8 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaContextIntegrationTests.java +++ b/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(); diff --git a/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaContextUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaContextUnitTests.java index 831c73f1c..c08a05ca2 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaContextUnitTests.java +++ b/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}. diff --git a/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaEntityMetadataUnitTest.java b/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaEntityMetadataUnitTest.java index 026402dcd..aebfc412a 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaEntityMetadataUnitTest.java +++ b/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; diff --git a/src/test/java/org/springframework/data/jpa/repository/support/DefaultQueryHintsTest.java b/src/test/java/org/springframework/data/jpa/repository/support/DefaultQueryHintsTest.java index 2eecbedd6..2a2902efa 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/DefaultQueryHintsTest.java +++ b/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(); diff --git a/src/test/java/org/springframework/data/jpa/repository/support/DefaultTransactionDisablingIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/support/DefaultTransactionDisablingIntegrationTests.java index 9e274d465..94f4170c3 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/DefaultTransactionDisablingIntegrationTests.java +++ b/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; diff --git a/src/test/java/org/springframework/data/jpa/repository/support/EclipseLinkJpaMetamodelEntityInformationIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/support/EclipseLinkJpaMetamodelEntityInformationIntegrationTests.java index 1e5f812f8..ae8332fde 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/EclipseLinkJpaMetamodelEntityInformationIntegrationTests.java +++ b/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() { diff --git a/src/test/java/org/springframework/data/jpa/repository/support/EclipseLinkProxyIdAccessorTests.java b/src/test/java/org/springframework/data/jpa/repository/support/EclipseLinkProxyIdAccessorTests.java index 5fcbf1cb3..417735726 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/EclipseLinkProxyIdAccessorTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/EclipseLinkProxyIdAccessorTests.java @@ -15,7 +15,7 @@ */ package org.springframework.data.jpa.repository.support; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ImportResource; import org.springframework.data.jpa.provider.PersistenceProviderIntegrationTests; @@ -35,6 +35,6 @@ public class EclipseLinkProxyIdAccessorTests extends PersistenceProviderIntegrat * Do not execute the test as EclipseLink does not create a lazy-loading proxy as expected. */ @Override - @Ignore + @Disabled public void testname() {} } diff --git a/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerBeanDefinitionRegistrarPostProcessorIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerBeanDefinitionRegistrarPostProcessorIntegrationTests.java index 6675ce7ee..28f157aa4 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerBeanDefinitionRegistrarPostProcessorIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerBeanDefinitionRegistrarPostProcessorIntegrationTests.java @@ -25,8 +25,9 @@ import java.lang.annotation.Target; import javax.persistence.EntityManager; 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.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; @@ -38,7 +39,7 @@ import org.springframework.orm.jpa.JpaVendorAdapter; import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; import org.springframework.stereotype.Component; 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 EntityManagerBeanDefinitionRegistrarPostProcessor}. @@ -46,7 +47,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * @author Oliver Gierke * @author Jens Schauder */ -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration public class EntityManagerBeanDefinitionRegistrarPostProcessorIntegrationTests { diff --git a/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerBeanDefinitionRegistrarPostProcessorUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerBeanDefinitionRegistrarPostProcessorUnitTests.java index edabbe72b..ebdfc44a5 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerBeanDefinitionRegistrarPostProcessorUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerBeanDefinitionRegistrarPostProcessorUnitTests.java @@ -20,7 +20,7 @@ import static org.mockito.Mockito.*; import javax.persistence.EntityManagerFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.config.BeanFactoryPostProcessor; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.support.BeanDefinitionBuilder; diff --git a/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerFactoryRefTests.java b/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerFactoryRefTests.java index de6098d73..1339e55e5 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerFactoryRefTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerFactoryRefTests.java @@ -17,15 +17,16 @@ package org.springframework.data.jpa.repository.support; import javax.persistence.EntityManagerFactory; -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.AuditableUser; import org.springframework.data.jpa.domain.sample.User; import org.springframework.data.jpa.repository.sample.AuditableUserRepository; 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; /** @@ -33,7 +34,7 @@ import org.springframework.transaction.annotation.Transactional; * * @author Oliver Gierke */ -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(locations = "classpath:multiple-entity-manager-integration-context.xml") public class EntityManagerFactoryRefTests { diff --git a/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerFactoryRefUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerFactoryRefUnitTests.java index 9af28152c..9c60b649f 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerFactoryRefUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerFactoryRefUnitTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*; import javax.persistence.EntityManagerFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanReference; import org.springframework.beans.factory.support.DefaultListableBeanFactory; diff --git a/src/test/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupportUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupportUnitTests.java index 5016f56fa..ddc13786e 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupportUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupportUnitTests.java @@ -26,10 +26,12 @@ import javax.persistence.EntityManager; import javax.persistence.metamodel.Metamodel; import javax.persistence.metamodel.SingularAttribute; -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; /** * Unit tests for {@link AbstractJpaEntityInformation}. @@ -37,7 +39,8 @@ import org.mockito.junit.MockitoJUnitRunner; * @author Oliver Gierke * @author Jens Schauder */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public class JpaEntityInformationSupportUnitTests { @Mock EntityManager em; diff --git a/src/test/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformationIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformationIntegrationTests.java index ea99b4b52..e955f9016 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformationIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformationIntegrationTests.java @@ -27,14 +27,15 @@ import java.util.Date; import javax.persistence.*; import javax.persistence.metamodel.Metamodel; -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.AbstractPersistable; import org.springframework.data.jpa.domain.sample.*; import org.springframework.data.repository.core.EntityInformation; 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; /** @@ -45,7 +46,7 @@ import org.springframework.test.util.ReflectionTestUtils; * @author Christoph Strobl * @author Jens Schauder */ -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration({ "classpath:infrastructure.xml" }) public class JpaMetamodelEntityInformationIntegrationTests { @@ -65,7 +66,7 @@ public class JpaMetamodelEntityInformationIntegrationTests { * @see HHH-6896 */ @Test // DATAJPA-141 - @Ignore + @Disabled public void detectsIdTypeForMappedSuperclass() { JpaEntityInformation information = getEntityInformation(AbstractPersistable.class, em); @@ -251,7 +252,7 @@ public class JpaMetamodelEntityInformationIntegrationTests { * Ignored as Hibernate < 4.3 doesn't expose the version property properly if it's declared on the superclass. */ @Test // DATAJPA-820 - @Ignore + @Disabled public void detectsVersionPropertyOnMappedSuperClass() { EntityInformation information = getEntityInformation(ConcreteType1.class, em); @@ -302,7 +303,7 @@ public class JpaMetamodelEntityInformationIntegrationTests { } @Test // DATAJPA-1576 - @Ignore + @Disabled public void prefersPrivateGetterOverFieldAccess() { EntityManagerFactory emf = Persistence.createEntityManagerFactory(getMetadadataPersitenceUnitName()); diff --git a/src/test/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformationUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformationUnitTests.java index 6530190cc..eb8645b3c 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformationUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformationUnitTests.java @@ -28,11 +28,14 @@ import javax.persistence.metamodel.Metamodel; 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.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.PersistableWithIdClass; import org.springframework.data.jpa.domain.sample.PersistableWithIdClassPK; @@ -42,7 +45,8 @@ import org.springframework.data.jpa.domain.sample.PersistableWithIdClassPK; * @author Oliver Gierke * @author Jens Schauder */ -@RunWith(MockitoJUnitRunner.Silent.class) +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public class JpaMetamodelEntityInformationUnitTests { @Mock Metamodel metamodel; @@ -52,7 +56,7 @@ public class JpaMetamodelEntityInformationUnitTests { @Mock @SuppressWarnings("rawtypes") Type idType; - @Before + @BeforeEach @SuppressWarnings("unchecked") public void setUp() { diff --git a/src/test/java/org/springframework/data/jpa/repository/support/JpaPersistableEntityInformationUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/support/JpaPersistableEntityInformationUnitTests.java index e0989dba7..16441d903 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/JpaPersistableEntityInformationUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/JpaPersistableEntityInformationUnitTests.java @@ -22,11 +22,14 @@ import javax.persistence.metamodel.EntityType; import javax.persistence.metamodel.Metamodel; 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.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.Persistable; import org.springframework.data.repository.core.EntityInformation; @@ -36,7 +39,8 @@ import org.springframework.data.repository.core.EntityInformation; * @author Oliver Gierke * @author Jens Schauder */ -@RunWith(MockitoJUnitRunner.Silent.class) +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public class JpaPersistableEntityInformationUnitTests { @Mock Metamodel metamodel; @@ -45,7 +49,7 @@ public class JpaPersistableEntityInformationUnitTests { @Mock @SuppressWarnings("rawtypes") Type idType; - @Before + @BeforeEach @SuppressWarnings("unchecked") public void setUp() { diff --git a/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryBeanEntityPathResolverIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryBeanEntityPathResolverIntegrationTests.java index 61d633f37..c30591e7b 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryBeanEntityPathResolverIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryBeanEntityPathResolverIntegrationTests.java @@ -17,7 +17,7 @@ package org.springframework.data.jpa.repository.support; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.NoUniqueBeanDefinitionException; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryBeanUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryBeanUnitTests.java index 4041de9ab..f83c3a435 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryBeanUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryBeanUnitTests.java @@ -26,12 +26,15 @@ import java.util.Map; import javax.persistence.EntityManager; 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.beans.factory.BeanFactory; import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.dao.support.PersistenceExceptionTranslator; @@ -53,7 +56,8 @@ import org.springframework.data.repository.core.support.RepositoryFactorySupport * @author Mark Paluch * @author Jens Schauder */ -@RunWith(MockitoJUnitRunner.Silent.class) +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public class JpaRepositoryFactoryBeanUnitTests { JpaRepositoryFactoryBean factoryBean; @@ -65,7 +69,7 @@ public class JpaRepositoryFactoryBeanUnitTests { @Mock(extraInterfaces = SimpleSampleRepository.class) Repository repository; @Mock Metamodel metamodel; - @Before + @BeforeEach public void setUp() { Map beans = new HashMap<>(); diff --git a/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryUnitTests.java index 4bd02107c..00c88397f 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryUnitTests.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.aop.framework.Advised; import org.springframework.core.OverridingClassLoader; import org.springframework.data.jpa.domain.sample.User; @@ -50,7 +53,8 @@ import org.springframework.util.ClassUtils; * @author Thomas Darimont * @author Jens Schauder */ -@RunWith(MockitoJUnitRunner.Silent.class) +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public class JpaRepositoryFactoryUnitTests { JpaRepositoryFactory factory; @@ -60,7 +64,7 @@ public class JpaRepositoryFactoryUnitTests { @Mock @SuppressWarnings("rawtypes") JpaEntityInformation entityInformation; @Mock EntityManagerFactory emf; - @Before + @BeforeEach public void setUp() { when(entityManager.getMetamodel()).thenReturn(metamodel); diff --git a/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryTests.java b/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryTests.java index 788ec246a..7fbc38457 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryTests.java @@ -23,9 +23,10 @@ import java.util.Optional; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; -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.PersistableWithIdClass; import org.springframework.data.jpa.domain.sample.PersistableWithIdClassPK; import org.springframework.data.jpa.domain.sample.SampleEntity; @@ -33,7 +34,7 @@ import org.springframework.data.jpa.domain.sample.SampleEntityPK; import org.springframework.data.jpa.repository.JpaRepository; 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; /** @@ -43,7 +44,7 @@ import org.springframework.transaction.annotation.Transactional; * @author Thomas Darimont * @author Jens Schauder */ -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration({ "classpath:infrastructure.xml" }) @Transactional public class JpaRepositoryTests { @@ -53,7 +54,7 @@ public class JpaRepositoryTests { JpaRepository repository; CrudRepository idClassRepository; - @Before + @BeforeEach public void setUp() { repository = new JpaRepositoryFactory(em).getRepository(SampleEntityRepository.class); diff --git a/src/test/java/org/springframework/data/jpa/repository/support/MailMessageRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/support/MailMessageRepositoryIntegrationTests.java index 32f2b1f22..cdcc9d22d 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/MailMessageRepositoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/MailMessageRepositoryIntegrationTests.java @@ -23,8 +23,9 @@ 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.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -41,7 +42,7 @@ import org.springframework.data.jpa.domain.sample.QMailSender; import org.springframework.data.jpa.repository.sample.MailMessageRepository; 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; /** @@ -51,7 +52,7 @@ import org.springframework.transaction.annotation.Transactional; * @author Oliver Gierke * @author Jens Schauder */ -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = SampleConfig.class) @Transactional public class MailMessageRepositoryIntegrationTests { diff --git a/src/test/java/org/springframework/data/jpa/repository/support/MutableQueryHintsUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/support/MutableQueryHintsUnitTests.java index 0838c0780..a0910617b 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/MutableQueryHintsUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/MutableQueryHintsUnitTests.java @@ -21,7 +21,7 @@ import java.util.ArrayList; import java.util.List; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.util.Pair; diff --git a/src/test/java/org/springframework/data/jpa/repository/support/OpenJpaJpaRepositoryTests.java b/src/test/java/org/springframework/data/jpa/repository/support/OpenJpaJpaRepositoryTests.java index 120354c45..1a7932b5a 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/OpenJpaJpaRepositoryTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/OpenJpaJpaRepositoryTests.java @@ -15,7 +15,7 @@ */ package org.springframework.data.jpa.repository.support; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; import org.springframework.test.context.ContextConfiguration; /** @@ -31,7 +31,7 @@ public class OpenJpaJpaRepositoryTests extends JpaRepositoryTests { * @see org.springframework.data.jpa.repository.support.JpaRepositoryTests#testCrudOperationsForCompoundKeyEntity() */ @Override - @Ignore + @Disabled public void testCrudOperationsForCompoundKeyEntity() throws Exception { } } diff --git a/src/test/java/org/springframework/data/jpa/repository/support/OpenJpaMetamodelEntityInformationIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/support/OpenJpaMetamodelEntityInformationIntegrationTests.java index fdbd4ef47..e85a2068b 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/OpenJpaMetamodelEntityInformationIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/OpenJpaMetamodelEntityInformationIntegrationTests.java @@ -15,8 +15,8 @@ */ package org.springframework.data.jpa.repository.support; -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; /** @@ -39,7 +39,7 @@ public class OpenJpaMetamodelEntityInformationIntegrationTests extends JpaMetamo * Ignore as it fails with weird {@link NoClassDefFoundError}. */ @Override - @Ignore + @Disabled public void findsIdClassOnMappedSuperclass() {} /** diff --git a/src/test/java/org/springframework/data/jpa/repository/support/QuerydslIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/support/QuerydslIntegrationTests.java index 030384045..959fbaa7b 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/QuerydslIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/QuerydslIntegrationTests.java @@ -22,14 +22,14 @@ import java.util.stream.Stream; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; -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.Sort; 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; import com.querydsl.core.types.dsl.PathBuilder; @@ -42,7 +42,7 @@ import com.querydsl.jpa.JPQLQuery; * @author Jens Schauder * @author Marcus Voltolim */ -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration({ "classpath:infrastructure.xml" }) @Transactional public class QuerydslIntegrationTests { @@ -53,7 +53,7 @@ public class QuerydslIntegrationTests { PathBuilder userPath; JPQLQuery userQuery; - @Before + @BeforeEach public void setup() { userPath = new PathBuilder<>(User.class, "user"); diff --git a/src/test/java/org/springframework/data/jpa/repository/support/QuerydslJpaPredicateExecutorUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/support/QuerydslJpaPredicateExecutorUnitTests.java index ede0da039..a8e7aeb27 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/QuerydslJpaPredicateExecutorUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/QuerydslJpaPredicateExecutorUnitTests.java @@ -23,9 +23,10 @@ import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import org.joda.time.LocalDate; -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.dao.IncorrectResultSizeDataAccessException; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -41,7 +42,7 @@ import org.springframework.data.querydsl.QPageRequest; import org.springframework.data.querydsl.QSort; import org.springframework.data.querydsl.SimpleEntityPathResolver; 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.querydsl.core.types.Predicate; @@ -58,7 +59,7 @@ import com.querydsl.core.types.dsl.PathBuilderFactory; * @author Mark Paluch * @author Christoph Strobl */ -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration({ "classpath:infrastructure.xml" }) @Transactional public class QuerydslJpaPredicateExecutorUnitTests { @@ -70,7 +71,7 @@ public class QuerydslJpaPredicateExecutorUnitTests { User dave, carter, oliver; Role adminRole; - @Before + @BeforeEach public void setUp() { JpaEntityInformation information = new JpaMetamodelEntityInformation<>(User.class, diff --git a/src/test/java/org/springframework/data/jpa/repository/support/QuerydslJpaRepositoryTests.java b/src/test/java/org/springframework/data/jpa/repository/support/QuerydslJpaRepositoryTests.java index 85b33b1a2..5ef3b3628 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/QuerydslJpaRepositoryTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/QuerydslJpaRepositoryTests.java @@ -23,9 +23,10 @@ import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import org.joda.time.LocalDate; -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.dao.IncorrectResultSizeDataAccessException; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -40,7 +41,7 @@ import org.springframework.data.jpa.domain.sample.User; import org.springframework.data.querydsl.QPageRequest; import org.springframework.data.querydsl.QSort; 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.querydsl.core.types.Predicate; @@ -56,7 +57,7 @@ import com.querydsl.core.types.dsl.PathBuilderFactory; * @author Mark Paluch * @author Christoph Strobl */ -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration({ "classpath:infrastructure.xml" }) @Transactional public class QuerydslJpaRepositoryTests { @@ -68,7 +69,7 @@ public class QuerydslJpaRepositoryTests { User dave, carter, oliver; Role adminRole; - @Before + @BeforeEach public void setUp() { JpaEntityInformation information = new JpaMetamodelEntityInformation(User.class, diff --git a/src/test/java/org/springframework/data/jpa/repository/support/QuerydslRepositorySupportIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/support/QuerydslRepositorySupportIntegrationTests.java index f49e0fe2b..1dd8e0131 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/QuerydslRepositorySupportIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/QuerydslRepositorySupportIntegrationTests.java @@ -20,8 +20,9 @@ import static org.assertj.core.api.Assertions.*; 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.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -30,7 +31,7 @@ import org.springframework.data.jpa.repository.config.InfrastructureConfig; import org.springframework.data.jpa.repository.support.QuerydslRepositorySupportTests.UserRepositoryImpl; import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; 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.EnableTransactionManagement; import org.springframework.transaction.annotation.Transactional; @@ -43,7 +44,7 @@ import org.springframework.transaction.annotation.Transactional; */ @Transactional @ContextConfiguration -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) public class QuerydslRepositorySupportIntegrationTests { @Configuration diff --git a/src/test/java/org/springframework/data/jpa/repository/support/QuerydslRepositorySupportTests.java b/src/test/java/org/springframework/data/jpa/repository/support/QuerydslRepositorySupportTests.java index f94e0f89c..d635f9239 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/QuerydslRepositorySupportTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/QuerydslRepositorySupportTests.java @@ -22,13 +22,14 @@ import java.util.List; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; -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.QUser; 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; /** @@ -38,7 +39,7 @@ import org.springframework.transaction.annotation.Transactional; * @author Thomas Darimont * @author Jens Schauder */ -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration({ "classpath:infrastructure.xml" }) @Transactional public class QuerydslRepositorySupportTests { @@ -48,7 +49,7 @@ public class QuerydslRepositorySupportTests { UserRepository repository; User dave, carter; - @Before + @BeforeEach public void setup() { dave = new User("Dave", "Matthews", "dave@matthews.com"); diff --git a/src/test/java/org/springframework/data/jpa/repository/support/SimpleJpaRepositoryUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/support/SimpleJpaRepositoryUnitTests.java index e7647437c..b6d73d544 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/SimpleJpaRepositoryUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/SimpleJpaRepositoryUnitTests.java @@ -28,11 +28,13 @@ import javax.persistence.TypedQuery; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; -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.dao.EmptyResultDataAccessException; import org.springframework.data.domain.PageRequest; @@ -48,7 +50,8 @@ import org.springframework.data.repository.CrudRepository; * @author Mark Paluch * @author Jens Schauder */ -@RunWith(MockitoJUnitRunner.Silent.class) +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public class SimpleJpaRepositoryUnitTests { SimpleJpaRepository repo; @@ -64,7 +67,7 @@ public class SimpleJpaRepositoryUnitTests { @Mock EntityGraph entityGraph; @Mock org.springframework.data.jpa.repository.EntityGraph entityGraphAnnotation; - @Before + @BeforeEach public void setUp() { when(em.getDelegate()).thenReturn(em); diff --git a/src/test/java/org/springframework/data/jpa/repository/support/TransactionalRepositoryTests.java b/src/test/java/org/springframework/data/jpa/repository/support/TransactionalRepositoryTests.java index 1dd978832..d3204eb83 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/TransactionalRepositoryTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/TransactionalRepositoryTests.java @@ -17,14 +17,16 @@ package org.springframework.data.jpa.repository.support; import static org.assertj.core.api.Assertions.*; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +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.data.jpa.domain.sample.User; import org.springframework.data.jpa.repository.sample.UserRepository; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.TransactionDefinition; import org.springframework.transaction.TransactionException; @@ -36,19 +38,20 @@ import org.springframework.transaction.TransactionStatus; * @author Oliver Gierke * @author Jens Schauder */ +@ExtendWith(SpringExtension.class) @ContextConfiguration({ "classpath:config/namespace-autoconfig-context.xml", "classpath:tx-manager.xml" }) -public class TransactionalRepositoryTests extends AbstractJUnit4SpringContextTests { +public class TransactionalRepositoryTests { @Autowired UserRepository repository; @Autowired DelegatingTransactionManager transactionManager; - @Before + @BeforeEach public void setUp() { transactionManager.resetCount(); } - @After + @AfterEach public void tearDown() { repository.deleteAll(); diff --git a/src/test/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessorUnitTests.java b/src/test/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessorUnitTests.java index d5f28be74..03c14433b 100644 --- a/src/test/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessorUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessorUnitTests.java @@ -26,10 +26,13 @@ import java.util.Set; import javax.persistence.Entity; -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.core.io.DefaultResourceLoader; import org.springframework.core.io.Resource; import org.springframework.core.io.ResourceLoader; @@ -45,7 +48,8 @@ import org.springframework.test.util.ReflectionTestUtils; * @author Oliver Gierke * @author Thomas Darimont */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public class ClasspathScanningPersistenceUnitPostProcessorUnitTests { @Mock MutablePersistenceUnitInfo pui; diff --git a/src/test/java/org/springframework/data/jpa/support/MergingPersistenceUnitManagerUnitTests.java b/src/test/java/org/springframework/data/jpa/support/MergingPersistenceUnitManagerUnitTests.java index 69e5867ab..ef070c049 100644 --- a/src/test/java/org/springframework/data/jpa/support/MergingPersistenceUnitManagerUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/support/MergingPersistenceUnitManagerUnitTests.java @@ -24,10 +24,13 @@ import java.util.Arrays; import javax.persistence.spi.PersistenceUnitInfo; -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.data.jpa.domain.sample.Role; import org.springframework.data.jpa.domain.sample.User; import org.springframework.orm.jpa.persistenceunit.MutablePersistenceUnitInfo; @@ -38,7 +41,8 @@ import org.springframework.orm.jpa.persistenceunit.MutablePersistenceUnitInfo; * @author Oliver Gierke * @author Jens Schauder */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public class MergingPersistenceUnitManagerUnitTests { @Mock PersistenceUnitInfo oldInfo; diff --git a/src/test/java/org/springframework/data/jpa/util/JpaMetamodelCacheCleanupIntegrationTests.java b/src/test/java/org/springframework/data/jpa/util/JpaMetamodelCacheCleanupIntegrationTests.java index fa978add1..f407dc34e 100644 --- a/src/test/java/org/springframework/data/jpa/util/JpaMetamodelCacheCleanupIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/util/JpaMetamodelCacheCleanupIntegrationTests.java @@ -20,10 +20,13 @@ import static org.mockito.Mockito.*; 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.support.DefaultListableBeanFactory; import org.springframework.context.support.GenericApplicationContext; import org.springframework.data.jpa.repository.config.JpaRepositoryConfigExtension; @@ -32,10 +35,11 @@ import org.springframework.data.repository.config.RepositoryConfigurationSource; /** * Integration tests for {@link JpaMetamodelCacheCleanup}. - * + * * @author Oliver Gierke */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public class JpaMetamodelCacheCleanupIntegrationTests { @Mock Metamodel metamodel; diff --git a/src/test/java/org/springframework/data/jpa/util/JpaMetamodelUnitTests.java b/src/test/java/org/springframework/data/jpa/util/JpaMetamodelUnitTests.java index c6e8d8972..ea14c975c 100644 --- a/src/test/java/org/springframework/data/jpa/util/JpaMetamodelUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/util/JpaMetamodelUnitTests.java @@ -23,17 +23,20 @@ import java.util.Collections; import javax.persistence.metamodel.EntityType; 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; /** * Unit tests for {@link JpaMetamodel}. - * + * * @author Oliver Gierke */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public class JpaMetamodelUnitTests { @Mock Metamodel metamodel;