diff --git a/src/test/java/SampleInterface.java b/src/test/java/SampleInterface.java index 7320caa48..33e511e9e 100644 --- a/src/test/java/SampleInterface.java +++ b/src/test/java/SampleInterface.java @@ -1,5 +1,3 @@ -import org.springframework.data.web.ProxyingHandlerMethodArgumentResolverUnitTests; - /* * Copyright 2017-2020 the original author or authors. * @@ -18,6 +16,6 @@ import org.springframework.data.web.ProxyingHandlerMethodArgumentResolverUnitTes /** * @author Oliver Gierke - * @see ProxyingHandlerMethodArgumentResolverUnitTests + * @see org.springframework.data.web.ProxyingHandlerMethodArgumentResolverUnitTests */ public interface SampleInterface {} diff --git a/src/test/java/org/springframework/data/DependencyTests.java b/src/test/java/org/springframework/data/DependencyTests.java index ef5fc791d..d22c7be15 100644 --- a/src/test/java/org/springframework/data/DependencyTests.java +++ b/src/test/java/org/springframework/data/DependencyTests.java @@ -18,7 +18,7 @@ package org.springframework.data; import static de.schauderhaft.degraph.check.JCheck.*; import static org.junit.Assert.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author Jens Schauder diff --git a/src/test/java/org/springframework/data/annotation/TypeAliasUnitTests.java b/src/test/java/org/springframework/data/annotation/TypeAliasUnitTests.java index 53a7537b3..88999c848 100755 --- a/src/test/java/org/springframework/data/annotation/TypeAliasUnitTests.java +++ b/src/test/java/org/springframework/data/annotation/TypeAliasUnitTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.util.AnnotatedTypeScanner; /** @@ -27,11 +27,11 @@ import org.springframework.data.util.AnnotatedTypeScanner; * * @author Oliver Gierke */ -public class TypeAliasUnitTests { +class TypeAliasUnitTests { @Test // DATACMNS-547 @SuppressWarnings("unchecked") - public void scanningforAtPersistentFindsTypeAliasAnnotatedTypes() { + void scanningforAtPersistentFindsTypeAliasAnnotatedTypes() { AnnotatedTypeScanner scanner = new AnnotatedTypeScanner(Persistent.class); Set> types = scanner.findTypes(getClass().getPackage().getName()); diff --git a/src/test/java/org/springframework/data/auditing/AnnotationAuditingMetadataUnitTests.java b/src/test/java/org/springframework/data/auditing/AnnotationAuditingMetadataUnitTests.java index c96dcb0ce..8a6dadb19 100755 --- a/src/test/java/org/springframework/data/auditing/AnnotationAuditingMetadataUnitTests.java +++ b/src/test/java/org/springframework/data/auditing/AnnotationAuditingMetadataUnitTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*; import java.lang.reflect.Field; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.annotation.CreatedDate; import org.springframework.util.ReflectionUtils; @@ -31,7 +31,7 @@ import org.springframework.util.ReflectionUtils; * @author Oliver Gierke * @since 1.5 */ -public class AnnotationAuditingMetadataUnitTests { +class AnnotationAuditingMetadataUnitTests { static final Field createdByField = ReflectionUtils.findField(AnnotatedUser.class, "createdBy"); static final Field createdDateField = ReflectionUtils.findField(AnnotatedUser.class, "createdDate"); @@ -39,7 +39,7 @@ public class AnnotationAuditingMetadataUnitTests { static final Field lastModifiedDateField = ReflectionUtils.findField(AnnotatedUser.class, "lastModifiedDate"); @Test - public void checkAnnotationDiscovery() { + void checkAnnotationDiscovery() { AnnotationAuditingMetadata metadata = AnnotationAuditingMetadata.getMetadata(AnnotatedUser.class); @@ -51,7 +51,7 @@ public class AnnotationAuditingMetadataUnitTests { } @Test - public void checkCaching() { + void checkCaching() { AnnotationAuditingMetadata firstCall = AnnotationAuditingMetadata.getMetadata(AnnotatedUser.class); assertThat(firstCall).isNotNull(); @@ -61,7 +61,7 @@ public class AnnotationAuditingMetadataUnitTests { } @Test - public void checkIsAuditable() { + void checkIsAuditable() { AnnotationAuditingMetadata metadata = AnnotationAuditingMetadata.getMetadata(AnnotatedUser.class); assertThat(metadata).isNotNull(); @@ -73,7 +73,7 @@ public class AnnotationAuditingMetadataUnitTests { } @Test - public void rejectsInvalidDateTypeField() { + void rejectsInvalidDateTypeField() { class Sample { @CreatedDate String field; diff --git a/src/test/java/org/springframework/data/auditing/AuditingHandlerUnitTests.java b/src/test/java/org/springframework/data/auditing/AuditingHandlerUnitTests.java index 77e7d3768..20119d5aa 100755 --- a/src/test/java/org/springframework/data/auditing/AuditingHandlerUnitTests.java +++ b/src/test/java/org/springframework/data/auditing/AuditingHandlerUnitTests.java @@ -22,8 +22,8 @@ import java.time.Instant; import java.util.List; import java.util.Optional; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.data.annotation.CreatedBy; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedBy; @@ -39,15 +39,15 @@ import org.springframework.data.mapping.context.SampleMappingContext; * @since 1.5 */ @SuppressWarnings("unchecked") -public class AuditingHandlerUnitTests { +class AuditingHandlerUnitTests { AuditingHandler handler; AuditorAware auditorAware; AuditedUser user; - @Before - public void setUp() { + @BeforeEach + void setUp() { handler = getHandler(); user = new AuditedUser(); @@ -64,7 +64,7 @@ public class AuditingHandlerUnitTests { * Checks that the advice does not set auditor on the target entity if no {@code AuditorAware} was configured. */ @Test - public void doesNotSetAuditorIfNotConfigured() { + void doesNotSetAuditorIfNotConfigured() { handler.markCreated(user); @@ -79,7 +79,7 @@ public class AuditingHandlerUnitTests { * Checks that the advice sets the auditor on the target entity if an {@code AuditorAware} was configured. */ @Test - public void setsAuditorIfConfigured() { + void setsAuditorIfConfigured() { handler.setAuditorAware(auditorAware); @@ -98,7 +98,7 @@ public class AuditingHandlerUnitTests { * Checks that the advice does not set modification information on creation if the falg is set to {@code false}. */ @Test - public void honoursModifiedOnCreationFlag() { + void honoursModifiedOnCreationFlag() { handler.setAuditorAware(auditorAware); handler.setModifyOnCreation(false); @@ -117,7 +117,7 @@ public class AuditingHandlerUnitTests { * Tests that the advice only sets modification data if a not-new entity is handled. */ @Test - public void onlySetsModificationDataOnNotNewEntities() { + void onlySetsModificationDataOnNotNewEntities() { AuditedUser audited = new AuditedUser(); audited.id = 1L; @@ -135,7 +135,7 @@ public class AuditingHandlerUnitTests { } @Test - public void doesNotSetTimeIfConfigured() { + void doesNotSetTimeIfConfigured() { handler.setDateTimeForNow(false); handler.setAuditorAware(auditorAware); @@ -149,7 +149,7 @@ public class AuditingHandlerUnitTests { } @Test // DATAJPA-9 - public void usesDateTimeProviderIfConfigured() { + void usesDateTimeProviderIfConfigured() { DateTimeProvider provider = mock(DateTimeProvider.class); doReturn(Optional.empty()).when(provider).getNow(); @@ -161,7 +161,7 @@ public class AuditingHandlerUnitTests { } @Test - public void setsAuditingInfoOnEntityUsingInheritance() { + void setsAuditingInfoOnEntityUsingInheritance() { AuditingHandler handler = new AuditingHandler(PersistentEntities.of(new SampleMappingContext())); handler.setModifyOnCreation(false); diff --git a/src/test/java/org/springframework/data/auditing/DefaultAuditableBeanWrapperFactoryUnitTests.java b/src/test/java/org/springframework/data/auditing/DefaultAuditableBeanWrapperFactoryUnitTests.java index 57fdaf8e7..d86057724 100755 --- a/src/test/java/org/springframework/data/auditing/DefaultAuditableBeanWrapperFactoryUnitTests.java +++ b/src/test/java/org/springframework/data/auditing/DefaultAuditableBeanWrapperFactoryUnitTests.java @@ -25,7 +25,7 @@ import java.time.temporal.ChronoField; import java.time.temporal.TemporalAccessor; import java.util.Optional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; @@ -40,36 +40,36 @@ import org.springframework.data.auditing.DefaultAuditableBeanWrapperFactory.Refl * @author Jens Schauder * @since 1.5 */ -public class DefaultAuditableBeanWrapperFactoryUnitTests { +class DefaultAuditableBeanWrapperFactoryUnitTests { DefaultAuditableBeanWrapperFactory factory = new DefaultAuditableBeanWrapperFactory(); @Test - public void rejectsNullSource() { + void rejectsNullSource() { assertThatIllegalArgumentException().isThrownBy(() -> factory.getBeanWrapperFor(null)); } @Test - public void returnsAuditableInterfaceBeanWrapperForAuditable() { + void returnsAuditableInterfaceBeanWrapperForAuditable() { assertThat(factory.getBeanWrapperFor(new AuditedUser())) .hasValueSatisfying(it -> assertThat(it).isInstanceOf(AuditableInterfaceBeanWrapper.class)); } @Test - public void returnsReflectionAuditingBeanWrapperForNonAuditableButAnnotated() { + void returnsReflectionAuditingBeanWrapperForNonAuditableButAnnotated() { assertThat(factory.getBeanWrapperFor(new AnnotatedUser())) .hasValueSatisfying(it -> assertThat(it).isInstanceOf(ReflectionAuditingBeanWrapper.class)); } @Test - public void returnsEmptyForNonAuditableType() { + void returnsEmptyForNonAuditableType() { assertThat(factory.getBeanWrapperFor(new Object())).isNotPresent(); } @Test // DATACMNS-643 - public void setsJsr310AndThreeTenBpTypes() { + void setsJsr310AndThreeTenBpTypes() { Jsr310ThreeTenBpAuditedUser user = new Jsr310ThreeTenBpAuditedUser(); Instant instant = Instant.now(); @@ -87,7 +87,7 @@ public class DefaultAuditableBeanWrapperFactoryUnitTests { } @Test // DATACMNS-867 - public void errorsWhenUnableToConvertDateViaIntermediateJavaUtilDateConversion() { + void errorsWhenUnableToConvertDateViaIntermediateJavaUtilDateConversion() { Jsr310ThreeTenBpAuditedUser user = new Jsr310ThreeTenBpAuditedUser(); ZonedDateTime zonedDateTime = ZonedDateTime.now(); @@ -101,7 +101,7 @@ public class DefaultAuditableBeanWrapperFactoryUnitTests { } @Test // DATACMNS-1259 - public void lastModifiedDateAsLongIsAvailableViaWrapper() { + void lastModifiedDateAsLongIsAvailableViaWrapper() { LongBasedAuditable source = new LongBasedAuditable(); source.dateModified = 42000L; @@ -114,7 +114,7 @@ public class DefaultAuditableBeanWrapperFactoryUnitTests { } @Test // DATACMNS-1259 - public void canSetLastModifiedDateAsInstantViaWrapperOnLongField() { + void canSetLastModifiedDateAsInstantViaWrapperOnLongField() { LongBasedAuditable source = new LongBasedAuditable(); @@ -127,7 +127,7 @@ public class DefaultAuditableBeanWrapperFactoryUnitTests { } @Test // DATACMNS-1259 - public void canSetLastModifiedDateAsLocalDateTimeViaWrapperOnLongField() { + void canSetLastModifiedDateAsLocalDateTimeViaWrapperOnLongField() { LongBasedAuditable source = new LongBasedAuditable(); @@ -140,7 +140,7 @@ public class DefaultAuditableBeanWrapperFactoryUnitTests { } @Test // DATACMNS-1259 - public void lastModifiedAsLocalDateTimeDateIsAvailableViaWrapperAsLocalDateTime() { + void lastModifiedAsLocalDateTimeDateIsAvailableViaWrapperAsLocalDateTime() { LocalDateTime now = LocalDateTime.now(); diff --git a/src/test/java/org/springframework/data/auditing/IsNewAwareAuditingHandlerUnitTests.java b/src/test/java/org/springframework/data/auditing/IsNewAwareAuditingHandlerUnitTests.java index f17fe5bb7..f2b2209cb 100755 --- a/src/test/java/org/springframework/data/auditing/IsNewAwareAuditingHandlerUnitTests.java +++ b/src/test/java/org/springframework/data/auditing/IsNewAwareAuditingHandlerUnitTests.java @@ -19,10 +19,12 @@ import static org.assertj.core.api.Assertions.*; import java.util.Optional; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import org.springframework.data.annotation.Id; import org.springframework.data.mapping.context.PersistentEntities; @@ -34,13 +36,14 @@ import org.springframework.data.mapping.context.SampleMappingContext; * @author Oliver Gierke * @since 1.5 */ -@RunWith(MockitoJUnitRunner.class) -public class IsNewAwareAuditingHandlerUnitTests extends AuditingHandlerUnitTests { +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) +class IsNewAwareAuditingHandlerUnitTests extends AuditingHandlerUnitTests { SampleMappingContext mappingContext; - @Before - public void init() { + @BeforeEach + void init() { this.mappingContext = new SampleMappingContext(); this.mappingContext.getPersistentEntity(AuditedUser.class); @@ -53,7 +56,7 @@ public class IsNewAwareAuditingHandlerUnitTests extends AuditingHandlerUnitTests } @Test - public void delegatesToMarkCreatedForNewEntity() { + void delegatesToMarkCreatedForNewEntity() { AuditedUser user = new AuditedUser(); @@ -64,7 +67,7 @@ public class IsNewAwareAuditingHandlerUnitTests extends AuditingHandlerUnitTests } @Test - public void delegatesToMarkModifiedForNonNewEntity() { + void delegatesToMarkModifiedForNonNewEntity() { AuditedUser user = new AuditedUser(); user.id = 1L; @@ -76,17 +79,17 @@ public class IsNewAwareAuditingHandlerUnitTests extends AuditingHandlerUnitTests } @Test // DATACMNS-365 - public void rejectsNullMappingContext() { + void rejectsNullMappingContext() { assertThatIllegalArgumentException().isThrownBy(() -> new IsNewAwareAuditingHandler((PersistentEntities) null)); } @Test // DATACMNS-365 - public void setsUpHandlerWithMappingContext() { + void setsUpHandlerWithMappingContext() { new IsNewAwareAuditingHandler(PersistentEntities.of()); } @Test // DATACMNS-638 - public void handlingOptionalIsANoOp() { + void handlingOptionalIsANoOp() { IsNewAwareAuditingHandler handler = getHandler(); @@ -96,7 +99,7 @@ public class IsNewAwareAuditingHandlerUnitTests extends AuditingHandlerUnitTests } @Test // DATACMNS-957 - public void skipsEntityWithoutIdentifier() { + void skipsEntityWithoutIdentifier() { getHandler().markAudited(Optional.of(new EntityWithoutId())); } diff --git a/src/test/java/org/springframework/data/auditing/Jsr310ThreeTenBpAuditedUser.java b/src/test/java/org/springframework/data/auditing/Jsr310ThreeTenBpAuditedUser.java index c6707e981..f0eaa7cad 100644 --- a/src/test/java/org/springframework/data/auditing/Jsr310ThreeTenBpAuditedUser.java +++ b/src/test/java/org/springframework/data/auditing/Jsr310ThreeTenBpAuditedUser.java @@ -23,7 +23,7 @@ import org.springframework.data.annotation.LastModifiedDate; /** * @author Oliver Gierke */ -public class Jsr310ThreeTenBpAuditedUser { +class Jsr310ThreeTenBpAuditedUser { @CreatedDate LocalDateTime createdDate; @LastModifiedDate org.threeten.bp.LocalDateTime lastModifiedDate; diff --git a/src/test/java/org/springframework/data/auditing/MappingAuditableBeanWrapperFactoryUnitTests.java b/src/test/java/org/springframework/data/auditing/MappingAuditableBeanWrapperFactoryUnitTests.java index a99a796e7..480876ddd 100755 --- a/src/test/java/org/springframework/data/auditing/MappingAuditableBeanWrapperFactoryUnitTests.java +++ b/src/test/java/org/springframework/data/auditing/MappingAuditableBeanWrapperFactoryUnitTests.java @@ -33,8 +33,8 @@ import java.util.Map; import java.util.Optional; import org.assertj.core.api.AbstractLongAssert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.data.annotation.CreatedBy; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedBy; @@ -54,12 +54,12 @@ import org.springframework.data.mapping.context.SampleMappingContext; * @author Jens Schauder * @since 1.8 */ -public class MappingAuditableBeanWrapperFactoryUnitTests { +class MappingAuditableBeanWrapperFactoryUnitTests { DefaultAuditableBeanWrapperFactory factory; - @Before - public void setUp() { + @BeforeEach + void setUp() { SampleMappingContext context = new SampleMappingContext(); context.getPersistentEntity(Sample.class); @@ -71,7 +71,7 @@ public class MappingAuditableBeanWrapperFactoryUnitTests { } @Test // DATACMNS-365 - public void discoversAuditingPropertyOnField() { + void discoversAuditingPropertyOnField() { Sample sample = new Sample(); @@ -85,7 +85,7 @@ public class MappingAuditableBeanWrapperFactoryUnitTests { } @Test // DATACMNS-365 - public void discoversAuditingPropertyOnAccessor() { + void discoversAuditingPropertyOnAccessor() { Sample sample = new Sample(); @@ -99,7 +99,7 @@ public class MappingAuditableBeanWrapperFactoryUnitTests { } @Test // DATACMNS-365 - public void settingInavailablePropertyIsNoop() { + void settingInavailablePropertyIsNoop() { Sample sample = new Sample(); @@ -109,19 +109,19 @@ public class MappingAuditableBeanWrapperFactoryUnitTests { } @Test // DATACMNS-365 - public void doesNotReturnWrapperForEntityNotUsingAuditing() { + void doesNotReturnWrapperForEntityNotUsingAuditing() { assertThat(factory.getBeanWrapperFor(new NoAuditing())).isNotPresent(); } @Test // DATACMNS-365 - public void returnsAuditableWrapperForAuditable() { + void returnsAuditableWrapperForAuditable() { assertThat(factory.getBeanWrapperFor(mock(ExtendingAuditable.class))) .hasValueSatisfying(it -> assertThat(it).isInstanceOf(AuditableInterfaceBeanWrapper.class)); } @Test // DATACMNS-638 - public void returnsLastModificationCalendarAsCalendar() { + void returnsLastModificationCalendarAsCalendar() { Date reference = new Date(); @@ -133,7 +133,7 @@ public class MappingAuditableBeanWrapperFactoryUnitTests { } @Test // DATACMNS-638 - public void returnsLastModificationDateTimeAsCalendar() { + void returnsLastModificationDateTimeAsCalendar() { org.joda.time.LocalDateTime reference = new org.joda.time.LocalDateTime(); @@ -142,7 +142,7 @@ public class MappingAuditableBeanWrapperFactoryUnitTests { } @Test // DATACMNS-638 - public void returnsLastModificationDateAsCalendar() { + void returnsLastModificationDateAsCalendar() { Date reference = new Date(); @@ -151,7 +151,7 @@ public class MappingAuditableBeanWrapperFactoryUnitTests { } @Test // DATACMNS-638, DATACMNS-43 - public void returnsLastModificationJsr310DateTimeAsCalendar() { + void returnsLastModificationJsr310DateTimeAsCalendar() { LocalDateTime reference = LocalDateTime.now(); @@ -159,7 +159,7 @@ public class MappingAuditableBeanWrapperFactoryUnitTests { } @Test // DATACMNS-638, DATACMNS-43 - public void returnsLastModificationThreeTenBpDateTimeAsCalendar() { + void returnsLastModificationThreeTenBpDateTimeAsCalendar() { org.threeten.bp.LocalDateTime reference = org.threeten.bp.LocalDateTime.now(); @@ -168,7 +168,7 @@ public class MappingAuditableBeanWrapperFactoryUnitTests { } @Test // DATACMNS-1109 - public void exposesInstantAsModificationDate() { + void exposesInstantAsModificationDate() { SampleWithInstant sample = new SampleWithInstant(); sample.modified = Instant.now(); @@ -180,7 +180,7 @@ public class MappingAuditableBeanWrapperFactoryUnitTests { } @Test // DATACMNS-1259 - public void exposesLongAsModificationDate() { + void exposesLongAsModificationDate() { Long reference = new Date().getTime(); @@ -188,7 +188,7 @@ public class MappingAuditableBeanWrapperFactoryUnitTests { } @Test // DATACMNS-1274 - public void writesNestedAuditingData() { + void writesNestedAuditingData() { WithEmbedded target = new WithEmbedded(); target.embedded = new Embedded(); @@ -217,7 +217,7 @@ public class MappingAuditableBeanWrapperFactoryUnitTests { } @Test // DATACMNS-1461, DATACMNS-1671 - public void skipsNullIntermediatesWhenSettingProperties() { + void skipsNullIntermediatesWhenSettingProperties() { WithEmbedded withEmbedded = new WithEmbedded(); @@ -228,7 +228,7 @@ public class MappingAuditableBeanWrapperFactoryUnitTests { } @Test // DATACMNS-1438 - public void skipsCollectionPropertiesWhenSettingProperties() { + void skipsCollectionPropertiesWhenSettingProperties() { WithEmbedded withEmbedded = new WithEmbedded(); withEmbedded.embedded = new Embedded(); diff --git a/src/test/java/org/springframework/data/auditing/ReflectionAuditingBeanWrapperUnitTests.java b/src/test/java/org/springframework/data/auditing/ReflectionAuditingBeanWrapperUnitTests.java index b0c30d48e..7da060dfb 100755 --- a/src/test/java/org/springframework/data/auditing/ReflectionAuditingBeanWrapperUnitTests.java +++ b/src/test/java/org/springframework/data/auditing/ReflectionAuditingBeanWrapperUnitTests.java @@ -21,8 +21,8 @@ import java.time.LocalDateTime; import java.time.ZoneOffset; import org.joda.time.DateTime; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.auditing.DefaultAuditableBeanWrapperFactory.ReflectionAuditingBeanWrapper; @@ -34,7 +34,7 @@ import org.springframework.data.convert.Jsr310Converters.LocalDateTimeToDateConv * @author Oliver Gierke * @since 1.5 */ -public class ReflectionAuditingBeanWrapperUnitTests { +class ReflectionAuditingBeanWrapperUnitTests { AnnotationAuditingMetadata metadata; AnnotatedUser user; @@ -42,29 +42,29 @@ public class ReflectionAuditingBeanWrapperUnitTests { LocalDateTime time = LocalDateTime.now(); - @Before - public void setUp() { + @BeforeEach + void setUp() { this.user = new AnnotatedUser(); this.wrapper = new ReflectionAuditingBeanWrapper(user); } @Test - public void setsDateTimeFieldCorrectly() { + void setsDateTimeFieldCorrectly() { wrapper.setCreatedDate(time); assertThat(user.createdDate).isEqualTo(new DateTime(LocalDateTimeToDateConverter.INSTANCE.convert(time))); } @Test - public void setsDateFieldCorrectly() { + void setsDateFieldCorrectly() { wrapper.setLastModifiedDate(time); assertThat(user.lastModifiedDate).isEqualTo(LocalDateTimeToDateConverter.INSTANCE.convert(time)); } @Test - public void setsLongFieldCorrectly() { + void setsLongFieldCorrectly() { class Sample { @@ -84,7 +84,7 @@ public class ReflectionAuditingBeanWrapperUnitTests { } @Test - public void setsAuditorFieldsCorrectly() { + void setsAuditorFieldsCorrectly() { Object object = new Object(); diff --git a/src/test/java/org/springframework/data/auditing/config/AuditingBeanDefinitionRegistrarSupportUnitTests.java b/src/test/java/org/springframework/data/auditing/config/AuditingBeanDefinitionRegistrarSupportUnitTests.java index 82bbd6141..81ac06871 100755 --- a/src/test/java/org/springframework/data/auditing/config/AuditingBeanDefinitionRegistrarSupportUnitTests.java +++ b/src/test/java/org/springframework/data/auditing/config/AuditingBeanDefinitionRegistrarSupportUnitTests.java @@ -20,10 +20,11 @@ import static org.mockito.Mockito.*; import java.lang.annotation.Annotation; -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.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.core.type.AnnotationMetadata; @@ -38,13 +39,13 @@ import org.springframework.data.auditing.EnableAuditing; * @author Oliver Gierke * @author Francisco Soler */ -@RunWith(MockitoJUnitRunner.class) -public class AuditingBeanDefinitionRegistrarSupportUnitTests { +@ExtendWith(MockitoExtension.class) +class AuditingBeanDefinitionRegistrarSupportUnitTests { @Mock BeanDefinitionRegistry registry; @Test // DATCMNS-389 - public void testRegisterBeanDefinitions() { + void testRegisterBeanDefinitions() { AuditingBeanDefinitionRegistrarSupport registrar = new DummyAuditingBeanDefinitionRegistrarSupport(); AnnotationMetadata metadata = new StandardAnnotationMetadata(SampleConfig.class); @@ -54,7 +55,7 @@ public class AuditingBeanDefinitionRegistrarSupportUnitTests { } @Test // DATACMNS-1453 - public void rejectsNullAnnotationMetadata() { + void rejectsNullAnnotationMetadata() { AuditingBeanDefinitionRegistrarSupport registrar = new DummyAuditingBeanDefinitionRegistrarSupport(); @@ -63,7 +64,7 @@ public class AuditingBeanDefinitionRegistrarSupportUnitTests { } @Test // DATACMNS-1453 - public void rejectsNullRegistry() { + void rejectsNullRegistry() { AuditingBeanDefinitionRegistrarSupport registrar = new DummyAuditingBeanDefinitionRegistrarSupport(); AnnotationMetadata metadata = new StandardAnnotationMetadata(SampleConfig.class); diff --git a/src/test/java/org/springframework/data/config/TypeFilterParserUnitTests.java b/src/test/java/org/springframework/data/config/TypeFilterParserUnitTests.java index 2f0f34d60..be93d499d 100755 --- a/src/test/java/org/springframework/data/config/TypeFilterParserUnitTests.java +++ b/src/test/java/org/springframework/data/config/TypeFilterParserUnitTests.java @@ -22,11 +22,12 @@ import java.io.IOException; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -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.springframework.beans.factory.parsing.ReaderContext; import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider; import org.springframework.core.io.ClassPathResource; @@ -35,6 +36,7 @@ import org.springframework.core.type.filter.AssignableTypeFilter; import org.springframework.core.type.filter.TypeFilter; import org.springframework.data.config.TypeFilterParser.Type; import org.springframework.util.xml.DomUtils; + import org.w3c.dom.Element; import org.xml.sax.SAXException; @@ -43,8 +45,8 @@ import org.xml.sax.SAXException; * * @author Oliver Gierke */ -@RunWith(MockitoJUnitRunner.class) -public class TypeFilterParserUnitTests { +@ExtendWith(MockitoExtension.class) +class TypeFilterParserUnitTests { TypeFilterParser parser; Element documentElement; @@ -54,8 +56,8 @@ public class TypeFilterParserUnitTests { @Mock ClassPathScanningCandidateComponentProvider scanner; - @Before - public void setUp() throws SAXException, IOException, ParserConfigurationException { + @BeforeEach + void setUp() throws SAXException, IOException, ParserConfigurationException { parser = new TypeFilterParser(context, classLoader); @@ -68,7 +70,7 @@ public class TypeFilterParserUnitTests { } @Test - public void parsesIncludesCorrectly() throws Exception { + void parsesIncludesCorrectly() throws Exception { Element element = DomUtils.getChildElementByTagName(documentElement, "firstSample"); @@ -77,7 +79,7 @@ public class TypeFilterParserUnitTests { } @Test - public void parsesExcludesCorrectly() throws Exception { + void parsesExcludesCorrectly() throws Exception { Element element = DomUtils.getChildElementByTagName(documentElement, "secondSample"); diff --git a/src/test/java/org/springframework/data/convert/ConfigurableTypeInformationMapperUnitTests.java b/src/test/java/org/springframework/data/convert/ConfigurableTypeInformationMapperUnitTests.java index f3814286c..bb3051a72 100755 --- a/src/test/java/org/springframework/data/convert/ConfigurableTypeInformationMapperUnitTests.java +++ b/src/test/java/org/springframework/data/convert/ConfigurableTypeInformationMapperUnitTests.java @@ -21,10 +21,11 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; + import org.springframework.data.mapping.Alias; import org.springframework.data.mapping.PersistentProperty; import org.springframework.data.util.ClassTypeInformation; @@ -35,23 +36,23 @@ import org.springframework.data.util.ClassTypeInformation; * @author Oliver Gierke * @author Mark Paluch */ -@RunWith(MockitoJUnitRunner.class) -public class ConfigurableTypeInformationMapperUnitTests> { +@ExtendWith(MockitoExtension.class) +class ConfigurableTypeInformationMapperUnitTests> { ConfigurableTypeInformationMapper mapper; - @Before - public void setUp() { + @BeforeEach + void setUp() { mapper = new ConfigurableTypeInformationMapper(Collections.singletonMap(String.class, "1")); } @Test - public void rejectsNullTypeMap() { + void rejectsNullTypeMap() { assertThatIllegalArgumentException().isThrownBy(() -> new ConfigurableTypeInformationMapper(null)); } @Test - public void rejectsNonBijectionalMap() { + void rejectsNonBijectionalMap() { Map, String> map = new HashMap<>(); map.put(String.class, "1"); @@ -61,14 +62,14 @@ public class ConfigurableTypeInformationMapperUnitTests Long.valueOf(it)) .andWriting(Object::toString); @@ -46,7 +46,7 @@ public class ConverterBuilderUnitTests { } @Test // DATACMNS-1034 - public void setsUpBidirectionalConvertersFromWriting() { + void setsUpBidirectionalConvertersFromWriting() { ConverterAware builder = ConverterBuilder.writing(Long.class, String.class, Object::toString) .andReading(it -> Long.valueOf(it)); @@ -56,7 +56,7 @@ public class ConverterBuilderUnitTests { } @Test // DATACMNS-1034 - public void setsUpReadingConverter() { + void setsUpReadingConverter() { ReadingConverterBuilder builder = ConverterBuilder.reading(String.class, Long.class, string -> Long.valueOf(string)); @@ -66,7 +66,7 @@ public class ConverterBuilderUnitTests { } @Test // DATACMNS-1034 - public void setsUpWritingConverter() { + void setsUpWritingConverter() { WritingConverterBuilder builder = ConverterBuilder.writing(Long.class, String.class, Object::toString); diff --git a/src/test/java/org/springframework/data/convert/CustomConversionsUnitTests.java b/src/test/java/org/springframework/data/convert/CustomConversionsUnitTests.java index 29f58d3bf..066904bc0 100644 --- a/src/test/java/org/springframework/data/convert/CustomConversionsUnitTests.java +++ b/src/test/java/org/springframework/data/convert/CustomConversionsUnitTests.java @@ -55,7 +55,7 @@ import org.threeten.bp.LocalDateTime; * @author Mark Paluch * @since 2.0 */ -public class CustomConversionsUnitTests { +class CustomConversionsUnitTests { static final SimpleTypeHolder DATE_EXCLUDING_SIMPLE_TYPE_HOLDER = new SimpleTypeHolder( Collections.singleton(Date.class), true) { @@ -67,7 +67,7 @@ public class CustomConversionsUnitTests { }; @Test // DATACMNS-1035 - public void findsBasicReadAndWriteConversions() { + void findsBasicReadAndWriteConversions() { CustomConversions conversions = new CustomConversions(StoreConversions.NONE, Arrays.asList(FormatToStringConverter.INSTANCE, StringToFormatConverter.INSTANCE)); @@ -80,7 +80,7 @@ public class CustomConversionsUnitTests { } @Test // DATACMNS-1035 - public void considersSubtypesCorrectly() { + void considersSubtypesCorrectly() { CustomConversions conversions = new CustomConversions(StoreConversions.NONE, Arrays.asList(NumberToStringConverter.INSTANCE, StringToNumberConverter.INSTANCE)); @@ -90,7 +90,7 @@ public class CustomConversionsUnitTests { } @Test // DATACMNS-1101 - public void considersSubtypeCachingCorrectly() { + void considersSubtypeCachingCorrectly() { CustomConversions conversions = new CustomConversions(StoreConversions.NONE, Arrays.asList(NumberToStringConverter.INSTANCE, StringToNumberConverter.INSTANCE)); @@ -101,7 +101,7 @@ public class CustomConversionsUnitTests { } @Test // DATACMNS-1035 - public void populatesConversionServiceCorrectly() { + void populatesConversionServiceCorrectly() { GenericConversionService conversionService = new DefaultConversionService(); @@ -113,7 +113,7 @@ public class CustomConversionsUnitTests { } @Test // DATAMONGO-259, DATACMNS-1035 - public void doesNotConsiderTypeSimpleIfOnlyReadConverterIsRegistered() { + void doesNotConsiderTypeSimpleIfOnlyReadConverterIsRegistered() { CustomConversions conversions = new CustomConversions(StoreConversions.NONE, Arrays.asList(StringToFormatConverter.INSTANCE)); @@ -121,7 +121,7 @@ public class CustomConversionsUnitTests { } @Test // DATAMONGO-298, DATACMNS-1035 - public void discoversConvertersForSubtypesOfMongoTypes() { + void discoversConvertersForSubtypesOfMongoTypes() { CustomConversions conversions = new CustomConversions(StoreConversions.NONE, Arrays.asList(StringToIntegerConverter.INSTANCE)); @@ -130,7 +130,7 @@ public class CustomConversionsUnitTests { } @Test // DATAMONGO-795, DATACMNS-1035 - public void favorsCustomConverterForIndeterminedTargetType() { + void favorsCustomConverterForIndeterminedTargetType() { CustomConversions conversions = new CustomConversions(StoreConversions.NONE, Arrays.asList(DateTimeToStringConverter.INSTANCE)); @@ -138,7 +138,7 @@ public class CustomConversionsUnitTests { } @Test // DATAMONGO-881, DATACMNS-1035 - public void customConverterOverridesDefault() { + void customConverterOverridesDefault() { CustomConversions conversions = new CustomConversions(StoreConversions.NONE, Arrays.asList(CustomDateTimeConverter.INSTANCE)); @@ -149,7 +149,7 @@ public class CustomConversionsUnitTests { } @Test // DATAMONGO-1001, DATACMNS-1035 - public void shouldSelectPropertCustomWriteTargetForCglibProxiedType() { + void shouldSelectPropertCustomWriteTargetForCglibProxiedType() { CustomConversions conversions = new CustomConversions(StoreConversions.NONE, Arrays.asList(FormatToStringConverter.INSTANCE)); @@ -157,7 +157,7 @@ public class CustomConversionsUnitTests { } @Test // DATAMONGO-1001, DATACMNS-1035 - public void shouldSelectPropertCustomReadTargetForCglibProxiedType() { + void shouldSelectPropertCustomReadTargetForCglibProxiedType() { CustomConversions conversions = new CustomConversions(StoreConversions.NONE, Arrays.asList(CustomObjectToStringConverter.INSTANCE)); @@ -165,7 +165,7 @@ public class CustomConversionsUnitTests { } @Test // DATAMONGO-1131, DATACMNS-1035 - public void registersConvertersForJsr310() { + void registersConvertersForJsr310() { CustomConversions customConversions = new CustomConversions(StoreConversions.NONE, Collections.emptyList()); @@ -173,7 +173,7 @@ public class CustomConversionsUnitTests { } @Test // DATAMONGO-1131, DATACMNS-1035 - public void registersConvertersForThreeTenBackPort() { + void registersConvertersForThreeTenBackPort() { CustomConversions customConversions = new CustomConversions(StoreConversions.NONE, Collections.emptyList()); @@ -181,7 +181,7 @@ public class CustomConversionsUnitTests { } @Test // DATAMONGO-1302, DATACMNS-1035 - public void registersConverterFactoryCorrectly() { + void registersConverterFactoryCorrectly() { StoreConversions conversions = StoreConversions.of(new SimpleTypeHolder(Collections.singleton(Format.class), true)); @@ -192,7 +192,7 @@ public class CustomConversionsUnitTests { } @Test // DATACMNS-1034 - public void registersConverterFromConverterAware() { + void registersConverterFromConverterAware() { ConverterAware converters = ConverterBuilder // .reading(Locale.class, CustomType.class, left -> new CustomType()) // @@ -211,7 +211,7 @@ public class CustomConversionsUnitTests { } @Test // DATACMNS-1615 - public void skipsUnsupportedDefaultWritingConverter() { + void skipsUnsupportedDefaultWritingConverter() { ConverterRegistry registry = mock(ConverterRegistry.class); @@ -222,7 +222,7 @@ public class CustomConversionsUnitTests { } @Test // DATACMNS-1665 - public void registersStoreConverter() { + void registersStoreConverter() { ConverterRegistry registry = mock(ConverterRegistry.class); @@ -237,7 +237,7 @@ public class CustomConversionsUnitTests { } @Test // DATACMNS-1615 - public void doesNotSkipUnsupportedUserConverter() { + void doesNotSkipUnsupportedUserConverter() { ConverterRegistry registry = mock(ConverterRegistry.class); @@ -248,7 +248,7 @@ public class CustomConversionsUnitTests { } @Test // DATACMNS-1615 - public void skipsConverterBasedOnConfiguration() { + void skipsConverterBasedOnConfiguration() { ConverterRegistry registry = mock(ConverterRegistry.class); @@ -260,7 +260,7 @@ public class CustomConversionsUnitTests { } @Test // DATACMNS-1615 - public void doesNotSkipUserConverterConverterEvenWhenConfigurationWouldNotAllowIt() { + void doesNotSkipUserConverterConverterEvenWhenConfigurationWouldNotAllowIt() { ConverterRegistry registry = mock(ConverterRegistry.class); @@ -381,7 +381,7 @@ public class CustomConversionsUnitTests { private final Class targetType; - public StringToFormat(Class targetType) { + StringToFormat(Class targetType) { this.targetType = targetType; } diff --git a/src/test/java/org/springframework/data/convert/DefaultTypeMapperUnitTests.java b/src/test/java/org/springframework/data/convert/DefaultTypeMapperUnitTests.java index 2ceaaef82..411d1f5f2 100755 --- a/src/test/java/org/springframework/data/convert/DefaultTypeMapperUnitTests.java +++ b/src/test/java/org/springframework/data/convert/DefaultTypeMapperUnitTests.java @@ -21,11 +21,14 @@ import static org.mockito.Mockito.*; import java.util.Collections; import java.util.Map; -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.mapping.Alias; import org.springframework.data.util.ClassTypeInformation; import org.springframework.data.util.TypeInformation; @@ -36,8 +39,9 @@ import org.springframework.data.util.TypeInformation; * @author Oliver Gierke * @author Mark Paluch */ -@RunWith(MockitoJUnitRunner.class) -public class DefaultTypeMapperUnitTests { +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) +class DefaultTypeMapperUnitTests { static final TypeInformation STRING_TYPE_INFO = ClassTypeInformation.from(String.class); static final Alias ALIAS = Alias.of(String.class.getName()); @@ -48,8 +52,8 @@ public class DefaultTypeMapperUnitTests { DefaultTypeMapper> typeMapper; Map source; - @Before - public void setUp() { + @BeforeEach + void setUp() { this.typeMapper = new DefaultTypeMapper<>(accessor, Collections.singletonList(mapper)); this.source = Collections.singletonMap("key", ALIAS.toString()); @@ -59,7 +63,7 @@ public class DefaultTypeMapperUnitTests { } @Test - public void cachesResolvedTypeInformation() { + void cachesResolvedTypeInformation() { TypeInformation information = typeMapper.readType(source); assertThat(information).isEqualTo(STRING_TYPE_INFO); @@ -70,7 +74,7 @@ public class DefaultTypeMapperUnitTests { } @Test // DATACMNS-349 - public void returnsTypeAliasForInformation() { + void returnsTypeAliasForInformation() { Alias alias = Alias.of("alias"); doReturn(alias).when(mapper).createAliasFor(STRING_TYPE_INFO); @@ -79,7 +83,7 @@ public class DefaultTypeMapperUnitTests { } @Test // DATACMNS-783 - public void specializesRawSourceTypeUsingGenericContext() { + void specializesRawSourceTypeUsingGenericContext() { ClassTypeInformation root = ClassTypeInformation.from(Foo.class); TypeInformation propertyType = root.getProperty("abstractBar"); diff --git a/src/test/java/org/springframework/data/convert/Jsr310ConvertersUnitTests.java b/src/test/java/org/springframework/data/convert/Jsr310ConvertersUnitTests.java index c8d7cb0d4..20e73ded2 100644 --- a/src/test/java/org/springframework/data/convert/Jsr310ConvertersUnitTests.java +++ b/src/test/java/org/springframework/data/convert/Jsr310ConvertersUnitTests.java @@ -28,27 +28,21 @@ import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.time.temporal.Temporal; import java.util.Arrays; -import java.util.Collection; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.function.Predicate; +import java.util.stream.Stream; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; -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.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; -import org.springframework.core.ResolvableType; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.converter.Converter; import org.springframework.core.convert.support.GenericConversionService; -import org.springframework.data.convert.Jsr310ConvertersUnitTests.CommonTests; -import org.springframework.data.convert.Jsr310ConvertersUnitTests.DurationConversionTests; -import org.springframework.data.convert.Jsr310ConvertersUnitTests.PeriodConversionTests; /** * Unit tests for {@link Jsr310Converters}. @@ -58,9 +52,7 @@ import org.springframework.data.convert.Jsr310ConvertersUnitTests.PeriodConversi * @author Jens Schauder * @author Mark Paluch */ -@RunWith(Suite.class) -@SuiteClasses({ CommonTests.class, DurationConversionTests.class, PeriodConversionTests.class }) -public class Jsr310ConvertersUnitTests { +class Jsr310ConvertersUnitTests { static final Date NOW = new Date(); static final ConversionService CONVERSION_SERVICE; @@ -76,171 +68,162 @@ public class Jsr310ConvertersUnitTests { CONVERSION_SERVICE = conversionService; } - public static class CommonTests { + static final String FORMAT_DATE = "yyyy-MM-dd"; + static final String FORMAT_TIME = "HH:mm:ss.SSS"; + static final String FORMAT_FULL = String.format("%s'T'%s", FORMAT_DATE, FORMAT_TIME); - static final String FORMAT_DATE = "yyyy-MM-dd"; - static final String FORMAT_TIME = "HH:mm:ss.SSS"; - static final String FORMAT_FULL = String.format("%s'T'%s", FORMAT_DATE, FORMAT_TIME); + @Test + // DATACMNS-606, DATACMNS-1091 + void convertsDateToLocalDateTime() { + assertThat(CONVERSION_SERVICE.convert(NOW, LocalDateTime.class)).matches(formatted(NOW, FORMAT_FULL)); + } - @Test // DATACMNS-606, DATACMNS-1091 - public void convertsDateToLocalDateTime() { - assertThat(CONVERSION_SERVICE.convert(NOW, LocalDateTime.class)).matches(formatted(NOW, FORMAT_FULL)); - } + @Test + // DATACMNS-606, DATACMNS-1091 + void convertsLocalDateTimeToDate() { - @Test // DATACMNS-606, DATACMNS-1091 - public void convertsLocalDateTimeToDate() { + LocalDateTime now = LocalDateTime.now(); + assertThat(CONVERSION_SERVICE.convert(now, Date.class)).matches(formatted(now, FORMAT_FULL)); + } - LocalDateTime now = LocalDateTime.now(); - assertThat(CONVERSION_SERVICE.convert(now, Date.class)).matches(formatted(now, FORMAT_FULL)); - } + @Test + // DATACMNS-606, DATACMNS-1091 + void convertsDateToLocalDate() { + assertThat(CONVERSION_SERVICE.convert(NOW, LocalDate.class)).matches(formatted(NOW, FORMAT_DATE)); + } - @Test // DATACMNS-606, DATACMNS-1091 - public void convertsDateToLocalDate() { - assertThat(CONVERSION_SERVICE.convert(NOW, LocalDate.class)).matches(formatted(NOW, FORMAT_DATE)); - } + @Test + // DATACMNS-606, DATACMNS-1091 + void convertsLocalDateToDate() { - @Test // DATACMNS-606, DATACMNS-1091 - public void convertsLocalDateToDate() { + LocalDate now = LocalDate.now(); + assertThat(CONVERSION_SERVICE.convert(now, Date.class)).matches(formatted(now, FORMAT_DATE)); + } - LocalDate now = LocalDate.now(); - assertThat(CONVERSION_SERVICE.convert(now, Date.class)).matches(formatted(now, FORMAT_DATE)); - } + @Test + // DATACMNS-606, DATACMNS-1091 + void convertsDateToLocalTime() { + assertThat(CONVERSION_SERVICE.convert(NOW, LocalTime.class)).matches(formatted(NOW, FORMAT_TIME)); + } - @Test // DATACMNS-606, DATACMNS-1091 - public void convertsDateToLocalTime() { - assertThat(CONVERSION_SERVICE.convert(NOW, LocalTime.class)).matches(formatted(NOW, FORMAT_TIME)); - } + @Test + // DATACMNS-606, DATACMNS-1091 + void convertsLocalTimeToDate() { - @Test // DATACMNS-606, DATACMNS-1091 - public void convertsLocalTimeToDate() { + LocalTime now = LocalTime.now(); + assertThat(CONVERSION_SERVICE.convert(now, Date.class)).matches(formatted(now, FORMAT_TIME)); + } - LocalTime now = LocalTime.now(); - assertThat(CONVERSION_SERVICE.convert(now, Date.class)).matches(formatted(now, FORMAT_TIME)); - } + @Test + // DATACMNS-623 + void convertsDateToInstant() { - @Test // DATACMNS-623 - public void convertsDateToInstant() { + Date now = new Date(); + assertThat(CONVERSION_SERVICE.convert(now, Instant.class)).isEqualTo(now.toInstant()); + } - Date now = new Date(); - assertThat(CONVERSION_SERVICE.convert(now, Instant.class)).isEqualTo(now.toInstant()); - } + @Test + // DATACMNS-623 + void convertsInstantToDate() { - @Test // DATACMNS-623 - public void convertsInstantToDate() { + Date now = new Date(); + assertThat(CONVERSION_SERVICE.convert(now.toInstant(), Date.class)).isEqualTo(now); + } - Date now = new Date(); - assertThat(CONVERSION_SERVICE.convert(now.toInstant(), Date.class)).isEqualTo(now); - } + @Test + void convertsZoneIdToStringAndBack() { - @Test - public void convertsZoneIdToStringAndBack() { + Map ids = new HashMap<>(); + ids.put("Europe/Berlin", ZoneId.of("Europe/Berlin")); + ids.put("+06:00", ZoneId.of("+06:00")); - Map ids = new HashMap<>(); - ids.put("Europe/Berlin", ZoneId.of("Europe/Berlin")); - ids.put("+06:00", ZoneId.of("+06:00")); - - for (Entry entry : ids.entrySet()) { - assertThat(CONVERSION_SERVICE.convert(entry.getValue(), String.class)).isEqualTo(entry.getKey()); - assertThat(CONVERSION_SERVICE.convert(entry.getKey(), ZoneId.class)).isEqualTo(entry.getValue()); - } - } - - @Test // DATACMNS-1243 - public void convertsLocalDateTimeToInstantAndBack() { - - LocalDateTime dateTime = LocalDateTime.now(); - - Instant instant = CONVERSION_SERVICE.convert(dateTime, Instant.class); - LocalDateTime convertedDateTime = CONVERSION_SERVICE.convert(dateTime, LocalDateTime.class); - - assertThat(convertedDateTime).isEqualTo(dateTime); - } - - @Test // DATACMNS-1440 - public void convertsIsoFormattedStringToLocalDate() { - - LocalDate date = LocalDate.now(); - - assertThat(CONVERSION_SERVICE.convert(date.toString(), LocalDate.class)).isEqualTo(date); - } - - @Test // DATACMNS-1440 - public void convertsIsoFormattedStringToLocalDateTime() { - - LocalDateTime date = LocalDateTime.now(); - - assertThat(CONVERSION_SERVICE.convert(date.toString(), LocalDateTime.class)).isEqualTo(date); - } - - @Test // DATACMNS-1440 - public void convertsIsoFormattedStringToInstant() { - - Instant date = Instant.now(); - - assertThat(CONVERSION_SERVICE.convert(date.toString(), Instant.class)).isEqualTo(date); - } - - private static Predicate formatted(Temporal expected, String format) { - - DateTimeFormatter formatter = DateTimeFormatter.ofPattern(format); - return d -> format(d, format).equals(formatter.format(expected)); - } - - private static Predicate formatted(Date expected, String format) { - - DateTimeFormatter formatter = DateTimeFormatter.ofPattern(format); - return d -> formatter.format(d).equals(format(expected, format)); - } - - private static String format(Date date, String format) { - return new SimpleDateFormat(format).format(date); + for (Entry entry : ids.entrySet()) { + assertThat(CONVERSION_SERVICE.convert(entry.getValue(), String.class)).isEqualTo(entry.getKey()); + assertThat(CONVERSION_SERVICE.convert(entry.getKey(), ZoneId.class)).isEqualTo(entry.getValue()); } } - public static class DurationConversionTests extends ConversionTest { + @Test + // DATACMNS-1243 + void convertsLocalDateTimeToInstantAndBack() { - // DATACMNS-951 - @Parameters - public static Collection data() { + LocalDateTime dateTime = LocalDateTime.now(); - return Arrays.asList(new Object[][] { // - { "PT240H", Duration.ofDays(10) }, // - { "PT2H", Duration.ofHours(2) }, // - { "PT3M", Duration.ofMinutes(3) }, // - { "PT4S", Duration.ofSeconds(4) }, // - { "PT0.005S", Duration.ofMillis(5) }, // - { "PT0.000000006S", Duration.ofNanos(6) } // - }); - } + Instant instant = CONVERSION_SERVICE.convert(dateTime, Instant.class); + LocalDateTime convertedDateTime = CONVERSION_SERVICE.convert(dateTime, LocalDateTime.class); + + assertThat(convertedDateTime).isEqualTo(dateTime); } - public static class PeriodConversionTests extends ConversionTest { + @Test + // DATACMNS-1440 + void convertsIsoFormattedStringToLocalDate() { - // DATACMNS-951 - @Parameters - public static Collection data() { + LocalDate date = LocalDate.now(); - return Arrays.asList(new Object[][] { // - { "P2D", Period.ofDays(2) }, // - { "P21D", Period.ofWeeks(3) }, // - { "P4M", Period.ofMonths(4) }, // - { "P5Y", Period.ofYears(5) }, // - }); - } + assertThat(CONVERSION_SERVICE.convert(date.toString(), LocalDate.class)).isEqualTo(date); } - @RunWith(Parameterized.class) - public static abstract class ConversionTest { + @Test + // DATACMNS-1440 + void convertsIsoFormattedStringToLocalDateTime() { - public @Parameter(0) String string; - public @Parameter(1) T target; + LocalDateTime date = LocalDateTime.now(); - @Test - public void convertsPeriodToStringAndBack() { + assertThat(CONVERSION_SERVICE.convert(date.toString(), LocalDateTime.class)).isEqualTo(date); + } - ResolvableType type = ResolvableType.forClass(ConversionTest.class, this.getClass()); - assertThat(CONVERSION_SERVICE.convert(target, String.class)).isEqualTo(string); - assertThat(CONVERSION_SERVICE.convert(string, type.getGeneric(0).getRawClass())).isEqualTo(target); - } + @Test + // DATACMNS-1440 + void convertsIsoFormattedStringToInstant() { + + Instant date = Instant.now(); + + assertThat(CONVERSION_SERVICE.convert(date.toString(), Instant.class)).isEqualTo(date); + } + + private static Predicate formatted(Temporal expected, String format) { + + DateTimeFormatter formatter = DateTimeFormatter.ofPattern(format); + return d -> format(d, format).equals(formatter.format(expected)); + } + + private static Predicate formatted(Date expected, String format) { + + DateTimeFormatter formatter = DateTimeFormatter.ofPattern(format); + return d -> formatter.format(d).equals(format(expected, format)); + } + + private static String format(Date date, String format) { + return new SimpleDateFormat(format).format(date); + } + + static Stream parameters() { + + List duration = Arrays.asList(new Object[][] { // + { "PT240H", Duration.ofDays(10) }, // + { "PT2H", Duration.ofHours(2) }, // + { "PT3M", Duration.ofMinutes(3) }, // + { "PT4S", Duration.ofSeconds(4) }, // + { "PT0.005S", Duration.ofMillis(5) }, // + { "PT0.000000006S", Duration.ofNanos(6) } // + }); + + List period = Arrays.asList(new Object[][] { // + { "P2D", Period.ofDays(2) }, // + { "P21D", Period.ofWeeks(3) }, // + { "P4M", Period.ofMonths(4) }, // + { "P5Y", Period.ofYears(5) }, // + }); + + return Stream.concat(duration.stream(), period.stream()); + } + + @ParameterizedTest // DATACMNS-951 + @MethodSource("parameters") + void convertsPeriodToStringAndBack(String string, Object target) { + + assertThat(CONVERSION_SERVICE.convert(target, String.class)).isEqualTo(string); + assertThat(CONVERSION_SERVICE.convert(string, target.getClass())).isEqualTo(target); } } diff --git a/src/test/java/org/springframework/data/convert/MappingContextTypeInformationMapperUnitTests.java b/src/test/java/org/springframework/data/convert/MappingContextTypeInformationMapperUnitTests.java index b961f439f..ca9cdadc6 100755 --- a/src/test/java/org/springframework/data/convert/MappingContextTypeInformationMapperUnitTests.java +++ b/src/test/java/org/springframework/data/convert/MappingContextTypeInformationMapperUnitTests.java @@ -20,8 +20,8 @@ import static org.springframework.data.util.ClassTypeInformation.from; import java.util.Collections; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.data.annotation.TypeAlias; import org.springframework.data.mapping.Alias; import org.springframework.data.mapping.PersistentEntity; @@ -35,23 +35,23 @@ import org.springframework.data.util.ClassTypeInformation; * * @author Oliver Gierke */ -public class MappingContextTypeInformationMapperUnitTests { +class MappingContextTypeInformationMapperUnitTests { SampleMappingContext mappingContext; TypeInformationMapper mapper; - @Before - public void setUp() { + @BeforeEach + void setUp() { mappingContext = new SampleMappingContext(); } @Test - public void rejectsNullMappingContext() { + void rejectsNullMappingContext() { assertThatIllegalArgumentException().isThrownBy(() -> new MappingContextTypeInformationMapper(null)); } @Test - public void extractsAliasInfoFromMappingContext() { + void extractsAliasInfoFromMappingContext() { mappingContext.setInitialEntitySet(Collections.singleton(Entity.class)); mappingContext.initialize(); @@ -62,7 +62,7 @@ public class MappingContextTypeInformationMapperUnitTests { } @Test - public void extractsAliasForUnknownType() { + void extractsAliasForUnknownType() { SampleMappingContext mappingContext = new SampleMappingContext(); mappingContext.initialize(); @@ -73,7 +73,7 @@ public class MappingContextTypeInformationMapperUnitTests { } @Test - public void doesNotReturnTypeAliasForSimpleType() { + void doesNotReturnTypeAliasForSimpleType() { SampleMappingContext mappingContext = new SampleMappingContext(); mappingContext.initialize(); @@ -83,7 +83,7 @@ public class MappingContextTypeInformationMapperUnitTests { } @Test - public void detectsTypeForUnknownEntity() { + void detectsTypeForUnknownEntity() { SampleMappingContext mappingContext = new SampleMappingContext(); mappingContext.initialize(); @@ -99,7 +99,7 @@ public class MappingContextTypeInformationMapperUnitTests { @Test // DATACMNS-485 @SuppressWarnings("unchecked") - public void createsTypeMapperForGenericTypesWithDifferentBindings() { + void createsTypeMapperForGenericTypesWithDifferentBindings() { AnnotatedTypeScanner scanner = new AnnotatedTypeScanner(TypeAlias.class); diff --git a/src/test/java/org/springframework/data/convert/SimpleTypeInformationMapperUnitTests.java b/src/test/java/org/springframework/data/convert/SimpleTypeInformationMapperUnitTests.java index 2e4a7c703..1fe2f9066 100755 --- a/src/test/java/org/springframework/data/convert/SimpleTypeInformationMapperUnitTests.java +++ b/src/test/java/org/springframework/data/convert/SimpleTypeInformationMapperUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.convert; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.mapping.Alias; import org.springframework.data.util.ClassTypeInformation; import org.springframework.data.util.TypeInformation; @@ -27,12 +27,12 @@ import org.springframework.data.util.TypeInformation; * * @author Oliver Gierke */ -public class SimpleTypeInformationMapperUnitTests { +class SimpleTypeInformationMapperUnitTests { TypeInformationMapper mapper = new SimpleTypeInformationMapper(); @Test - public void resolvesTypeByLoadingClass() { + void resolvesTypeByLoadingClass() { TypeInformation type = mapper.resolveTypeFrom(Alias.of("java.lang.String")); @@ -42,23 +42,23 @@ public class SimpleTypeInformationMapperUnitTests { } @Test - public void returnsNullForNonStringKey() { + void returnsNullForNonStringKey() { assertThat(mapper.resolveTypeFrom(Alias.of(new Object()))).isNull(); } @Test - public void returnsNullForEmptyTypeKey() { + void returnsNullForEmptyTypeKey() { assertThat(mapper.resolveTypeFrom(Alias.of(""))).isNull(); } @Test - public void returnsNullForUnloadableClass() { + void returnsNullForUnloadableClass() { assertThat(mapper.resolveTypeFrom(Alias.of("Foo"))).isNull(); } @Test - public void usesFullyQualifiedClassNameAsTypeKey() { + void usesFullyQualifiedClassNameAsTypeKey() { assertThat(mapper.createAliasFor(ClassTypeInformation.from(String.class))) .isEqualTo(Alias.of(String.class.getName())); diff --git a/src/test/java/org/springframework/data/convert/ThreeTenBackPortConvertersUnitTests.java b/src/test/java/org/springframework/data/convert/ThreeTenBackPortConvertersUnitTests.java index 618150ea1..e010614a1 100755 --- a/src/test/java/org/springframework/data/convert/ThreeTenBackPortConvertersUnitTests.java +++ b/src/test/java/org/springframework/data/convert/ThreeTenBackPortConvertersUnitTests.java @@ -24,7 +24,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.converter.Converter; import org.springframework.core.convert.support.GenericConversionService; @@ -40,7 +40,7 @@ import org.threeten.bp.ZoneId; * @author Oliver Gierke * @since 1.10 */ -public class ThreeTenBackPortConvertersUnitTests { +class ThreeTenBackPortConvertersUnitTests { static final Date NOW = new Date(); static final ConversionService CONVERSION_SERVICE; @@ -57,13 +57,13 @@ public class ThreeTenBackPortConvertersUnitTests { } @Test // DATACMNS-606 - public void convertsDateToLocalDateTime() { + void convertsDateToLocalDateTime() { assertThat(CONVERSION_SERVICE.convert(NOW, LocalDateTime.class).toString()) .isEqualTo(format(NOW, "yyyy-MM-dd'T'HH:mm:ss.SSS")); } @Test // DATACMNS-606 - public void convertsLocalDateTimeToDate() { + void convertsLocalDateTimeToDate() { LocalDateTime now = LocalDateTime.now(); assertThat(format(CONVERSION_SERVICE.convert(now, Date.class), "yyyy-MM-dd'T'HH:mm:ss.SSS")) @@ -71,45 +71,45 @@ public class ThreeTenBackPortConvertersUnitTests { } @Test // DATACMNS-606 - public void convertsDateToLocalDate() { + void convertsDateToLocalDate() { assertThat(CONVERSION_SERVICE.convert(NOW, LocalDate.class).toString()).isEqualTo(format(NOW, "yyyy-MM-dd")); } @Test // DATACMNS-606 - public void convertsLocalDateToDate() { + void convertsLocalDateToDate() { LocalDate now = LocalDate.now(); assertThat(format(CONVERSION_SERVICE.convert(now, Date.class), "yyyy-MM-dd")).isEqualTo(now.toString()); } @Test // DATACMNS-606 - public void convertsDateToLocalTime() { + void convertsDateToLocalTime() { assertThat(CONVERSION_SERVICE.convert(NOW, LocalTime.class).toString()).isEqualTo(format(NOW, "HH:mm:ss.SSS")); } @Test // DATACMNS-606 - public void convertsLocalTimeToDate() { + void convertsLocalTimeToDate() { LocalTime now = LocalTime.now(); assertThat(format(CONVERSION_SERVICE.convert(now, Date.class), "HH:mm:ss.SSS")).isEqualTo(now.toString()); } @Test // DATACMNS-623 - public void convertsDateToInstant() { + void convertsDateToInstant() { Date now = new Date(); assertThat(CONVERSION_SERVICE.convert(now, Instant.class)).isEqualTo(toInstant(now)); } @Test // DATACMNS-623 - public void convertsInstantToDate() { + void convertsInstantToDate() { Date now = new Date(); assertThat(CONVERSION_SERVICE.convert(toInstant(now), Date.class)).isEqualTo(now); } @Test - public void convertsZoneIdToStringAndBack() { + void convertsZoneIdToStringAndBack() { Map ids = new HashMap<>(); ids.put("Europe/Berlin", ZoneId.of("Europe/Berlin")); diff --git a/src/test/java/org/springframework/data/domain/AbstractAggregateRootUnitTests.java b/src/test/java/org/springframework/data/domain/AbstractAggregateRootUnitTests.java index 998038bb9..de5d648b3 100644 --- a/src/test/java/org/springframework/data/domain/AbstractAggregateRootUnitTests.java +++ b/src/test/java/org/springframework/data/domain/AbstractAggregateRootUnitTests.java @@ -17,17 +17,17 @@ package org.springframework.data.domain; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Unit tests for {@link AbstractAggregateRoot}. * * @author Oliver Gierke */ -public class AbstractAggregateRootUnitTests { +class AbstractAggregateRootUnitTests { @Test // DATACMNS-928 - public void registersEvent() { + void registersEvent() { Object event = new Object(); @@ -38,7 +38,7 @@ public class AbstractAggregateRootUnitTests { } @Test // DATACMNS-928 - public void clearsEvents() { + void clearsEvents() { Object event = new Object(); @@ -53,7 +53,7 @@ public class AbstractAggregateRootUnitTests { } @Test // DATACMNS-928, DATACMNS-1162 - public void copiesEventsFromExistingAggregate() { + void copiesEventsFromExistingAggregate() { SampleAggregate aggregate = new SampleAggregate(); aggregate.registerEvent(new Object()); @@ -64,7 +64,7 @@ public class AbstractAggregateRootUnitTests { } @Test // DATACMNS-928, DATACMNS-1162 - public void addsEventAndReturnsAggregate() { + void addsEventAndReturnsAggregate() { Object first = new Object(); Object second = new Object(); @@ -80,7 +80,7 @@ public class AbstractAggregateRootUnitTests { @Test // DATACMNS-928, DATACMNS-1162 @SuppressWarnings("null") - public void rejectsNullEvent() { + void rejectsNullEvent() { assertThatExceptionOfType(IllegalArgumentException.class) // .isThrownBy(() -> new SampleAggregate().andEvent(null)); @@ -88,7 +88,7 @@ public class AbstractAggregateRootUnitTests { @Test // DATACMNS-928 @SuppressWarnings("null") - public void rejectsNullEventForRegistration() { + void rejectsNullEventForRegistration() { assertThatExceptionOfType(IllegalArgumentException.class) // .isThrownBy(() -> new SampleAggregate().registerEvent(null)); @@ -96,7 +96,7 @@ public class AbstractAggregateRootUnitTests { @Test // DATACMNS-928, DATACMNS-1162 @SuppressWarnings("null") - public void rejectsNullAggregate() { + void rejectsNullAggregate() { assertThatExceptionOfType(IllegalArgumentException.class) // .isThrownBy(() -> new SampleAggregate().andEventsFrom(null)); diff --git a/src/test/java/org/springframework/data/domain/AbstractPageRequestUnitTests.java b/src/test/java/org/springframework/data/domain/AbstractPageRequestUnitTests.java index fedd27669..0bff3a21b 100755 --- a/src/test/java/org/springframework/data/domain/AbstractPageRequestUnitTests.java +++ b/src/test/java/org/springframework/data/domain/AbstractPageRequestUnitTests.java @@ -18,7 +18,7 @@ package org.springframework.data.domain; import static org.assertj.core.api.Assertions.*; import static org.springframework.data.domain.UnitTestUtils.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author Thomas Darimont @@ -29,17 +29,17 @@ public abstract class AbstractPageRequestUnitTests { public abstract AbstractPageRequest newPageRequest(int page, int size); @Test // DATACMNS-402 - public void preventsNegativePage() { + void preventsNegativePage() { assertThatIllegalArgumentException().isThrownBy(() -> newPageRequest(-1, 10)); } @Test // DATACMNS-402 - public void preventsNegativeSize() { + void preventsNegativeSize() { assertThatIllegalArgumentException().isThrownBy(() -> newPageRequest(0, -1)); } @Test // DATACMNS-402 - public void navigatesPageablesCorrectly() { + void navigatesPageablesCorrectly() { Pageable request = newPageRequest(1, 10); @@ -55,7 +55,7 @@ public abstract class AbstractPageRequestUnitTests { } @Test // DATACMNS-402 - public void equalsHonoursPageAndSize() { + void equalsHonoursPageAndSize() { AbstractPageRequest request = newPageRequest(0, 10); @@ -73,12 +73,12 @@ public abstract class AbstractPageRequestUnitTests { } @Test // DATACMNS-377 - public void preventsPageSizeLessThanOne() { + void preventsPageSizeLessThanOne() { assertThatIllegalArgumentException().isThrownBy(() -> newPageRequest(0, 0)); } @Test // DATACMNS-1327 - public void getOffsetShouldNotCauseOverflow() { + void getOffsetShouldNotCauseOverflow() { AbstractPageRequest request = newPageRequest(Integer.MAX_VALUE, Integer.MAX_VALUE); diff --git a/src/test/java/org/springframework/data/domain/DirectionUnitTests.java b/src/test/java/org/springframework/data/domain/DirectionUnitTests.java index 3ff24449a..0b22036a6 100755 --- a/src/test/java/org/springframework/data/domain/DirectionUnitTests.java +++ b/src/test/java/org/springframework/data/domain/DirectionUnitTests.java @@ -2,7 +2,7 @@ package org.springframework.data.domain; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.domain.Sort.Direction; /** @@ -10,17 +10,17 @@ import org.springframework.data.domain.Sort.Direction; * * @author Oliver Gierke */ -public class DirectionUnitTests { +class DirectionUnitTests { @Test - public void jpaValueMapping() throws Exception { + void jpaValueMapping() throws Exception { assertThat(Direction.fromString("asc")).isEqualTo(Direction.ASC); assertThat(Direction.fromString("desc")).isEqualTo(Direction.DESC); } @Test - public void rejectsInvalidString() { + void rejectsInvalidString() { assertThatIllegalArgumentException().isThrownBy(() -> Direction.fromString("foo")); } } diff --git a/src/test/java/org/springframework/data/domain/ExampleMatcherUnitTests.java b/src/test/java/org/springframework/data/domain/ExampleMatcherUnitTests.java index 2a785b1f4..2321357c3 100755 --- a/src/test/java/org/springframework/data/domain/ExampleMatcherUnitTests.java +++ b/src/test/java/org/springframework/data/domain/ExampleMatcherUnitTests.java @@ -18,8 +18,8 @@ package org.springframework.data.domain; import static org.assertj.core.api.Assertions.*; import static org.springframework.data.domain.ExampleMatcher.*; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Unit test for {@link ExampleMatcher}. @@ -28,43 +28,43 @@ import org.junit.Test; * @author Oliver Gierke * @soundtrack K2 - Der Berg Ruft (Club Mix) */ -public class ExampleMatcherUnitTests { +class ExampleMatcherUnitTests { ExampleMatcher matcher; - @Before - public void setUp() { + @BeforeEach + void setUp() { matcher = matching(); } @Test // DATACMNS-810 - public void defaultStringMatcherShouldReturnDefault() { + void defaultStringMatcherShouldReturnDefault() { assertThat(matcher.getDefaultStringMatcher()).isEqualTo(StringMatcher.DEFAULT); } @Test // DATACMNS-810 - public void ignoreCaseShouldReturnFalseByDefault() { + void ignoreCaseShouldReturnFalseByDefault() { assertThat(matcher.isIgnoreCaseEnabled()).isFalse(); } @Test // DATACMNS-810 - public void ignoredPathsIsEmptyByDefault() { + void ignoredPathsIsEmptyByDefault() { assertThat(matcher.getIgnoredPaths()).isEmpty(); } @Test // DATACMNS-810 - public void nullHandlerShouldReturnIgnoreByDefault() { + void nullHandlerShouldReturnIgnoreByDefault() { assertThat(matcher.getNullHandler()).isEqualTo(NullHandler.IGNORE); } @Test // DATACMNS-810 - public void ignoredPathsIsNotModifiable() { + void ignoredPathsIsNotModifiable() { assertThatExceptionOfType(UnsupportedOperationException.class) .isThrownBy(() -> matcher.getIgnoredPaths().add("¯\\_(ツ)_/¯")); } @Test // DATACMNS-810 - public void ignoreCaseShouldReturnTrueWhenIgnoreCaseEnabled() { + void ignoreCaseShouldReturnTrueWhenIgnoreCaseEnabled() { matcher = matching().withIgnoreCase(); @@ -72,7 +72,7 @@ public class ExampleMatcherUnitTests { } @Test // DATACMNS-810 - public void ignoreCaseShouldReturnTrueWhenIgnoreCaseSet() { + void ignoreCaseShouldReturnTrueWhenIgnoreCaseSet() { matcher = matching().withIgnoreCase(true); @@ -80,7 +80,7 @@ public class ExampleMatcherUnitTests { } @Test // DATACMNS-810 - public void nullHandlerShouldReturnInclude() { + void nullHandlerShouldReturnInclude() { matcher = matching().withIncludeNullValues(); @@ -88,7 +88,7 @@ public class ExampleMatcherUnitTests { } @Test // DATACMNS-810 - public void nullHandlerShouldReturnIgnore() { + void nullHandlerShouldReturnIgnore() { matcher = matching().withIgnoreNullValues(); @@ -96,7 +96,7 @@ public class ExampleMatcherUnitTests { } @Test // DATACMNS-810 - public void nullHandlerShouldReturnConfiguredValue() { + void nullHandlerShouldReturnConfiguredValue() { matcher = matching().withNullHandler(NullHandler.INCLUDE); @@ -104,7 +104,7 @@ public class ExampleMatcherUnitTests { } @Test // DATACMNS-810 - public void ignoredPathsShouldReturnCorrectProperties() { + void ignoredPathsShouldReturnCorrectProperties() { matcher = matching().withIgnorePaths("foo", "bar", "baz"); @@ -113,7 +113,7 @@ public class ExampleMatcherUnitTests { } @Test // DATACMNS-810 - public void ignoredPathsShouldReturnUniqueProperties() { + void ignoredPathsShouldReturnUniqueProperties() { matcher = matching().withIgnorePaths("foo", "bar", "foo"); @@ -122,7 +122,7 @@ public class ExampleMatcherUnitTests { } @Test // DATACMNS-810 - public void withCreatesNewInstance() { + void withCreatesNewInstance() { matcher = matching().withIgnorePaths("foo", "bar", "foo"); ExampleMatcher configuredExampleSpec = matcher.withIgnoreCase(); @@ -136,28 +136,28 @@ public class ExampleMatcherUnitTests { } @Test // DATACMNS-879 - public void defaultMatcherRequiresAllMatching() { + void defaultMatcherRequiresAllMatching() { assertThat(matching().isAllMatching()).isTrue(); assertThat(matching().isAnyMatching()).isFalse(); } @Test // DATACMNS-879 - public void allMatcherRequiresAllMatching() { + void allMatcherRequiresAllMatching() { assertThat(matchingAll().isAllMatching()).isTrue(); assertThat(matchingAll().isAnyMatching()).isFalse(); } @Test // DATACMNS-879 - public void anyMatcherYieldsAnyMatching() { + void anyMatcherYieldsAnyMatching() { assertThat(matchingAny().isAnyMatching()).isTrue(); assertThat(matchingAny().isAllMatching()).isFalse(); } @Test // DATACMNS-900 - public void shouldCompareUsingHashCodeAndEquals() { + void shouldCompareUsingHashCodeAndEquals() { matcher = matching() // .withIgnorePaths("foo", "bar", "baz") // diff --git a/src/test/java/org/springframework/data/domain/ExampleUnitTests.java b/src/test/java/org/springframework/data/domain/ExampleUnitTests.java index a2faaf648..4ed2aa6f7 100755 --- a/src/test/java/org/springframework/data/domain/ExampleUnitTests.java +++ b/src/test/java/org/springframework/data/domain/ExampleUnitTests.java @@ -18,8 +18,8 @@ package org.springframework.data.domain; import static org.assertj.core.api.Assertions.*; import static org.springframework.data.domain.ExampleMatcher.*; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Test for {@link Example}. @@ -28,13 +28,13 @@ import org.junit.Test; * @author Mark Paluch * @author Oliver Gierke */ -public class ExampleUnitTests { +class ExampleUnitTests { Person person; Example example; - @Before - public void setUp() { + @BeforeEach + void setUp() { person = new Person(); person.firstname = "rand"; @@ -43,17 +43,17 @@ public class ExampleUnitTests { } @Test // DATACMNS-810 - public void rejectsNullProbe() { + void rejectsNullProbe() { assertThatIllegalArgumentException().isThrownBy(() -> Example.of(null)); } @Test // DATACMNS-810 - public void retunsSampleObjectsClassAsProbeType() { + void retunsSampleObjectsClassAsProbeType() { assertThat(example.getProbeType()).isEqualTo(Person.class); } @Test // DATACMNS-900 - public void shouldCompareUsingHashCodeAndEquals() throws Exception { + void shouldCompareUsingHashCodeAndEquals() throws Exception { Example example = Example.of(person, matching().withIgnoreCase("firstname")); Example sameAsExample = Example.of(person, matching().withIgnoreCase("firstname")); diff --git a/src/test/java/org/springframework/data/domain/PageImplUnitTests.java b/src/test/java/org/springframework/data/domain/PageImplUnitTests.java index 94e6fc042..b8b0ef2bd 100755 --- a/src/test/java/org/springframework/data/domain/PageImplUnitTests.java +++ b/src/test/java/org/springframework/data/domain/PageImplUnitTests.java @@ -22,17 +22,17 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Unit test for {@link PageImpl}. * * @author Oliver Gierke */ -public class PageImplUnitTests { +class PageImplUnitTests { @Test - public void assertEqualsForSimpleSetup() throws Exception { + void assertEqualsForSimpleSetup() throws Exception { PageImpl page = new PageImpl<>(Collections.singletonList("Foo")); @@ -41,7 +41,7 @@ public class PageImplUnitTests { } @Test - public void assertEqualsForComplexSetup() throws Exception { + void assertEqualsForComplexSetup() throws Exception { Pageable pageable = PageRequest.of(0, 10); List content = Collections.singletonList("Foo"); @@ -56,17 +56,17 @@ public class PageImplUnitTests { } @Test - public void preventsNullContentForSimpleSetup() { + void preventsNullContentForSimpleSetup() { assertThatIllegalArgumentException().isThrownBy(() -> new PageImpl<>(null)); } @Test - public void preventsNullContentForAdvancedSetup() { + void preventsNullContentForAdvancedSetup() { assertThatIllegalArgumentException().isThrownBy(() -> new PageImpl<>(null, null, 0)); } @Test - public void returnsNextPageable() { + void returnsNextPageable() { Page page = new PageImpl<>(Collections.singletonList(new Object()), PageRequest.of(0, 1), 10); @@ -80,7 +80,7 @@ public class PageImplUnitTests { } @Test - public void returnsPreviousPageable() { + void returnsPreviousPageable() { Page page = new PageImpl<>(Collections.singletonList(new Object()), PageRequest.of(1, 1), 2); @@ -94,7 +94,7 @@ public class PageImplUnitTests { } @Test - public void createsPageForEmptyContentCorrectly() { + void createsPageForEmptyContentCorrectly() { List list = Collections.emptyList(); Page page = new PageImpl<>(list); @@ -114,7 +114,7 @@ public class PageImplUnitTests { } @Test // DATACMNS-323 - public void returnsCorrectTotalPages() { + void returnsCorrectTotalPages() { Page page = new PageImpl<>(Collections.singletonList("a")); @@ -124,7 +124,7 @@ public class PageImplUnitTests { } @Test // DATACMNS-635 - public void transformsPageCorrectly() { + void transformsPageCorrectly() { Page transformed = new PageImpl<>(Arrays.asList("foo", "bar"), PageRequest.of(0, 2), 10) .map(String::length); @@ -134,36 +134,36 @@ public class PageImplUnitTests { } @Test // DATACMNS-713 - public void adaptsTotalForLastPageOnIntermediateDeletion() { + void adaptsTotalForLastPageOnIntermediateDeletion() { assertThat(new PageImpl<>(Arrays.asList("foo", "bar"), PageRequest.of(0, 5), 3).getTotalElements()).isEqualTo(2L); } @Test // DATACMNS-713 - public void adaptsTotalForLastPageOnIntermediateInsertion() { + void adaptsTotalForLastPageOnIntermediateInsertion() { assertThat(new PageImpl<>(Arrays.asList("foo", "bar"), PageRequest.of(0, 5), 1).getTotalElements()).isEqualTo(2L); } @Test // DATACMNS-713 - public void adaptsTotalForLastPageOnIntermediateDeletionOnLastPate() { + void adaptsTotalForLastPageOnIntermediateDeletionOnLastPate() { assertThat(new PageImpl<>(Arrays.asList("foo", "bar"), PageRequest.of(1, 10), 13).getTotalElements()) .isEqualTo(12L); } @Test // DATACMNS-713 - public void adaptsTotalForLastPageOnIntermediateInsertionOnLastPate() { + void adaptsTotalForLastPageOnIntermediateInsertionOnLastPate() { assertThat(new PageImpl<>(Arrays.asList("foo", "bar"), PageRequest.of(1, 10), 11).getTotalElements()) .isEqualTo(12L); } @Test // DATACMNS-713 - public void doesNotAdapttotalIfPageIsEmpty() { + void doesNotAdapttotalIfPageIsEmpty() { assertThat(new PageImpl<>(Collections. emptyList(), PageRequest.of(1, 10), 0).getTotalElements()) .isEqualTo(0L); } @Test // DATACMNS-1476 - public void returnsSelfPagablesIfThePageIsAlreadyTheFirstOrLastOne() { + void returnsSelfPagablesIfThePageIsAlreadyTheFirstOrLastOne() { Pageable pageable = PageRequest.of(0, 2); Slice page = new PageImpl<>(Arrays.asList("foo", "bar"), pageable, 2); @@ -176,7 +176,7 @@ public class PageImplUnitTests { } @Test // DATACMNS-1613 - public void usesContentLengthForSizeIfNoPageableGiven() { + void usesContentLengthForSizeIfNoPageableGiven() { Page page = new PageImpl<>(Arrays.asList(1, 2)); diff --git a/src/test/java/org/springframework/data/domain/PageRequestUnitTests.java b/src/test/java/org/springframework/data/domain/PageRequestUnitTests.java index e6550a305..2e4562a48 100755 --- a/src/test/java/org/springframework/data/domain/PageRequestUnitTests.java +++ b/src/test/java/org/springframework/data/domain/PageRequestUnitTests.java @@ -18,7 +18,7 @@ package org.springframework.data.domain; import static org.assertj.core.api.Assertions.*; import static org.springframework.data.domain.UnitTestUtils.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.domain.Sort.Direction; /** @@ -26,7 +26,7 @@ import org.springframework.data.domain.Sort.Direction; * * @author Oliver Gierke */ -public class PageRequestUnitTests extends AbstractPageRequestUnitTests { +class PageRequestUnitTests extends AbstractPageRequestUnitTests { /* * (non-Javadoc) @@ -37,12 +37,12 @@ public class PageRequestUnitTests extends AbstractPageRequestUnitTests { return PageRequest.of(page, size); } - public AbstractPageRequest newPageRequest(int page, int size, Sort sort) { + AbstractPageRequest newPageRequest(int page, int size, Sort sort) { return PageRequest.of(page, size, sort); } @Test - public void equalsRegardsSortCorrectly() { + void equalsRegardsSortCorrectly() { Sort sort = Sort.by(Direction.DESC, "foo"); AbstractPageRequest request = PageRequest.of(0, 10, sort); @@ -64,7 +64,7 @@ public class PageRequestUnitTests extends AbstractPageRequestUnitTests { } @Test // DATACMNS-1581 - public void rejectsNullSort() { + void rejectsNullSort() { assertThatExceptionOfType(IllegalArgumentException.class) // .isThrownBy(() -> PageRequest.of(0, 10, null)); diff --git a/src/test/java/org/springframework/data/domain/RangeUnitTests.java b/src/test/java/org/springframework/data/domain/RangeUnitTests.java index b331c1cea..509ad17ed 100755 --- a/src/test/java/org/springframework/data/domain/RangeUnitTests.java +++ b/src/test/java/org/springframework/data/domain/RangeUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.domain; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.domain.Range.Bound; @@ -28,16 +28,16 @@ import org.springframework.data.domain.Range.Bound; * @author Mark Paluch * @since 1.10 */ -public class RangeUnitTests { +class RangeUnitTests { @Test // DATACMNS-651 - public void rejectsNullReferenceValuesForContains() { + void rejectsNullReferenceValuesForContains() { assertThatIllegalArgumentException() .isThrownBy(() -> Range.from(Bound.inclusive(10L)).to(Bound.inclusive(20L)).contains(null)); } @Test // DATACMNS-651 - public void excludesLowerBoundIfConfigured() { + void excludesLowerBoundIfConfigured() { Range range = Range.from(Bound.exclusive(10L)).to(Bound.inclusive(20L)); @@ -49,7 +49,7 @@ public class RangeUnitTests { } @Test // DATACMNS-651 - public void excludesUpperBoundIfConfigured() { + void excludesUpperBoundIfConfigured() { Range range = Range.of(Bound.inclusive(10L), Bound.exclusive(20L)); @@ -61,7 +61,7 @@ public class RangeUnitTests { } @Test // DATACMNS-651, DATACMNS-1050 - public void handlesOpenUpperBoundCorrectly() { + void handlesOpenUpperBoundCorrectly() { Range range = Range.of(Bound.inclusive(10L), Bound.unbounded()); @@ -76,7 +76,7 @@ public class RangeUnitTests { } @Test // DATACMNS-651, DATACMNS-1050 - public void handlesOpenLowerBoundCorrectly() { + void handlesOpenLowerBoundCorrectly() { Range range = Range.of(Bound.unbounded(), Bound.inclusive(20L)); @@ -90,7 +90,7 @@ public class RangeUnitTests { } @Test // DATACMNS-1050 - public void createsInclusiveBoundaryCorrectly() { + void createsInclusiveBoundaryCorrectly() { Bound bound = Bound.inclusive(10); @@ -99,7 +99,7 @@ public class RangeUnitTests { } @Test // DATACMNS-1050 - public void createsExclusiveBoundaryCorrectly() { + void createsExclusiveBoundaryCorrectly() { Bound bound = Bound.exclusive(10d); @@ -108,7 +108,7 @@ public class RangeUnitTests { } @Test // DATACMNS-1050 - public void createsRangeFromBoundariesCorrectly() { + void createsRangeFromBoundariesCorrectly() { Bound lower = Bound.inclusive(10L); Bound upper = Bound.inclusive(20L); @@ -122,7 +122,7 @@ public class RangeUnitTests { } @Test // DATACMNS-1050 - public void shouldExclusiveBuildRangeLowerFirst() { + void shouldExclusiveBuildRangeLowerFirst() { Range range = Range.from(Bound.exclusive(10L)).to(Bound.exclusive(20L)); @@ -136,7 +136,7 @@ public class RangeUnitTests { } @Test // DATACMNS-1050 - public void shouldBuildRange() { + void shouldBuildRange() { Range range = Range.from(Bound.inclusive(10L)).to(Bound.inclusive(20L)); @@ -150,7 +150,7 @@ public class RangeUnitTests { } @Test // DATACMNS-1050 - public void createsUnboundedRange() { + void createsUnboundedRange() { Range range = Range.unbounded(); @@ -160,7 +160,7 @@ public class RangeUnitTests { } @Test // DATACMNS-1499 - public void createsOpenRange() { + void createsOpenRange() { Range range = Range.open(5L, 10L); @@ -169,7 +169,7 @@ public class RangeUnitTests { } @Test // DATACMNS-1499 - public void createsClosedRange() { + void createsClosedRange() { Range range = Range.closed(5L, 10L); @@ -178,7 +178,7 @@ public class RangeUnitTests { } @Test // DATACMNS-1499 - public void createsLeftOpenRange() { + void createsLeftOpenRange() { Range range = Range.leftOpen(5L, 10L); @@ -187,7 +187,7 @@ public class RangeUnitTests { } @Test // DATACMNS-1499 - public void createsRightOpenRange() { + void createsRightOpenRange() { Range range = Range.rightOpen(5L, 10L); @@ -196,17 +196,17 @@ public class RangeUnitTests { } @Test // DATACMNS-1499 - public void createsLeftUnboundedRange() { + void createsLeftUnboundedRange() { assertThat(Range.leftUnbounded(Bound.inclusive(10L)).contains(-10000L)).isTrue(); } @Test // DATACMNS-1499 - public void createsRightUnboundedRange() { + void createsRightUnboundedRange() { assertThat(Range.rightUnbounded(Bound.inclusive(10L)).contains(10000L)).isTrue(); } @Test // DATACMNS-1499 - public void createsSingleValueRange() { + void createsSingleValueRange() { assertThat(Range.just(10L).contains(10L)).isTrue(); } } diff --git a/src/test/java/org/springframework/data/domain/SortUnitTests.java b/src/test/java/org/springframework/data/domain/SortUnitTests.java index 4bf47cfc1..cf4989c09 100755 --- a/src/test/java/org/springframework/data/domain/SortUnitTests.java +++ b/src/test/java/org/springframework/data/domain/SortUnitTests.java @@ -22,7 +22,7 @@ import lombok.Getter; import java.util.Collection; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.domain.Sort.Direction; import org.springframework.data.domain.Sort.Order; @@ -34,7 +34,7 @@ import org.springframework.data.domain.Sort.Order; * @author Thomas Darimont * @author Mark Paluch */ -public class SortUnitTests { +class SortUnitTests { /** * Asserts that the class applies the default sort order if no order or {@code null} was provided. @@ -42,7 +42,7 @@ public class SortUnitTests { * @throws Exception */ @Test - public void appliesDefaultForOrder() { + void appliesDefaultForOrder() { assertThat(Sort.by("foo").iterator().next().getDirection()).isEqualTo(Sort.DEFAULT_DIRECTION); } @@ -53,7 +53,7 @@ public class SortUnitTests { */ @Test @SuppressWarnings("null") - public void preventsNullProperties() { + void preventsNullProperties() { assertThatIllegalArgumentException().isThrownBy(() -> Sort.by(Direction.ASC, (String[]) null)); } @@ -63,7 +63,7 @@ public class SortUnitTests { * @throws Exception */ @Test - public void preventsNullProperty() { + void preventsNullProperty() { assertThatIllegalArgumentException().isThrownBy(() -> Sort.by(Direction.ASC, (String) null)); } @@ -73,7 +73,7 @@ public class SortUnitTests { * @throws Exception */ @Test - public void preventsEmptyProperty() { + void preventsEmptyProperty() { assertThatIllegalArgumentException().isThrownBy(() -> Sort.by(Direction.ASC, "")); } @@ -83,19 +83,19 @@ public class SortUnitTests { * @throws Exception */ @Test - public void preventsNoProperties() { + void preventsNoProperties() { assertThatIllegalArgumentException().isThrownBy(() -> Sort.by(Direction.ASC)); } @Test - public void allowsCombiningSorts() { + void allowsCombiningSorts() { Sort sort = Sort.by("foo").and(Sort.by("bar")); assertThat(sort).containsExactly(Order.by("foo"), Order.by("bar")); } @Test - public void handlesAdditionalNullSort() { + void handlesAdditionalNullSort() { Sort sort = Sort.by("foo").and(Sort.unsorted()); @@ -103,12 +103,12 @@ public class SortUnitTests { } @Test // DATACMNS-281, DATACMNS-1021 - public void configuresIgnoreCaseForOrder() { + void configuresIgnoreCaseForOrder() { assertThat(Order.asc("foo").ignoreCase().isIgnoreCase()).isTrue(); } @Test // DATACMNS-281, DATACMNS-1021 - public void orderDoesNotIgnoreCaseByDefault() { + void orderDoesNotIgnoreCaseByDefault() { assertThat(Order.by("foo").isIgnoreCase()).isFalse(); assertThat(Order.asc("foo").isIgnoreCase()).isFalse(); @@ -116,14 +116,14 @@ public class SortUnitTests { } @Test // DATACMNS-1021 - public void createsOrderWithDirection() { + void createsOrderWithDirection() { assertThat(Order.asc("foo").getDirection()).isEqualTo(Direction.ASC); assertThat(Order.desc("foo").getDirection()).isEqualTo(Direction.DESC); } @Test // DATACMNS-436 - public void ordersWithDifferentIgnoreCaseDoNotEqual() { + void ordersWithDifferentIgnoreCaseDoNotEqual() { Order foo = Order.by("foo"); Order fooIgnoreCase = Order.by("foo").ignoreCase(); @@ -133,27 +133,27 @@ public class SortUnitTests { } @Test // DATACMNS-491 - public void orderWithNullHandlingHintNullsFirst() { + void orderWithNullHandlingHintNullsFirst() { assertThat(Order.by("foo").nullsFirst().getNullHandling()).isEqualTo(NULLS_FIRST); } @Test // DATACMNS-491 - public void orderWithNullHandlingHintNullsLast() { + void orderWithNullHandlingHintNullsLast() { assertThat(Order.by("foo").nullsLast().getNullHandling()).isEqualTo(NULLS_LAST); } @Test // DATACMNS-491 - public void orderWithNullHandlingHintNullsNative() { + void orderWithNullHandlingHintNullsNative() { assertThat(Order.by("foo").nullsNative().getNullHandling()).isEqualTo(NATIVE); } @Test // DATACMNS-491 - public void orderWithDefaultNullHandlingHint() { + void orderWithDefaultNullHandlingHint() { assertThat(Order.by("foo").getNullHandling()).isEqualTo(NATIVE); } @Test // DATACMNS-908 - public void createsNewOrderForDifferentProperty() { + void createsNewOrderForDifferentProperty() { Order source = Order.desc("foo").nullsFirst().ignoreCase(); Order result = source.withProperty("bar"); @@ -166,7 +166,7 @@ public class SortUnitTests { @Test @SuppressWarnings("null") - public void preventsNullDirection() { + void preventsNullDirection() { assertThatExceptionOfType(IllegalArgumentException.class)// .isThrownBy(() -> Sort.by((Direction) null, "foo"))// @@ -174,7 +174,7 @@ public class SortUnitTests { } @Test // DATACMNS-1450 - public void translatesTypedSortCorrectly() { + void translatesTypedSortCorrectly() { assertThat(Sort.sort(Sample.class).by(Sample::getNested).by(Nested::getFirstname)) // .containsExactly(Order.by("nested.firstname")); diff --git a/src/test/java/org/springframework/data/domain/UnitTestUtils.java b/src/test/java/org/springframework/data/domain/UnitTestUtils.java index 308cb4f2b..153d0abfc 100644 --- a/src/test/java/org/springframework/data/domain/UnitTestUtils.java +++ b/src/test/java/org/springframework/data/domain/UnitTestUtils.java @@ -5,7 +5,7 @@ import static org.assertj.core.api.Assertions.*; /** * @author Oliver Gierke */ -public abstract class UnitTestUtils { +abstract class UnitTestUtils { private UnitTestUtils() { @@ -17,7 +17,7 @@ public abstract class UnitTestUtils { * @param first * @param second */ - public static void assertEqualsAndHashcode(Object first, Object second) { + static void assertEqualsAndHashcode(Object first, Object second) { assertThat(first).isEqualTo(second); assertThat(second).isEqualTo(first); @@ -30,7 +30,7 @@ public abstract class UnitTestUtils { * @param first * @param second */ - public static void assertNotEqualsAndHashcode(Object first, Object second) { + static void assertNotEqualsAndHashcode(Object first, Object second) { assertThat(first).isNotEqualTo(second); assertThat(second).isNotEqualTo(first); diff --git a/src/test/java/org/springframework/data/domain/jaxb/SpringDataJaxbUnitTests.java b/src/test/java/org/springframework/data/domain/jaxb/SpringDataJaxbUnitTests.java index 7749f9645..26306103f 100755 --- a/src/test/java/org/springframework/data/domain/jaxb/SpringDataJaxbUnitTests.java +++ b/src/test/java/org/springframework/data/domain/jaxb/SpringDataJaxbUnitTests.java @@ -35,8 +35,8 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.custommonkey.xmlunit.Diff; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; import org.springframework.data.domain.Page; @@ -53,7 +53,7 @@ import org.springframework.hateoas.Link; * * @author Oliver Gierke */ -public class SpringDataJaxbUnitTests { +class SpringDataJaxbUnitTests { Marshaller marshaller; Unmarshaller unmarshaller; @@ -65,8 +65,8 @@ public class SpringDataJaxbUnitTests { String reference = readFile(resource); - @Before - public void setUp() throws Exception { + @BeforeEach + void setUp() throws Exception { JAXBContext context = JAXBContext.newInstance("org.springframework.data.domain.jaxb"); @@ -77,7 +77,7 @@ public class SpringDataJaxbUnitTests { } @Test - public void usesCustomTypeAdapterForPageRequests() throws Exception { + void usesCustomTypeAdapterForPageRequests() throws Exception { StringWriter writer = new StringWriter(); Wrapper wrapper = new Wrapper(); @@ -90,7 +90,7 @@ public class SpringDataJaxbUnitTests { } @Test - public void readsPageRequest() throws Exception { + void readsPageRequest() throws Exception { Object result = unmarshaller.unmarshal(resource.getFile()); @@ -100,7 +100,7 @@ public class SpringDataJaxbUnitTests { } @Test - public void writesPlainPage() throws Exception { + void writesPlainPage() throws Exception { PageWrapper wrapper = new PageWrapper(); Content content = new Content(); diff --git a/src/test/java/org/springframework/data/geo/BoxUnitTests.java b/src/test/java/org/springframework/data/geo/BoxUnitTests.java index c5efe693b..e31528189 100755 --- a/src/test/java/org/springframework/data/geo/BoxUnitTests.java +++ b/src/test/java/org/springframework/data/geo/BoxUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.geo; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.util.SerializationUtils; /** @@ -26,14 +26,14 @@ import org.springframework.util.SerializationUtils; * @author Oliver Gierke * @author Thomas Darimont */ -public class BoxUnitTests { +class BoxUnitTests { Box first = new Box(new Point(1d, 1d), new Point(2d, 2d)); Box second = new Box(new Point(1d, 1d), new Point(2d, 2d)); Box third = new Box(new Point(3d, 3d), new Point(1d, 1d)); @Test // DATACMNS-437 - public void equalsWorksCorrectly() { + void equalsWorksCorrectly() { assertThat(first.equals(second)).isTrue(); assertThat(second.equals(first)).isTrue(); @@ -41,20 +41,20 @@ public class BoxUnitTests { } @Test // DATACMNS-437 - public void hashCodeWorksCorrectly() { + void hashCodeWorksCorrectly() { assertThat(first.hashCode()).isEqualTo(second.hashCode()); assertThat(first.hashCode()).isNotEqualTo(third.hashCode()); } @Test // DATACMNS-437 - public void testToString() { + void testToString() { assertThat(first.toString()).isEqualTo("Box [Point [x=1.000000, y=1.000000], Point [x=2.000000, y=2.000000]]"); } @Test // DATACMNS-482 - public void testSerialization() { + void testSerialization() { Box serialized = (Box) SerializationUtils.deserialize(SerializationUtils.serialize(first)); assertThat(serialized).isEqualTo(first); diff --git a/src/test/java/org/springframework/data/geo/CircleUnitTests.java b/src/test/java/org/springframework/data/geo/CircleUnitTests.java index 561cfa267..8928ce809 100755 --- a/src/test/java/org/springframework/data/geo/CircleUnitTests.java +++ b/src/test/java/org/springframework/data/geo/CircleUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.geo; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.util.SerializationUtils; /** @@ -26,20 +26,20 @@ import org.springframework.util.SerializationUtils; * @author Oliver Gierke * @author Thomas Darimont */ -public class CircleUnitTests { +class CircleUnitTests { @Test // DATACMNS-437 - public void rejectsNullOrigin() { + void rejectsNullOrigin() { assertThatIllegalArgumentException().isThrownBy(() -> new Circle(null, new Distance(0))); } @Test // DATACMNS-437 - public void rejectsNegativeRadius() { + void rejectsNegativeRadius() { assertThatIllegalArgumentException().isThrownBy(() -> new Circle(1, 1, -1)); } @Test // DATACMNS-437 - public void considersTwoCirclesEqualCorrectly() { + void considersTwoCirclesEqualCorrectly() { Circle left = new Circle(1, 1, 1); Circle right = new Circle(1, 1, 1); @@ -54,13 +54,13 @@ public class CircleUnitTests { } @Test // DATACMNS-437 - public void testToString() { + void testToString() { assertThat(new Circle(1, 1, 1).toString()).isEqualTo("Circle: [center=Point [x=1.000000, y=1.000000], radius=1.0]"); } @Test // DATACMNS-482 - public void testSerialization() { + void testSerialization() { Circle circle = new Circle(1, 1, 1); diff --git a/src/test/java/org/springframework/data/geo/DistanceUnitTests.java b/src/test/java/org/springframework/data/geo/DistanceUnitTests.java index 4194b48f0..f2c21e6b4 100755 --- a/src/test/java/org/springframework/data/geo/DistanceUnitTests.java +++ b/src/test/java/org/springframework/data/geo/DistanceUnitTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*; import static org.springframework.data.geo.Metrics.*; import org.assertj.core.data.Offset; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.domain.Range; import org.springframework.data.domain.Range.Bound; import org.springframework.util.SerializationUtils; @@ -31,19 +31,19 @@ import org.springframework.util.SerializationUtils; * @author Thomas Darimont * @author Mark Paluch */ -public class DistanceUnitTests { +class DistanceUnitTests { private static final Offset EPS = Offset.offset(0.000000001); private static final double TEN_MILES_NORMALIZED = 0.002523219294755161; private static final double TEN_KM_NORMALIZED = 0.001567855942887398; @Test // DATACMNS-437 - public void defaultsMetricToNeutralOne() { + void defaultsMetricToNeutralOne() { assertThat(new Distance(2.5).getMetric()).isEqualTo((Metric) Metrics.NEUTRAL); } @Test // DATACMNS-437 - public void addsDistancesWithoutExplicitMetric() { + void addsDistancesWithoutExplicitMetric() { Distance left = new Distance(2.5, KILOMETERS); Distance right = new Distance(2.5, KILOMETERS); @@ -52,7 +52,7 @@ public class DistanceUnitTests { } @Test // DATACMNS-437 - public void addsDistancesWithExplicitMetric() { + void addsDistancesWithExplicitMetric() { Distance left = new Distance(2.5, KILOMETERS); Distance right = new Distance(2.5, KILOMETERS); @@ -61,7 +61,7 @@ public class DistanceUnitTests { } @Test // DATACMNS-474 - public void distanceWithSameMetricShoudEqualAfterConversion() { + void distanceWithSameMetricShoudEqualAfterConversion() { assertThat(new Distance(1).in(NEUTRAL)).isEqualTo(new Distance(1)); assertThat(new Distance(TEN_KM_NORMALIZED).in(KILOMETERS)).isEqualTo(new Distance(10, KILOMETERS)); @@ -69,14 +69,14 @@ public class DistanceUnitTests { } @Test // DATACMNS-474 - public void distanceWithDifferentMetricShoudEqualAfterConversion() { + void distanceWithDifferentMetricShoudEqualAfterConversion() { assertThat(new Distance(10, MILES)).isEqualTo(new Distance(TEN_MILES_NORMALIZED).in(MILES)); assertThat(new Distance(10, KILOMETERS)).isEqualTo(new Distance(TEN_KM_NORMALIZED).in(KILOMETERS)); } @Test // DATACMNS-474 - public void conversionShouldProduceCorrectNormalizedValue() { + void conversionShouldProduceCorrectNormalizedValue() { assertThat(new Distance(TEN_KM_NORMALIZED, NEUTRAL).in(KILOMETERS).getNormalizedValue()) .isCloseTo(new Distance(10, KILOMETERS).getNormalizedValue(), EPS); @@ -98,7 +98,7 @@ public class DistanceUnitTests { } @Test // DATACMNS-474 - public void toStringAfterConversion() { + void toStringAfterConversion() { assertThat(new Distance(10, KILOMETERS).in(MILES).toString()) .isEqualTo(new Distance(6.21371256214785, MILES).toString()); @@ -107,7 +107,7 @@ public class DistanceUnitTests { } @Test // DATACMNS-482 - public void testSerialization() { + void testSerialization() { Distance dist = new Distance(10, KILOMETERS); @@ -116,12 +116,12 @@ public class DistanceUnitTests { } @Test // DATACMNS-626 - public void returnsMetricsAbbreviationAsUnit() { + void returnsMetricsAbbreviationAsUnit() { assertThat(new Distance(10, KILOMETERS).getUnit()).isEqualTo("km"); } @Test // DATACMNS-651 - public void createsARangeCorrectly() { + void createsARangeCorrectly() { Distance twoKilometers = new Distance(2, KILOMETERS); Distance tenKilometers = new Distance(10, KILOMETERS); @@ -134,7 +134,7 @@ public class DistanceUnitTests { } @Test // DATACMNS-651 - public void createsARangeFromPiecesCorrectly() { + void createsARangeFromPiecesCorrectly() { Distance twoKilometers = new Distance(2, KILOMETERS); Distance tenKilometers = new Distance(10, KILOMETERS); @@ -147,7 +147,7 @@ public class DistanceUnitTests { } @Test // DATACMNS-651 - public void implementsComparableCorrectly() { + void implementsComparableCorrectly() { Distance twoKilometers = new Distance(2, KILOMETERS); Distance tenKilometers = new Distance(10, KILOMETERS); diff --git a/src/test/java/org/springframework/data/geo/GeoModuleIntegrationTests.java b/src/test/java/org/springframework/data/geo/GeoModuleIntegrationTests.java index 00bdde9c2..b9c368b98 100755 --- a/src/test/java/org/springframework/data/geo/GeoModuleIntegrationTests.java +++ b/src/test/java/org/springframework/data/geo/GeoModuleIntegrationTests.java @@ -17,8 +17,8 @@ package org.springframework.data.geo; import static org.assertj.core.api.Assertions.*; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.fasterxml.jackson.databind.ObjectMapper; @@ -27,19 +27,19 @@ import com.fasterxml.jackson.databind.ObjectMapper; * * @author Oliver Gierke */ -public class GeoModuleIntegrationTests { +class GeoModuleIntegrationTests { ObjectMapper mapper; - @Before - public void setUp() { + @BeforeEach + void setUp() { this.mapper = new ObjectMapper(); this.mapper.registerModule(new GeoModule()); } @Test // DATACMNS-475 - public void deserializesDistance() throws Exception { + void deserializesDistance() throws Exception { String json = "{\"value\":10.0,\"metric\":\"KILOMETERS\"}"; Distance reference = new Distance(10.0, Metrics.KILOMETERS); @@ -49,7 +49,7 @@ public class GeoModuleIntegrationTests { } @Test // DATACMNS-475 - public void deserializesPoint() throws Exception { + void deserializesPoint() throws Exception { String json = "{\"x\":10.0,\"y\":20.0}"; Point reference = new Point(10.0, 20.0); @@ -59,7 +59,7 @@ public class GeoModuleIntegrationTests { } @Test // DATACMNS-475 - public void deserializesCircle() throws Exception { + void deserializesCircle() throws Exception { String json = "{\"center\":{\"x\":10.0,\"y\":20.0},\"radius\":{\"value\":10.0,\"metric\":\"KILOMETERS\"}}"; Circle reference = new Circle(new Point(10.0, 20.0), new Distance(10, Metrics.KILOMETERS)); @@ -69,7 +69,7 @@ public class GeoModuleIntegrationTests { } @Test // DATACMNS-475 - public void deserializesBox() throws Exception { + void deserializesBox() throws Exception { String json = "{\"first\":{\"x\":1.0,\"y\":2.0},\"second\":{\"x\":2.0,\"y\":3.0}}"; Box reference = new Box(new Point(1, 2), new Point(2, 3)); @@ -79,7 +79,7 @@ public class GeoModuleIntegrationTests { } @Test // DATACMNS-475 - public void deserializesPolygon() throws Exception { + void deserializesPolygon() throws Exception { String json = "{\"points\":[{\"x\":1.0,\"y\":2.0},{\"x\":2.0,\"y\":3.0},{\"x\":3.0,\"y\":4.0}]}"; Polygon reference = new Polygon(new Point(1, 2), new Point(2, 3), new Point(3, 4)); diff --git a/src/test/java/org/springframework/data/geo/GeoResultUnitTests.java b/src/test/java/org/springframework/data/geo/GeoResultUnitTests.java index 16b6208c9..41ce10530 100755 --- a/src/test/java/org/springframework/data/geo/GeoResultUnitTests.java +++ b/src/test/java/org/springframework/data/geo/GeoResultUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.geo; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.util.SerializationUtils; /** @@ -26,7 +26,7 @@ import org.springframework.util.SerializationUtils; * @author Oliver Gierke * @author Thomas Darimont */ -public class GeoResultUnitTests { +class GeoResultUnitTests { GeoResult first = new GeoResult<>("Foo", new Distance(2.5)); GeoResult second = new GeoResult<>("Foo", new Distance(2.5)); @@ -34,13 +34,13 @@ public class GeoResultUnitTests { GeoResult fourth = new GeoResult<>("Foo", new Distance(5.2)); @Test // DATACMNS-437 - public void considersSameInstanceEqual() { + void considersSameInstanceEqual() { assertThat(first.equals(first)).isTrue(); } @Test // DATACMNS-437 - public void considersSameValuesAsEqual() { + void considersSameValuesAsEqual() { assertThat(first.equals(second)).isTrue(); assertThat(second.equals(first)).isTrue(); @@ -53,12 +53,12 @@ public class GeoResultUnitTests { @Test @SuppressWarnings({ "rawtypes", "unchecked" }) // DATACMNS-437 - public void rejectsNullContent() { + void rejectsNullContent() { assertThatIllegalArgumentException().isThrownBy(() -> new GeoResult(null, new Distance(2.5))); } @Test // DATACMNS-482 - public void testSerialization() { + void testSerialization() { GeoResult result = new GeoResult<>("test", new Distance(2)); diff --git a/src/test/java/org/springframework/data/geo/GeoResultsUnitTests.java b/src/test/java/org/springframework/data/geo/GeoResultsUnitTests.java index f65e44a57..75ecfdae3 100755 --- a/src/test/java/org/springframework/data/geo/GeoResultsUnitTests.java +++ b/src/test/java/org/springframework/data/geo/GeoResultsUnitTests.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.*; import java.util.Arrays; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.util.SerializationUtils; /** @@ -29,11 +29,11 @@ import org.springframework.util.SerializationUtils; * @author Oliver Gierke * @author Thomas Darimont */ -public class GeoResultsUnitTests { +class GeoResultsUnitTests { @Test // DATACMNS-437 @SuppressWarnings("unchecked") - public void calculatesAverageForGivenGeoResults() { + void calculatesAverageForGivenGeoResults() { GeoResult first = new GeoResult<>(new Object(), new Distance(2)); GeoResult second = new GeoResult<>(new Object(), new Distance(5)); @@ -43,7 +43,7 @@ public class GeoResultsUnitTests { } @Test // DATACMNS-482 - public void testSerialization() { + void testSerialization() { GeoResult result = new GeoResult<>("test", new Distance(2)); GeoResults geoResults = new GeoResults<>(Collections.singletonList(result)); diff --git a/src/test/java/org/springframework/data/geo/PointUnitTests.java b/src/test/java/org/springframework/data/geo/PointUnitTests.java index e33a847c2..871f68acf 100755 --- a/src/test/java/org/springframework/data/geo/PointUnitTests.java +++ b/src/test/java/org/springframework/data/geo/PointUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.geo; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.util.SerializationUtils; /** @@ -26,15 +26,15 @@ import org.springframework.util.SerializationUtils; * @author Oliver Gierke * @author Thomas Darimont */ -public class PointUnitTests { +class PointUnitTests { @Test // DATACMNS-437 - public void rejectsNullforCopyConstructor() { + void rejectsNullforCopyConstructor() { assertThatIllegalArgumentException().isThrownBy(() -> new Point(null)); } @Test // DATACMNS-437 - public void equalsIsImplementedCorrectly() { + void equalsIsImplementedCorrectly() { assertThat(new Point(1.5, 1.5)).isEqualTo(new Point(1.5, 1.5)); assertThat(new Point(1.5, 1.5)).isNotEqualTo(new Point(2.0, 2.0)); @@ -42,12 +42,12 @@ public class PointUnitTests { } @Test // DATACMNS-437 - public void invokingToStringWorksCorrectly() { + void invokingToStringWorksCorrectly() { assertThat(new Point(1.5, 1.5).toString()).isEqualTo("Point [x=1.500000, y=1.500000]"); } @Test // DATACMNS-482 - public void testSerialization() { + void testSerialization() { Point point = new Point(1.5, 1.5); diff --git a/src/test/java/org/springframework/data/geo/PolygonUnitTests.java b/src/test/java/org/springframework/data/geo/PolygonUnitTests.java index 579da3006..110725340 100755 --- a/src/test/java/org/springframework/data/geo/PolygonUnitTests.java +++ b/src/test/java/org/springframework/data/geo/PolygonUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.geo; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.util.SerializationUtils; /** @@ -26,19 +26,19 @@ import org.springframework.util.SerializationUtils; * @author Oliver Gierke * @author Thomas Darimont */ -public class PolygonUnitTests { +class PolygonUnitTests { Point first = new Point(1, 1); Point second = new Point(2, 2); Point third = new Point(3, 3); @Test // DATACMNS-437 - public void rejectsNullPoints() { + void rejectsNullPoints() { assertThatIllegalArgumentException().isThrownBy(() -> new Polygon(null, null, null)); } @Test // DATACMNS-437 - public void createsSimplePolygon() { + void createsSimplePolygon() { Polygon polygon = new Polygon(third, second, first); @@ -46,7 +46,7 @@ public class PolygonUnitTests { } @Test // DATACMNS-437 - public void isEqualForSamePoints() { + void isEqualForSamePoints() { Polygon left = new Polygon(third, second, first); Polygon right = new Polygon(third, second, first); @@ -56,14 +56,14 @@ public class PolygonUnitTests { } @Test // DATACMNS-437 - public void testToString() { + void testToString() { assertThat(new Polygon(third, second, first).toString()).isEqualTo( "Polygon: [Point [x=3.000000, y=3.000000],Point [x=2.000000, y=2.000000],Point [x=1.000000, y=1.000000]]"); } @Test // DATACMNS-482 - public void testSerialization() { + void testSerialization() { Polygon polygon = new Polygon(third, second, first); diff --git a/src/test/java/org/springframework/data/geo/format/DistanceFormatterUnitTests.java b/src/test/java/org/springframework/data/geo/format/DistanceFormatterUnitTests.java index e8f2886e1..132420b77 100755 --- a/src/test/java/org/springframework/data/geo/format/DistanceFormatterUnitTests.java +++ b/src/test/java/org/springframework/data/geo/format/DistanceFormatterUnitTests.java @@ -23,12 +23,10 @@ import java.util.Arrays; import java.util.Collection; import java.util.Locale; -import org.junit.Test; -import org.junit.experimental.runners.Enclosed; -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.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; + import org.springframework.data.geo.Distance; import org.springframework.data.geo.Metrics; @@ -37,54 +35,40 @@ import org.springframework.data.geo.Metrics; * * @author Oliver Gierke */ -@RunWith(Enclosed.class) -public class DistanceFormatterUnitTests { +class DistanceFormatterUnitTests { static Distance REFERENCE = new Distance(10.8, Metrics.KILOMETERS); - @Test - public void testname() { - // To make sure Maven picks up the tests + @Test // DATAREST-279, DATACMNS-626 + void rejectsArbitraryNonsense() { + assertThatIllegalArgumentException().isThrownBy(() -> INSTANCE.convert("foo")); } - public static class UnparameterizedTests { - - @Test // DATAREST-279, DATACMNS-626 - public void rejectsArbitraryNonsense() { - assertThatIllegalArgumentException().isThrownBy(() -> INSTANCE.convert("foo")); - } - - @Test // DATAREST-279, DATACMNS-626 - public void rejectsUnsupportedMetric() { - assertThatIllegalArgumentException().isThrownBy(() -> INSTANCE.convert("10.8cm")); - } - - @Test // DATAREST-279, DATACMNS-626 - public void printsDistance() { - assertThat(INSTANCE.print(REFERENCE, Locale.US)).isEqualTo("10.8km"); - } + @Test // DATAREST-279, DATACMNS-626 + void rejectsUnsupportedMetric() { + assertThatIllegalArgumentException().isThrownBy(() -> INSTANCE.convert("10.8cm")); } - @RunWith(Parameterized.class) - public static class ParameterizedTests { + @Test // DATAREST-279, DATACMNS-626 + void printsDistance() { + assertThat(INSTANCE.print(REFERENCE, Locale.US)).isEqualTo("10.8km"); + } - @Parameters - public static Collection parameters() { - return Arrays.asList(new String[] { "10.8km" }, new String[] { " 10.8km" }, new String[] { " 10.8 km" }, - new String[] { " 10.8 km " }, new String[] { " 10.8 KM" }, new String[] { " 10.8 kilometers" }, - new String[] { " 10.8 KILOMETERS" }, new String[] { " 10.8 KILOMETERS " }); - } + static Collection parameters() { + return Arrays.asList(new String[] { "10.8km" }, new String[] { " 10.8km" }, new String[] { " 10.8 km" }, + new String[] { " 10.8 km " }, new String[] { " 10.8 KM" }, new String[] { " 10.8 kilometers" }, + new String[] { " 10.8 KILOMETERS" }, new String[] { " 10.8 KILOMETERS " }); + } - public @Parameter String source; + @ParameterizedTest // DATAREST-279, DATACMNS-626 + @MethodSource("parameters") + void parsesDistanceFromString(String source) { + assertThat(INSTANCE.convert(source)).isEqualTo(REFERENCE); + } - @Test // DATAREST-279, DATACMNS-626 - public void parsesDistanceFromString() { - assertThat(INSTANCE.convert(source)).isEqualTo(REFERENCE); - } - - @Test - public void parsesDistances() throws ParseException { - assertThat(INSTANCE.parse(source, Locale.US)).isEqualTo(REFERENCE); - } + @ParameterizedTest + @MethodSource("parameters") + void parsesDistances(String source) throws ParseException { + assertThat(INSTANCE.parse(source, Locale.US)).isEqualTo(REFERENCE); } } diff --git a/src/test/java/org/springframework/data/geo/format/PointFormatterUnitTests.java b/src/test/java/org/springframework/data/geo/format/PointFormatterUnitTests.java index 5d81194fa..5a351254d 100755 --- a/src/test/java/org/springframework/data/geo/format/PointFormatterUnitTests.java +++ b/src/test/java/org/springframework/data/geo/format/PointFormatterUnitTests.java @@ -23,12 +23,9 @@ import java.util.Arrays; import java.util.Collection; import java.util.Locale; -import org.junit.Test; -import org.junit.experimental.runners.Enclosed; -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.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; import org.springframework.data.geo.Point; @@ -37,53 +34,47 @@ import org.springframework.data.geo.Point; * * @author Oliver Gierke */ -@RunWith(Enclosed.class) -public class PointFormatterUnitTests { +class PointFormatterUnitTests { static Point REFERENCE = new Point(20.9, 10.8); @Test - public void testname() { + void testname() { // To make sure Maven picks up the tests } - public static class UnparameterizedTests { - - @Test // DATAREST-279, DATACMNS-626 - public void rejectsArbitraryNonsense() { - assertThatIllegalArgumentException().isThrownBy(() -> INSTANCE.convert("foo")).withMessageContaining("comma"); - } - - @Test // DATAREST-279, DATACMNS-626 - public void rejectsMoreThanTwoCoordinates() { - assertThatIllegalArgumentException().isThrownBy(() -> INSTANCE.convert("10.8,20.9,30.10")); - } - - @Test // DATAREST-279, DATACMNS-626 - public void rejectsInvalidCoordinate() { - assertThatIllegalArgumentException().isThrownBy(() -> INSTANCE.convert("10.8,foo")); - } + @Test + // DATAREST-279, DATACMNS-626 + void rejectsArbitraryNonsense() { + assertThatIllegalArgumentException().isThrownBy(() -> INSTANCE.convert("foo")).withMessageContaining("comma"); } - @RunWith(Parameterized.class) - public static class ParameterizedTests { + @Test + // DATAREST-279, DATACMNS-626 + void rejectsMoreThanTwoCoordinates() { + assertThatIllegalArgumentException().isThrownBy(() -> INSTANCE.convert("10.8,20.9,30.10")); + } - @Parameters - public static Collection parameters() { - return Arrays.asList(new String[] { "10.8,20.9" }, new String[] { " 10.8,20.9 " }, new String[] { " 10.8 ,20.9" }, - new String[] { " 10.8, 20.9 " }); - } + @Test + // DATAREST-279, DATACMNS-626 + void rejectsInvalidCoordinate() { + assertThatIllegalArgumentException().isThrownBy(() -> INSTANCE.convert("10.8,foo")); + } - public @Parameter String source; + static Collection parameters() { + return Arrays.asList(new String[] { "10.8,20.9" }, new String[] { " 10.8,20.9 " }, new String[] { " 10.8 ,20.9" }, + new String[] { " 10.8, 20.9 " }); + } - @Test // DATAREST-279, DATACMNS-626 - public void convertsPointFromString() { - assertThat(INSTANCE.convert(source)).isEqualTo(REFERENCE); - } + @ParameterizedTest // DATAREST-279, DATACMNS-626 + @MethodSource("parameters") + void convertsPointFromString(String source) { + assertThat(INSTANCE.convert(source)).isEqualTo(REFERENCE); + } - @Test // DATAREST-279, DATACMNS-626 - public void parsesPoint() throws ParseException { - assertThat(INSTANCE.parse(source, Locale.US)).isEqualTo(REFERENCE); - } + @ParameterizedTest // DATAREST-279, DATACMNS-626 + @MethodSource("parameters") + void parsesPoint(String source) throws ParseException { + assertThat(INSTANCE.parse(source, Locale.US)).isEqualTo(REFERENCE); } } diff --git a/src/test/java/org/springframework/data/history/AnnotationRevisionMetadataUnitTests.java b/src/test/java/org/springframework/data/history/AnnotationRevisionMetadataUnitTests.java index 7ed2c6b23..faba15cc8 100644 --- a/src/test/java/org/springframework/data/history/AnnotationRevisionMetadataUnitTests.java +++ b/src/test/java/org/springframework/data/history/AnnotationRevisionMetadataUnitTests.java @@ -24,7 +24,7 @@ import java.time.ZoneOffset; import java.util.Date; import org.assertj.core.api.SoftAssertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.annotation.Reference; @@ -34,12 +34,12 @@ import org.springframework.data.annotation.Reference; * @author Oliver Gierke * @author Jens Schauder */ -public class AnnotationRevisionMetadataUnitTests { +class AnnotationRevisionMetadataUnitTests { SoftAssertions softly = new SoftAssertions(); @Test // DATACMNS-1173 - public void exposesNoInformationOnEmptyProbe() { + void exposesNoInformationOnEmptyProbe() { Sample sample = new Sample(); RevisionMetadata metadata = getMetadata(sample); @@ -55,7 +55,7 @@ public class AnnotationRevisionMetadataUnitTests { } @Test // DATACMNS-1173 - public void exposesRevisionNumber() { + void exposesRevisionNumber() { Sample sample = new Sample(); sample.revisionNumber = 1L; @@ -69,7 +69,7 @@ public class AnnotationRevisionMetadataUnitTests { } @Test // DATACMNS-1173 - public void exposesRevisionDateAndInstantForLocalDateTime() { + void exposesRevisionDateAndInstantForLocalDateTime() { Sample sample = new Sample(); sample.revisionDate = LocalDateTime.now(); @@ -84,7 +84,7 @@ public class AnnotationRevisionMetadataUnitTests { } @Test // DATACMNS-1251 - public void exposesRevisionDateAndInstantForInstant() { + void exposesRevisionDateAndInstantForInstant() { SampleWithInstant sample = new SampleWithInstant(); sample.revisionInstant = Instant.now(); @@ -99,7 +99,7 @@ public class AnnotationRevisionMetadataUnitTests { } @Test // DATACMNS-1290 - public void exposesRevisionDateAndInstantForLong() { + void exposesRevisionDateAndInstantForLong() { SampleWithLong sample = new SampleWithLong(); sample.revisionLong = 4711L; @@ -116,7 +116,7 @@ public class AnnotationRevisionMetadataUnitTests { } @Test // DATACMNS-1384 - public void supportsTimestampRevisionInstant() { + void supportsTimestampRevisionInstant() { SampleWithTimestamp sample = new SampleWithTimestamp(); Instant now = Instant.now(); @@ -128,7 +128,7 @@ public class AnnotationRevisionMetadataUnitTests { } @Test // DATACMNS-1384 - public void supportsDateRevisionInstant() { + void supportsDateRevisionInstant() { SampleWithDate sample = new SampleWithDate(); Date date = new Date(); diff --git a/src/test/java/org/springframework/data/history/RevisionUnitTests.java b/src/test/java/org/springframework/data/history/RevisionUnitTests.java index 2a82868fd..c239d8d77 100755 --- a/src/test/java/org/springframework/data/history/RevisionUnitTests.java +++ b/src/test/java/org/springframework/data/history/RevisionUnitTests.java @@ -24,10 +24,10 @@ import java.util.Optional; import java.util.stream.Collectors; import java.util.stream.Stream; -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; /** * Unit tests for {@link RevisionMetadata}. @@ -35,13 +35,13 @@ import org.mockito.junit.MockitoJUnitRunner; * @author Oliver Gierke * @author Jens Schauder */ -@RunWith(MockitoJUnitRunner.class) -public class RevisionUnitTests { +@ExtendWith(MockitoExtension.class) +class RevisionUnitTests { @Mock RevisionMetadata firstMetadata, secondMetadata; @Test - public void comparesCorrectly() { + void comparesCorrectly() { when(firstMetadata.getRevisionNumber()).thenReturn(Optional.of(1)); when(secondMetadata.getRevisionNumber()).thenReturn(Optional.of(2)); @@ -56,7 +56,7 @@ public class RevisionUnitTests { } @Test // DATACMNS-187 - public void returnsRevisionNumber() { + void returnsRevisionNumber() { Optional reference = Optional.of(4711); when(firstMetadata.getRevisionNumber()).thenReturn(reference); @@ -65,7 +65,7 @@ public class RevisionUnitTests { } @Test // DATACMNS-1251 - public void returnsRevisionInstant() { + void returnsRevisionInstant() { Optional reference = Optional.of(Instant.now()); when(firstMetadata.getRevisionInstant()).thenReturn(reference); @@ -74,7 +74,7 @@ public class RevisionUnitTests { } @Test // DATACMNS-218 - public void returnsRevisionMetadata() { + void returnsRevisionMetadata() { assertThat(Revision.of(firstMetadata, new Object()).getMetadata()).isEqualTo(firstMetadata); } } diff --git a/src/test/java/org/springframework/data/history/RevisionsUnitTests.java b/src/test/java/org/springframework/data/history/RevisionsUnitTests.java index 95fb19a30..7d0ed7e1e 100755 --- a/src/test/java/org/springframework/data/history/RevisionsUnitTests.java +++ b/src/test/java/org/springframework/data/history/RevisionsUnitTests.java @@ -22,25 +22,25 @@ import java.util.Arrays; import java.util.Iterator; 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.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; /** * Unit tests for {@link Revisions}. * * @author Oliver Gierke */ -@RunWith(MockitoJUnitRunner.class) -public class RevisionsUnitTests { +@ExtendWith(MockitoExtension.class) +class RevisionsUnitTests { @Mock RevisionMetadata first, second; Revision firstRevision, secondRevision; - @Before - public void setUp() { + @BeforeEach + void setUp() { when(first.getRevisionNumber()).thenReturn(Optional.of(0)); when(second.getRevisionNumber()).thenReturn(Optional.of(10)); @@ -50,13 +50,13 @@ public class RevisionsUnitTests { } @Test - public void returnsCorrectLatestRevision() { + void returnsCorrectLatestRevision() { assertThat(Revisions.of(Arrays.asList(firstRevision, secondRevision)).getLatestRevision()) .isEqualTo(secondRevision); } @Test - public void iteratesInCorrectOrder() { + void iteratesInCorrectOrder() { Revisions revisions = Revisions.of(Arrays.asList(firstRevision, secondRevision)); Iterator> iterator = revisions.iterator(); @@ -69,13 +69,13 @@ public class RevisionsUnitTests { } @Test - public void reversedRevisionsStillReturnsCorrectLatestRevision() { + void reversedRevisionsStillReturnsCorrectLatestRevision() { assertThat(Revisions.of(Arrays.asList(firstRevision, secondRevision)).reverse().getLatestRevision()) .isEqualTo(secondRevision); } @Test - public void iteratesReversedRevisionsInCorrectOrder() { + void iteratesReversedRevisionsInCorrectOrder() { Revisions revisions = Revisions.of(Arrays.asList(firstRevision, secondRevision)); Iterator> iterator = revisions.reverse().iterator(); @@ -88,7 +88,7 @@ public class RevisionsUnitTests { } @Test - public void forcesInvalidlyOrderedRevisionsToBeOrdered() { + void forcesInvalidlyOrderedRevisionsToBeOrdered() { Revisions revisions = Revisions.of(Arrays.asList(secondRevision, firstRevision)); Iterator> iterator = revisions.iterator(); diff --git a/src/test/java/org/springframework/data/mapping/InstantiationAwarePersistentPropertyAccessorUnitTests.java b/src/test/java/org/springframework/data/mapping/InstantiationAwarePersistentPropertyAccessorUnitTests.java index 7bc810bd2..24e2123bf 100644 --- a/src/test/java/org/springframework/data/mapping/InstantiationAwarePersistentPropertyAccessorUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/InstantiationAwarePersistentPropertyAccessorUnitTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*; import lombok.Value; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.convert.EntityInstantiators; import org.springframework.data.mapping.context.SampleMappingContext; import org.springframework.data.mapping.context.SamplePersistentProperty; diff --git a/src/test/java/org/springframework/data/mapping/MappingMetadataTests.java b/src/test/java/org/springframework/data/mapping/MappingMetadataTests.java index b77ec18a1..f31449fc4 100755 --- a/src/test/java/org/springframework/data/mapping/MappingMetadataTests.java +++ b/src/test/java/org/springframework/data/mapping/MappingMetadataTests.java @@ -17,8 +17,8 @@ package org.springframework.data.mapping; import static org.assertj.core.api.Assertions.*; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.data.mapping.context.SampleMappingContext; import org.springframework.data.mapping.context.SamplePersistentProperty; @@ -32,7 +32,7 @@ public class MappingMetadataTests { SampleMappingContext ctx; - @Before + @BeforeEach public void setup() { ctx = new SampleMappingContext(); } diff --git a/src/test/java/org/springframework/data/mapping/ParameterUnitTests.java b/src/test/java/org/springframework/data/mapping/ParameterUnitTests.java index b3e9ff82c..38d6bdfae 100755 --- a/src/test/java/org/springframework/data/mapping/ParameterUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/ParameterUnitTests.java @@ -19,10 +19,11 @@ import static org.assertj.core.api.Assertions.*; import java.lang.annotation.Annotation; -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.springframework.data.mapping.PreferredConstructor.Parameter; import org.springframework.data.util.ClassTypeInformation; import org.springframework.data.util.TypeInformation; @@ -32,17 +33,17 @@ import org.springframework.data.util.TypeInformation; * * @author Oliver Gierke */ -@RunWith(MockitoJUnitRunner.class) -public class ParameterUnitTests

> { +@ExtendWith(MockitoExtension.class) +class ParameterUnitTests

> { @Mock PersistentEntity entity; @Mock PersistentEntity stringEntity; - TypeInformation type = ClassTypeInformation.from(Object.class); - Annotation[] annotations = new Annotation[0]; + private TypeInformation type = ClassTypeInformation.from(Object.class); + private Annotation[] annotations = new Annotation[0]; @Test - public void twoParametersWithIdenticalSetupEqual() { + void twoParametersWithIdenticalSetupEqual() { Parameter left = new Parameter<>("name", type, annotations, entity); Parameter right = new Parameter<>("name", type, annotations, entity); @@ -52,7 +53,7 @@ public class ParameterUnitTests

> { } @Test - public void twoParametersWithIdenticalSetupAndNullNameEqual() { + void twoParametersWithIdenticalSetupAndNullNameEqual() { Parameter left = new Parameter<>(null, type, annotations, entity); Parameter right = new Parameter<>(null, type, annotations, entity); @@ -62,7 +63,7 @@ public class ParameterUnitTests

> { } @Test - public void twoParametersWithIdenticalAndNullEntitySetupEqual() { + void twoParametersWithIdenticalAndNullEntitySetupEqual() { Parameter left = new Parameter<>("name", type, annotations, null); Parameter right = new Parameter<>("name", type, annotations, null); @@ -72,7 +73,7 @@ public class ParameterUnitTests

> { } @Test - public void twoParametersWithDifferentNameAreNotEqual() { + void twoParametersWithDifferentNameAreNotEqual() { Parameter left = new Parameter<>("first", type, annotations, entity); Parameter right = new Parameter<>("second", type, annotations, entity); @@ -81,7 +82,7 @@ public class ParameterUnitTests

> { } @Test - public void twoParametersWithDifferenTypeAreNotEqual() { + void twoParametersWithDifferenTypeAreNotEqual() { Parameter left = new Parameter<>("name", type, annotations, entity); Parameter right = new Parameter<>("name", ClassTypeInformation.from(String.class), annotations, diff --git a/src/test/java/org/springframework/data/mapping/PersistentPropertyAccessorUnitTests.java b/src/test/java/org/springframework/data/mapping/PersistentPropertyAccessorUnitTests.java index 06313eda3..893de68f4 100644 --- a/src/test/java/org/springframework/data/mapping/PersistentPropertyAccessorUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/PersistentPropertyAccessorUnitTests.java @@ -33,7 +33,7 @@ import java.util.function.BiFunction; import java.util.function.Function; import java.util.stream.Stream; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.data.mapping.context.SampleMappingContext; import org.springframework.data.mapping.context.SamplePersistentProperty; diff --git a/src/test/java/org/springframework/data/mapping/PreferredConstructorDiscovererUnitTests.java b/src/test/java/org/springframework/data/mapping/PreferredConstructorDiscovererUnitTests.java index d2d70f575..f899946fd 100755 --- a/src/test/java/org/springframework/data/mapping/PreferredConstructorDiscovererUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/PreferredConstructorDiscovererUnitTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*; import java.util.Iterator; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.annotation.PersistenceConstructor; import org.springframework.data.mapping.PreferredConstructor.Parameter; import org.springframework.data.mapping.PreferredConstructorDiscovererUnitTests.Outer.Inner; diff --git a/src/test/java/org/springframework/data/mapping/PropertyPathUnitTests.java b/src/test/java/org/springframework/data/mapping/PropertyPathUnitTests.java index 592f5957c..e7eb7b4f9 100755 --- a/src/test/java/org/springframework/data/mapping/PropertyPathUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/PropertyPathUnitTests.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Set; import java.util.regex.Pattern; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.util.ClassTypeInformation; import org.springframework.data.util.TypeInformation; diff --git a/src/test/java/org/springframework/data/mapping/PropertyReferenceExceptionUnitTests.java b/src/test/java/org/springframework/data/mapping/PropertyReferenceExceptionUnitTests.java index c10c3fd97..3842f10a7 100755 --- a/src/test/java/org/springframework/data/mapping/PropertyReferenceExceptionUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/PropertyReferenceExceptionUnitTests.java @@ -21,7 +21,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.util.ClassTypeInformation; import org.springframework.data.util.TypeInformation; diff --git a/src/test/java/org/springframework/data/mapping/SimpleTypeHolderUnitTests.java b/src/test/java/org/springframework/data/mapping/SimpleTypeHolderUnitTests.java index 4fa70be2d..182d6af11 100755 --- a/src/test/java/org/springframework/data/mapping/SimpleTypeHolderUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/SimpleTypeHolderUnitTests.java @@ -23,7 +23,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.UUID; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.mapping.model.SimpleTypeHolder; diff --git a/src/test/java/org/springframework/data/mapping/TargetAwareIdentifierAccessorUnitTests.java b/src/test/java/org/springframework/data/mapping/TargetAwareIdentifierAccessorUnitTests.java index b8645311f..f1959ec96 100644 --- a/src/test/java/org/springframework/data/mapping/TargetAwareIdentifierAccessorUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/TargetAwareIdentifierAccessorUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.mapping; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Unit tests for {@link TargetAwareIdentifierAccessor}. diff --git a/src/test/java/org/springframework/data/mapping/callback/DefaultEntityCallbacksUnitTests.java b/src/test/java/org/springframework/data/mapping/callback/DefaultEntityCallbacksUnitTests.java index 8aab67665..248fc8ad6 100644 --- a/src/test/java/org/springframework/data/mapping/callback/DefaultEntityCallbacksUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/callback/DefaultEntityCallbacksUnitTests.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.*; import java.util.ArrayList; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -38,10 +38,10 @@ import org.springframework.data.mapping.callback.CapturingEntityCallback.ThirdCa * @author Mark Paluch * @author Christoph Strobl */ -public class DefaultEntityCallbacksUnitTests { +class DefaultEntityCallbacksUnitTests { @Test // DATACMNS-1467 - public void shouldDispatchCallback() { + void shouldDispatchCallback() { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(MyConfig.class); @@ -54,7 +54,7 @@ public class DefaultEntityCallbacksUnitTests { } @Test // DATACMNS-1467 - public void shouldDispatchCallsToLambdaReceivers() { + void shouldDispatchCallsToLambdaReceivers() { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(LambdaConfig.class); @@ -67,7 +67,7 @@ public class DefaultEntityCallbacksUnitTests { } @Test // DATACMNS-1467 - public void invokeGenericEvent() { + void invokeGenericEvent() { DefaultEntityCallbacks callbacks = new DefaultEntityCallbacks(); callbacks.addEntityCallback(new GenericPersonCallback()); @@ -78,7 +78,7 @@ public class DefaultEntityCallbacksUnitTests { } @Test // DATACMNS-1467 - public void invokeGenericEventWithArgs() { + void invokeGenericEventWithArgs() { DefaultEntityCallbacks callbacks = new DefaultEntityCallbacks(); callbacks.addEntityCallback(new GenericPersonCallbackWithArgs()); @@ -90,7 +90,7 @@ public class DefaultEntityCallbacksUnitTests { } @Test // DATACMNS-1467 - public void invokeInvalidEvent() { + void invokeInvalidEvent() { DefaultEntityCallbacks callbacks = new DefaultEntityCallbacks(); callbacks.addEntityCallback(new InvalidEntityCallback() {}); @@ -101,7 +101,7 @@ public class DefaultEntityCallbacksUnitTests { } @Test // DATACMNS-1467 - public void passesInvocationResultOnAlongTheChain() { + void passesInvocationResultOnAlongTheChain() { CapturingEntityCallback first = new FirstCallback(); CapturingEntityCallback second = new SecondCallback(); @@ -121,7 +121,7 @@ public class DefaultEntityCallbacksUnitTests { } @Test // DATACMNS-1467 - public void errorsOnNullEntity() { + void errorsOnNullEntity() { DefaultEntityCallbacks callbacks = new DefaultEntityCallbacks(); callbacks.addEntityCallback(new CapturingEntityCallback()); @@ -131,7 +131,7 @@ public class DefaultEntityCallbacksUnitTests { } @Test // DATACMNS-1467 - public void errorsOnNullValueReturnedByCallbackEntity() { + void errorsOnNullValueReturnedByCallbackEntity() { CapturingEntityCallback first = new FirstCallback(); CapturingEntityCallback second = new SecondCallback(null); @@ -153,7 +153,7 @@ public class DefaultEntityCallbacksUnitTests { } @Test // DATACMNS-1467 - public void detectsMultipleCallbacksWithinOneClass() { + void detectsMultipleCallbacksWithinOneClass() { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(MultipleCallbacksInOneClassConfig.class); diff --git a/src/test/java/org/springframework/data/mapping/callback/DefaultReactiveEntityCallbacksUnitTests.java b/src/test/java/org/springframework/data/mapping/callback/DefaultReactiveEntityCallbacksUnitTests.java index 47e11bf7c..02fe0760d 100644 --- a/src/test/java/org/springframework/data/mapping/callback/DefaultReactiveEntityCallbacksUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/callback/DefaultReactiveEntityCallbacksUnitTests.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.*; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -36,10 +36,10 @@ import org.springframework.data.mapping.callback.CapturingEntityCallback.ThirdCa * @author Mark Paluch * @author Christoph Strobl */ -public class DefaultReactiveEntityCallbacksUnitTests { +class DefaultReactiveEntityCallbacksUnitTests { @Test // DATACMNS-1467 - public void dispatchResolvesOnSubscribe() { + void dispatchResolvesOnSubscribe() { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(MyConfig.class); @@ -56,7 +56,7 @@ public class DefaultReactiveEntityCallbacksUnitTests { } @Test // DATACMNS-1467 - public void invokeGenericEvent() { + void invokeGenericEvent() { DefaultReactiveEntityCallbacks callbacks = new DefaultReactiveEntityCallbacks(); callbacks.addEntityCallback(new GenericPersonCallback()); @@ -68,7 +68,7 @@ public class DefaultReactiveEntityCallbacksUnitTests { } @Test // DATACMNS-1467 - public void passesInvocationResultOnAlongTheChain() { + void passesInvocationResultOnAlongTheChain() { CapturingEntityCallback first = new FirstCallback(); CapturingEntityCallback second = new SecondCallback(); @@ -91,7 +91,7 @@ public class DefaultReactiveEntityCallbacksUnitTests { } @Test // DATACMNS-1467 - public void errorsOnNullEntity() { + void errorsOnNullEntity() { DefaultReactiveEntityCallbacks callbacks = new DefaultReactiveEntityCallbacks(); callbacks.addEntityCallback(new CapturingEntityCallback()); @@ -101,7 +101,7 @@ public class DefaultReactiveEntityCallbacksUnitTests { } @Test // DATACMNS-1467 - public void errorsOnNullValueReturnedByCallbackEntity() { + void errorsOnNullValueReturnedByCallbackEntity() { CapturingEntityCallback first = new FirstCallback(); CapturingEntityCallback second = new SecondCallback(null); diff --git a/src/test/java/org/springframework/data/mapping/callback/EntityCallbackDiscovererUnitTests.java b/src/test/java/org/springframework/data/mapping/callback/EntityCallbackDiscovererUnitTests.java index 4a8505bc9..17dfd9b1c 100644 --- a/src/test/java/org/springframework/data/mapping/callback/EntityCallbackDiscovererUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/callback/EntityCallbackDiscovererUnitTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*; import java.util.Collection; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -34,10 +34,10 @@ import org.springframework.data.mapping.PersonDocument; /** * @author Christoph Strobl */ -public class EntityCallbackDiscovererUnitTests { +class EntityCallbackDiscovererUnitTests { @Test // DATACMNS-1467 - public void shouldDiscoverCallbackType() { + void shouldDiscoverCallbackType() { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(MyConfig.class); @@ -50,7 +50,7 @@ public class EntityCallbackDiscovererUnitTests { } @Test // DATACMNS-1467 - public void shouldDiscoverCallbackTypeByName() { + void shouldDiscoverCallbackTypeByName() { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(MyConfig.class); @@ -65,7 +65,7 @@ public class EntityCallbackDiscovererUnitTests { } @Test // DATACMNS-1467 - public void shouldSupportCallbackTypes() { + void shouldSupportCallbackTypes() { EntityCallbackDiscoverer discoverer = new EntityCallbackDiscoverer(); @@ -79,7 +79,7 @@ public class EntityCallbackDiscovererUnitTests { } @Test // DATACMNS-1467 - public void shouldSupportInstanceCallbackTypes() { + void shouldSupportInstanceCallbackTypes() { EntityCallbackDiscoverer discoverer = new EntityCallbackDiscoverer(); @@ -99,7 +99,7 @@ public class EntityCallbackDiscovererUnitTests { } @Test // DATACMNS-1467 - public void shouldDispatchInOrder() { + void shouldDispatchInOrder() { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(OrderedConfig.class); @@ -155,14 +155,14 @@ public class EntityCallbackDiscovererUnitTests { @Order(3) static class Third implements EntityCallback { - public Person beforeSave(Person object) { + Person beforeSave(Person object) { return object; } } static class Second implements EntityCallback, Ordered { - public Person beforeSave(Person object) { + Person beforeSave(Person object) { return object; } @@ -175,7 +175,7 @@ public class EntityCallbackDiscovererUnitTests { @Order(1) static class First implements EntityCallback { - public Person beforeSave(Person object) { + Person beforeSave(Person object) { return object; } } diff --git a/src/test/java/org/springframework/data/mapping/context/AbstractMappingContextIntegrationTests.java b/src/test/java/org/springframework/data/mapping/context/AbstractMappingContextIntegrationTests.java index f8a640e82..4babe1309 100755 --- a/src/test/java/org/springframework/data/mapping/context/AbstractMappingContextIntegrationTests.java +++ b/src/test/java/org/springframework/data/mapping/context/AbstractMappingContextIntegrationTests.java @@ -20,7 +20,7 @@ import static org.mockito.Mockito.*; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.annotation.Id; import org.springframework.data.mapping.PersistentEntity; import org.springframework.data.mapping.PersistentProperty; @@ -36,10 +36,10 @@ import org.springframework.data.util.TypeInformation; * * @author Oliver Gierke */ -public class AbstractMappingContextIntegrationTests> { +class AbstractMappingContextIntegrationTests> { @Test // DATACMNS-457 - public void returnsManagedType() { + void returnsManagedType() { SampleMappingContext context = new SampleMappingContext(); context.setInitialEntitySet(Collections.singleton(Person.class)); @@ -49,7 +49,7 @@ public class AbstractMappingContextIntegrationTests entity = context @@ -69,7 +69,7 @@ public class AbstractMappingContextIntegrationTests new MappingException("Not supported!"), Unsupported.class); @@ -74,7 +74,7 @@ public class AbstractMappingContextUnitTests { } @Test - public void registersEntitiesOnInitialization() { + void registersEntitiesOnInitialization() { ApplicationContext applicationContext = mock(ApplicationContext.class); @@ -88,24 +88,24 @@ public class AbstractMappingContextUnitTests { } @Test // DATACMNS-214 - public void returnsNullPersistentEntityForSimpleTypes() { + void returnsNullPersistentEntityForSimpleTypes() { SampleMappingContext context = new SampleMappingContext(); assertThat(context.getPersistentEntity(String.class)).isNull(); } @Test // DATACMNS-214 - public void rejectsNullValueForGetPersistentEntityOfClass() { + void rejectsNullValueForGetPersistentEntityOfClass() { assertThatIllegalArgumentException().isThrownBy(() -> context.getPersistentEntity((Class) null)); } @Test // DATACMNS-214 - public void rejectsNullValueForGetPersistentEntityOfTypeInformation() { + void rejectsNullValueForGetPersistentEntityOfTypeInformation() { assertThatIllegalArgumentException().isThrownBy(() -> context.getPersistentEntity((TypeInformation) null)); } @Test // DATACMNS-228 - public void doesNotCreatePersistentPropertyForGroovyMetaClass() { + void doesNotCreatePersistentPropertyForGroovyMetaClass() { SampleMappingContext mappingContext = new SampleMappingContext(); mappingContext.initialize(); @@ -116,7 +116,7 @@ public class AbstractMappingContextUnitTests { } @Test // DATACMNS-332 - public void usesMostConcreteProperty() { + void usesMostConcreteProperty() { SampleMappingContext mappingContext = new SampleMappingContext(); PersistentEntity entity = mappingContext @@ -127,7 +127,7 @@ public class AbstractMappingContextUnitTests { @Test // DATACMNS-345 @SuppressWarnings("rawtypes") - public void returnsEntityForComponentType() { + void returnsEntityForComponentType() { SampleMappingContext mappingContext = new SampleMappingContext(); PersistentEntity entity = mappingContext @@ -139,7 +139,7 @@ public class AbstractMappingContextUnitTests { } @Test // DATACMNS-390 - public void exposesCopyOfPersistentEntitiesToAvoidConcurrentModificationException() { + void exposesCopyOfPersistentEntitiesToAvoidConcurrentModificationException() { SampleMappingContext context = new SampleMappingContext(); context.getPersistentEntity(ClassTypeInformation.MAP); @@ -154,38 +154,38 @@ public class AbstractMappingContextUnitTests { } @Test // DATACMNS-447 - public void shouldReturnNullForSimpleTypesIfInStrictIsEnabled() { + void shouldReturnNullForSimpleTypesIfInStrictIsEnabled() { context.setStrict(true); assertThat(context.getPersistentEntity(Integer.class)).isNull(); } @Test // DATACMNS-462 - public void hasPersistentEntityForCollectionPropertiesAfterInitialization() { + void hasPersistentEntityForCollectionPropertiesAfterInitialization() { context.getPersistentEntity(Sample.class); assertHasEntityFor(Person.class, context, true); } @Test // DATACMNS-479 - public void doesNotAddMapImplementationClassesAsPersistentEntity() { + void doesNotAddMapImplementationClassesAsPersistentEntity() { context.getPersistentEntity(Sample.class); assertHasEntityFor(TreeMap.class, context, false); } @Test // DATACMNS-1171 - public void shouldCreateEntityForKotlinDataClass() { + void shouldCreateEntityForKotlinDataClass() { assertThat(context.getPersistentEntity(SimpleDataClass.class)).isNotNull(); } @Test // DATACMNS-1171 - public void shouldNotCreateEntityForSyntheticKotlinClass() { + void shouldNotCreateEntityForSyntheticKotlinClass() { assertThat(context.getPersistentEntity(TypeCreatingSyntheticClass.class)).isNotNull(); } @Test // DATACMNS-1208 - public void ensureHasPersistentEntityReportsFalseForTypesThatShouldntBeCreated() { + void ensureHasPersistentEntityReportsFalseForTypesThatShouldntBeCreated() { assertThat(context.hasPersistentEntityFor(String.class)).isFalse(); assertThat(context.getPersistentEntity(String.class)).isNull(); @@ -193,7 +193,7 @@ public class AbstractMappingContextUnitTests { } @Test // DATACMNS-1214 - public void doesNotReturnPersistentEntityForCustomSimpleTypeProperty() { + void doesNotReturnPersistentEntityForCustomSimpleTypeProperty() { PersistentEntity entity = context.getRequiredPersistentEntity(Person.class); SamplePersistentProperty property = entity.getRequiredPersistentProperty("date"); @@ -202,7 +202,7 @@ public class AbstractMappingContextUnitTests { } @Test // DATACMNS-1574 - public void cleansUpCacheForRuntimeException() { + void cleansUpCacheForRuntimeException() { TypeRejectingMappingContext context = TypeRejectingMappingContext.rejecting(() -> new RuntimeException(), Unsupported.class); @@ -278,7 +278,7 @@ public class AbstractMappingContextUnitTests { * @param types must not be {@literal null}. * @return */ - public static TypeRejectingMappingContext rejecting(Supplier exception, + static TypeRejectingMappingContext rejecting(Supplier exception, Class... types) { return new TypeRejectingMappingContext(exception, Arrays.asList(types)); } diff --git a/src/test/java/org/springframework/data/mapping/context/DefaultPersistentPropertyPathUnitTests.java b/src/test/java/org/springframework/data/mapping/context/DefaultPersistentPropertyPathUnitTests.java index 5800ff5bb..2a8a2ed56 100755 --- a/src/test/java/org/springframework/data/mapping/context/DefaultPersistentPropertyPathUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/context/DefaultPersistentPropertyPathUnitTests.java @@ -22,11 +22,12 @@ import static org.mockito.Mockito.*; import java.util.Arrays; import java.util.Collections; -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.springframework.core.convert.converter.Converter; import org.springframework.data.mapping.PersistentProperty; import org.springframework.data.mapping.PersistentPropertyPath; @@ -36,8 +37,8 @@ import org.springframework.data.mapping.PersistentPropertyPath; * * @author Oliver Gierke */ -@RunWith(MockitoJUnitRunner.class) -public class DefaultPersistentPropertyPathUnitTests

> { +@ExtendWith(MockitoExtension.class) +class DefaultPersistentPropertyPathUnitTests

> { @Mock P first, second; @@ -46,19 +47,19 @@ public class DefaultPersistentPropertyPathUnitTests

oneLeg; PersistentPropertyPath

twoLegs; - @Before - public void setUp() { + @BeforeEach + void setUp() { oneLeg = new DefaultPersistentPropertyPath<>(Collections.singletonList(first)); twoLegs = new DefaultPersistentPropertyPath<>(Arrays.asList(first, second)); } @Test - public void rejectsNullProperties() { + void rejectsNullProperties() { assertThatIllegalArgumentException().isThrownBy(() -> new DefaultPersistentPropertyPath<>(null)); } @Test - public void usesPropertyNameForSimpleDotPath() { + void usesPropertyNameForSimpleDotPath() { when(first.getName()).thenReturn("foo"); when(second.getName()).thenReturn("bar"); @@ -67,7 +68,7 @@ public class DefaultPersistentPropertyPathUnitTests

extension = twoLegs.getExtensionForBaseOf(oneLeg); @@ -104,17 +105,17 @@ public class DefaultPersistentPropertyPathUnitTests

parent = oneLeg.getParentPath(); PersistentPropertyPath

parentsParent = parent.getParentPath(); @@ -124,23 +125,23 @@ public class DefaultPersistentPropertyPathUnitTests

null)).isNull(); } @Test // DATACMNS-444 - public void skipsMappedPropertyNameIfConverterReturnsEmptyStrings() { + void skipsMappedPropertyNameIfConverterReturnsEmptyStrings() { assertThat(twoLegs.toDotPath(source -> "")).isNull(); } @Test // DATACMNS-1466 - public void returnsNullForLeafPropertyOnEmptyPath() { + void returnsNullForLeafPropertyOnEmptyPath() { PersistentPropertyPath

path = new DefaultPersistentPropertyPath

(Collections.emptyList()); @@ -148,7 +149,7 @@ public class DefaultPersistentPropertyPathUnitTests

path = new DefaultPersistentPropertyPath

(Collections.emptyList()); diff --git a/src/test/java/org/springframework/data/mapping/context/MappingContextEventUnitTests.java b/src/test/java/org/springframework/data/mapping/context/MappingContextEventUnitTests.java index 39f976898..855ca234c 100755 --- a/src/test/java/org/springframework/data/mapping/context/MappingContextEventUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/context/MappingContextEventUnitTests.java @@ -17,10 +17,11 @@ package org.springframework.data.mapping.context; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; + import org.springframework.data.mapping.PersistentEntity; import org.springframework.data.mapping.PersistentProperty; @@ -29,8 +30,8 @@ import org.springframework.data.mapping.PersistentProperty; * * @author Oliver Gierke */ -@RunWith(MockitoJUnitRunner.class) -public class MappingContextEventUnitTests, P extends PersistentProperty

> { +@ExtendWith(MockitoExtension.class) +class MappingContextEventUnitTests, P extends PersistentProperty

> { @Mock E entity; @@ -39,21 +40,21 @@ public class MappingContextEventUnitTests, P ex MappingContext mappingContext, otherMappingContext; @Test - public void returnsPersistentEntityHandedToTheEvent() { + void returnsPersistentEntityHandedToTheEvent() { MappingContextEvent event = new MappingContextEvent<>(mappingContext, entity); assertThat(event.getPersistentEntity()).isEqualTo(entity); } @Test - public void usesMappingContextAsEventSource() { + void usesMappingContextAsEventSource() { MappingContextEvent event = new MappingContextEvent<>(mappingContext, entity); assertThat(event.getSource()).isEqualTo(mappingContext); } @Test - public void detectsEmittingMappingContextCorrectly() { + void detectsEmittingMappingContextCorrectly() { MappingContextEvent event = new MappingContextEvent<>(mappingContext, entity); assertThat(event.wasEmittedBy(mappingContext)).isTrue(); diff --git a/src/test/java/org/springframework/data/mapping/context/PersistentEntitiesUnitTests.java b/src/test/java/org/springframework/data/mapping/context/PersistentEntitiesUnitTests.java index 633c04e53..0e4cf0bde 100755 --- a/src/test/java/org/springframework/data/mapping/context/PersistentEntitiesUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/context/PersistentEntitiesUnitTests.java @@ -20,10 +20,11 @@ import static org.mockito.Mockito.*; import java.util.Collections; -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.springframework.data.annotation.Id; import org.springframework.data.annotation.Reference; import org.springframework.data.mapping.PersistentEntity; @@ -34,19 +35,19 @@ import org.springframework.data.util.ClassTypeInformation; * * @author Oliver Gierke */ -@RunWith(MockitoJUnitRunner.class) -public class PersistentEntitiesUnitTests { +@ExtendWith(MockitoExtension.class) +class PersistentEntitiesUnitTests { @Mock SampleMappingContext first; @Mock SampleMappingContext second; @Test // DATACMNS-458 - public void rejectsNullMappingContexts() { + void rejectsNullMappingContexts() { assertThatIllegalArgumentException().isThrownBy(() -> new PersistentEntities(null)); } @Test // DATACMNS-458 - public void returnsPersistentEntitiesFromMappingContexts() { + void returnsPersistentEntitiesFromMappingContexts() { when(first.hasPersistentEntityFor(Sample.class)).thenReturn(false); when(second.hasPersistentEntityFor(Sample.class)).thenReturn(true); @@ -61,7 +62,7 @@ public class PersistentEntitiesUnitTests { } @Test // DATACMNS-458 - public void indicatesManagedType() { + void indicatesManagedType() { SampleMappingContext context = new SampleMappingContext(); context.setInitialEntitySet(Collections.singleton(Sample.class)); @@ -77,7 +78,7 @@ public class PersistentEntitiesUnitTests { } @Test // DATACMNS-1318 - public void detectsReferredToEntity() { + void detectsReferredToEntity() { SampleMappingContext context = new SampleMappingContext(); context.getPersistentEntity(Sample.class); @@ -92,7 +93,7 @@ public class PersistentEntitiesUnitTests { } @Test // DATACMNS-1318 - public void rejectsAmbiguousIdentifierType() { + void rejectsAmbiguousIdentifierType() { SampleMappingContext context = new SampleMappingContext(); context.getPersistentEntity(FirstWithLongId.class); @@ -111,7 +112,7 @@ public class PersistentEntitiesUnitTests { } @Test // DATACMNS-1318 - public void allowsExplicitlyQualifiedReference() { + void allowsExplicitlyQualifiedReference() { SampleMappingContext context = new SampleMappingContext(); context.getPersistentEntity(FirstWithLongId.class); @@ -127,7 +128,7 @@ public class PersistentEntitiesUnitTests { } @Test // DATACMNS-1318 - public void allowsGenericReference() { + void allowsGenericReference() { SampleMappingContext context = new SampleMappingContext(); context.getPersistentEntity(FirstWithGenericId.class); diff --git a/src/test/java/org/springframework/data/mapping/context/PersistentPropertyPathFactoryUnitTests.java b/src/test/java/org/springframework/data/mapping/context/PersistentPropertyPathFactoryUnitTests.java index 96ab75f41..a43ad34bd 100644 --- a/src/test/java/org/springframework/data/mapping/context/PersistentPropertyPathFactoryUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/context/PersistentPropertyPathFactoryUnitTests.java @@ -21,7 +21,7 @@ import java.util.List; import javax.inject.Inject; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.annotation.Reference; import org.springframework.data.mapping.MappingException; import org.springframework.data.mapping.PersistentPropertyPath; @@ -37,18 +37,18 @@ import org.springframework.util.StringUtils; * @author Oliver Gierke * @soundtrack Cypress Hill - Illusions (Q-Tip Remix, Unreleased & Revamped) */ -public class PersistentPropertyPathFactoryUnitTests { +class PersistentPropertyPathFactoryUnitTests { PersistentPropertyPathFactory, SamplePersistentProperty> factory = // new PersistentPropertyPathFactory<>(new SampleMappingContext()); @Test - public void doesNotTryToLookupPersistentEntityForLeafProperty() { + void doesNotTryToLookupPersistentEntityForLeafProperty() { assertThat(factory.from(Person.class, "name")).isNotNull(); } @Test // DATACMNS-380 - public void returnsPersistentPropertyPathForDotPath() { + void returnsPersistentPropertyPathForDotPath() { PersistentPropertyPath path = factory.from(PersonSample.class, "persons.name"); @@ -58,17 +58,17 @@ public class PersistentPropertyPathFactoryUnitTests { } @Test // DATACMNS-380 - public void rejectsInvalidPropertyReferenceWithMappingException() { + void rejectsInvalidPropertyReferenceWithMappingException() { assertThatExceptionOfType(MappingException.class).isThrownBy(() -> factory.from(PersonSample.class, "foo")); } @Test // DATACMNS-695 - public void persistentPropertyPathTraversesGenericTypesCorrectly() { + void persistentPropertyPathTraversesGenericTypesCorrectly() { assertThat(factory.from(Outer.class, "field.wrapped.field")).hasSize(3); } @Test // DATACMNS-727 - public void exposesContextForFailingPropertyPathLookup() { + void exposesContextForFailingPropertyPathLookup() { assertThatExceptionOfType(InvalidPersistentPropertyPath.class)// .isThrownBy(() -> factory.from(PersonSample.class, "persons.firstname"))// @@ -79,14 +79,14 @@ public class PersistentPropertyPathFactoryUnitTests { } @Test // DATACMNS-1116 - public void cachesPersistentPropertyPaths() { + void cachesPersistentPropertyPaths() { assertThat(factory.from(PersonSample.class, "persons.name")) // .isSameAs(factory.from(PersonSample.class, "persons.name")); } @Test // DATACMNS-1275 - public void findsNestedPropertyByFilter() { + void findsNestedPropertyByFilter() { PersistentPropertyPaths paths = factory.from(Sample.class, property -> property.findAnnotation(Inject.class) != null); @@ -95,7 +95,7 @@ public class PersistentPropertyPathFactoryUnitTests { } @Test // DATACMNS-1275 - public void findsNestedPropertiesByFilter() { + void findsNestedPropertiesByFilter() { PersistentPropertyPaths paths = factory.from(Wrapper.class, property -> property.findAnnotation(Inject.class) != null); @@ -106,12 +106,12 @@ public class PersistentPropertyPathFactoryUnitTests { } @Test // DATACMNS-1275 - public void createsEmptyPropertyPathCorrectly() { + void createsEmptyPropertyPathCorrectly() { assertThat(factory.from(Wrapper.class, "")).isEmpty(); } @Test // DATACMNS-1275 - public void returnsShortestsPathsFirst() { + void returnsShortestsPathsFirst() { Streamable paths = factory.from(First.class, it -> true, it -> true) // .map(PersistentPropertyPath::toDotPath); @@ -120,7 +120,7 @@ public class PersistentPropertyPathFactoryUnitTests { } @Test // DATACMNS-1275 - public void doesNotTraverseAssociationsByDefault() { + void doesNotTraverseAssociationsByDefault() { Streamable paths = factory.from(First.class, it -> true) // .map(PersistentPropertyPath::toDotPath); @@ -131,7 +131,7 @@ public class PersistentPropertyPathFactoryUnitTests { } @Test // DATACMNS-1275 - public void traversesAssociationsIfTraversalGuardAllowsIt() { + void traversesAssociationsIfTraversalGuardAllowsIt() { PersistentPropertyPaths paths = // factory.from(First.class, it -> true, it -> true); @@ -141,7 +141,7 @@ public class PersistentPropertyPathFactoryUnitTests { } @Test // DATACMNS-1275 - public void returnsEmptyPropertyPathsIfNoneSelected() { + void returnsEmptyPropertyPathsIfNoneSelected() { PersistentPropertyPaths paths = factory.from(Third.class, it -> false); @@ -150,7 +150,7 @@ public class PersistentPropertyPathFactoryUnitTests { } @Test // DATACMNS-1275 - public void returnsShortestPathFirst() { + void returnsShortestPathFirst() { PersistentPropertyPaths paths = factory.from(First.class, it -> !it.isEntity(), it -> true); diff --git a/src/test/java/org/springframework/data/mapping/context/PropertyMatchUnitTests.java b/src/test/java/org/springframework/data/mapping/context/PropertyMatchUnitTests.java index f45758762..f35f3d281 100755 --- a/src/test/java/org/springframework/data/mapping/context/PropertyMatchUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/context/PropertyMatchUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.mapping.context; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.mapping.context.AbstractMappingContext.PersistentPropertyFilter.PropertyMatch; /** @@ -26,15 +26,15 @@ import org.springframework.data.mapping.context.AbstractMappingContext.Persisten * @since 1.4 * @author Oliver Gierke */ -public class PropertyMatchUnitTests { +class PropertyMatchUnitTests { @Test - public void rejectsBothParametersBeingNull() { + void rejectsBothParametersBeingNull() { assertThatIllegalArgumentException().isThrownBy(() -> new PropertyMatch(null, null)); } @Test - public void matchesFieldByConcreteNameAndType() throws Exception { + void matchesFieldByConcreteNameAndType() throws Exception { PropertyMatch match = new PropertyMatch("name", "java.lang.String"); assertThat(match.matches("this$0", Object.class)).isFalse(); @@ -43,7 +43,7 @@ public class PropertyMatchUnitTests { } @Test - public void matchesFieldByNamePattern() throws Exception { + void matchesFieldByNamePattern() throws Exception { PropertyMatch match = new PropertyMatch("this\\$.*", "java.lang.Object"); assertThat(match.matches("this$0", Object.class)).isTrue(); @@ -52,7 +52,7 @@ public class PropertyMatchUnitTests { } @Test - public void matchesFieldByNameOnly() throws Exception { + void matchesFieldByNameOnly() throws Exception { PropertyMatch match = new PropertyMatch("this\\$.*", null); assertThat(match.matches("this$0", Object.class)).isTrue(); @@ -61,7 +61,7 @@ public class PropertyMatchUnitTests { } @Test - public void matchesFieldByTypeNameOnly() throws Exception { + void matchesFieldByTypeNameOnly() throws Exception { PropertyMatch match = new PropertyMatch(null, "java.lang.Object"); assertThat(match.matches("this$0", Object.class)).isTrue(); diff --git a/src/test/java/org/springframework/data/mapping/context/SamplePersistentProperty.java b/src/test/java/org/springframework/data/mapping/context/SamplePersistentProperty.java index b1fead0b9..903e742b8 100644 --- a/src/test/java/org/springframework/data/mapping/context/SamplePersistentProperty.java +++ b/src/test/java/org/springframework/data/mapping/context/SamplePersistentProperty.java @@ -23,7 +23,7 @@ import org.springframework.data.mapping.model.SimpleTypeHolder; public class SamplePersistentProperty extends AnnotationBasedPersistentProperty { - public SamplePersistentProperty(Property property, BasicPersistentEntity owner, + SamplePersistentProperty(Property property, BasicPersistentEntity owner, SimpleTypeHolder simpleTypeHolder) { super(property, owner, simpleTypeHolder); } diff --git a/src/test/java/org/springframework/data/mapping/model/AbstractPersistentPropertyUnitTests.java b/src/test/java/org/springframework/data/mapping/model/AbstractPersistentPropertyUnitTests.java index 1c726b0d7..5dbb320f2 100755 --- a/src/test/java/org/springframework/data/mapping/model/AbstractPersistentPropertyUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/model/AbstractPersistentPropertyUnitTests.java @@ -32,8 +32,8 @@ import java.util.Optional; import java.util.TreeMap; import java.util.TreeSet; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.data.mapping.Association; import org.springframework.data.mapping.PersistentEntity; import org.springframework.data.mapping.PersistentProperty; @@ -52,12 +52,12 @@ import org.springframework.util.ReflectionUtils; */ public class AbstractPersistentPropertyUnitTests { - TypeInformation typeInfo; - PersistentEntity entity; - SimpleTypeHolder typeHolder; + private TypeInformation typeInfo; + private PersistentEntity entity; + private SimpleTypeHolder typeHolder; - @Before - public void setUp() { + @BeforeEach + void setUp() { typeInfo = ClassTypeInformation.from(TestClassComplex.class); entity = new BasicPersistentEntity<>(typeInfo); @@ -65,27 +65,27 @@ public class AbstractPersistentPropertyUnitTests { } @Test // DATACMNS-68 - public void discoversComponentTypeCorrectly() throws Exception { + void discoversComponentTypeCorrectly() { assertThat(getProperty(TestClassComplex.class, "testClassSet").getComponentType()).isEqualTo(Object.class); } @Test // DATACMNS-101 - public void returnsNestedEntityTypeCorrectly() { + void returnsNestedEntityTypeCorrectly() { assertThat(getProperty(TestClassComplex.class, "testClassSet").getPersistentEntityTypes()).isEmpty(); } @Test // DATACMNS-132 - public void isEntityWorksForUntypedMaps() throws Exception { + void isEntityWorksForUntypedMaps() { assertThat(getProperty(TestClassComplex.class, "map").isEntity()).isFalse(); } @Test // DATACMNS-132 - public void isEntityWorksForUntypedCollection() throws Exception { + void isEntityWorksForUntypedCollection() { assertThat(getProperty(TestClassComplex.class, "collection").isEntity()).isFalse(); } @Test // DATACMNS-121 - public void considersPropertiesEqualIfFieldEquals() { + void considersPropertiesEqualIfFieldEquals() { SamplePersistentProperty firstProperty = getProperty(FirstConcrete.class, "genericField"); SamplePersistentProperty secondProperty = getProperty(SecondConcrete.class, "genericField"); @@ -95,12 +95,12 @@ public class AbstractPersistentPropertyUnitTests { } @Test // DATACMNS-180 - public void doesNotConsiderJavaTransientFieldsTransient() { + void doesNotConsiderJavaTransientFieldsTransient() { assertThat(getProperty(TestClassComplex.class, "transientField").isTransient()).isFalse(); } @Test // DATACMNS-206 - public void findsSimpleGettersAndASetters() { + void findsSimpleGettersAndASetters() { SamplePersistentProperty property = getProperty(AccessorTestClass.class, "id"); @@ -109,7 +109,7 @@ public class AbstractPersistentPropertyUnitTests { } @Test // DATACMNS-206 - public void doesNotUseInvalidGettersAndASetters() { + void doesNotUseInvalidGettersAndASetters() { SamplePersistentProperty property = getProperty(AccessorTestClass.class, "anotherId"); @@ -118,7 +118,7 @@ public class AbstractPersistentPropertyUnitTests { } @Test // DATACMNS-206 - public void usesCustomGetter() { + void usesCustomGetter() { SamplePersistentProperty property = getProperty(AccessorTestClass.class, "yetAnotherId"); @@ -127,7 +127,7 @@ public class AbstractPersistentPropertyUnitTests { } @Test // DATACMNS-206 - public void usesCustomSetter() { + void usesCustomSetter() { SamplePersistentProperty property = getProperty(AccessorTestClass.class, "yetYetAnotherId"); @@ -136,7 +136,7 @@ public class AbstractPersistentPropertyUnitTests { } @Test // DATACMNS-206 - public void doesNotDiscoverGetterAndSetterIfNoPropertyDescriptorGiven() { + void doesNotDiscoverGetterAndSetterIfNoPropertyDescriptorGiven() { Field field = ReflectionUtils.findField(AccessorTestClass.class, "id"); Property property = Property.of(ClassTypeInformation.from(AccessorTestClass.class), field); @@ -149,7 +149,7 @@ public class AbstractPersistentPropertyUnitTests { } @Test // DATACMNS-337 - public void resolvesActualType() { + void resolvesActualType() { SamplePersistentProperty property = getProperty(Sample.class, "person"); assertThat(property.getActualType()).isEqualTo(Person.class); @@ -165,35 +165,35 @@ public class AbstractPersistentPropertyUnitTests { } @Test // DATACMNS-462 - public void considersCollectionPropertyEntitiesIfComponentTypeIsEntity() { + void considersCollectionPropertyEntitiesIfComponentTypeIsEntity() { SamplePersistentProperty property = getProperty(Sample.class, "persons"); assertThat(property.isEntity()).isTrue(); } @Test // DATACMNS-462 - public void considersMapPropertyEntitiesIfValueTypeIsEntity() { + void considersMapPropertyEntitiesIfValueTypeIsEntity() { SamplePersistentProperty property = getProperty(Sample.class, "personMap"); assertThat(property.isEntity()).isTrue(); } @Test // DATACMNS-462 - public void considersArrayPropertyEntitiesIfComponentTypeIsEntity() { + void considersArrayPropertyEntitiesIfComponentTypeIsEntity() { SamplePersistentProperty property = getProperty(Sample.class, "personArray"); assertThat(property.isEntity()).isTrue(); } @Test // DATACMNS-462 - public void considersCollectionPropertySimpleIfComponentTypeIsSimple() { + void considersCollectionPropertySimpleIfComponentTypeIsSimple() { SamplePersistentProperty property = getProperty(Sample.class, "strings"); assertThat(property.isEntity()).isFalse(); } @Test // DATACMNS-562 - public void doesNotConsiderPropertyWithTreeMapMapValueAnEntity() { + void doesNotConsiderPropertyWithTreeMapMapValueAnEntity() { SamplePersistentProperty property = getProperty(TreeMapWrapper.class, "map"); assertThat(property.getPersistentEntityTypes()).isEmpty(); @@ -201,14 +201,14 @@ public class AbstractPersistentPropertyUnitTests { } @Test // DATACMNS-867 - public void resolvesFieldNameWithUnderscoresCorrectly() { + void resolvesFieldNameWithUnderscoresCorrectly() { SamplePersistentProperty property = getProperty(TestClassComplex.class, "var_name_with_underscores"); assertThat(property.getName()).isEqualTo("var_name_with_underscores"); } @Test // DATACMNS-1139 - public void resolvesGenericsForRawType() { + void resolvesGenericsForRawType() { SamplePersistentProperty property = getProperty(FirstConcrete.class, "genericField"); @@ -216,7 +216,7 @@ public class AbstractPersistentPropertyUnitTests { } @Test // DATACMNS-1180 - public void returnsAccessorsForGenericReturnType() { + void returnsAccessorsForGenericReturnType() { SamplePersistentProperty property = getProperty(ConcreteGetter.class, "genericField"); diff --git a/src/test/java/org/springframework/data/mapping/model/AnnotationBasedPersistentPropertyUnitTests.java b/src/test/java/org/springframework/data/mapping/model/AnnotationBasedPersistentPropertyUnitTests.java index 3b6d68dc3..240ce8e96 100755 --- a/src/test/java/org/springframework/data/mapping/model/AnnotationBasedPersistentPropertyUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/model/AnnotationBasedPersistentPropertyUnitTests.java @@ -26,8 +26,8 @@ import java.util.Map; import java.util.Optional; 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.springframework.core.annotation.AliasFor; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.data.annotation.AccessType; @@ -55,7 +55,7 @@ public class AnnotationBasedPersistentPropertyUnitTests

entity; SampleMappingContext context; - @Before + @BeforeEach public void setUp() { context = new SampleMappingContext(); diff --git a/src/test/java/org/springframework/data/mapping/model/BasicPersistentEntityUnitTests.java b/src/test/java/org/springframework/data/mapping/model/BasicPersistentEntityUnitTests.java index 523fda604..2c46355d5 100755 --- a/src/test/java/org/springframework/data/mapping/model/BasicPersistentEntityUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/model/BasicPersistentEntityUnitTests.java @@ -30,11 +30,12 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Stream; -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.Mockito; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; + import org.springframework.core.annotation.AliasFor; import org.springframework.data.annotation.AccessType; import org.springframework.data.annotation.AccessType.Type; @@ -67,35 +68,35 @@ import org.springframework.test.util.ReflectionTestUtils; * @author Christoph Strobl * @author Mark Paluch */ -@RunWith(MockitoJUnitRunner.class) -public class BasicPersistentEntityUnitTests> { +@ExtendWith(MockitoExtension.class) +class BasicPersistentEntityUnitTests> { @Mock T property, anotherProperty; @Test - public void assertInvariants() { + void assertInvariants() { PersistentEntitySpec.assertInvariants(createEntity(Person.class)); } @Test - public void rejectsNullTypeInformation() { + void rejectsNullTypeInformation() { assertThatIllegalArgumentException().isThrownBy(() -> new BasicPersistentEntity(null)); } @Test - public void rejectsNullProperty() { + void rejectsNullProperty() { assertThatIllegalArgumentException().isThrownBy(() -> createEntity(Person.class, null).addPersistentProperty(null)); } @Test - public void returnsNullForTypeAliasIfNoneConfigured() { + void returnsNullForTypeAliasIfNoneConfigured() { PersistentEntity entity = createEntity(Entity.class); assertThat(entity.getTypeAlias()).isEqualTo(Alias.NONE); } @Test - public void returnsTypeAliasIfAnnotated() { + void returnsTypeAliasIfAnnotated() { PersistentEntity entity = createEntity(AliasedEntity.class); assertThat(entity.getTypeAlias()).isEqualTo(Alias.of("foo")); @@ -103,7 +104,7 @@ public class BasicPersistentEntityUnitTests> { @Test // DATACMNS-50 @SuppressWarnings("unchecked") - public void considersComparatorForPropertyOrder() { + void considersComparatorForPropertyOrder() { BasicPersistentEntity entity = createEntity(Person.class, Comparator.comparing(PersistentProperty::getName)); @@ -133,7 +134,7 @@ public class BasicPersistentEntityUnitTests> { } @Test // DATACMNS-18, DATACMNS-1364 - public void addingAndIdPropertySetsIdPropertyInternally() { + void addingAndIdPropertySetsIdPropertyInternally() { MutablePersistentEntity entity = createEntity(Person.class); assertThat(entity.getIdProperty()).isNull(); @@ -145,7 +146,7 @@ public class BasicPersistentEntityUnitTests> { } @Test // DATACMNS-186, DATACMNS-1364 - public void rejectsIdPropertyIfAlreadySet() { + void rejectsIdPropertyIfAlreadySet() { MutablePersistentEntity entity = createEntity(Person.class); @@ -159,7 +160,7 @@ public class BasicPersistentEntityUnitTests> { } @Test // DATACMNS-365 - public void detectsPropertyWithAnnotation() { + void detectsPropertyWithAnnotation() { SampleMappingContext context = new SampleMappingContext(); PersistentEntity entity = context.getRequiredPersistentEntity(Entity.class); @@ -176,7 +177,7 @@ public class BasicPersistentEntityUnitTests> { } @Test // DATACMNS-1122 - public void reportsRequiredPropertyName() { + void reportsRequiredPropertyName() { SampleMappingContext context = new SampleMappingContext(); PersistentEntity entity = context.getRequiredPersistentEntity(Entity.class); @@ -186,7 +187,7 @@ public class BasicPersistentEntityUnitTests> { } @Test // DATACMNS-809 - public void returnsGeneratedPropertyAccessorForPropertyAccessor() { + void returnsGeneratedPropertyAccessorForPropertyAccessor() { SampleMappingContext context = new SampleMappingContext(); PersistentEntity entity = context.getRequiredPersistentEntity(Entity.class); @@ -206,7 +207,7 @@ public class BasicPersistentEntityUnitTests> { } @Test // DATACMNS-596 - public void rejectsNullBeanForPropertyAccessor() { + void rejectsNullBeanForPropertyAccessor() { SampleMappingContext context = new SampleMappingContext(); PersistentEntity entity = context.getRequiredPersistentEntity(Entity.class); @@ -215,7 +216,7 @@ public class BasicPersistentEntityUnitTests> { } @Test // DATACMNS-596 - public void rejectsNonMatchingBeanForPropertyAccessor() { + void rejectsNonMatchingBeanForPropertyAccessor() { SampleMappingContext context = new SampleMappingContext(); PersistentEntity entity = context.getRequiredPersistentEntity(Entity.class); @@ -224,7 +225,7 @@ public class BasicPersistentEntityUnitTests> { } @Test // DATACMNS-597 - public void supportsSubtypeInstancesOnPropertyAccessorLookup() { + void supportsSubtypeInstancesOnPropertyAccessorLookup() { SampleMappingContext context = new SampleMappingContext(); PersistentEntity entity = context.getRequiredPersistentEntity(Entity.class); @@ -233,7 +234,7 @@ public class BasicPersistentEntityUnitTests> { } @Test // DATACMNS-825 - public void returnsTypeAliasIfAnnotatedUsingComposedAnnotation() { + void returnsTypeAliasIfAnnotatedUsingComposedAnnotation() { PersistentEntity entity = createEntity( AliasEntityUsingComposedAnnotation.class); @@ -241,7 +242,7 @@ public class BasicPersistentEntityUnitTests> { } @Test // DATACMNS-866 - public void invalidBeanAccessCreatesDescriptiveErrorMessage() { + void invalidBeanAccessCreatesDescriptiveErrorMessage() { PersistentEntity entity = createEntity(Entity.class); @@ -250,7 +251,7 @@ public class BasicPersistentEntityUnitTests> { } @Test // DATACMNS-934, DATACMNS-867 - public void rejectsNullAssociation() { + void rejectsNullAssociation() { MutablePersistentEntity entity = createEntity(Entity.class); @@ -258,7 +259,7 @@ public class BasicPersistentEntityUnitTests> { } @Test // DATACMNS-1141 - public void getRequiredAnnotationReturnsAnnotation() { + void getRequiredAnnotationReturnsAnnotation() { PersistentEntity entity = createEntity( AliasEntityUsingComposedAnnotation.class); @@ -266,7 +267,7 @@ public class BasicPersistentEntityUnitTests> { } @Test // DATACMNS-1141 - public void getRequiredAnnotationThrowsException() { + void getRequiredAnnotationThrowsException() { PersistentEntity entity = createEntity( AliasEntityUsingComposedAnnotation.class); @@ -275,7 +276,7 @@ public class BasicPersistentEntityUnitTests> { } @Test // DATACMNS-1210 - public void findAnnotationShouldBeThreadSafe() throws InterruptedException { + void findAnnotationShouldBeThreadSafe() throws InterruptedException { CountDownLatch latch = new CountDownLatch(2); CountDownLatch syncLatch = new CountDownLatch(1); @@ -330,7 +331,7 @@ public class BasicPersistentEntityUnitTests> { } @Test // DATACMNS-1325 - public void supportsPersistableViaIdentifierAccessor() { + void supportsPersistableViaIdentifierAccessor() { PersistentEntity entity = createEntity(PersistableEntity.class); @@ -338,20 +339,20 @@ public class BasicPersistentEntityUnitTests> { } @Test // DATACMNS-1322 - public void detectsImmutableEntity() { + void detectsImmutableEntity() { assertThat(createEntity(SomeValue.class).isImmutable()).isTrue(); assertThat(createEntity(Entity.class).isImmutable()).isFalse(); } @Test // DATACMNS-1366 - public void exposesPropertyPopulationRequired() { + void exposesPropertyPopulationRequired() { assertThat(createPopulatedPersistentEntity(PropertyPopulationRequired.class).requiresPropertyPopulation()).isTrue(); } @Test // DATACMNS-1366 - public void exposesPropertyPopulationNotRequired() { + void exposesPropertyPopulationNotRequired() { Stream.of(PropertyPopulationNotRequired.class, PropertyPopulationNotRequiredWithTransient.class) // .forEach(it -> assertThat(createPopulatedPersistentEntity(it).requiresPropertyPopulation()).isFalse()); @@ -372,7 +373,7 @@ public class BasicPersistentEntityUnitTests> { } @TypeAlias("foo") - static class AliasedEntity { + private static class AliasedEntity { } @@ -399,12 +400,12 @@ public class BasicPersistentEntityUnitTests> { } @ComposedTypeAlias - static class AliasEntityUsingComposedAnnotation {} + private static class AliasEntityUsingComposedAnnotation {} - static class Subtype extends Entity {} + private static class Subtype extends Entity {} @AccessType(Type.PROPERTY) - static class EntityWithAnnotation { + private static class EntityWithAnnotation { } @@ -434,25 +435,25 @@ public class BasicPersistentEntityUnitTests> { } @Immutable - static class SomeValue {} + private static class SomeValue {} // DATACMNS-1366 @RequiredArgsConstructor - static class PropertyPopulationRequired { + private static class PropertyPopulationRequired { private final String firstname, lastname; private String email; } @RequiredArgsConstructor - static class PropertyPopulationNotRequired { + private static class PropertyPopulationNotRequired { private final String firstname, lastname; } @RequiredArgsConstructor - static class PropertyPopulationNotRequiredWithTransient { + private static class PropertyPopulationNotRequiredWithTransient { private final String firstname, lastname; private @Transient String email; diff --git a/src/test/java/org/springframework/data/mapping/model/CamelCaseAbbreviatingFieldNamingStrategyUnitTests.java b/src/test/java/org/springframework/data/mapping/model/CamelCaseAbbreviatingFieldNamingStrategyUnitTests.java index c11a55208..f4a3bbff4 100755 --- a/src/test/java/org/springframework/data/mapping/model/CamelCaseAbbreviatingFieldNamingStrategyUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/model/CamelCaseAbbreviatingFieldNamingStrategyUnitTests.java @@ -18,10 +18,11 @@ package org.springframework.data.mapping.model; 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.springframework.data.mapping.PersistentProperty; /** @@ -30,7 +31,7 @@ import org.springframework.data.mapping.PersistentProperty; * @author Oliver Gierke * @since 1.9 */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class CamelCaseAbbreviatingFieldNamingStrategyUnitTests { FieldNamingStrategy strategy = new CamelCaseAbbreviatingFieldNamingStrategy(); @@ -38,7 +39,7 @@ public class CamelCaseAbbreviatingFieldNamingStrategyUnitTests { @Mock PersistentProperty property; @Test // DATACMNS-523 - public void abbreviatesToCamelCase() { + void abbreviatesToCamelCase() { assertFieldNameForPropertyName("fooBar", "fb"); assertFieldNameForPropertyName("fooBARFooBar", "fbfb"); diff --git a/src/test/java/org/springframework/data/mapping/model/ClassGeneratingEntityInstantiatorUnitTests.java b/src/test/java/org/springframework/data/mapping/model/ClassGeneratingEntityInstantiatorUnitTests.java index 873e5b1cb..8e9e87dab 100755 --- a/src/test/java/org/springframework/data/mapping/model/ClassGeneratingEntityInstantiatorUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/model/ClassGeneratingEntityInstantiatorUnitTests.java @@ -25,10 +25,13 @@ import java.util.Arrays; import java.util.List; import java.util.stream.IntStream; -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.classloadersupport.HidingClassLoader; import org.springframework.data.mapping.PersistentEntity; import org.springframework.data.mapping.PersistentProperty; @@ -45,8 +48,9 @@ import org.springframework.util.ReflectionUtils; * @author Oliver Gierke * @author Mark Paluch */ -@RunWith(MockitoJUnitRunner.class) -public class ClassGeneratingEntityInstantiatorUnitTests

> { +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) +class ClassGeneratingEntityInstantiatorUnitTests

> { ClassGeneratingEntityInstantiator instance = new ClassGeneratingEntityInstantiator(); @@ -54,7 +58,7 @@ public class ClassGeneratingEntityInstantiatorUnitTests

provider; @Test - public void instantiatesSimpleObjectCorrectly() { + void instantiatesSimpleObjectCorrectly() { doReturn(Object.class).when(entity).getType(); @@ -62,7 +66,7 @@ public class ClassGeneratingEntityInstantiatorUnitTests

constructor = PreferredConstructorDiscoverer.discover(Foo.class); @@ -85,7 +89,7 @@ public class ClassGeneratingEntityInstantiatorUnitTests

entity = new BasicPersistentEntity<>(from(Inner.class)); assertThat(entity.getPersistenceConstructor()).satisfies(constructor -> { @@ -120,7 +124,7 @@ public class ClassGeneratingEntityInstantiatorUnitTests

entity = new BasicPersistentEntity<>(from(Sample.class)); @@ -149,7 +153,7 @@ public class ClassGeneratingEntityInstantiatorUnitTests

outer = new BasicPersistentEntity<>(from(SampleWithReference.class)); PersistentEntity inner = new BasicPersistentEntity<>(from(Sample.class)); @@ -182,7 +186,7 @@ public class ClassGeneratingEntityInstantiatorUnitTests

typeInDefaultPackage = Class.forName("TypeInDefaultPackage"); prepareMocks(typeInDefaultPackage); @@ -349,7 +353,7 @@ public class ClassGeneratingEntityInstantiatorUnitTests

parameters() throws Exception { + static List parameters() throws Exception { List parameters = new ArrayList<>(); List> types = Arrays.asList(FieldAccess.class, PropertyAccess.class, PrivateFinalFieldAccess.class, @@ -120,8 +105,9 @@ public class ClassGeneratingPropertyAccessorFactoryDatatypeTests { return parameters; } - @Test // DATACMNS-809 - public void shouldSetAndGetProperty() throws Exception { + @ParameterizedTest(name = "{3}") // DATACMNS-809 + @MethodSource("parameters") + void shouldSetAndGetProperty(Object bean, String propertyName, Object value, String displayName) { assertThat(getProperty(bean, propertyName)).satisfies(property -> { @@ -132,8 +118,10 @@ public class ClassGeneratingPropertyAccessorFactoryDatatypeTests { }); } - @Test // DATACMNS-809 - public void shouldUseClassPropertyAccessorFactory() throws Exception { + @ParameterizedTest(name = "{3}") // DATACMNS-809 + @MethodSource("parameters") + void shouldUseClassPropertyAccessorFactory(Object bean, String propertyName, Object value, String displayName) + throws Exception { BasicPersistentEntity persistentEntity = mappingContext .getRequiredPersistentEntity(bean.getClass()); diff --git a/src/test/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactoryEntityTypeTests.java b/src/test/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactoryEntityTypeTests.java index 1d93c6b82..410a33fb5 100755 --- a/src/test/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactoryEntityTypeTests.java +++ b/src/test/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactoryEntityTypeTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*; import java.io.Serializable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.annotation.Id; import org.springframework.data.mapping.PersistentEntity; import org.springframework.data.mapping.context.SampleMappingContext; diff --git a/src/test/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactoryTests.java b/src/test/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactoryTests.java index 060471a09..27441c64a 100755 --- a/src/test/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactoryTests.java +++ b/src/test/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactoryTests.java @@ -16,7 +16,7 @@ package org.springframework.data.mapping.model; import static org.assertj.core.api.Assertions.*; -import static org.junit.Assume.*; +import static org.assertj.core.api.Assumptions.*; import java.lang.reflect.Constructor; import java.util.ArrayList; @@ -24,10 +24,9 @@ import java.util.Arrays; import java.util.List; import java.util.Optional; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; + import org.springframework.data.annotation.AccessType; import org.springframework.data.annotation.AccessType.Type; import org.springframework.data.mapping.PersistentProperty; @@ -36,32 +35,18 @@ import org.springframework.data.mapping.context.SampleMappingContext; import org.springframework.data.mapping.context.SamplePersistentProperty; import org.springframework.data.mapping.model.subpackage.TypeInOtherPackage; import org.springframework.test.util.ReflectionTestUtils; -import org.springframework.util.StringUtils; /** * Unit tests for {@link ClassGeneratingPropertyAccessorFactory} * * @author Mark Paluch */ -@RunWith(Parameterized.class) public class ClassGeneratingPropertyAccessorFactoryTests { private final static ClassGeneratingPropertyAccessorFactory factory = new ClassGeneratingPropertyAccessorFactory(); private final static SampleMappingContext mappingContext = new SampleMappingContext(); - private final Object bean; - private final String propertyName; - private final Class expectedConstructorType; - public ClassGeneratingPropertyAccessorFactoryTests(Object bean, String propertyName, Class expectedConstructorType, - String displayName) { - - this.bean = bean; - this.propertyName = propertyName; - this.expectedConstructorType = expectedConstructorType; - } - - @Parameters(name = "{3}") @SuppressWarnings("unchecked") public static List parameters() throws ReflectiveOperationException { @@ -102,15 +87,19 @@ public class ClassGeneratingPropertyAccessorFactoryTests { return parameters; } - @Test // DATACMNS-1201 - public void shouldSupportGeneratedPropertyAccessors() { + @ParameterizedTest(name = "{3}") // DATACMNS-1201 + @MethodSource("parameters") + void shouldSupportGeneratedPropertyAccessors(Object bean, String propertyName, Class expectedConstructorType, + String displayName) { assertThat(factory.isSupported(mappingContext.getRequiredPersistentEntity(bean.getClass()))).isTrue(); } - @Test // DATACMNS-809, // DATACMNS-1322 - public void shouldSetAndGetProperty() throws Exception { + @ParameterizedTest(name = "{3}") // DATACMNS-809, DATACMNS-1322 + @MethodSource("parameters") + void shouldSetAndGetProperty(Object bean, String propertyName, Class expectedConstructorType, String displayName) + throws Exception { - assumeTrue(StringUtils.hasText(propertyName)); + assumeThat(propertyName).isNotEmpty(); assertThat(getProperty(bean, propertyName)).satisfies(property -> { @@ -127,9 +116,11 @@ public class ClassGeneratingPropertyAccessorFactoryTests { }); } - @Test // DATACMNS-809 + @ParameterizedTest(name = "{3}") // DATACMNS-809 + @MethodSource("parameters") @SuppressWarnings("rawtypes") - public void accessorShouldDeclareConstructor() throws Exception { + void accessorShouldDeclareConstructor(Object bean, String propertyName, Class expectedConstructorType, + String displayName) throws Exception { PersistentPropertyAccessor persistentPropertyAccessor = getPersistentPropertyAccessor(bean); @@ -139,30 +130,37 @@ public class ClassGeneratingPropertyAccessorFactoryTests { assertThat(declaredConstructors[0].getParameterTypes()[0]).isEqualTo(expectedConstructorType); } - @Test // DATACMNS-809 - public void shouldFailOnNullBean() { + @ParameterizedTest(name = "{3}") // DATACMNS-809 + @MethodSource("parameters") + void shouldFailOnNullBean(Object bean, String propertyName, Class expectedConstructorType, String displayName) { assertThatIllegalArgumentException().isThrownBy( () -> factory.getPropertyAccessor(mappingContext.getRequiredPersistentEntity(bean.getClass()), null)); } - @Test // DATACMNS-809 - public void getPropertyShouldFailOnUnhandledProperty() { + @ParameterizedTest(name = "{3}") // DATACMNS-809 + @MethodSource("parameters") + void getPropertyShouldFailOnUnhandledProperty(Object bean, String propertyName, Class expectedConstructorType, + String displayName) { assertThat(getProperty(new Dummy(), "dummy")) .satisfies(property -> assertThatExceptionOfType(UnsupportedOperationException.class)// .isThrownBy(() -> getPersistentPropertyAccessor(bean).getProperty(property))); } - @Test // DATACMNS-809 - public void setPropertyShouldFailOnUnhandledProperty() { + @ParameterizedTest(name = "{3}") // DATACMNS-809 + @MethodSource("parameters") + void setPropertyShouldFailOnUnhandledProperty(Object bean, String propertyName, Class expectedConstructorType, + String displayName) { assertThat(getProperty(new Dummy(), "dummy")) .satisfies(property -> assertThatExceptionOfType(UnsupportedOperationException.class)// .isThrownBy(() -> getPersistentPropertyAccessor(bean).setProperty(property, Optional.empty()))); } - @Test // DATACMNS-809 - public void shouldUseClassPropertyAccessorFactory() throws Exception { + @ParameterizedTest(name = "{3}") // DATACMNS-809 + @MethodSource("parameters") + void shouldUseClassPropertyAccessorFactory(Object bean, String propertyName, Class expectedConstructorType, + String displayName) throws Exception { BasicPersistentEntity persistentEntity = mappingContext .getRequiredPersistentEntity(bean.getClass()); diff --git a/src/test/java/org/springframework/data/mapping/model/ConvertingPropertyAccessorUnitTests.java b/src/test/java/org/springframework/data/mapping/model/ConvertingPropertyAccessorUnitTests.java index cad9e3a84..2fc1c6e1e 100755 --- a/src/test/java/org/springframework/data/mapping/model/ConvertingPropertyAccessorUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/model/ConvertingPropertyAccessorUnitTests.java @@ -22,7 +22,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.Value; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.data.mapping.PersistentPropertyAccessor; diff --git a/src/test/java/org/springframework/data/mapping/model/EntityInstantiatorsUnitTests.java b/src/test/java/org/springframework/data/mapping/model/EntityInstantiatorsUnitTests.java index ad040998d..ee0686201 100755 --- a/src/test/java/org/springframework/data/mapping/model/EntityInstantiatorsUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/model/EntityInstantiatorsUnitTests.java @@ -21,10 +21,11 @@ import static org.mockito.Mockito.*; import java.util.Collections; 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.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; + import org.springframework.data.mapping.PersistentEntity; /** @@ -32,26 +33,26 @@ import org.springframework.data.mapping.PersistentEntity; * * @author Oliver Gierke */ -@RunWith(MockitoJUnitRunner.class) -public class EntityInstantiatorsUnitTests { +@ExtendWith(MockitoExtension.class) +class EntityInstantiatorsUnitTests { @Mock PersistentEntity entity; @Mock EntityInstantiator customInstantiator; @Test - public void rejectsNullFallbackInstantiator() { + void rejectsNullFallbackInstantiator() { assertThatIllegalArgumentException().isThrownBy(() -> new EntityInstantiators((EntityInstantiator) null)); } @Test - public void usesReflectionEntityInstantiatorAsDefaultFallback() { + void usesReflectionEntityInstantiatorAsDefaultFallback() { EntityInstantiators instantiators = new EntityInstantiators(); assertThat(instantiators.getInstantiatorFor(entity)).isInstanceOf(ClassGeneratingEntityInstantiator.class); } @Test - public void returnsCustomInstantiatorForTypeIfRegistered() { + void returnsCustomInstantiatorForTypeIfRegistered() { doReturn(String.class).when(entity).getType(); @@ -62,7 +63,7 @@ public class EntityInstantiatorsUnitTests { } @Test - public void usesCustomFallbackInstantiatorsIfConfigured() { + void usesCustomFallbackInstantiatorsIfConfigured() { doReturn(Object.class).when(entity).getType(); diff --git a/src/test/java/org/springframework/data/mapping/model/IdPropertyIdentifierAccessorUnitTests.java b/src/test/java/org/springframework/data/mapping/model/IdPropertyIdentifierAccessorUnitTests.java index 2c5187311..fd1e5b4fd 100755 --- a/src/test/java/org/springframework/data/mapping/model/IdPropertyIdentifierAccessorUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/model/IdPropertyIdentifierAccessorUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.mapping.model; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.annotation.Id; import org.springframework.data.mapping.IdentifierAccessor; import org.springframework.data.mapping.context.SampleMappingContext; @@ -26,24 +26,24 @@ import org.springframework.data.mapping.context.SampleMappingContext; * @author Oliver Gierke * @author Mark Paluch */ -public class IdPropertyIdentifierAccessorUnitTests { +class IdPropertyIdentifierAccessorUnitTests { SampleMappingContext mappingContext = new SampleMappingContext(); @Test // DATACMNS-599 - public void rejectsEntityWithoutIdentifierProperty() { + void rejectsEntityWithoutIdentifierProperty() { assertThatIllegalArgumentException().isThrownBy( () -> new IdPropertyIdentifierAccessor(mappingContext.getRequiredPersistentEntity(Sample.class), new Sample())); } @Test // DATACMNS-599 - public void rejectsNullBean() { + void rejectsNullBean() { assertThatIllegalArgumentException().isThrownBy( () -> new IdPropertyIdentifierAccessor(mappingContext.getRequiredPersistentEntity(SampleWithId.class), null)); } @Test // DATACMNS-599 - public void returnsIdentifierValue() { + void returnsIdentifierValue() { SampleWithId sample = new SampleWithId(); sample.id = 1L; @@ -54,7 +54,7 @@ public class IdPropertyIdentifierAccessorUnitTests { assertThat(accessor.getIdentifier()).isEqualTo(sample.id); } - static class Sample {} + private static class Sample {} static class SampleWithId { @Id Long id; diff --git a/src/test/java/org/springframework/data/mapping/model/ParameterizedKotlinInstantiatorUnitTests.java b/src/test/java/org/springframework/data/mapping/model/ParameterizedKotlinInstantiatorUnitTests.java index 22fbdcecb..119015fcf 100644 --- a/src/test/java/org/springframework/data/mapping/model/ParameterizedKotlinInstantiatorUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/model/ParameterizedKotlinInstantiatorUnitTests.java @@ -26,12 +26,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; + import org.springframework.data.mapping.PersistentEntity; import org.springframework.data.mapping.PreferredConstructor.Parameter; import org.springframework.data.mapping.context.SampleMappingContext; import org.springframework.data.mapping.context.SamplePersistentProperty; -import org.springframework.data.mapping.model.With32Args; -import org.springframework.data.mapping.model.With33Args; import org.springframework.test.util.ReflectionTestUtils; /** diff --git a/src/test/java/org/springframework/data/mapping/model/PersistentEntityIsNewStrategyUnitTests.java b/src/test/java/org/springframework/data/mapping/model/PersistentEntityIsNewStrategyUnitTests.java index 6c79da774..f9f6f0adb 100644 --- a/src/test/java/org/springframework/data/mapping/model/PersistentEntityIsNewStrategyUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/model/PersistentEntityIsNewStrategyUnitTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*; import lombok.AllArgsConstructor; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.annotation.Id; import org.springframework.data.annotation.Version; import org.springframework.data.domain.Persistable; @@ -33,12 +33,12 @@ import org.springframework.data.mapping.context.SampleMappingContext; * @soundtrack Scary Pockets - Crash Into Me (Dave Matthews Band Cover feat. Julia Nunes) - * https://www.youtube.com/watch?v=syGlBNVGEqU */ -public class PersistentEntityIsNewStrategyUnitTests { +class PersistentEntityIsNewStrategyUnitTests { - SampleMappingContext context = new SampleMappingContext(); + private SampleMappingContext context = new SampleMappingContext(); @Test // DATACMNS-133 - public void detectsNewEntityForPrimitiveId() { + void detectsNewEntityForPrimitiveId() { PersistentEntity entity = context.getRequiredPersistentEntity(PrimitiveIdEntity.class); @@ -47,7 +47,7 @@ public class PersistentEntityIsNewStrategyUnitTests { } @Test // DATACMNS-133 - public void detectsNotNewEntityForPrimitiveId() { + void detectsNotNewEntityForPrimitiveId() { PersistentEntity entity = context.getRequiredPersistentEntity(PrimitiveIdEntity.class); @@ -58,7 +58,7 @@ public class PersistentEntityIsNewStrategyUnitTests { } @Test // DATACMNS-133 - public void detectsNewEntityForWrapperId() { + void detectsNewEntityForWrapperId() { PersistentEntity entity = context.getRequiredPersistentEntity(PrimitiveWrapperIdEntity.class); @@ -67,7 +67,7 @@ public class PersistentEntityIsNewStrategyUnitTests { } @Test // DATACMNS-133 - public void detectsNotNewEntityForWrapperId() { + void detectsNotNewEntityForWrapperId() { PersistentEntity entity = context.getRequiredPersistentEntity(PrimitiveWrapperIdEntity.class); @@ -78,7 +78,7 @@ public class PersistentEntityIsNewStrategyUnitTests { } @Test // DATACMNS-133 - public void rejectsUnsupportedIdentifierType() { + void rejectsUnsupportedIdentifierType() { PersistentEntity entity = context.getRequiredPersistentEntity(UnsupportedPrimitiveIdEntity.class); @@ -88,7 +88,7 @@ public class PersistentEntityIsNewStrategyUnitTests { } @Test // DATACMNS-1333 - public void discoversNewPersistableEntity() { + void discoversNewPersistableEntity() { PersistentEntity entity = context.getRequiredPersistentEntity(PersistableEntity.class); @@ -96,7 +96,7 @@ public class PersistentEntityIsNewStrategyUnitTests { } @Test // DATACMNS-1333 - public void discoversNonNewPersistableEntity() { + void discoversNonNewPersistableEntity() { PersistentEntity entity = context.getRequiredPersistentEntity(PersistableEntity.class); @@ -104,7 +104,7 @@ public class PersistentEntityIsNewStrategyUnitTests { } @Test // DATACMNS-1333 - public void prefersVersionOverIdentifier() { + void prefersVersionOverIdentifier() { PersistentEntity entity = context.getRequiredPersistentEntity(VersionedEntity.class); @@ -118,7 +118,7 @@ public class PersistentEntityIsNewStrategyUnitTests { } @Test // DATACMNS-1333 - public void considersEntityWithoutIdNew() { + void considersEntityWithoutIdNew() { PersistentEntity entity = context.getRequiredPersistentEntity(NoIdEntity.class); @@ -170,5 +170,5 @@ public class PersistentEntityIsNewStrategyUnitTests { } } - static class NoIdEntity {} + private static class NoIdEntity {} } diff --git a/src/test/java/org/springframework/data/mapping/model/PersistentEntityParameterValueProviderUnitTests.java b/src/test/java/org/springframework/data/mapping/model/PersistentEntityParameterValueProviderUnitTests.java index 25614f5d5..aa1f0e288 100755 --- a/src/test/java/org/springframework/data/mapping/model/PersistentEntityParameterValueProviderUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/model/PersistentEntityParameterValueProviderUnitTests.java @@ -20,10 +20,11 @@ import static org.assertj.core.api.Assertions.*; import java.util.Iterator; 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.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; + import org.springframework.data.mapping.MappingException; import org.springframework.data.mapping.PersistentEntity; import org.springframework.data.mapping.PersistentProperty; @@ -37,14 +38,14 @@ import org.springframework.data.util.ClassTypeInformation; * @author Oliver Gierke * @author Mark Paluch */ -@RunWith(MockitoJUnitRunner.class) -public class PersistentEntityParameterValueProviderUnitTests

> { +@ExtendWith(MockitoExtension.class) +class PersistentEntityParameterValueProviderUnitTests

> { @Mock PropertyValueProvider

propertyValueProvider; @Mock P property; @Test // DATACMNS-134 - public void usesParentObjectAsImplicitFirstConstructorArgument() { + void usesParentObjectAsImplicitFirstConstructorArgument() { Object outer = new Outer(); @@ -69,7 +70,7 @@ public class PersistentEntityParameterValueProviderUnitTests

entity = new BasicPersistentEntity<>(ClassTypeInformation.from(Entity.class)); ParameterValueProvider

provider = new PersistentEntityParameterValueProvider<>(entity, propertyValueProvider, diff --git a/src/test/java/org/springframework/data/mapping/model/PersistentPropertyAccessorTests.java b/src/test/java/org/springframework/data/mapping/model/PersistentPropertyAccessorTests.java index 3f63749ee..d67de7da1 100644 --- a/src/test/java/org/springframework/data/mapping/model/PersistentPropertyAccessorTests.java +++ b/src/test/java/org/springframework/data/mapping/model/PersistentPropertyAccessorTests.java @@ -27,10 +27,10 @@ import java.util.List; import java.util.UUID; import java.util.function.Function; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; + import org.springframework.data.classloadersupport.HidingClassLoader; import org.springframework.data.mapping.PersistentPropertyAccessor; import org.springframework.data.mapping.context.SampleMappingContext; @@ -43,20 +43,10 @@ import org.springframework.util.Assert; * * @author Mark Paluch */ -@RunWith(Parameterized.class) public class PersistentPropertyAccessorTests { private final static SampleMappingContext MAPPING_CONTEXT = new SampleMappingContext(); - private final Function> propertyAccessorFunction; - - public PersistentPropertyAccessorTests(Function> propertyAccessor, - String displayName) { - - this.propertyAccessorFunction = propertyAccessor; - } - - @Parameters(name = "{1}") @SuppressWarnings("unchecked") public static List parameters() { @@ -74,8 +64,9 @@ public class PersistentPropertyAccessorTests { return parameters; } - @Test // DATACMNS-1322 - public void shouldSetProperty() { + @ParameterizedTest // DATACMNS-1322 + @MethodSource("parameters") + void shouldSetProperty(Function> propertyAccessorFunction) { DataClass bean = new DataClass(); PersistentPropertyAccessor accessor = propertyAccessorFunction.apply(bean); @@ -88,8 +79,9 @@ public class PersistentPropertyAccessorTests { assertThat(accessor.getProperty(property)).isEqualTo("value"); } - @Test // DATACMNS-1322 - public void shouldSetKotlinDataClassProperty() { + @ParameterizedTest // DATACMNS-1322 + @MethodSource("parameters") + void shouldSetKotlinDataClassProperty(Function> propertyAccessorFunction) { DataClassKt bean = new DataClassKt("foo"); PersistentPropertyAccessor accessor = propertyAccessorFunction.apply(bean); @@ -102,8 +94,10 @@ public class PersistentPropertyAccessorTests { assertThat(accessor.getProperty(property)).isEqualTo("value"); } - @Test // DATACMNS-1322, DATACMNS-1391 - public void shouldSetExtendedKotlinDataClassProperty() { + @ParameterizedTest // DATACMNS-1322, DATACMNS-1391 + @MethodSource("parameters") + void shouldSetExtendedKotlinDataClassProperty( + Function> propertyAccessorFunction) { ExtendedDataClassKt bean = new ExtendedDataClassKt(0, "bar"); PersistentPropertyAccessor accessor = propertyAccessorFunction.apply(bean); @@ -116,8 +110,9 @@ public class PersistentPropertyAccessorTests { assertThat(accessor.getProperty(property)).isEqualTo(1L); } - @Test // DATACMNS-1391 - public void shouldUseKotlinGeneratedCopyMethod() { + @ParameterizedTest // DATACMNS-1391 + @MethodSource("parameters") + void shouldUseKotlinGeneratedCopyMethod(Function> propertyAccessorFunction) { UnusedCustomCopy bean = new UnusedCustomCopy(new Timestamp(100)); PersistentPropertyAccessor accessor = propertyAccessorFunction.apply(bean); @@ -130,8 +125,10 @@ public class PersistentPropertyAccessorTests { assertThat(accessor.getProperty(property)).isEqualTo(new Timestamp(200)); } - @Test // DATACMNS-1391 - public void kotlinCopyMethodShouldNotSetUnsettableProperty() { + @ParameterizedTest // DATACMNS-1391 + @MethodSource("parameters") + void kotlinCopyMethodShouldNotSetUnsettableProperty( + Function> propertyAccessorFunction) { SingleSettableProperty bean = new SingleSettableProperty(UUID.randomUUID()); PersistentPropertyAccessor accessor = propertyAccessorFunction.apply(bean); @@ -140,8 +137,10 @@ public class PersistentPropertyAccessorTests { assertThatThrownBy(() -> accessor.setProperty(property, 1)).isInstanceOf(UnsupportedOperationException.class); } - @Test // DATACMNS-1451 - public void shouldSet17thImmutableNullableKotlinProperty() { + @ParameterizedTest // DATACMNS-1451 + @MethodSource("parameters") + void shouldSet17thImmutableNullableKotlinProperty( + Function> propertyAccessorFunction) { With33Args bean = new With33Args(); PersistentPropertyAccessor accessor = propertyAccessorFunction.apply(bean); @@ -153,8 +152,9 @@ public class PersistentPropertyAccessorTests { assertThat(updated.get17()).isEqualTo("foo"); } - @Test // DATACMNS-1322 - public void shouldWitherProperty() { + @ParameterizedTest // DATACMNS-1322 + @MethodSource("parameters") + void shouldWitherProperty(Function> propertyAccessorFunction) { ValueClass bean = new ValueClass("foo", "bar"); PersistentPropertyAccessor accessor = propertyAccessorFunction.apply(bean); @@ -167,8 +167,9 @@ public class PersistentPropertyAccessorTests { assertThat(accessor.getProperty(property)).isEqualTo("value"); } - @Test // DATACMNS-1322 - public void shouldRejectImmutablePropertyUpdate() { + @ParameterizedTest // DATACMNS-1322 + @MethodSource("parameters") + void shouldRejectImmutablePropertyUpdate(Function> propertyAccessorFunction) { ValueClass bean = new ValueClass("foo", "bar"); PersistentPropertyAccessor accessor = propertyAccessorFunction.apply(bean); @@ -177,8 +178,10 @@ public class PersistentPropertyAccessorTests { assertThatThrownBy(() -> accessor.setProperty(property, "value")).isInstanceOf(UnsupportedOperationException.class); } - @Test // DATACMNS-1322 - public void shouldRejectImmutableKotlinClassPropertyUpdate() { + @ParameterizedTest // DATACMNS-1322 + @MethodSource("parameters") + void shouldRejectImmutableKotlinClassPropertyUpdate( + Function> propertyAccessorFunction) { ValueClassKt bean = new ValueClassKt("foo"); PersistentPropertyAccessor accessor = propertyAccessorFunction.apply(bean); @@ -188,7 +191,7 @@ public class PersistentPropertyAccessorTests { } @Test // DATACMNS-1422 - public void shouldUseReflectionIfFrameworkTypesNotVisible() throws Exception { + void shouldUseReflectionIfFrameworkTypesNotVisible() throws Exception { HidingClassLoader classLoader = HidingClassLoader.hide(Assert.class); classLoader.excludePackage("org.springframework.data.mapping.model"); @@ -216,7 +219,7 @@ public class PersistentPropertyAccessorTests { @Value - static class ValueClass { + private static class ValueClass { @With String id; String immutable; } diff --git a/src/test/java/org/springframework/data/mapping/model/PropertyAccessorClassGeneratorUnitTests.java b/src/test/java/org/springframework/data/mapping/model/PropertyAccessorClassGeneratorUnitTests.java index 8fc61341d..b250da095 100644 --- a/src/test/java/org/springframework/data/mapping/model/PropertyAccessorClassGeneratorUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/model/PropertyAccessorClassGeneratorUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.mapping.model; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.mapping.PersistentEntity; import org.springframework.data.mapping.context.SampleMappingContext; import org.springframework.data.mapping.context.SamplePersistentProperty; @@ -28,10 +28,10 @@ import org.springframework.data.mapping.model.ClassGeneratingPropertyAccessorFac * * @author Oliver Drotbohm */ -public class PropertyAccessorClassGeneratorUnitTests { +class PropertyAccessorClassGeneratorUnitTests { @Test // DATACMNS-1602 - public void reusesAlreadyDeclaredClass() { + void reusesAlreadyDeclaredClass() { SampleMappingContext context = new SampleMappingContext(); PersistentEntity entity = context.getRequiredPersistentEntity(Sample.class); @@ -42,5 +42,5 @@ public class PropertyAccessorClassGeneratorUnitTests { .doesNotThrowAnyException(); } - static class Sample {} + private static class Sample {} } diff --git a/src/test/java/org/springframework/data/mapping/model/PropertyUnitTests.java b/src/test/java/org/springframework/data/mapping/model/PropertyUnitTests.java index bae6aeef7..3147a8935 100644 --- a/src/test/java/org/springframework/data/mapping/model/PropertyUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/model/PropertyUnitTests.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.*; import lombok.Value; import lombok.With; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.util.ClassTypeInformation; import org.springframework.util.ReflectionUtils; @@ -29,10 +29,10 @@ import org.springframework.util.ReflectionUtils; * * @author Mark Paluch */ -public class PropertyUnitTests { +class PropertyUnitTests { @Test // DATACMNS-1322 - public void shouldNotFindWitherMethod() { + void shouldNotFindWitherMethod() { assertThat(Property .of(ClassTypeInformation.from(ImmutableType.class), ReflectionUtils.findField(ImmutableType.class, "id")) @@ -43,7 +43,7 @@ public class PropertyUnitTests { } @Test // DATACMNS-1322 - public void shouldDiscoverWitherMethod() { + void shouldDiscoverWitherMethod() { Property property = Property.of(ClassTypeInformation.from(WitherType.class), ReflectionUtils.findField(WitherType.class, "id")); @@ -55,7 +55,7 @@ public class PropertyUnitTests { } @Test // DATACMNS-1421 - public void shouldDiscoverDerivedWitherMethod() { + void shouldDiscoverDerivedWitherMethod() { Property property = Property.of(ClassTypeInformation.from(DerivedWitherClass.class), ReflectionUtils.findField(DerivedWitherClass.class, "id")); @@ -68,7 +68,7 @@ public class PropertyUnitTests { } @Test // DATACMNS-1421 - public void shouldNotDiscoverWitherMethodWithIncompatibleReturnType() { + void shouldNotDiscoverWitherMethodWithIncompatibleReturnType() { Property property = Property.of(ClassTypeInformation.from(AnotherLevel.class), ReflectionUtils.findField(AnotherLevel.class, "id")); @@ -97,7 +97,7 @@ public class PropertyUnitTests { @Value @With - static class WitherType { + private static class WitherType { String id; String name; @@ -117,7 +117,7 @@ public class PropertyUnitTests { private final String id; - protected DerivedWitherClass(String id) { + DerivedWitherClass(String id) { this.id = id; } diff --git a/src/test/java/org/springframework/data/mapping/model/ReflectionEntityInstantiatorUnitTests.java b/src/test/java/org/springframework/data/mapping/model/ReflectionEntityInstantiatorUnitTests.java index c1560d298..1f2b52d84 100755 --- a/src/test/java/org/springframework/data/mapping/model/ReflectionEntityInstantiatorUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/model/ReflectionEntityInstantiatorUnitTests.java @@ -25,10 +25,11 @@ import java.lang.reflect.Constructor; 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.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; + import org.springframework.data.mapping.PersistentEntity; import org.springframework.data.mapping.PersistentProperty; import org.springframework.data.mapping.PreferredConstructor; @@ -43,28 +44,28 @@ import org.springframework.util.ReflectionUtils; * @author Johannes Mockenhaupt * @author Mark Paluch */ -@RunWith(MockitoJUnitRunner.class) -public class ReflectionEntityInstantiatorUnitTests

> { +@ExtendWith(MockitoExtension.class) +class ReflectionEntityInstantiatorUnitTests

> { @Mock PersistentEntity entity; @Mock ParameterValueProvider

provider; @Test - public void instantiatesSimpleObjectCorrectly() { + void instantiatesSimpleObjectCorrectly() { doReturn(Object.class).when(entity).getType(); INSTANCE.createInstance(entity, provider); } @Test - public void instantiatesArrayCorrectly() { + void instantiatesArrayCorrectly() { doReturn(String[][].class).when(entity).getType(); INSTANCE.createInstance(entity, provider); } @Test // DATACMNS-1126 - public void instantiatesTypeWithPreferredConstructorUsingParameterValueProvider() { + void instantiatesTypeWithPreferredConstructorUsingParameterValueProvider() { PreferredConstructor constructor = PreferredConstructorDiscoverer.discover(Foo.class); @@ -79,7 +80,7 @@ public class ReflectionEntityInstantiatorUnitTests

entity = new BasicPersistentEntity<>(from(Inner.class)); assertThat(entity.getPersistenceConstructor()).satisfies(it -> { @@ -114,7 +115,7 @@ public class ReflectionEntityInstantiatorUnitTests

entity = new BasicPersistentEntity<>(from(Sample.class)); diff --git a/src/test/java/org/springframework/data/mapping/model/SimplePersistentPropertyPathAccessorUnitTests.java b/src/test/java/org/springframework/data/mapping/model/SimplePersistentPropertyPathAccessorUnitTests.java index f3f4b964f..6e7b78043 100644 --- a/src/test/java/org/springframework/data/mapping/model/SimplePersistentPropertyPathAccessorUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/model/SimplePersistentPropertyPathAccessorUnitTests.java @@ -29,7 +29,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Stream; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.mapping.AccessOptions; import org.springframework.data.mapping.AccessOptions.SetOptions.SetNulls; import org.springframework.data.mapping.PersistentEntity; @@ -45,15 +45,15 @@ import org.springframework.data.mapping.context.SamplePersistentProperty; * @since 2.3 * @soundtrack Ron Spielman Trio - Raindrops (Electric Tales) */ -public class SimplePersistentPropertyPathAccessorUnitTests { +class SimplePersistentPropertyPathAccessorUnitTests { - SampleMappingContext context = new SampleMappingContext(); + private SampleMappingContext context = new SampleMappingContext(); - Customer first = new Customer("1"); - Customer second = new Customer("2"); + private Customer first = new Customer("1"); + private Customer second = new Customer("2"); @Test // DATACMNS-1438 - public void setsPropertyContainingCollectionPathForAllElements() { + void setsPropertyContainingCollectionPathForAllElements() { Customers customers = new Customers(Arrays.asList(first, second), Collections.emptyMap()); @@ -61,7 +61,7 @@ public class SimplePersistentPropertyPathAccessorUnitTests { } @Test // DATACMNS-1438 - public void setsPropertyContainingMapPathForAllValues() { + void setsPropertyContainingMapPathForAllValues() { Map map = new HashMap<>(); map.put("1", first); @@ -73,7 +73,7 @@ public class SimplePersistentPropertyPathAccessorUnitTests { } @Test // DATACMNS-1461 - public void skipsNullValueIfConfigured() { + void skipsNullValueIfConfigured() { CustomerWrapper wrapper = new CustomerWrapper(null); @@ -115,7 +115,7 @@ public class SimplePersistentPropertyPathAccessorUnitTests { } @Value - static class Customers { + private static class Customers { @Wither List customers; @Wither Map customerMap; } diff --git a/src/test/java/org/springframework/data/mapping/model/SnakeCaseFieldNamingStrategyUnitTests.java b/src/test/java/org/springframework/data/mapping/model/SnakeCaseFieldNamingStrategyUnitTests.java index 25e2d7c0b..aa8cd0470 100755 --- a/src/test/java/org/springframework/data/mapping/model/SnakeCaseFieldNamingStrategyUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/model/SnakeCaseFieldNamingStrategyUnitTests.java @@ -18,10 +18,11 @@ package org.springframework.data.mapping.model; 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.springframework.data.mapping.PersistentProperty; /** @@ -31,15 +32,15 @@ import org.springframework.data.mapping.PersistentProperty; * @author Oliver Gierke * @since 1.9 */ -@RunWith(MockitoJUnitRunner.class) -public class SnakeCaseFieldNamingStrategyUnitTests { +@ExtendWith(MockitoExtension.class) +class SnakeCaseFieldNamingStrategyUnitTests { - FieldNamingStrategy strategy = new SnakeCaseFieldNamingStrategy(); + private FieldNamingStrategy strategy = new SnakeCaseFieldNamingStrategy(); @Mock PersistentProperty property; @Test // DATACMNS-523 - public void rendersSnakeCaseFieldNames() { + void rendersSnakeCaseFieldNames() { assertFieldNameForPropertyName("fooBar", "foo_bar"); assertFieldNameForPropertyName("FooBar", "foo_bar"); diff --git a/src/test/java/org/springframework/data/mapping/model/SpelExpressionParameterProviderUnitTests.java b/src/test/java/org/springframework/data/mapping/model/SpelExpressionParameterProviderUnitTests.java index b15ea2c2c..cbbdbed5a 100755 --- a/src/test/java/org/springframework/data/mapping/model/SpelExpressionParameterProviderUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/model/SpelExpressionParameterProviderUnitTests.java @@ -18,11 +18,14 @@ package org.springframework.data.mapping.model; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; -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.convert.ConversionService; import org.springframework.data.mapping.PreferredConstructor.Parameter; import org.springframework.data.mapping.model.AbstractPersistentPropertyUnitTests.SamplePersistentProperty; @@ -33,20 +36,21 @@ import org.springframework.data.mapping.model.AbstractPersistentPropertyUnitTest * @author Oliver Gierke * @author Mark Paluch */ -@RunWith(MockitoJUnitRunner.class) -public class SpelExpressionParameterProviderUnitTests { +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) +class SpelExpressionParameterProviderUnitTests { @Mock SpELExpressionEvaluator evaluator; @Mock ParameterValueProvider delegate; @Mock ConversionService conversionService; - SpELExpressionParameterValueProvider provider; + private SpELExpressionParameterValueProvider provider; - Parameter parameter; + private Parameter parameter; - @Before + @BeforeEach @SuppressWarnings("unchecked") - public void setUp() { + void setUp() { provider = new SpELExpressionParameterValueProvider<>(evaluator, conversionService, delegate); parameter = mock(Parameter.class); @@ -56,7 +60,7 @@ public class SpelExpressionParameterProviderUnitTests { @Test @SuppressWarnings("unchecked") - public void delegatesIfParameterDoesNotHaveASpELExpression() { + void delegatesIfParameterDoesNotHaveASpELExpression() { Parameter parameter = mock(Parameter.class); when(parameter.hasSpelExpression()).thenReturn(false); @@ -67,7 +71,7 @@ public class SpelExpressionParameterProviderUnitTests { } @Test - public void evaluatesSpELExpression() { + void evaluatesSpELExpression() { when(parameter.getSpelExpression()).thenReturn("expression"); @@ -77,7 +81,7 @@ public class SpelExpressionParameterProviderUnitTests { } @Test - public void handsSpELValueToConversionService() { + void handsSpELValueToConversionService() { doReturn("source").when(parameter).getSpelExpression(); doReturn("value").when(evaluator).evaluate(any()); @@ -89,7 +93,7 @@ public class SpelExpressionParameterProviderUnitTests { } @Test - public void doesNotConvertNullValue() { + void doesNotConvertNullValue() { doReturn("source").when(parameter).getSpelExpression(); doReturn(null).when(evaluator).evaluate(any()); @@ -101,7 +105,7 @@ public class SpelExpressionParameterProviderUnitTests { } @Test - public void returnsMassagedObjectOnOverride() { + void returnsMassagedObjectOnOverride() { provider = new SpELExpressionParameterValueProvider(evaluator, conversionService, delegate) { diff --git a/src/test/java/org/springframework/data/projection/DefaultMethodInvokingMethodInterceptorUnitTests.java b/src/test/java/org/springframework/data/projection/DefaultMethodInvokingMethodInterceptorUnitTests.java index 32b29c9ea..c8ce9edeb 100644 --- a/src/test/java/org/springframework/data/projection/DefaultMethodInvokingMethodInterceptorUnitTests.java +++ b/src/test/java/org/springframework/data/projection/DefaultMethodInvokingMethodInterceptorUnitTests.java @@ -16,9 +16,9 @@ package org.springframework.data.projection; import static org.assertj.core.api.Assertions.*; -import static org.junit.Assume.*; +import static org.assertj.core.api.Assumptions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.projection.DefaultMethodInvokingMethodInterceptor.MethodHandleLookup; import org.springframework.data.util.Version; @@ -28,21 +28,21 @@ import org.springframework.data.util.Version; * @author Mark Paluch * @author Oliver Gierke */ -public class DefaultMethodInvokingMethodInterceptorUnitTests { +class DefaultMethodInvokingMethodInterceptorUnitTests { @Test // DATACMNS-1376 - public void shouldApplyEncapsulatedLookupOnJava9AndHigher() { + void shouldApplyEncapsulatedLookupOnJava9AndHigher() { - assumeTrue(Version.javaVersion().isGreaterThanOrEqualTo(Version.parse("9.0"))); + assumeThat(Version.javaVersion()).isGreaterThanOrEqualTo(Version.parse("9.0")); assertThat(MethodHandleLookup.getMethodHandleLookup()).isEqualTo(MethodHandleLookup.ENCAPSULATED); assertThat(MethodHandleLookup.ENCAPSULATED.isAvailable()).isTrue(); } @Test // DATACMNS-1376 - public void shouldApplyOpenLookupOnJava8() { + void shouldApplyOpenLookupOnJava8() { - assumeTrue(Version.javaVersion().isLessThan(Version.parse("1.8.9999"))); + assumeThat(Version.javaVersion()).isLessThan(Version.parse("1.8.9999")); assertThat(MethodHandleLookup.getMethodHandleLookup()).isEqualTo(MethodHandleLookup.OPEN); assertThat(MethodHandleLookup.OPEN.isAvailable()).isTrue(); diff --git a/src/test/java/org/springframework/data/projection/DefaultProjectionInformationUnitTests.java b/src/test/java/org/springframework/data/projection/DefaultProjectionInformationUnitTests.java index 7eb201d99..09608d5cc 100755 --- a/src/test/java/org/springframework/data/projection/DefaultProjectionInformationUnitTests.java +++ b/src/test/java/org/springframework/data/projection/DefaultProjectionInformationUnitTests.java @@ -22,7 +22,7 @@ import java.beans.PropertyDescriptor; import java.util.List; import java.util.stream.Collectors; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Value; /** @@ -31,10 +31,10 @@ import org.springframework.beans.factory.annotation.Value; * @author Oliver Gierke * @author Mark Paluch */ -public class DefaultProjectionInformationUnitTests { +class DefaultProjectionInformationUnitTests { @Test // DATACMNS-89 - public void discoversInputProperties() { + void discoversInputProperties() { ProjectionInformation information = new DefaultProjectionInformation(CustomerProjection.class); @@ -42,7 +42,7 @@ public class DefaultProjectionInformationUnitTests { } @Test // DATACMNS-1206 - public void omitsInputPropertiesAcceptingArguments() { + void omitsInputPropertiesAcceptingArguments() { ProjectionInformation information = new DefaultProjectionInformation(ProjectionAcceptingArguments.class); @@ -50,7 +50,7 @@ public class DefaultProjectionInformationUnitTests { } @Test // DATACMNS-89 - public void discoversAllInputProperties() { + void discoversAllInputProperties() { ProjectionInformation information = new DefaultProjectionInformation(ExtendedProjection.class); @@ -58,7 +58,7 @@ public class DefaultProjectionInformationUnitTests { } @Test // DATACMNS-1206 - public void discoversInputPropertiesInOrder() { + void discoversInputPropertiesInOrder() { ProjectionInformation information = new DefaultProjectionInformation(SameMethodNamesInAlternateOrder.class); @@ -66,7 +66,7 @@ public class DefaultProjectionInformationUnitTests { } @Test // DATACMNS-1206 - public void discoversAllInputPropertiesInOrder() { + void discoversAllInputPropertiesInOrder() { assertThat(toNames(new DefaultProjectionInformation(CompositeProjection.class).getInputProperties())) .containsExactly("firstname", "lastname", "age"); @@ -75,7 +75,7 @@ public class DefaultProjectionInformationUnitTests { } @Test // DATACMNS-967 - public void doesNotConsiderDefaultMethodInputProperties() { + void doesNotConsiderDefaultMethodInputProperties() { ProjectionInformation information = new DefaultProjectionInformation(WithDefaultMethod.class); diff --git a/src/test/java/org/springframework/data/projection/MapAccessingMethodInterceptorUnitTests.java b/src/test/java/org/springframework/data/projection/MapAccessingMethodInterceptorUnitTests.java index 22d4aa3cb..5673455ec 100755 --- a/src/test/java/org/springframework/data/projection/MapAccessingMethodInterceptorUnitTests.java +++ b/src/test/java/org/springframework/data/projection/MapAccessingMethodInterceptorUnitTests.java @@ -23,28 +23,28 @@ import java.util.HashMap; import java.util.Map; 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; /** * Unit tests for {@link MapAccessingMethodInterceptor}. * * @author Oliver Gierke */ -@RunWith(MockitoJUnitRunner.class) -public class MapAccessingMethodInterceptorUnitTests { +@ExtendWith(MockitoExtension.class) +class MapAccessingMethodInterceptorUnitTests { @Mock MethodInvocation invocation; @Test // DATACMNS-630 - public void rejectsNullMap() { + void rejectsNullMap() { assertThatIllegalArgumentException().isThrownBy(() -> new MapAccessingMethodInterceptor(null)); } @Test // DATACMNS-630 - public void forwardsObjectMethodsToBackingMap() throws Throwable { + void forwardsObjectMethodsToBackingMap() throws Throwable { Map map = Collections.emptyMap(); @@ -58,7 +58,7 @@ public class MapAccessingMethodInterceptorUnitTests { } @Test // DATACMNS-630 - public void setterInvocationStoresValueInMap() throws Throwable { + void setterInvocationStoresValueInMap() throws Throwable { Map map = new HashMap<>(); @@ -72,7 +72,7 @@ public class MapAccessingMethodInterceptorUnitTests { } @Test // DATACMNS-630 - public void getterInvocationReturnsValueFromMap() throws Throwable { + void getterInvocationReturnsValueFromMap() throws Throwable { Map map = new HashMap<>(); map.put("name", "Foo"); @@ -85,7 +85,7 @@ public class MapAccessingMethodInterceptorUnitTests { } @Test // DATACMNS-630 - public void getterReturnsNullIfMapDoesNotContainValue() throws Throwable { + void getterReturnsNullIfMapDoesNotContainValue() throws Throwable { Map map = new HashMap<>(); @@ -95,7 +95,7 @@ public class MapAccessingMethodInterceptorUnitTests { } @Test // DATACMNS-630 - public void rejectsNonAccessorInvocation() throws Throwable { + void rejectsNonAccessorInvocation() throws Throwable { when(invocation.getMethod()).thenReturn(Sample.class.getMethod("someMethod")); assertThatIllegalArgumentException() diff --git a/src/test/java/org/springframework/data/projection/ProjectingMethodInterceptorUnitTests.java b/src/test/java/org/springframework/data/projection/ProjectingMethodInterceptorUnitTests.java index 82655bb9a..e486db511 100755 --- a/src/test/java/org/springframework/data/projection/ProjectingMethodInterceptorUnitTests.java +++ b/src/test/java/org/springframework/data/projection/ProjectingMethodInterceptorUnitTests.java @@ -28,10 +28,11 @@ import java.util.Set; 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.springframework.core.convert.ConversionService; import org.springframework.core.convert.support.DefaultConversionService; @@ -42,8 +43,8 @@ import org.springframework.core.convert.support.DefaultConversionService; * @author Saulo Medeiros de Araujo * @author Mark Paluch */ -@RunWith(MockitoJUnitRunner.class) -public class ProjectingMethodInterceptorUnitTests { +@ExtendWith(MockitoExtension.class) +class ProjectingMethodInterceptorUnitTests { @Mock MethodInterceptor interceptor; @Mock MethodInvocation invocation; @@ -51,7 +52,7 @@ public class ProjectingMethodInterceptorUnitTests { ConversionService conversionService = new DefaultConversionService(); @Test // DATAREST-221 - public void wrapsDelegateResultInProxyIfTypesDontMatch() throws Throwable { + void wrapsDelegateResultInProxyIfTypesDontMatch() throws Throwable { MethodInterceptor methodInterceptor = new ProjectingMethodInterceptor(new ProxyProjectionFactory(), interceptor, conversionService); @@ -63,7 +64,7 @@ public class ProjectingMethodInterceptorUnitTests { } @Test // DATAREST-221 - public void retunsDelegateResultAsIsIfTypesMatch() throws Throwable { + void retunsDelegateResultAsIsIfTypesMatch() throws Throwable { MethodInterceptor methodInterceptor = new ProjectingMethodInterceptor(factory, interceptor, conversionService); @@ -74,7 +75,7 @@ public class ProjectingMethodInterceptorUnitTests { } @Test // DATAREST-221 - public void returnsNullAsIs() throws Throwable { + void returnsNullAsIs() throws Throwable { MethodInterceptor methodInterceptor = new ProjectingMethodInterceptor(factory, interceptor, conversionService); @@ -84,7 +85,7 @@ public class ProjectingMethodInterceptorUnitTests { } @Test // DATAREST-221 - public void considersPrimitivesAsWrappers() throws Throwable { + void considersPrimitivesAsWrappers() throws Throwable { MethodInterceptor methodInterceptor = new ProjectingMethodInterceptor(factory, interceptor, conversionService); @@ -97,7 +98,7 @@ public class ProjectingMethodInterceptorUnitTests { @Test // DATAREST-394, DATAREST-408 @SuppressWarnings("unchecked") - public void appliesProjectionToNonEmptySets() throws Throwable { + void appliesProjectionToNonEmptySets() throws Throwable { MethodInterceptor methodInterceptor = new ProjectingMethodInterceptor(new ProxyProjectionFactory(), interceptor, conversionService); @@ -112,7 +113,7 @@ public class ProjectingMethodInterceptorUnitTests { @Test // DATAREST-394, DATAREST-408 @SuppressWarnings("unchecked") - public void appliesProjectionToNonEmptyLists() throws Throwable { + void appliesProjectionToNonEmptyLists() throws Throwable { MethodInterceptor methodInterceptor = new ProjectingMethodInterceptor(new ProxyProjectionFactory(), interceptor, conversionService); @@ -128,7 +129,7 @@ public class ProjectingMethodInterceptorUnitTests { @Test // DATAREST-394, DATAREST-408 @SuppressWarnings("unchecked") - public void allowsMaskingAnArrayIntoACollection() throws Throwable { + void allowsMaskingAnArrayIntoACollection() throws Throwable { MethodInterceptor methodInterceptor = new ProjectingMethodInterceptor(new ProxyProjectionFactory(), interceptor, conversionService); @@ -143,7 +144,7 @@ public class ProjectingMethodInterceptorUnitTests { @Test // DATAREST-394, DATAREST-408 @SuppressWarnings("unchecked") - public void appliesProjectionToNonEmptyMap() throws Throwable { + void appliesProjectionToNonEmptyMap() throws Throwable { MethodInterceptor methodInterceptor = new ProjectingMethodInterceptor(new ProxyProjectionFactory(), interceptor, conversionService); @@ -159,7 +160,7 @@ public class ProjectingMethodInterceptorUnitTests { } @Test - public void returnsSingleElementCollectionForTargetThatReturnsNonCollection() throws Throwable { + void returnsSingleElementCollectionForTargetThatReturnsNonCollection() throws Throwable { MethodInterceptor methodInterceptor = new ProjectingMethodInterceptor(new ProxyProjectionFactory(), interceptor, conversionService); @@ -175,7 +176,7 @@ public class ProjectingMethodInterceptorUnitTests { } @Test // DATACMNS-1598 - public void returnsEnumSet() throws Throwable { + void returnsEnumSet() throws Throwable { MethodInterceptor methodInterceptor = new ProjectingMethodInterceptor(new ProxyProjectionFactory(), interceptor, conversionService); diff --git a/src/test/java/org/springframework/data/projection/ProjectionIntegrationTests.java b/src/test/java/org/springframework/data/projection/ProjectionIntegrationTests.java index 10a7be8fe..5c60f4030 100755 --- a/src/test/java/org/springframework/data/projection/ProjectionIntegrationTests.java +++ b/src/test/java/org/springframework/data/projection/ProjectionIntegrationTests.java @@ -17,7 +17,7 @@ package org.springframework.data.projection; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.fasterxml.jackson.databind.ObjectMapper; import com.jayway.jsonpath.Configuration.ConfigurationBuilder; @@ -31,10 +31,10 @@ import com.jayway.jsonpath.ParseContext; * * @author Oliver Gierke */ -public class ProjectionIntegrationTests { +class ProjectionIntegrationTests { @Test // DATACMNS-909 - public void jacksonSerializationDoesNotExposeDecoratedClass() throws Exception { + void jacksonSerializationDoesNotExposeDecoratedClass() throws Exception { ProxyProjectionFactory factory = new ProxyProjectionFactory(); SampleProjection projection = factory.createProjection(SampleProjection.class); diff --git a/src/test/java/org/springframework/data/projection/PropertyAccessingMethodInterceptorUnitTests.java b/src/test/java/org/springframework/data/projection/PropertyAccessingMethodInterceptorUnitTests.java index e87e5a35a..1d8f95e3b 100755 --- a/src/test/java/org/springframework/data/projection/PropertyAccessingMethodInterceptorUnitTests.java +++ b/src/test/java/org/springframework/data/projection/PropertyAccessingMethodInterceptorUnitTests.java @@ -20,10 +20,11 @@ import static org.mockito.Mockito.*; 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.springframework.beans.NotReadablePropertyException; import org.springframework.beans.NotWritablePropertyException; @@ -33,13 +34,13 @@ import org.springframework.beans.NotWritablePropertyException; * @author Oliver Gierke * @author Mark Paluch */ -@RunWith(MockitoJUnitRunner.class) -public class PropertyAccessingMethodInterceptorUnitTests { +@ExtendWith(MockitoExtension.class) +class PropertyAccessingMethodInterceptorUnitTests { @Mock MethodInvocation invocation; @Test // DATAREST-221 - public void triggersPropertyAccessOnTarget() throws Throwable { + void triggersPropertyAccessOnTarget() throws Throwable { Source source = new Source(); source.firstname = "Dave"; @@ -51,7 +52,7 @@ public class PropertyAccessingMethodInterceptorUnitTests { } @Test // DATAREST-221 - public void throwsAppropriateExceptionIfThePropertyCannotBeFound() throws Throwable { + void throwsAppropriateExceptionIfThePropertyCannotBeFound() throws Throwable { when(invocation.getMethod()).thenReturn(Projection.class.getMethod("getLastname")); assertThatExceptionOfType(NotReadablePropertyException.class) @@ -59,7 +60,7 @@ public class PropertyAccessingMethodInterceptorUnitTests { } @Test // DATAREST-221 - public void forwardsObjectMethodInvocation() throws Throwable { + void forwardsObjectMethodInvocation() throws Throwable { when(invocation.getMethod()).thenReturn(Object.class.getMethod("toString")); @@ -67,7 +68,7 @@ public class PropertyAccessingMethodInterceptorUnitTests { } @Test // DATACMNS-630 - public void rejectsNonAccessorMethod() throws Throwable { + void rejectsNonAccessorMethod() throws Throwable { when(invocation.getMethod()).thenReturn(Projection.class.getMethod("someGarbage")); @@ -76,7 +77,7 @@ public class PropertyAccessingMethodInterceptorUnitTests { } @Test // DATACMNS-820 - public void triggersWritePropertyAccessOnTarget() throws Throwable { + void triggersWritePropertyAccessOnTarget() throws Throwable { Source source = new Source(); source.firstname = "Dave"; @@ -90,7 +91,7 @@ public class PropertyAccessingMethodInterceptorUnitTests { } @Test // DATACMNS-820 - public void throwsAppropriateExceptionIfTheInvocationHasNoArguments() throws Throwable { + void throwsAppropriateExceptionIfTheInvocationHasNoArguments() throws Throwable { Source source = new Source(); @@ -102,7 +103,7 @@ public class PropertyAccessingMethodInterceptorUnitTests { } @Test // DATACMNS-820 - public void throwsAppropriateExceptionIfThePropertyCannotWritten() throws Throwable { + void throwsAppropriateExceptionIfThePropertyCannotWritten() throws Throwable { when(invocation.getMethod()).thenReturn(Projection.class.getMethod("setGarbage", String.class)); when(invocation.getArguments()).thenReturn(new Object[] { "Carl" }); diff --git a/src/test/java/org/springframework/data/projection/ProxyProjectionFactoryUnitTests.java b/src/test/java/org/springframework/data/projection/ProxyProjectionFactoryUnitTests.java index 13341af19..5a6a8b487 100755 --- a/src/test/java/org/springframework/data/projection/ProxyProjectionFactoryUnitTests.java +++ b/src/test/java/org/springframework/data/projection/ProxyProjectionFactoryUnitTests.java @@ -24,7 +24,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.aop.Advisor; import org.springframework.aop.TargetClassAware; import org.springframework.aop.framework.Advised; @@ -35,31 +35,31 @@ import org.springframework.test.util.ReflectionTestUtils; * * @author Oliver Gierke */ -public class ProxyProjectionFactoryUnitTests { +class ProxyProjectionFactoryUnitTests { ProjectionFactory factory = new ProxyProjectionFactory(); @Test @SuppressWarnings("null") // DATACMNS-630 - public void rejectsNullProjectionType() { + void rejectsNullProjectionType() { assertThatIllegalArgumentException().isThrownBy(() -> factory.createProjection(null)); } @Test @SuppressWarnings("null") // DATACMNS-630 - public void rejectsNullProjectionTypeWithSource() { + void rejectsNullProjectionTypeWithSource() { assertThatIllegalArgumentException().isThrownBy(() -> factory.createProjection(null, new Object())); } @Test // DATACMNS-630 - public void returnsNullForNullSource() { + void returnsNullForNullSource() { assertThat(factory.createNullableProjection(CustomerExcerpt.class, null)).isNull(); } @Test // DATAREST-221, DATACMNS-630 - public void createsProjectingProxy() { + void createsProjectingProxy() { Customer customer = new Customer(); customer.firstname = "Dave"; @@ -76,7 +76,7 @@ public class ProxyProjectionFactoryUnitTests { } @Test // DATAREST-221, DATACMNS-630 - public void proxyExposesTargetClassAware() { + void proxyExposesTargetClassAware() { CustomerExcerpt proxy = factory.createProjection(CustomerExcerpt.class); @@ -85,12 +85,12 @@ public class ProxyProjectionFactoryUnitTests { } @Test // DATAREST-221, DATACMNS-630 - public void rejectsNonInterfacesAsProjectionTarget() { + void rejectsNonInterfacesAsProjectionTarget() { assertThatIllegalArgumentException().isThrownBy(() -> factory.createProjection(Object.class, new Object())); } @Test // DATACMNS-630 - public void createsMapBasedProxyFromSource() { + void createsMapBasedProxyFromSource() { HashMap addressSource = new HashMap<>(); addressSource.put("zipCode", "ZIP"); @@ -111,7 +111,7 @@ public class ProxyProjectionFactoryUnitTests { } @Test // DATACMNS-630 - public void createsEmptyMapBasedProxy() { + void createsEmptyMapBasedProxy() { CustomerProxy proxy = factory.createProjection(CustomerProxy.class); @@ -122,7 +122,7 @@ public class ProxyProjectionFactoryUnitTests { } @Test // DATACMNS-630 - public void returnsAllPropertiesAsInputProperties() { + void returnsAllPropertiesAsInputProperties() { ProjectionInformation projectionInformation = factory.getProjectionInformation(CustomerExcerpt.class); List result = projectionInformation.getInputProperties(); @@ -131,7 +131,7 @@ public class ProxyProjectionFactoryUnitTests { } @Test // DATACMNS-655 - public void invokesDefaultMethodOnProxy() { + void invokesDefaultMethodOnProxy() { CustomerExcerpt excerpt = factory.createProjection(CustomerExcerpt.class); @@ -143,7 +143,7 @@ public class ProxyProjectionFactoryUnitTests { } @Test // DATACMNS-648 - public void exposesProxyTarget() { + void exposesProxyTarget() { CustomerExcerpt excerpt = factory.createProjection(CustomerExcerpt.class); @@ -152,7 +152,7 @@ public class ProxyProjectionFactoryUnitTests { } @Test // DATACMNS-722 - public void doesNotProjectPrimitiveArray() { + void doesNotProjectPrimitiveArray() { Customer customer = new Customer(); customer.picture = "binarydata".getBytes(); @@ -163,7 +163,7 @@ public class ProxyProjectionFactoryUnitTests { } @Test // DATACMNS-722 - public void projectsNonPrimitiveArray() { + void projectsNonPrimitiveArray() { Address address = new Address(); address.city = "New York"; @@ -178,7 +178,7 @@ public class ProxyProjectionFactoryUnitTests { } @Test // DATACMNS-782 - public void convertsPrimitiveValues() { + void convertsPrimitiveValues() { Customer customer = new Customer(); customer.id = 1L; @@ -189,7 +189,7 @@ public class ProxyProjectionFactoryUnitTests { } @Test // DATACMNS-89 - public void exposesProjectionInformationCorrectly() { + void exposesProjectionInformationCorrectly() { ProjectionInformation information = factory.getProjectionInformation(CustomerExcerpt.class); @@ -198,7 +198,7 @@ public class ProxyProjectionFactoryUnitTests { } @Test // DATACMNS-829 - public void projectsMapOfStringToObjectCorrectly() { + void projectsMapOfStringToObjectCorrectly() { Customer customer = new Customer(); customer.data = Collections.singletonMap("key", null); @@ -211,7 +211,7 @@ public class ProxyProjectionFactoryUnitTests { } @Test // DATACMNS-1121 - public void doesNotCreateWrappingProxyIfTargetImplementsProjectionInterface() { + void doesNotCreateWrappingProxyIfTargetImplementsProjectionInterface() { Customer customer = new Customer(); @@ -222,17 +222,17 @@ public class ProxyProjectionFactoryUnitTests { static class Customer implements Contact { - public Long id; - public String firstname, lastname; - public Address address; - public byte[] picture; - public Address[] shippingAddresses; - public Map data; + Long id; + String firstname, lastname; + Address address; + byte[] picture; + Address[] shippingAddresses; + Map data; } static class Address { - public String zipCode, city; + String zipCode, city; } interface CustomerExcerpt { diff --git a/src/test/java/org/springframework/data/projection/SpelAwareProxyProjectionFactoryUnitTests.java b/src/test/java/org/springframework/data/projection/SpelAwareProxyProjectionFactoryUnitTests.java index 495069a38..9209e84e3 100755 --- a/src/test/java/org/springframework/data/projection/SpelAwareProxyProjectionFactoryUnitTests.java +++ b/src/test/java/org/springframework/data/projection/SpelAwareProxyProjectionFactoryUnitTests.java @@ -20,8 +20,8 @@ import static org.assertj.core.api.Assertions.*; import java.beans.PropertyDescriptor; import java.util.List; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.beans.NotWritablePropertyException; import org.springframework.beans.factory.annotation.Value; @@ -33,17 +33,17 @@ import org.springframework.beans.factory.annotation.Value; * @author Thomas Darimont * @author Mark Paluch */ -public class SpelAwareProxyProjectionFactoryUnitTests { +class SpelAwareProxyProjectionFactoryUnitTests { SpelAwareProxyProjectionFactory factory; - @Before - public void setup() { + @BeforeEach + void setup() { factory = new SpelAwareProxyProjectionFactory(); } @Test // DATAREST-221, DATACMNS-630 - public void exposesSpelInvokingMethod() { + void exposesSpelInvokingMethod() { Customer customer = new Customer(); customer.firstname = "Dave"; @@ -54,7 +54,7 @@ public class SpelAwareProxyProjectionFactoryUnitTests { } @Test // DATACMNS-630 - public void excludesAtValueAnnotatedMethodsForInputProperties() { + void excludesAtValueAnnotatedMethodsForInputProperties() { List properties = factory // .getProjectionInformation(CustomerExcerpt.class) // @@ -66,7 +66,7 @@ public class SpelAwareProxyProjectionFactoryUnitTests { } @Test // DATACMNS-89 - public void considersProjectionUsingAtValueNotClosed() { + void considersProjectionUsingAtValueNotClosed() { ProjectionInformation information = factory.getProjectionInformation(CustomerExcerpt.class); @@ -74,7 +74,7 @@ public class SpelAwareProxyProjectionFactoryUnitTests { } @Test // DATACMNS-820 - public void setsValueUsingProjection() { + void setsValueUsingProjection() { Customer customer = new Customer(); customer.firstname = "Dave"; @@ -86,7 +86,7 @@ public class SpelAwareProxyProjectionFactoryUnitTests { } @Test // DATACMNS-820 - public void settingNotWriteablePropertyFails() { + void settingNotWriteablePropertyFails() { Customer customer = new Customer(); customer.firstname = "Dave"; diff --git a/src/test/java/org/springframework/data/projection/SpelEvaluatingMethodInterceptorUnitTests.java b/src/test/java/org/springframework/data/projection/SpelEvaluatingMethodInterceptorUnitTests.java index 67fbc8b1a..f1d4f2616 100755 --- a/src/test/java/org/springframework/data/projection/SpelEvaluatingMethodInterceptorUnitTests.java +++ b/src/test/java/org/springframework/data/projection/SpelEvaluatingMethodInterceptorUnitTests.java @@ -23,10 +23,11 @@ import java.util.Map; 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.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.expression.spel.standard.SpelExpressionParser; @@ -37,8 +38,8 @@ import org.springframework.expression.spel.standard.SpelExpressionParser; * @author Oliver Gierke * @author Thomas Darimont */ -@RunWith(MockitoJUnitRunner.class) -public class SpelEvaluatingMethodInterceptorUnitTests { +@ExtendWith(MockitoExtension.class) +class SpelEvaluatingMethodInterceptorUnitTests { @Mock MethodInterceptor delegate; @Mock MethodInvocation invocation; @@ -46,7 +47,7 @@ public class SpelEvaluatingMethodInterceptorUnitTests { SpelExpressionParser parser = new SpelExpressionParser(); @Test // DATAREST-221, DATACMNS-630 - public void invokesMethodOnTarget() throws Throwable { + void invokesMethodOnTarget() throws Throwable { when(invocation.getMethod()).thenReturn(Projection.class.getMethod("propertyFromTarget")); @@ -57,7 +58,7 @@ public class SpelEvaluatingMethodInterceptorUnitTests { } @Test // DATAREST-221, DATACMNS-630 - public void invokesMethodOnBean() throws Throwable { + void invokesMethodOnBean() throws Throwable { when(invocation.getMethod()).thenReturn(Projection.class.getMethod("invokeBean")); @@ -71,7 +72,7 @@ public class SpelEvaluatingMethodInterceptorUnitTests { } @Test // DATACMNS-630 - public void forwardNonAtValueAnnotatedMethodToDelegate() throws Throwable { + void forwardNonAtValueAnnotatedMethodToDelegate() throws Throwable { when(invocation.getMethod()).thenReturn(Projection.class.getMethod("getName")); @@ -84,13 +85,13 @@ public class SpelEvaluatingMethodInterceptorUnitTests { } @Test // DATACMNS-630 - public void rejectsEmptySpelExpression() { + void rejectsEmptySpelExpression() { assertThatIllegalStateException().isThrownBy(() -> new SpelEvaluatingMethodInterceptor(delegate, new Target(), new DefaultListableBeanFactory(), parser, InvalidProjection.class)); } @Test // DATACMNS-630 - public void allowsMapAccessViaPropertyExpression() throws Throwable { + void allowsMapAccessViaPropertyExpression() throws Throwable { Map map = new HashMap<>(); map.put("name", "Dave"); @@ -104,7 +105,7 @@ public class SpelEvaluatingMethodInterceptorUnitTests { } @Test // DATACMNS-1150 - public void forwardsParameterIntoSpElExpressionEvaluation() throws Throwable { + void forwardsParameterIntoSpElExpressionEvaluation() throws Throwable { DefaultListableBeanFactory factory = new DefaultListableBeanFactory(); factory.registerSingleton("someBean", new SomeBean()); diff --git a/src/test/java/org/springframework/data/querydsl/QPageRequestUnitTests.java b/src/test/java/org/springframework/data/querydsl/QPageRequestUnitTests.java index 84d53e29b..21ebd1d85 100755 --- a/src/test/java/org/springframework/data/querydsl/QPageRequestUnitTests.java +++ b/src/test/java/org/springframework/data/querydsl/QPageRequestUnitTests.java @@ -17,7 +17,8 @@ package org.springframework.data.querydsl; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; + import org.springframework.data.domain.AbstractPageRequest; import org.springframework.data.domain.AbstractPageRequestUnitTests; @@ -25,6 +26,7 @@ import org.springframework.data.domain.AbstractPageRequestUnitTests; * @author Thomas Darimont */ public class QPageRequestUnitTests extends AbstractPageRequestUnitTests { + /* * (non-Javadoc) * @see org.springframework.data.domain.AbstractPageRequestUnitTests#newPageRequest(int, int) @@ -35,7 +37,7 @@ public class QPageRequestUnitTests extends AbstractPageRequestUnitTests { } @Test - public void constructsQPageRequestWithOrderSpecifiers() { + void constructsQPageRequestWithOrderSpecifiers() { QUser user = QUser.user; QPageRequest pageRequest = QPageRequest.of(0, 10, user.firstname.asc()); @@ -44,7 +46,7 @@ public class QPageRequestUnitTests extends AbstractPageRequestUnitTests { } @Test - public void constructsQPageRequestWithQSort() { + void constructsQPageRequestWithQSort() { QUser user = QUser.user; QPageRequest pageRequest = QPageRequest.of(0, 10, QSort.by(user.firstname.asc())); @@ -53,7 +55,7 @@ public class QPageRequestUnitTests extends AbstractPageRequestUnitTests { } @Test // DATACMNS-1581 - public void rejectsNullSort() { + void rejectsNullSort() { assertThatExceptionOfType(IllegalArgumentException.class) // .isThrownBy(() -> QPageRequest.of(0, 10, (QSort) null)); diff --git a/src/test/java/org/springframework/data/querydsl/QSortUnitTests.java b/src/test/java/org/springframework/data/querydsl/QSortUnitTests.java index 118a1e0c0..28a95fa3a 100755 --- a/src/test/java/org/springframework/data/querydsl/QSortUnitTests.java +++ b/src/test/java/org/springframework/data/querydsl/QSortUnitTests.java @@ -22,7 +22,7 @@ import static org.springframework.data.querydsl.QQSortUnitTests_WrapperToWrapWra import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort.Direction; @@ -40,15 +40,15 @@ import com.querydsl.core.types.dsl.StringPath; * @author Oliver Gierke * @author Christoph Strobl */ -public class QSortUnitTests { +class QSortUnitTests { @Test // DATACMNS-402 - public void shouldThrowIfNullIsGiven() { + void shouldThrowIfNullIsGiven() { assertThatIllegalArgumentException().isThrownBy(() -> new QSort((List>) null)); } @Test // DATACMNS-402 - public void sortBySingleProperty() { + void sortBySingleProperty() { QUser user = QUser.user; QSort qsort = new QSort(user.firstname.asc()); @@ -59,7 +59,7 @@ public class QSortUnitTests { } @Test // DATACMNS-402 - public void sortByMultiplyProperties() { + void sortByMultiplyProperties() { QUser user = QUser.user; QSort qsort = new QSort(user.firstname.asc(), user.lastname.desc()); @@ -72,7 +72,7 @@ public class QSortUnitTests { } @Test // DATACMNS-402 - public void sortByMultiplyPropertiesWithAnd() { + void sortByMultiplyPropertiesWithAnd() { QUser user = QUser.user; QSort qsort = new QSort(user.firstname.asc()).and(new QSort(user.lastname.desc())); @@ -85,7 +85,7 @@ public class QSortUnitTests { } @Test // DATACMNS-402 - public void sortByMultiplyPropertiesWithAndAndVarArgs() { + void sortByMultiplyPropertiesWithAndAndVarArgs() { QUser user = QUser.user; QSort qsort = new QSort(user.firstname.asc()).and(user.lastname.desc()); @@ -98,7 +98,7 @@ public class QSortUnitTests { } @Test // DATACMNS-402 - public void ensureInteroperabilityWithSort() { + void ensureInteroperabilityWithSort() { QUser user = QUser.user; QSort qsort = new QSort(user.firstname.asc(), user.lastname.desc()); @@ -110,7 +110,7 @@ public class QSortUnitTests { } @Test // DATACMNS-402 - public void concatenatesPlainSortCorrectly() { + void concatenatesPlainSortCorrectly() { QUser user = QUser.user; QSort sort = new QSort(user.firstname.asc()); @@ -121,7 +121,7 @@ public class QSortUnitTests { } @Test // DATACMNS-566 - public void shouldSupportSortByOperatorExpressions() { + void shouldSupportSortByOperatorExpressions() { QUser user = QUser.user; QSort sort = new QSort(user.dateOfBirth.yearMonth().asc()); @@ -133,7 +133,7 @@ public class QSortUnitTests { } @Test // DATACMNS-621 - public void shouldCreateSortForNestedPathCorrectly() { + void shouldCreateSortForNestedPathCorrectly() { QSort sort = new QSort(userWrapper.user.firstname.asc()); @@ -141,7 +141,7 @@ public class QSortUnitTests { } @Test // DATACMNS-621 - public void shouldCreateSortForDeepNestedPathCorrectly() { + void shouldCreateSortForDeepNestedPathCorrectly() { QSort sort = new QSort(wrapperForUserWrapper.wrapper.user.firstname.asc()); @@ -149,7 +149,7 @@ public class QSortUnitTests { } @Test // DATACMNS-621 - public void shouldCreateSortForReallyDeepNestedPathCorrectly() { + void shouldCreateSortForReallyDeepNestedPathCorrectly() { QSort sort = new QSort(wrapperToWrapWrapperForUserWrapper.wrapperForUserWrapper.wrapper.user.firstname.asc()); @@ -157,7 +157,7 @@ public class QSortUnitTests { } @Test // DATACMNS-755 - public void handlesPlainStringPathsCorrectly() { + void handlesPlainStringPathsCorrectly() { StringPath path = new PathBuilderFactory().create(User.class).getString("firstname"); diff --git a/src/test/java/org/springframework/data/querydsl/QuerydslRepositoryInvokerAdapterUnitTests.java b/src/test/java/org/springframework/data/querydsl/QuerydslRepositoryInvokerAdapterUnitTests.java index ead57edff..36ea9d934 100755 --- a/src/test/java/org/springframework/data/querydsl/QuerydslRepositoryInvokerAdapterUnitTests.java +++ b/src/test/java/org/springframework/data/querydsl/QuerydslRepositoryInvokerAdapterUnitTests.java @@ -19,11 +19,12 @@ import static org.mockito.Mockito.*; import java.io.Serializable; -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.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; import org.springframework.data.repository.support.RepositoryInvoker; @@ -36,8 +37,8 @@ import com.querydsl.core.types.Predicate; * @author Oliver Gierke * @soundtrack Emilie Nicolas - Grown Up */ -@RunWith(MockitoJUnitRunner.class) -public class QuerydslRepositoryInvokerAdapterUnitTests { +@ExtendWith(MockitoExtension.class) +class QuerydslRepositoryInvokerAdapterUnitTests { @Mock RepositoryInvoker delegate; @Mock QuerydslPredicateExecutor executor; @@ -45,13 +46,13 @@ public class QuerydslRepositoryInvokerAdapterUnitTests { QuerydslRepositoryInvokerAdapter adapter; - @Before - public void setUp() { + @BeforeEach + void setUp() { this.adapter = new QuerydslRepositoryInvokerAdapter(delegate, executor, predicate); } @Test // DATACMNS-669 - public void forwardsFindAllToExecutorWithPredicate() { + void forwardsFindAllToExecutorWithPredicate() { Sort sort = Sort.by("firstname"); adapter.invokeFindAll(sort); @@ -61,7 +62,7 @@ public class QuerydslRepositoryInvokerAdapterUnitTests { } @Test // DATACMNS-669 - public void forwardsFindAllWithPageableToExecutorWithPredicate() { + void forwardsFindAllWithPageableToExecutorWithPredicate() { PageRequest pageable = PageRequest.of(0, 10); adapter.invokeFindAll(pageable); @@ -72,7 +73,7 @@ public class QuerydslRepositoryInvokerAdapterUnitTests { @Test // DATACMNS-669 @SuppressWarnings("unchecked") - public void forwardsMethodsToDelegate() { + void forwardsMethodsToDelegate() { adapter.hasDeleteMethod(); verify(delegate, times(1)).hasDeleteMethod(); diff --git a/src/test/java/org/springframework/data/querydsl/QuerydslUtilsUnitTests.java b/src/test/java/org/springframework/data/querydsl/QuerydslUtilsUnitTests.java index 7e2231c5b..90d2dafe4 100755 --- a/src/test/java/org/springframework/data/querydsl/QuerydslUtilsUnitTests.java +++ b/src/test/java/org/springframework/data/querydsl/QuerydslUtilsUnitTests.java @@ -18,22 +18,22 @@ package org.springframework.data.querydsl; import static org.assertj.core.api.Assertions.*; import static org.springframework.data.querydsl.QuerydslUtils.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Unit tests for {@link QuerydslUtils}. * * @author Oliver Gierke */ -public class QuerydslUtilsUnitTests { +class QuerydslUtilsUnitTests { @Test // DATACMNS-883 - public void rendersDotPathForPathTraversalContainingAnyExpression() { + void rendersDotPathForPathTraversalContainingAnyExpression() { assertThat(QuerydslUtils.toDotPath(QUser.user.addresses.any().street)).isEqualTo("addresses.street"); } @Test // DATACMNS-941 - public void skipsIntermediateDelegates() { + void skipsIntermediateDelegates() { assertThat(toDotPath(QUser.user.as(QSpecialUser.class).as(QSpecialUser.class).specialProperty)) .isEqualTo("specialProperty"); diff --git a/src/test/java/org/springframework/data/querydsl/SimpleEntityPathResolverUnitTests.java b/src/test/java/org/springframework/data/querydsl/SimpleEntityPathResolverUnitTests.java index a1d77f2a3..ca04f32d6 100755 --- a/src/test/java/org/springframework/data/querydsl/SimpleEntityPathResolverUnitTests.java +++ b/src/test/java/org/springframework/data/querydsl/SimpleEntityPathResolverUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.querydsl; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.querydsl.core.annotations.QueryEntity; @@ -27,28 +27,28 @@ import com.querydsl.core.annotations.QueryEntity; * @author Oliver Gierke * @author Jens Schauder */ -public class SimpleEntityPathResolverUnitTests { +class SimpleEntityPathResolverUnitTests { EntityPathResolver resolver = SimpleEntityPathResolver.INSTANCE; @Test - public void createsRepositoryFromDomainClassCorrectly() throws Exception { + void createsRepositoryFromDomainClassCorrectly() throws Exception { assertThat(resolver.createPath(User.class)).isInstanceOf(QUser.class); } @Test - public void resolvesEntityPathForInnerClassCorrectly() throws Exception { + void resolvesEntityPathForInnerClassCorrectly() throws Exception { assertThat(resolver.createPath(NamedUser.class)).isInstanceOf(QSimpleEntityPathResolverUnitTests_NamedUser.class); } @Test - public void rejectsClassWithoutQueryClassConfrmingToTheNamingScheme() { + void rejectsClassWithoutQueryClassConfrmingToTheNamingScheme() { assertThatIllegalArgumentException() .isThrownBy(() -> resolver.createPath(QSimpleEntityPathResolverUnitTests_Sample.class)); } @Test // DATACMNS-1235 - public void handlesPackageSuffixCorrectly() { + void handlesPackageSuffixCorrectly() { assertThat(new SimpleEntityPathResolver(".suffix").createPath(User.class)) .isInstanceOf(org.springframework.data.querydsl.suffix.QUser.class); } diff --git a/src/test/java/org/springframework/data/querydsl/binding/QuerydslBindingsFactoryUnitTests.java b/src/test/java/org/springframework/data/querydsl/binding/QuerydslBindingsFactoryUnitTests.java index 5a9a838a8..448236fad 100755 --- a/src/test/java/org/springframework/data/querydsl/binding/QuerydslBindingsFactoryUnitTests.java +++ b/src/test/java/org/springframework/data/querydsl/binding/QuerydslBindingsFactoryUnitTests.java @@ -21,8 +21,8 @@ import static org.mockito.Mockito.*; import java.util.Collections; import java.util.Optional; -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.AutowireCapableBeanFactory; import org.springframework.data.querydsl.QUser; import org.springframework.data.querydsl.SimpleEntityPathResolver; @@ -42,20 +42,20 @@ import com.querydsl.core.types.Predicate; * @author Oliver Gierke * @soundtrack Miles Davis - All Blues (Kind of Blue) */ -public class QuerydslBindingsFactoryUnitTests { +class QuerydslBindingsFactoryUnitTests { static final TypeInformation USER_TYPE = ClassTypeInformation.from(User.class); QuerydslBindingsFactory factory; - @Before - public void setUp() { + @BeforeEach + void setUp() { this.factory = new QuerydslBindingsFactory(SimpleEntityPathResolver.INSTANCE); } @Test // DATACMNS-669 @SuppressWarnings({ "unchecked", "rawtypes" }) - public void createBindingsShouldHonorQuerydslBinderCustomizerHookWhenPresent() { + void createBindingsShouldHonorQuerydslBinderCustomizerHookWhenPresent() { Repositories repositories = mock(Repositories.class); @@ -77,7 +77,7 @@ public class QuerydslBindingsFactoryUnitTests { @Test // DATACMNS-669 @SuppressWarnings({ "unchecked", "rawtypes" }) - public void shouldReuseExistingQuerydslBinderCustomizer() { + void shouldReuseExistingQuerydslBinderCustomizer() { AutowireCapableBeanFactory beanFactory = mock(AutowireCapableBeanFactory.class); when(beanFactory.getBean(SpecificBinding.class)).thenReturn(new SpecificBinding()); @@ -96,7 +96,7 @@ public class QuerydslBindingsFactoryUnitTests { } @Test // DATACMNS-669 - public void rejectsPredicateResolutionIfDomainTypeCantBeAutoDetected() { + void rejectsPredicateResolutionIfDomainTypeCantBeAutoDetected() { assertThatExceptionOfType(IllegalStateException.class)// .isThrownBy(() -> factory.createBindingsFor(ClassTypeInformation.from(ModelAndView.class)))// @@ -116,7 +116,7 @@ public class QuerydslBindingsFactoryUnitTests { } } - public static class SampleRepo implements QuerydslBinderCustomizer { + static class SampleRepo implements QuerydslBinderCustomizer { @Override public void customize(QuerydslBindings bindings, QUser user) { diff --git a/src/test/java/org/springframework/data/querydsl/binding/QuerydslBindingsUnitTests.java b/src/test/java/org/springframework/data/querydsl/binding/QuerydslBindingsUnitTests.java index 124dfd7eb..fdaf53244 100755 --- a/src/test/java/org/springframework/data/querydsl/binding/QuerydslBindingsUnitTests.java +++ b/src/test/java/org/springframework/data/querydsl/binding/QuerydslBindingsUnitTests.java @@ -19,8 +19,8 @@ import static org.assertj.core.api.Assertions.*; import java.util.Optional; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.data.querydsl.QSpecialUser; @@ -39,27 +39,27 @@ import com.querydsl.core.types.dsl.StringPath; * @author Oliver Gierke * @author Christoph Strobl */ -public class QuerydslBindingsUnitTests { +class QuerydslBindingsUnitTests { QuerydslPredicateBuilder builder; QuerydslBindings bindings; static final SingleValueBinding CONTAINS_BINDING = (path, value) -> path.contains(value); - @Before - public void setUp() { + @BeforeEach + void setUp() { this.builder = new QuerydslPredicateBuilder(new DefaultConversionService(), SimpleEntityPathResolver.INSTANCE); this.bindings = new QuerydslBindings(); } @Test // DATACMNS-669 - public void rejectsNullPath() { + void rejectsNullPath() { assertThatIllegalArgumentException().isThrownBy(() -> bindings.getBindingForPath(null)); } @Test // DATACMNS-669 - public void returnsEmptyOptionalIfNoBindingRegisteredForPath() { + void returnsEmptyOptionalIfNoBindingRegisteredForPath() { PathInformation path = PropertyPathInformation.of("lastname", User.class); @@ -67,7 +67,7 @@ public class QuerydslBindingsUnitTests { } @Test // DATACMNS-669 - public void returnsRegisteredBindingForSimplePath() { + void returnsRegisteredBindingForSimplePath() { bindings.bind(QUser.user.firstname).first(CONTAINS_BINDING); @@ -77,7 +77,7 @@ public class QuerydslBindingsUnitTests { } @Test // DATACMNS-669 - public void getBindingForPathShouldReturnSpeficicBindingForNestedElementsWhenAvailable() { + void getBindingForPathShouldReturnSpeficicBindingForNestedElementsWhenAvailable() { bindings.bind(QUser.user.address.street).first(CONTAINS_BINDING); @@ -87,7 +87,7 @@ public class QuerydslBindingsUnitTests { } @Test // DATACMNS-669 - public void getBindingForPathShouldReturnSpeficicBindingForTypes() { + void getBindingForPathShouldReturnSpeficicBindingForTypes() { bindings.bind(String.class).first(CONTAINS_BINDING); @@ -96,7 +96,7 @@ public class QuerydslBindingsUnitTests { } @Test // DATACMNS-669 - public void propertyNotExplicitlyIncludedAndWithoutTypeBindingIsNotAvailable() { + void propertyNotExplicitlyIncludedAndWithoutTypeBindingIsNotAvailable() { bindings.bind(String.class).first(CONTAINS_BINDING); @@ -106,7 +106,7 @@ public class QuerydslBindingsUnitTests { } @Test // DATACMNS-669 - public void pathIsAvailableIfTypeBasedBindingWasRegistered() { + void pathIsAvailableIfTypeBasedBindingWasRegistered() { bindings.bind(String.class).first(CONTAINS_BINDING); @@ -114,7 +114,7 @@ public class QuerydslBindingsUnitTests { } @Test // DATACMNS-669 - public void explicitlyIncludedPathIsAvailable() { + void explicitlyIncludedPathIsAvailable() { bindings.including(QUser.user.inceptionYear); @@ -122,7 +122,7 @@ public class QuerydslBindingsUnitTests { } @Test // DATACMNS-669 - public void notExplicitlyIncludedPathIsNotAvailable() { + void notExplicitlyIncludedPathIsNotAvailable() { bindings.including(QUser.user.inceptionYear); @@ -130,7 +130,7 @@ public class QuerydslBindingsUnitTests { } @Test // DATACMNS-669 - public void excludedPathIsNotAvailable() { + void excludedPathIsNotAvailable() { bindings.excluding(QUser.user.inceptionYear); @@ -138,7 +138,7 @@ public class QuerydslBindingsUnitTests { } @Test // DATACMNS-669 - public void pathIsAvailableIfNotExplicitlyExcluded() { + void pathIsAvailableIfNotExplicitlyExcluded() { bindings.excluding(QUser.user.inceptionYear); @@ -146,7 +146,7 @@ public class QuerydslBindingsUnitTests { } @Test // DATACMNS-669 - public void pathIsAvailableIfItsBothBlackAndWhitelisted() { + void pathIsAvailableIfItsBothBlackAndWhitelisted() { bindings.excluding(QUser.user.firstname); bindings.including(QUser.user.firstname); @@ -155,7 +155,7 @@ public class QuerydslBindingsUnitTests { } @Test // DATACMNS-669 - public void nestedPathIsNotAvailableIfAParanetPathWasExcluded() { + void nestedPathIsNotAvailableIfAParanetPathWasExcluded() { bindings.excluding(QUser.user.address); @@ -163,7 +163,7 @@ public class QuerydslBindingsUnitTests { } @Test // DATACMNS-669 - public void pathIsAvailableIfConcretePathIsAvailableButParentExcluded() { + void pathIsAvailableIfConcretePathIsAvailableButParentExcluded() { bindings.excluding(QUser.user.address); bindings.including(QUser.user.address.city); @@ -172,7 +172,7 @@ public class QuerydslBindingsUnitTests { } @Test // DATACMNS-669 - public void isPathAvailableShouldReturnFalseWhenPartialPathContainedInExcludingAndConcretePathToDifferentPropertyIsIncluded() { + void isPathAvailableShouldReturnFalseWhenPartialPathContainedInExcludingAndConcretePathToDifferentPropertyIsIncluded() { bindings.excluding(QUser.user.address); bindings.including(QUser.user.address.city); @@ -181,7 +181,7 @@ public class QuerydslBindingsUnitTests { } @Test // DATACMNS-669 - public void whitelistsPropertiesCorrectly() { + void whitelistsPropertiesCorrectly() { bindings.including(QUser.user.firstname, QUser.user.address.street); @@ -192,17 +192,17 @@ public class QuerydslBindingsUnitTests { } @Test // DATACMNS-787 - public void rejectsNullAlias() { + void rejectsNullAlias() { assertThatIllegalArgumentException().isThrownBy(() -> bindings.bind(QUser.user.address).as(null)); } @Test // DATACMNS-787 - public void rejectsEmptyAlias() { + void rejectsEmptyAlias() { assertThatIllegalArgumentException().isThrownBy(() -> bindings.bind(QUser.user.address).as("")); } @Test // DATACMNS-787 - public void aliasesBinding() { + void aliasesBinding() { bindings.bind(QUser.user.address.city).as("city").first(CONTAINS_BINDING); @@ -216,7 +216,7 @@ public class QuerydslBindingsUnitTests { } @Test // DATACMNS-787 - public void explicitlyIncludesOriginalBindingDespiteAlias() { + void explicitlyIncludesOriginalBindingDespiteAlias() { bindings.including(QUser.user.address.city); bindings.bind(QUser.user.address.city).as("city").first(CONTAINS_BINDING); @@ -235,7 +235,7 @@ public class QuerydslBindingsUnitTests { } @Test // DATACMNS-787 - public void registedAliasWithNullBinding() { + void registedAliasWithNullBinding() { bindings.bind(QUser.user.address.city).as("city").withDefaultBinding(); @@ -246,7 +246,7 @@ public class QuerydslBindingsUnitTests { } @Test // DATACMNS-941 - public void registersBindingForPropertyOfSubtype() { + void registersBindingForPropertyOfSubtype() { bindings.bind(QUser.user.as(QSpecialUser.class).specialProperty).first(ContainsBinding.INSTANCE); diff --git a/src/test/java/org/springframework/data/querydsl/binding/QuerydslDefaultBindingUnitTests.java b/src/test/java/org/springframework/data/querydsl/binding/QuerydslDefaultBindingUnitTests.java index 394654e69..bf4ec53b7 100755 --- a/src/test/java/org/springframework/data/querydsl/binding/QuerydslDefaultBindingUnitTests.java +++ b/src/test/java/org/springframework/data/querydsl/binding/QuerydslDefaultBindingUnitTests.java @@ -21,8 +21,8 @@ import java.util.Arrays; import java.util.Collections; import java.util.Optional; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.data.querydsl.QUser; import com.querydsl.core.types.Predicate; @@ -32,17 +32,17 @@ import com.querydsl.core.types.Predicate; * @author Oliver Gierke * @author Colin Gao */ -public class QuerydslDefaultBindingUnitTests { +class QuerydslDefaultBindingUnitTests { QuerydslDefaultBinding binding; - @Before - public void setUp() { + @BeforeEach + void setUp() { binding = new QuerydslDefaultBinding(); } @Test // DATACMNS-669 - public void shouldCreatePredicateCorrectlyWhenPropertyIsInRoot() { + void shouldCreatePredicateCorrectlyWhenPropertyIsInRoot() { Optional predicate = binding.bind(QUser.user.firstname, Collections.singleton("tam")); @@ -50,7 +50,7 @@ public class QuerydslDefaultBindingUnitTests { } @Test // DATACMNS-669 - public void shouldCreatePredicateCorrectlyWhenPropertyIsInNestedElement() { + void shouldCreatePredicateCorrectlyWhenPropertyIsInNestedElement() { Optional predicate = binding.bind(QUser.user.address.city, Collections.singleton("two rivers")); @@ -59,7 +59,7 @@ public class QuerydslDefaultBindingUnitTests { } @Test // DATACMNS-669 - public void shouldCreatePredicateWithContainingWhenPropertyIsCollectionLikeAndValueIsObject() { + void shouldCreatePredicateWithContainingWhenPropertyIsCollectionLikeAndValueIsObject() { Optional predicate = binding.bind(QUser.user.nickNames, Collections.singleton("dragon reborn")); @@ -67,7 +67,7 @@ public class QuerydslDefaultBindingUnitTests { } @Test // DATACMNS-669 - public void shouldCreatePredicateWithInWhenPropertyIsAnObjectAndValueIsACollection() { + void shouldCreatePredicateWithInWhenPropertyIsAnObjectAndValueIsACollection() { Optional predicate = binding.bind(QUser.user.firstname, Arrays.asList("dragon reborn", "shadowkiller")); @@ -75,12 +75,12 @@ public class QuerydslDefaultBindingUnitTests { } @Test - public void testname() { + void testname() { assertThat(binding.bind(QUser.user.lastname, Collections.emptySet())).isNotPresent(); } @Test // DATACMNS-1578 - public void shouldCreatePredicateWithIsNullWhenPropertyIsANestedObjectAndValueIsNull() { + void shouldCreatePredicateWithIsNullWhenPropertyIsANestedObjectAndValueIsNull() { Optional predicate = binding.bind(QUser.user.address.city, Collections.singleton(null)); diff --git a/src/test/java/org/springframework/data/querydsl/binding/QuerydslPredicateBuilderUnitTests.java b/src/test/java/org/springframework/data/querydsl/binding/QuerydslPredicateBuilderUnitTests.java index 897ff781f..c5f58a58b 100755 --- a/src/test/java/org/springframework/data/querydsl/binding/QuerydslPredicateBuilderUnitTests.java +++ b/src/test/java/org/springframework/data/querydsl/binding/QuerydslPredicateBuilderUnitTests.java @@ -25,8 +25,8 @@ import java.util.List; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.data.querydsl.QSpecialUser; import org.springframework.data.querydsl.QUser; import org.springframework.data.querydsl.QUserWrapper; @@ -50,7 +50,7 @@ import com.querydsl.core.types.Predicate; * @author Oliver Gierke * @author Mark Paluch */ -public class QuerydslPredicateBuilderUnitTests { +class QuerydslPredicateBuilderUnitTests { static final ClassTypeInformation USER_TYPE = ClassTypeInformation.from(User.class); static final QuerydslBindings DEFAULT_BINDINGS = new QuerydslBindings(); @@ -58,31 +58,31 @@ public class QuerydslPredicateBuilderUnitTests { QuerydslPredicateBuilder builder; MultiValueMap values; - @Before - public void setUp() { + @BeforeEach + void setUp() { this.builder = new QuerydslPredicateBuilder(new DefaultFormattingConversionService(), SimpleEntityPathResolver.INSTANCE); this.values = new LinkedMultiValueMap<>(); } @Test // DATACMNS-669 - public void rejectsNullConversionService() { + void rejectsNullConversionService() { assertThatIllegalArgumentException() .isThrownBy(() -> new QuerydslPredicateBuilder(null, SimpleEntityPathResolver.INSTANCE)); } @Test // DATACMNS-669 - public void getPredicateShouldThrowErrorWhenBindingContextIsNull() { + void getPredicateShouldThrowErrorWhenBindingContextIsNull() { assertThatIllegalArgumentException().isThrownBy(() -> builder.getPredicate(null, values, null)); } @Test // DATACMNS-669, DATACMNS-1168 - public void getPredicateShouldReturnNullWhenPropertiesAreEmpty() { + void getPredicateShouldReturnNullWhenPropertiesAreEmpty() { assertThat(builder.getPredicate(ClassTypeInformation.OBJECT, values, DEFAULT_BINDINGS)).isNull(); } @Test // DATACMNS-669 - public void resolveArgumentShouldCreateSingleStringParameterPredicateCorrectly() throws Exception { + void resolveArgumentShouldCreateSingleStringParameterPredicateCorrectly() throws Exception { assumeThat(Version.javaVersion().toString()) .as("QueryDSL isn't Java 11 ready https://github.com/querydsl/querydsl/issues/2151").startsWith("1.8"); @@ -99,7 +99,7 @@ public class QuerydslPredicateBuilderUnitTests { } @Test // DATACMNS-669 - public void resolveArgumentShouldCreateNestedStringParameterPredicateCorrectly() throws Exception { + void resolveArgumentShouldCreateNestedStringParameterPredicateCorrectly() throws Exception { assumeThat(Version.javaVersion().toString()) .as("QueryDSL isn't Java 11 ready https://github.com/querydsl/querydsl/issues/2151").startsWith("1.8"); @@ -116,7 +116,7 @@ public class QuerydslPredicateBuilderUnitTests { } @Test // DATACMNS-669 - public void ignoresNonDomainTypeProperties() { + void ignoresNonDomainTypeProperties() { values.add("firstname", "rand"); values.add("lastname".toUpperCase(), "al'thor"); @@ -127,7 +127,7 @@ public class QuerydslPredicateBuilderUnitTests { } @Test // DATACMNS-669 - public void forwardsNullForEmptyParameterToSingleValueBinder() { + void forwardsNullForEmptyParameterToSingleValueBinder() { values.add("lastname", null); @@ -139,7 +139,7 @@ public class QuerydslPredicateBuilderUnitTests { @Test // DATACMNS-734 @SuppressWarnings("unchecked") - public void resolvesCommaSeparatedArgumentToArrayCorrectly() { + void resolvesCommaSeparatedArgumentToArrayCorrectly() { values.add("address.lonLat", "40.740337,-73.995146"); @@ -152,7 +152,7 @@ public class QuerydslPredicateBuilderUnitTests { @Test // DATACMNS-734 @SuppressWarnings("unchecked") - public void leavesCommaSeparatedArgumentUntouchedWhenTargetIsNotAnArray() { + void leavesCommaSeparatedArgumentUntouchedWhenTargetIsNotAnArray() { values.add("address.city", "rivers,two"); @@ -164,7 +164,7 @@ public class QuerydslPredicateBuilderUnitTests { } @Test // DATACMNS-734 - public void bindsDateCorrectly() throws ParseException { + void bindsDateCorrectly() throws ParseException { DateTimeFormatter format = DateTimeFormat.forPattern("yyyy-MM-dd"); String date = format.print(new DateTime()); @@ -177,7 +177,7 @@ public class QuerydslPredicateBuilderUnitTests { } @Test // DATACMNS-883 - public void automaticallyInsertsAnyStepInCollectionReference() { + void automaticallyInsertsAnyStepInCollectionReference() { values.add("addresses.street", "VALUE"); @@ -187,7 +187,7 @@ public class QuerydslPredicateBuilderUnitTests { } @Test // DATACMNS-941 - public void buildsPredicateForBindingUsingDowncast() { + void buildsPredicateForBindingUsingDowncast() { values.add("specialProperty", "VALUE"); @@ -200,7 +200,7 @@ public class QuerydslPredicateBuilderUnitTests { } @Test // DATACMNS-941 - public void buildsPredicateForBindingUsingNestedDowncast() { + void buildsPredicateForBindingUsingNestedDowncast() { values.add("user.specialProperty", "VALUE"); @@ -215,7 +215,7 @@ public class QuerydslPredicateBuilderUnitTests { } @Test // DATACMNS-1443 - public void doesNotDropValuesContainingABlank() { + void doesNotDropValuesContainingABlank() { values.add("firstname", " "); @@ -224,7 +224,7 @@ public class QuerydslPredicateBuilderUnitTests { } @Test // DATACMNS-1443 - public void dropsValuesContainingAnEmptyString() { + void dropsValuesContainingAnEmptyString() { values.add("firstname", ""); diff --git a/src/test/java/org/springframework/data/repository/cdi/AnotherFragmentInterface.java b/src/test/java/org/springframework/data/repository/cdi/AnotherFragmentInterface.java index 56a6fedb3..50d7f4d16 100644 --- a/src/test/java/org/springframework/data/repository/cdi/AnotherFragmentInterface.java +++ b/src/test/java/org/springframework/data/repository/cdi/AnotherFragmentInterface.java @@ -18,7 +18,7 @@ package org.springframework.data.repository.cdi; /** * @author Mark Paluch */ -public interface AnotherFragmentInterface { +interface AnotherFragmentInterface { int getPriority(); diff --git a/src/test/java/org/springframework/data/repository/cdi/AnotherRepository.java b/src/test/java/org/springframework/data/repository/cdi/AnotherRepository.java index 8282d5fb8..cbcae45f0 100644 --- a/src/test/java/org/springframework/data/repository/cdi/AnotherRepository.java +++ b/src/test/java/org/springframework/data/repository/cdi/AnotherRepository.java @@ -20,6 +20,6 @@ import java.io.Serializable; import org.springframework.data.repository.Repository; -public interface AnotherRepository extends Repository, AnotherRepositoryCustom { +interface AnotherRepository extends Repository, AnotherRepositoryCustom { } diff --git a/src/test/java/org/springframework/data/repository/cdi/AnotherRepositoryCustom.java b/src/test/java/org/springframework/data/repository/cdi/AnotherRepositoryCustom.java index b8a87c4e7..cf6db799b 100644 --- a/src/test/java/org/springframework/data/repository/cdi/AnotherRepositoryCustom.java +++ b/src/test/java/org/springframework/data/repository/cdi/AnotherRepositoryCustom.java @@ -16,6 +16,6 @@ package org.springframework.data.repository.cdi; -public interface AnotherRepositoryCustom { +interface AnotherRepositoryCustom { int returnZero(); } diff --git a/src/test/java/org/springframework/data/repository/cdi/CdiConfigurationIntegrationTests.java b/src/test/java/org/springframework/data/repository/cdi/CdiConfigurationIntegrationTests.java index 67892d8b4..907db603e 100644 --- a/src/test/java/org/springframework/data/repository/cdi/CdiConfigurationIntegrationTests.java +++ b/src/test/java/org/springframework/data/repository/cdi/CdiConfigurationIntegrationTests.java @@ -20,9 +20,10 @@ import static org.assertj.core.api.Assertions.*; import javax.enterprise.inject.se.SeContainer; import javax.enterprise.inject.se.SeContainerInitializer; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + import org.springframework.data.repository.cdi.isolated.IsolatedComposedRepository; /** @@ -30,12 +31,12 @@ import org.springframework.data.repository.cdi.isolated.IsolatedComposedReposito * * @author Mark Paluch */ -public class CdiConfigurationIntegrationTests { +class CdiConfigurationIntegrationTests { private static SeContainer container; - @BeforeClass - public static void setUp() { + @BeforeAll + static void setUp() { container = SeContainerInitializer.newInstance() // .disableDiscovery() // @@ -44,15 +45,15 @@ public class CdiConfigurationIntegrationTests { } @Test // DATACMNS-1233 - public void shouldApplyImplementationPostfix() { + void shouldApplyImplementationPostfix() { IsolatedComposedRepository repository = container.select(IsolatedComposedRepository.class).get(); assertThat(repository.getPriority()).isEqualTo(42); } - @AfterClass - public static void tearDown() { + @AfterAll + static void tearDown() { container.close(); } } diff --git a/src/test/java/org/springframework/data/repository/cdi/CdiRepositoryBeanUnitTests.java b/src/test/java/org/springframework/data/repository/cdi/CdiRepositoryBeanUnitTests.java index e099a1cfb..ea967d0f0 100755 --- a/src/test/java/org/springframework/data/repository/cdi/CdiRepositoryBeanUnitTests.java +++ b/src/test/java/org/springframework/data/repository/cdi/CdiRepositoryBeanUnitTests.java @@ -32,11 +32,12 @@ import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; import javax.inject.Named; -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.ArgumentCaptor; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; + import org.springframework.aop.framework.ProxyFactory; import org.springframework.data.repository.Repository; import org.springframework.data.repository.config.CustomRepositoryImplementationDetector; @@ -58,8 +59,8 @@ import org.springframework.data.repository.query.RepositoryQuery; * @author Mark Paluch * @author Ariel Carrera */ -@RunWith(MockitoJUnitRunner.class) -public class CdiRepositoryBeanUnitTests { +@ExtendWith(MockitoExtension.class) +class CdiRepositoryBeanUnitTests { static final String PASSIVATION_ID = "javax.enterprise.inject.Default:org.springframework.data.repository.cdi.CdiRepositoryBeanUnitTests$SampleRepository"; @@ -71,25 +72,25 @@ public class CdiRepositoryBeanUnitTests { @Mock RepositoryFactorySupport repositoryFactory; @Test - public void voidRejectsNullQualifiers() { + void voidRejectsNullQualifiers() { assertThatIllegalArgumentException() .isThrownBy(() -> new DummyCdiRepositoryBean<>(null, SampleRepository.class, beanManager)); } @Test - public void voidRejectsNullRepositoryType() { + void voidRejectsNullRepositoryType() { assertThatIllegalArgumentException() .isThrownBy(() -> new DummyCdiRepositoryBean<>(NO_ANNOTATIONS, null, beanManager)); } @Test - public void voidRejectsNullBeanManager() { + void voidRejectsNullBeanManager() { assertThatIllegalArgumentException() .isThrownBy(() -> new DummyCdiRepositoryBean<>(NO_ANNOTATIONS, SampleRepository.class, null)); } @Test - public void returnsBasicMetadata() { + void returnsBasicMetadata() { DummyCdiRepositoryBean bean = new DummyCdiRepositoryBean<>(NO_ANNOTATIONS, SampleRepository.class, beanManager); @@ -100,7 +101,7 @@ public class CdiRepositoryBeanUnitTests { } @Test - public void returnsAllImplementedTypes() { + void returnsAllImplementedTypes() { DummyCdiRepositoryBean bean = new DummyCdiRepositoryBean<>(NO_ANNOTATIONS, SampleRepository.class, beanManager); @@ -111,7 +112,7 @@ public class CdiRepositoryBeanUnitTests { @Test @SuppressWarnings("unchecked") - public void detectsStereotypes() { + void detectsStereotypes() { DummyCdiRepositoryBean bean = new DummyCdiRepositoryBean<>(NO_ANNOTATIONS, StereotypedSampleRepository.class, beanManager); @@ -121,14 +122,14 @@ public class CdiRepositoryBeanUnitTests { @Test // DATACMNS-299 @SuppressWarnings("rawtypes") - public void scopeDefaultsToApplicationScoped() { + void scopeDefaultsToApplicationScoped() { Bean bean = new DummyCdiRepositoryBean<>(NO_ANNOTATIONS, SampleRepository.class, beanManager); assertThat(bean.getScope()).isEqualTo(ApplicationScoped.class); } @Test // DATACMNS-322 - public void createsPassivationId() { + void createsPassivationId() { CdiRepositoryBean bean = new DummyCdiRepositoryBean<>( // SINGLE_ANNOTATION, // @@ -140,7 +141,7 @@ public class CdiRepositoryBeanUnitTests { } @Test // DATACMNS-764 - public void passesCorrectBeanNameToTheImplementationDetector() { + void passesCorrectBeanNameToTheImplementationDetector() { CustomRepositoryImplementationDetector detector = mock(CustomRepositoryImplementationDetector.class); @@ -175,7 +176,7 @@ public class CdiRepositoryBeanUnitTests { } @Test // DATACMNS-1233 - public void appliesRepositoryConfiguration() { + void appliesRepositoryConfiguration() { DummyCdiRepositoryBean bean = new DummyCdiRepositoryBean(NO_ANNOTATIONS, SampleRepository.class, beanManager) { @@ -264,7 +265,7 @@ public class CdiRepositoryBeanUnitTests { static class DummyQueryCreationListener implements QueryCreationListener { - public static final DummyQueryCreationListener INSTANCE = new DummyQueryCreationListener(); + static final DummyQueryCreationListener INSTANCE = new DummyQueryCreationListener(); @Override public void onCreation(RepositoryQuery query) {} diff --git a/src/test/java/org/springframework/data/repository/cdi/CdiRepositoryExtensionSupportIntegrationTests.java b/src/test/java/org/springframework/data/repository/cdi/CdiRepositoryExtensionSupportIntegrationTests.java index e435cb560..32d0ab84e 100755 --- a/src/test/java/org/springframework/data/repository/cdi/CdiRepositoryExtensionSupportIntegrationTests.java +++ b/src/test/java/org/springframework/data/repository/cdi/CdiRepositoryExtensionSupportIntegrationTests.java @@ -17,17 +17,17 @@ package org.springframework.data.repository.cdi; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Common integration tests for Spring Data repository CDI extension. * * @author Oliver Gierke */ -public abstract class CdiRepositoryExtensionSupportIntegrationTests { +abstract class CdiRepositoryExtensionSupportIntegrationTests { @Test - public void createsSpringDataRepositoryBean() { + void createsSpringDataRepositoryBean() { assertThat(getBean(SampleRepository.class)).isNotNull(); @@ -36,7 +36,7 @@ public abstract class CdiRepositoryExtensionSupportIntegrationTests { } @Test // DATACMNS-557 - public void createsSpringDataRepositoryWithCustimImplBean() { + void createsSpringDataRepositoryWithCustimImplBean() { assertThat(getBean(AnotherRepository.class)).isNotNull(); diff --git a/src/test/java/org/springframework/data/repository/cdi/ComposedRepository.java b/src/test/java/org/springframework/data/repository/cdi/ComposedRepository.java index 3270212e2..55a4ad1cf 100644 --- a/src/test/java/org/springframework/data/repository/cdi/ComposedRepository.java +++ b/src/test/java/org/springframework/data/repository/cdi/ComposedRepository.java @@ -22,7 +22,7 @@ import org.springframework.data.repository.Repository; /** * @author Mark Paluch */ -public interface ComposedRepository +interface ComposedRepository extends Repository, FragmentInterface, AnotherFragmentInterface { // duplicate method shadowed by AnotherFragmentInterfaceImpl. The legacy custom implementation comes last, after all diff --git a/src/test/java/org/springframework/data/repository/cdi/ComposedRepositoryCustom.java b/src/test/java/org/springframework/data/repository/cdi/ComposedRepositoryCustom.java index 62cf35804..3b239328f 100644 --- a/src/test/java/org/springframework/data/repository/cdi/ComposedRepositoryCustom.java +++ b/src/test/java/org/springframework/data/repository/cdi/ComposedRepositoryCustom.java @@ -18,7 +18,7 @@ package org.springframework.data.repository.cdi; /** * @author Mark Paluch */ -public interface ComposedRepositoryCustom { +interface ComposedRepositoryCustom { int returnFourtyTwo(); diff --git a/src/test/java/org/springframework/data/repository/cdi/FragmentInterface.java b/src/test/java/org/springframework/data/repository/cdi/FragmentInterface.java index 836937202..623140bc3 100644 --- a/src/test/java/org/springframework/data/repository/cdi/FragmentInterface.java +++ b/src/test/java/org/springframework/data/repository/cdi/FragmentInterface.java @@ -18,6 +18,6 @@ package org.springframework.data.repository.cdi; /** * @author Mark Paluch */ -public interface FragmentInterface { +interface FragmentInterface { int getPriority(); } diff --git a/src/test/java/org/springframework/data/repository/cdi/RepositoryFragmentsIntegrationTests.java b/src/test/java/org/springframework/data/repository/cdi/RepositoryFragmentsIntegrationTests.java index 5825c03a3..69582515f 100644 --- a/src/test/java/org/springframework/data/repository/cdi/RepositoryFragmentsIntegrationTests.java +++ b/src/test/java/org/springframework/data/repository/cdi/RepositoryFragmentsIntegrationTests.java @@ -20,21 +20,21 @@ import static org.assertj.core.api.Assertions.*; import javax.enterprise.inject.se.SeContainer; import javax.enterprise.inject.se.SeContainerInitializer; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; /** * CDI integration tests for composed repositories. * * @author Mark Paluch */ -public class RepositoryFragmentsIntegrationTests { +class RepositoryFragmentsIntegrationTests { private static SeContainer container; - @BeforeClass - public static void setUp() { + @BeforeAll + static void setUp() { container = SeContainerInitializer.newInstance() // .disableDiscovery() // @@ -43,7 +43,7 @@ public class RepositoryFragmentsIntegrationTests { } @Test // DATACMNS-1233 - public void shouldInvokeCustomImplementationLast() { + void shouldInvokeCustomImplementationLast() { ComposedRepository repository = getBean(ComposedRepository.class); ComposedRepositoryImpl customImplementation = getBean(ComposedRepositoryImpl.class); @@ -55,7 +55,7 @@ public class RepositoryFragmentsIntegrationTests { } @Test // DATACMNS-1233 - public void shouldRespectInterfaceOrder() { + void shouldRespectInterfaceOrder() { ComposedRepository repository = getBean(ComposedRepository.class); FragmentInterfaceImpl fragment = getBean(FragmentInterfaceImpl.class); @@ -70,8 +70,8 @@ public class RepositoryFragmentsIntegrationTests { return container.select(type).get(); } - @AfterClass - public static void tearDown() { + @AfterAll + static void tearDown() { container.close(); } } diff --git a/src/test/java/org/springframework/data/repository/cdi/SampleRepository.java b/src/test/java/org/springframework/data/repository/cdi/SampleRepository.java index c55e4e1a5..5f0d3fd18 100644 --- a/src/test/java/org/springframework/data/repository/cdi/SampleRepository.java +++ b/src/test/java/org/springframework/data/repository/cdi/SampleRepository.java @@ -23,6 +23,6 @@ import org.springframework.data.repository.Repository; * * @author Oliver Gierke */ -public interface SampleRepository extends Repository { +interface SampleRepository extends Repository { } diff --git a/src/test/java/org/springframework/data/repository/cdi/WebbeansCdiRepositoryExtensionSupportIntegrationTests.java b/src/test/java/org/springframework/data/repository/cdi/WebbeansCdiRepositoryExtensionSupportIntegrationTests.java index a23f169ee..a95ed6cd5 100755 --- a/src/test/java/org/springframework/data/repository/cdi/WebbeansCdiRepositoryExtensionSupportIntegrationTests.java +++ b/src/test/java/org/springframework/data/repository/cdi/WebbeansCdiRepositoryExtensionSupportIntegrationTests.java @@ -18,8 +18,8 @@ package org.springframework.data.repository.cdi; import javax.enterprise.inject.se.SeContainer; import javax.enterprise.inject.se.SeContainerInitializer; -import org.junit.AfterClass; -import org.junit.BeforeClass; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; /** * CDI extension integration test using OpenWebbeans. @@ -27,13 +27,13 @@ import org.junit.BeforeClass; * @author Oliver Gierke * @author Mark Paluch */ -public class WebbeansCdiRepositoryExtensionSupportIntegrationTests +class WebbeansCdiRepositoryExtensionSupportIntegrationTests extends CdiRepositoryExtensionSupportIntegrationTests { private static SeContainer container; - @BeforeClass - public static void setUp() { + @BeforeAll + static void setUp() { container = SeContainerInitializer.newInstance() // .disableDiscovery() // @@ -46,8 +46,8 @@ public class WebbeansCdiRepositoryExtensionSupportIntegrationTests return container.select(type).get(); } - @AfterClass - public static void tearDown() { + @AfterAll + static void tearDown() { container.close(); } } diff --git a/src/test/java/org/springframework/data/repository/cdi/isolated/FragmentInterface.java b/src/test/java/org/springframework/data/repository/cdi/isolated/FragmentInterface.java index 3fa0fadf6..bf13f3d7a 100644 --- a/src/test/java/org/springframework/data/repository/cdi/isolated/FragmentInterface.java +++ b/src/test/java/org/springframework/data/repository/cdi/isolated/FragmentInterface.java @@ -18,7 +18,7 @@ package org.springframework.data.repository.cdi.isolated; /** * @author Mark Paluch */ -public interface FragmentInterface { +interface FragmentInterface { int getPriority(); } diff --git a/src/test/java/org/springframework/data/repository/config/AnnotationRepositoryConfigurationSourceUnitTests.java b/src/test/java/org/springframework/data/repository/config/AnnotationRepositoryConfigurationSourceUnitTests.java index 390580cbf..f304b741e 100755 --- a/src/test/java/org/springframework/data/repository/config/AnnotationRepositoryConfigurationSourceUnitTests.java +++ b/src/test/java/org/springframework/data/repository/config/AnnotationRepositoryConfigurationSourceUnitTests.java @@ -21,8 +21,8 @@ import static org.mockito.Mockito.*; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -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.BeanDefinitionRegistry; import org.springframework.context.annotation.ComponentScan.Filter; @@ -43,15 +43,15 @@ import org.springframework.data.util.Streamable; * @author Thomas Darimont * @author Mark Paluch */ -public class AnnotationRepositoryConfigurationSourceUnitTests { +class AnnotationRepositoryConfigurationSourceUnitTests { RepositoryConfigurationSource source; Environment environment; ResourceLoader resourceLoader; BeanDefinitionRegistry registry; - @Before - public void setUp() { + @BeforeEach + void setUp() { AnnotationMetadata annotationMetadata = new StandardAnnotationMetadata(SampleConfiguration.class, true); environment = new StandardEnvironment(); @@ -63,14 +63,14 @@ public class AnnotationRepositoryConfigurationSourceUnitTests { } @Test // DATACMNS-47 - public void findsBasePackagesForClasses() { + void findsBasePackagesForClasses() { assertThat(source.getBasePackages())// .contains(AnnotationRepositoryConfigurationSourceUnitTests.class.getPackage().getName()); } @Test // DATACMNS-47, DATACMNS-102 - public void evaluatesExcludeFiltersCorrectly() { + void evaluatesExcludeFiltersCorrectly() { Streamable candidates = source.getCandidates(new DefaultResourceLoader()); @@ -80,7 +80,7 @@ public class AnnotationRepositoryConfigurationSourceUnitTests { } @Test // DATACMNS-47 - public void defaultsToPackageOfAnnotatedClass() { + void defaultsToPackageOfAnnotatedClass() { AnnotationRepositoryConfigurationSource source = getConfigSource(DefaultConfiguration.class); Iterable packages = source.getBasePackages(); @@ -90,7 +90,7 @@ public class AnnotationRepositoryConfigurationSourceUnitTests { } @Test // DATACMNS-47 - public void returnsConfiguredBasePackage() { + void returnsConfiguredBasePackage() { AnnotationRepositoryConfigurationSource source = getConfigSource(DefaultConfigurationWithBasePackage.class); @@ -98,21 +98,21 @@ public class AnnotationRepositoryConfigurationSourceUnitTests { } @Test // DATACMNS-90 - public void returnsConsiderNestedRepositories() { + void returnsConsiderNestedRepositories() { AnnotationRepositoryConfigurationSource source = getConfigSource(DefaultConfigurationWithNestedRepositories.class); assertThat(source.shouldConsiderNestedRepositories()).isTrue(); } @Test // DATACMNS-456 - public void findsStringAttributeByName() { + void findsStringAttributeByName() { RepositoryConfigurationSource source = getConfigSource(DefaultConfigurationWithBasePackage.class); assertThat(source.getAttribute("namedQueriesLocation")).hasValue("bar"); } @Test // DATACMNS-502 - public void returnsEmptyStringForBasePackage() throws Exception { + void returnsEmptyStringForBasePackage() throws Exception { StandardAnnotationMetadata metadata = new StandardAnnotationMetadata( getClass().getClassLoader().loadClass("TypeInDefaultPackage"), true); @@ -123,14 +123,14 @@ public class AnnotationRepositoryConfigurationSourceUnitTests { } @Test // DATACMNS-526 - public void detectsExplicitFilterConfiguration() { + void detectsExplicitFilterConfiguration() { assertThat(getConfigSource(ConfigurationWithExplicitFilter.class).usesExplicitFilters()).isTrue(); assertThat(getConfigSource(DefaultConfiguration.class).usesExplicitFilters()).isFalse(); } @Test // DATACMNS-542 - public void ignoresMissingRepositoryBaseClassNameAttribute() { + void ignoresMissingRepositoryBaseClassNameAttribute() { AnnotationMetadata metadata = new StandardAnnotationMetadata(ConfigWithSampleAnnotation.class, true); RepositoryConfigurationSource configurationSource = new AnnotationRepositoryConfigurationSource(metadata, @@ -140,7 +140,7 @@ public class AnnotationRepositoryConfigurationSourceUnitTests { } @Test // DATACMNS-1498 - public void allowsLookupOfNonStringAttribute() { + void allowsLookupOfNonStringAttribute() { RepositoryConfigurationSource source = getConfigSource(DefaultConfiguration.class); @@ -150,7 +150,7 @@ public class AnnotationRepositoryConfigurationSourceUnitTests { } @Test // DATACMNS-1498 - public void rejectsInvalidAttributeName() { + void rejectsInvalidAttributeName() { RepositoryConfigurationSource source = getConfigSource(DefaultConfiguration.class); @@ -158,7 +158,7 @@ public class AnnotationRepositoryConfigurationSourceUnitTests { } @Test // DATACMNS-1498 - public void lookupOfEmptyStringExposesAbsentValue() { + void lookupOfEmptyStringExposesAbsentValue() { RepositoryConfigurationSource source = getConfigSource(DefaultConfiguration.class); @@ -174,7 +174,7 @@ public class AnnotationRepositoryConfigurationSourceUnitTests { registry); } - public static class Person {} + static class Person {} @EnableRepositories static class DefaultConfiguration {} diff --git a/src/test/java/org/springframework/data/repository/config/ComposedRepository.java b/src/test/java/org/springframework/data/repository/config/ComposedRepository.java index b6b5d40be..500ff7833 100644 --- a/src/test/java/org/springframework/data/repository/config/ComposedRepository.java +++ b/src/test/java/org/springframework/data/repository/config/ComposedRepository.java @@ -21,4 +21,4 @@ import org.springframework.data.repository.config.AnnotationRepositoryConfigurat /** * @author Mark Paluch */ -public interface ComposedRepository extends Repository, Mixin {} +interface ComposedRepository extends Repository, Mixin {} diff --git a/src/test/java/org/springframework/data/repository/config/CustomRepositoryImplementationDetectorUnitTests.java b/src/test/java/org/springframework/data/repository/config/CustomRepositoryImplementationDetectorUnitTests.java index a677580b7..3f025ab71 100644 --- a/src/test/java/org/springframework/data/repository/config/CustomRepositoryImplementationDetectorUnitTests.java +++ b/src/test/java/org/springframework/data/repository/config/CustomRepositoryImplementationDetectorUnitTests.java @@ -21,7 +21,7 @@ import static org.mockito.Mockito.*; import java.util.Optional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Answers; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.AbstractBeanDefinition; @@ -39,7 +39,7 @@ import org.springframework.mock.env.MockEnvironment; * * @author Jens Schauder */ -public class CustomRepositoryImplementationDetectorUnitTests { +class CustomRepositoryImplementationDetectorUnitTests { MetadataReaderFactory metadataFactory = new SimpleMetadataReaderFactory(); Environment environment = new MockEnvironment(); @@ -58,7 +58,7 @@ public class CustomRepositoryImplementationDetectorUnitTests { } @Test // DATACMNS-764, DATACMNS-1371 - public void returnsNullWhenNoImplementationFound() { + void returnsNullWhenNoImplementationFound() { RepositoryConfiguration mock = mock(RepositoryConfiguration.class); @@ -71,7 +71,7 @@ public class CustomRepositoryImplementationDetectorUnitTests { } @Test // DATACMNS-764, DATACMNS-1371 - public void returnsBeanDefinitionWhenOneImplementationIsFound() { + void returnsBeanDefinitionWhenOneImplementationIsFound() { ImplementationLookupConfiguration lookup = configuration .forRepositoryConfiguration(configFor(SingleSampleRepository.class)); @@ -83,7 +83,7 @@ public class CustomRepositoryImplementationDetectorUnitTests { } @Test // DATACMNS-764, DATACMNS-1371 - public void returnsBeanDefinitionMatchingByNameWhenMultipleImplementationAreFound() { + void returnsBeanDefinitionMatchingByNameWhenMultipleImplementationAreFound() { when(configuration.generateBeanName(any())).then(it -> { @@ -102,7 +102,7 @@ public class CustomRepositoryImplementationDetectorUnitTests { } @Test // DATACMNS-764, DATACMNS-1371 - public void throwsExceptionWhenMultipleImplementationAreFound() { + void throwsExceptionWhenMultipleImplementationAreFound() { assertThatExceptionOfType(IllegalStateException.class).isThrownBy(() -> { diff --git a/src/test/java/org/springframework/data/repository/config/DefaultImplementationLookupConfigurationUnitTests.java b/src/test/java/org/springframework/data/repository/config/DefaultImplementationLookupConfigurationUnitTests.java index 669c4357e..23d0b8a29 100644 --- a/src/test/java/org/springframework/data/repository/config/DefaultImplementationLookupConfigurationUnitTests.java +++ b/src/test/java/org/springframework/data/repository/config/DefaultImplementationLookupConfigurationUnitTests.java @@ -18,17 +18,17 @@ package org.springframework.data.repository.config; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Unit tests for {@link DefaultImplementationLookupConfigurationUnitTests}. * * @author Mark Paluch */ -public class DefaultImplementationLookupConfigurationUnitTests { +class DefaultImplementationLookupConfigurationUnitTests { @Test // DATACMNS-1439 - public void shouldConsiderBeanNameDecapitalization() { + void shouldConsiderBeanNameDecapitalization() { ImplementationDetectionConfiguration idcMock = mock(ImplementationDetectionConfiguration.class); when(idcMock.getImplementationPostfix()).thenReturn("Impl"); diff --git a/src/test/java/org/springframework/data/repository/config/DefaultRepositoryConfigurationUnitTests.java b/src/test/java/org/springframework/data/repository/config/DefaultRepositoryConfigurationUnitTests.java index 7cf1508ab..2230b5d76 100755 --- a/src/test/java/org/springframework/data/repository/config/DefaultRepositoryConfigurationUnitTests.java +++ b/src/test/java/org/springframework/data/repository/config/DefaultRepositoryConfigurationUnitTests.java @@ -23,11 +23,14 @@ import lombok.Value; 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.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.config.ConstructorArgumentValues; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.data.repository.query.QueryLookupStrategy.Key; @@ -39,20 +42,21 @@ import org.springframework.data.repository.query.QueryLookupStrategy.Key; * @author Jens Schauder * @author Mark Paluch */ -@RunWith(MockitoJUnitRunner.class) -public class DefaultRepositoryConfigurationUnitTests { +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) +class DefaultRepositoryConfigurationUnitTests { @Mock RepositoryConfigurationSource source; RepositoryConfigurationExtension extension = new SimplerRepositoryConfigurationExtension("factory", "module"); - @Before - public void before() { + @BeforeEach + void before() { when(source.getBootstrapMode()).thenReturn(BootstrapMode.DEFAULT); } @Test - public void supportsBasicConfiguration() { + void supportsBasicConfiguration() { RepositoryConfiguration configuration = getConfiguration(source); @@ -63,12 +67,12 @@ public class DefaultRepositoryConfigurationUnitTests { } @Test // DATACMNS-1018 - public void usesExtensionFactoryBeanClassNameIfNoneDefinedInSource() { + void usesExtensionFactoryBeanClassNameIfNoneDefinedInSource() { assertThat(getConfiguration(source).getRepositoryFactoryBeanClassName()).isEqualTo("factory"); } @Test // DATACMNS-1018 - public void prefersSourcesRepositoryFactoryBeanClass() { + void prefersSourcesRepositoryFactoryBeanClass() { when(source.getRepositoryFactoryBeanClassName()).thenReturn(Optional.of("custom")); diff --git a/src/test/java/org/springframework/data/repository/config/ExcludedRepository.java b/src/test/java/org/springframework/data/repository/config/ExcludedRepository.java index fd84a7e0c..2d1e33a83 100644 --- a/src/test/java/org/springframework/data/repository/config/ExcludedRepository.java +++ b/src/test/java/org/springframework/data/repository/config/ExcludedRepository.java @@ -24,6 +24,6 @@ import org.springframework.data.repository.Repository; * @author Mark Paluch */ @NoRepositoryBean -public interface ExcludedRepository extends Repository { +interface ExcludedRepository extends Repository { String getImplementationId(); } diff --git a/src/test/java/org/springframework/data/repository/config/ImplementationDetectionConfigurationUnitTests.java b/src/test/java/org/springframework/data/repository/config/ImplementationDetectionConfigurationUnitTests.java index b54a0f2e4..1df65ac13 100644 --- a/src/test/java/org/springframework/data/repository/config/ImplementationDetectionConfigurationUnitTests.java +++ b/src/test/java/org/springframework/data/repository/config/ImplementationDetectionConfigurationUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.repository.config; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.core.type.classreading.MetadataReaderFactory; import org.springframework.core.type.classreading.SimpleMetadataReaderFactory; @@ -30,10 +30,10 @@ import org.springframework.data.util.Streamable; * @author Mark Paluch * @author Oliver Gierke */ -public class ImplementationDetectionConfigurationUnitTests { +class ImplementationDetectionConfigurationUnitTests { @Test // DATACMNS-1439 - public void shouldConsiderBeanNameDecapitalization() { + void shouldConsiderBeanNameDecapitalization() { assertThat(getBeanName("com.acme.UDPRepository")).isEqualTo("UDPRepository"); assertThat(getBeanName("com.acme.UdpRepository")).isEqualTo("udpRepository"); diff --git a/src/test/java/org/springframework/data/repository/config/Mixin.java b/src/test/java/org/springframework/data/repository/config/Mixin.java index 347f31471..110ab0356 100644 --- a/src/test/java/org/springframework/data/repository/config/Mixin.java +++ b/src/test/java/org/springframework/data/repository/config/Mixin.java @@ -18,7 +18,7 @@ package org.springframework.data.repository.config; /** * @author Mark Paluch */ -public interface Mixin { +interface Mixin { String getOne(); } diff --git a/src/test/java/org/springframework/data/repository/config/PrimaryRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/repository/config/PrimaryRepositoryIntegrationTests.java index 34a1d2372..80edf4d22 100644 --- a/src/test/java/org/springframework/data/repository/config/PrimaryRepositoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/repository/config/PrimaryRepositoryIntegrationTests.java @@ -17,7 +17,7 @@ package org.springframework.data.repository.config; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.context.annotation.Configuration; @@ -30,10 +30,10 @@ import org.springframework.data.repository.CrudRepository; * * @author Oliver Drotbohm */ -public class PrimaryRepositoryIntegrationTests { +class PrimaryRepositoryIntegrationTests { @Test // DATACMNS-1591 - public void returnsPrimaryInstance() { + void returnsPrimaryInstance() { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(Config.class); diff --git a/src/test/java/org/springframework/data/repository/config/RepositoryBeanDefinitionRegistrarSupportIntegrationTests.java b/src/test/java/org/springframework/data/repository/config/RepositoryBeanDefinitionRegistrarSupportIntegrationTests.java index cfee89206..5b36ab51d 100755 --- a/src/test/java/org/springframework/data/repository/config/RepositoryBeanDefinitionRegistrarSupportIntegrationTests.java +++ b/src/test/java/org/springframework/data/repository/config/RepositoryBeanDefinitionRegistrarSupportIntegrationTests.java @@ -17,9 +17,10 @@ package org.springframework.data.repository.config; 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.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.ComponentScan; @@ -35,7 +36,7 @@ import org.springframework.util.ClassUtils; * @author Peter Rietzler * @author Mark Paluch */ -public class RepositoryBeanDefinitionRegistrarSupportIntegrationTests { +class RepositoryBeanDefinitionRegistrarSupportIntegrationTests { @Configuration @EnableRepositories(excludeFilters = @ComponentScan.Filter(type = FilterType.REGEX, pattern = ".*\\.excluded\\..*")) @@ -50,13 +51,13 @@ public class RepositoryBeanDefinitionRegistrarSupportIntegrationTests { AnnotationConfigApplicationContext context; - @Before - public void setUp() { + @BeforeEach + void setUp() { this.context = new AnnotationConfigApplicationContext(TestConfig.class); } - @After - public void tearDown() { + @AfterEach + void tearDown() { if (context != null) { this.context.close(); @@ -64,37 +65,37 @@ public class RepositoryBeanDefinitionRegistrarSupportIntegrationTests { } @Test // DATACMNS-989 - public void duplicateImplementationsMayBeExcludedViaFilters() { + void duplicateImplementationsMayBeExcludedViaFilters() { assertThat(context.getBean(MyOtherRepository.class).getImplementationId()) .isEqualTo(MyOtherRepositoryImpl.class.getName()); } @Test // DATACMNS-47 - public void testBootstrappingWithInheritedConfigClasses() { + void testBootstrappingWithInheritedConfigClasses() { assertThat(context.getBean(MyRepository.class)).isNotNull(); assertThat(context.getBean(MyOtherRepository.class)).isNotNull(); } @Test // DATACMNS-47 - public void beanDefinitionSourceIsSetForJavaConfigScannedBeans() { + void beanDefinitionSourceIsSetForJavaConfigScannedBeans() { BeanDefinition definition = context.getBeanDefinition("myRepository"); assertThat(definition.getSource()).isNotNull(); } @Test // DATACMNS-544 - public void registersExtensionAsBeanDefinition() { + void registersExtensionAsBeanDefinition() { assertThat(context.getBean(DummyConfigurationExtension.class)).isNotNull(); } @Test // DATACMNS-102 - public void composedRepositoriesShouldBeAssembledCorrectly() { + void composedRepositoriesShouldBeAssembledCorrectly() { assertThat(context.getBean(ComposedRepository.class).getOne()).isEqualTo("one"); } @Test // DATACMNS-1620 - public void registeredBeanDefinitionsContainHumanReadableResourceDescription() { + void registeredBeanDefinitionsContainHumanReadableResourceDescription() { BeanDefinition definition = context.getBeanDefinition("myRepository"); diff --git a/src/test/java/org/springframework/data/repository/config/RepositoryBeanDefinitionRegistrarSupportUnitTests.java b/src/test/java/org/springframework/data/repository/config/RepositoryBeanDefinitionRegistrarSupportUnitTests.java index f8e7ff131..299f3dbd2 100755 --- a/src/test/java/org/springframework/data/repository/config/RepositoryBeanDefinitionRegistrarSupportUnitTests.java +++ b/src/test/java/org/springframework/data/repository/config/RepositoryBeanDefinitionRegistrarSupportUnitTests.java @@ -20,11 +20,12 @@ import static org.mockito.Mockito.*; import java.lang.annotation.Annotation; -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.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.BeanNameGenerator; @@ -44,16 +45,16 @@ import org.springframework.data.repository.core.support.DummyRepositoryFactoryBe * @author Oliver Gierke * @author Mark Paluch */ -@RunWith(MockitoJUnitRunner.class) -public class RepositoryBeanDefinitionRegistrarSupportUnitTests { +@ExtendWith(MockitoExtension.class) +class RepositoryBeanDefinitionRegistrarSupportUnitTests { @Mock BeanDefinitionRegistry registry; StandardEnvironment environment; DummyRegistrar registrar; - @Before - public void setUp() { + @BeforeEach + void setUp() { environment = new StandardEnvironment(); @@ -62,7 +63,7 @@ public class RepositoryBeanDefinitionRegistrarSupportUnitTests { } @Test - public void registersBeanDefinitionForFoundBean() { + void registersBeanDefinitionForFoundBean() { AnnotationMetadata metadata = new StandardAnnotationMetadata(SampleConfiguration.class, true); @@ -76,7 +77,7 @@ public class RepositoryBeanDefinitionRegistrarSupportUnitTests { } @Test // DATACMNS-1147 - public void registersBeanDefinitionWithoutFragmentImplementations() { + void registersBeanDefinitionWithoutFragmentImplementations() { AnnotationMetadata metadata = new StandardAnnotationMetadata(FragmentExclusionConfiguration.class, true); @@ -87,7 +88,7 @@ public class RepositoryBeanDefinitionRegistrarSupportUnitTests { } @Test // DATACMNS-1172 - public void shouldLimitImplementationBasePackages() { + void shouldLimitImplementationBasePackages() { AnnotationMetadata metadata = new StandardAnnotationMetadata(LimitsImplementationBasePackages.class, true); @@ -98,7 +99,7 @@ public class RepositoryBeanDefinitionRegistrarSupportUnitTests { } @Test // DATACMNS-360 - public void registeredProfileRepositoriesIfProfileActivated() { + void registeredProfileRepositoriesIfProfileActivated() { AnnotationMetadata metadata = new StandardAnnotationMetadata(SampleConfiguration.class, true); environment.setActiveProfiles("profile"); @@ -111,7 +112,7 @@ public class RepositoryBeanDefinitionRegistrarSupportUnitTests { } @Test // DATACMNS-1497 - public void usesBeanNameGeneratorProvided() { + void usesBeanNameGeneratorProvided() { AnnotationMetadata metadata = new StandardAnnotationMetadata(SampleConfiguration.class, true); BeanNameGenerator delegate = new AnnotationBeanNameGenerator(); diff --git a/src/test/java/org/springframework/data/repository/config/RepositoryBeanNameGeneratorUnitTests.java b/src/test/java/org/springframework/data/repository/config/RepositoryBeanNameGeneratorUnitTests.java index 36aad015a..9cbff0a35 100755 --- a/src/test/java/org/springframework/data/repository/config/RepositoryBeanNameGeneratorUnitTests.java +++ b/src/test/java/org/springframework/data/repository/config/RepositoryBeanNameGeneratorUnitTests.java @@ -21,8 +21,8 @@ import java.io.IOException; import javax.inject.Named; -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.annotation.AnnotatedGenericBeanDefinition; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; @@ -40,31 +40,31 @@ import org.springframework.data.repository.core.support.RepositoryFactoryBeanSup * @author Oliver Gierke * @author Jens Schauder */ -public class RepositoryBeanNameGeneratorUnitTests { +class RepositoryBeanNameGeneratorUnitTests { static final String SAMPLE_IMPLEMENTATION_BEAN_NAME = "repositoryBeanNameGeneratorUnitTests.SomeImplementation"; RepositoryBeanNameGenerator generator; BeanDefinitionRegistry registry; - @Before - public void setUp() { + @BeforeEach + void setUp() { this.generator = new RepositoryBeanNameGenerator(Thread.currentThread().getContextClassLoader(), new AnnotationBeanNameGenerator()); } @Test - public void usesPlainClassNameIfNoAnnotationPresent() { + void usesPlainClassNameIfNoAnnotationPresent() { assertThat(generator.generateBeanName(getBeanDefinitionFor(MyRepository.class))).isEqualTo("myRepository"); } @Test - public void usesAnnotationValueIfAnnotationPresent() { + void usesAnnotationValueIfAnnotationPresent() { assertThat(generator.generateBeanName(getBeanDefinitionFor(AnnotatedInterface.class))).isEqualTo("specialName"); } @Test // DATACMNS-1115 - public void usesClassNameOfScannedBeanDefinition() throws IOException { + void usesClassNameOfScannedBeanDefinition() throws IOException { MetadataReaderFactory factory = new SimpleMetadataReaderFactory(); MetadataReader reader = factory.getMetadataReader(SomeImplementation.class.getName()); @@ -75,7 +75,7 @@ public class RepositoryBeanNameGeneratorUnitTests { } @Test // DATACMNS-1115 - public void usesClassNameOfAnnotatedBeanDefinition() { + void usesClassNameOfAnnotatedBeanDefinition() { BeanDefinition definition = new AnnotatedGenericBeanDefinition(SomeImplementation.class); diff --git a/src/test/java/org/springframework/data/repository/config/RepositoryComponentProviderUnitTests.java b/src/test/java/org/springframework/data/repository/config/RepositoryComponentProviderUnitTests.java index 8063eb28c..db0002a17 100755 --- a/src/test/java/org/springframework/data/repository/config/RepositoryComponentProviderUnitTests.java +++ b/src/test/java/org/springframework/data/repository/config/RepositoryComponentProviderUnitTests.java @@ -22,7 +22,7 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionRegistry; @@ -38,12 +38,12 @@ import org.springframework.data.repository.sample.SampleAnnotatedRepository; * @author Oliver Gierke * @author Thomas Darimont */ -public class RepositoryComponentProviderUnitTests { +class RepositoryComponentProviderUnitTests { BeanDefinitionRegistry registry = mock(BeanDefinitionRegistry.class); @Test - public void findsAnnotatedRepositoryInterface() { + void findsAnnotatedRepositoryInterface() { RepositoryComponentProvider provider = new RepositoryComponentProvider(Collections.emptyList(), registry); Set components = provider.findCandidateComponents("org.springframework.data.repository.sample"); @@ -54,7 +54,7 @@ public class RepositoryComponentProviderUnitTests { } @Test - public void limitsFoundRepositoriesToIncludeFiltersOnly() { + void limitsFoundRepositoriesToIncludeFiltersOnly() { List filters = Collections.singletonList(new AssignableTypeFilter(MyOtherRepository.class)); @@ -66,7 +66,7 @@ public class RepositoryComponentProviderUnitTests { } @Test // DATACMNS-90 - public void shouldConsiderNestedRepositoryInterfacesIfEnabled() { + void shouldConsiderNestedRepositoryInterfacesIfEnabled() { RepositoryComponentProvider provider = new RepositoryComponentProvider(Collections.emptyList(), registry); provider.setConsiderNestedRepositoryInterfaces(true); @@ -79,18 +79,18 @@ public class RepositoryComponentProviderUnitTests { } @Test // DATACMNS-1098 - public void rejectsNullBeanDefinitionRegistry() { + void rejectsNullBeanDefinitionRegistry() { assertThatIllegalArgumentException() .isThrownBy(() -> new RepositoryComponentProvider(Collections.emptyList(), null)); } @Test // DATACMNS-1098 - public void exposesBeanDefinitionRegistry() { + void exposesBeanDefinitionRegistry() { RepositoryComponentProvider provider = new RepositoryComponentProvider(Collections.emptyList(), registry); assertThat(provider.getRegistry()).isEqualTo(registry); } - public interface MyNestedRepository extends Repository {} + interface MyNestedRepository extends Repository {} } diff --git a/src/test/java/org/springframework/data/repository/config/RepositoryConfigurationDelegateUnitTests.java b/src/test/java/org/springframework/data/repository/config/RepositoryConfigurationDelegateUnitTests.java index 9b70e7454..cabb0ce6c 100644 --- a/src/test/java/org/springframework/data/repository/config/RepositoryConfigurationDelegateUnitTests.java +++ b/src/test/java/org/springframework/data/repository/config/RepositoryConfigurationDelegateUnitTests.java @@ -17,10 +17,12 @@ package org.springframework.data.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.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.TargetSource; import org.springframework.aop.framework.Advised; @@ -45,13 +47,14 @@ import org.springframework.data.repository.sample.ProductRepository; * @author Oliver Gierke * @soundtrack Richard Spaven - Tribute (Whole Other*) */ -@RunWith(MockitoJUnitRunner.Silent.class) -public class RepositoryConfigurationDelegateUnitTests { +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) +class RepositoryConfigurationDelegateUnitTests { @Mock RepositoryConfigurationExtension extension; @Test // DATACMNS-892 - public void registersRepositoryBeanNameAsAttribute() { + void registersRepositoryBeanNameAsAttribute() { StandardEnvironment environment = new StandardEnvironment(); GenericApplicationContext context = new GenericApplicationContext(); @@ -72,12 +75,12 @@ public class RepositoryConfigurationDelegateUnitTests { } @Test // DATACMNS-1368 - public void registersLazyAutowireCandidateResolver() { + void registersLazyAutowireCandidateResolver() { assertLazyRepositoryBeanSetup(LazyConfig.class); } @Test // DATACMNS-1368 - public void registersDeferredRepositoryInitializationListener() { + void registersDeferredRepositoryInitializationListener() { ListableBeanFactory beanFactory = assertLazyRepositoryBeanSetup(DeferredConfig.class); diff --git a/src/test/java/org/springframework/data/repository/config/RepositoryConfigurationExtensionSupportUnitTests.java b/src/test/java/org/springframework/data/repository/config/RepositoryConfigurationExtensionSupportUnitTests.java index 0ab548685..91bb063d2 100755 --- a/src/test/java/org/springframework/data/repository/config/RepositoryConfigurationExtensionSupportUnitTests.java +++ b/src/test/java/org/springframework/data/repository/config/RepositoryConfigurationExtensionSupportUnitTests.java @@ -22,7 +22,7 @@ import java.lang.annotation.Annotation; import java.util.Collection; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.context.annotation.FilterType; @@ -47,33 +47,33 @@ import org.springframework.data.repository.reactive.ReactiveCrudRepository; * * @author Oliver Gierke */ -public class RepositoryConfigurationExtensionSupportUnitTests { +class RepositoryConfigurationExtensionSupportUnitTests { RepositoryConfigurationExtensionSupport extension = new SampleRepositoryConfigurationExtension(); @Test // DATACMNS-526 - public void doesNotConsiderRepositoryForPlainTypeStrictMatch() { + void doesNotConsiderRepositoryForPlainTypeStrictMatch() { RepositoryMetadata metadata = AbstractRepositoryMetadata.getMetadata(PlainTypeRepository.class); assertThat(extension.isStrictRepositoryCandidate(metadata)).isFalse(); } @Test // DATACMNS-526 - public void considersRepositoryWithAnnotatedTypeStrictMatch() { + void considersRepositoryWithAnnotatedTypeStrictMatch() { RepositoryMetadata metadata = AbstractRepositoryMetadata.getMetadata(AnnotatedTypeRepository.class); assertThat(extension.isStrictRepositoryCandidate(metadata)).isTrue(); } @Test // DATACMNS-526 - public void considersRepositoryInterfaceExtendingStoreInterfaceStrictMatch() { + void considersRepositoryInterfaceExtendingStoreInterfaceStrictMatch() { RepositoryMetadata metadata = AbstractRepositoryMetadata.getMetadata(ExtendingInterface.class); assertThat(extension.isStrictRepositoryCandidate(metadata)).isTrue(); } @Test // DATACMNS-1174 - public void rejectsReactiveRepositories() { + void rejectsReactiveRepositories() { AnnotationMetadata annotationMetadata = new StandardAnnotationMetadata(ReactiveConfiguration.class, true); Environment environment = new StandardEnvironment(); @@ -89,7 +89,7 @@ public class RepositoryConfigurationExtensionSupportUnitTests { } @Test // DATACMNS-1596 - public void doesNotClaimEntityIfNoIdentifyingAnnotationsAreExposed() { + void doesNotClaimEntityIfNoIdentifyingAnnotationsAreExposed() { NonIdentifyingConfigurationExtension extension = new NonIdentifyingConfigurationExtension(); RepositoryMetadata metadata = AbstractRepositoryMetadata.getMetadata(AnnotatedTypeRepository.class); diff --git a/src/test/java/org/springframework/data/repository/config/RepositoryFragmentConfigurationUnitTests.java b/src/test/java/org/springframework/data/repository/config/RepositoryFragmentConfigurationUnitTests.java index 0306a8721..035bdcf52 100644 --- a/src/test/java/org/springframework/data/repository/config/RepositoryFragmentConfigurationUnitTests.java +++ b/src/test/java/org/springframework/data/repository/config/RepositoryFragmentConfigurationUnitTests.java @@ -17,17 +17,17 @@ package org.springframework.data.repository.config; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Unit tests for {@link RepositoryFragmentConfiguration}. * * @author Mark Paluch */ -public class RepositoryFragmentConfigurationUnitTests { +class RepositoryFragmentConfigurationUnitTests { @Test // DATACMNS-1439 - public void shouldConsiderBeanNameDecapitalization() { + void shouldConsiderBeanNameDecapitalization() { assertThat(getImplementationBeanName("com.acme.UDPRepository")).isEqualTo("UDPRepository"); assertThat(getImplementationBeanName("com.acme.UdpRepository")).isEqualTo("udpRepository"); diff --git a/src/test/java/org/springframework/data/repository/config/RepositoryWithFragmentExclusion.java b/src/test/java/org/springframework/data/repository/config/RepositoryWithFragmentExclusion.java index cda59f716..0c059d400 100644 --- a/src/test/java/org/springframework/data/repository/config/RepositoryWithFragmentExclusion.java +++ b/src/test/java/org/springframework/data/repository/config/RepositoryWithFragmentExclusion.java @@ -22,4 +22,4 @@ import org.springframework.data.repository.config.AnnotationRepositoryConfigurat * * @author Mark Paluch */ -public interface RepositoryWithFragmentExclusion extends ExcludedRepository {} +interface RepositoryWithFragmentExclusion extends ExcludedRepository {} diff --git a/src/test/java/org/springframework/data/repository/config/ResourceReaderRepositoryPopulatorBeanDefinitionParserIntegrationTests.java b/src/test/java/org/springframework/data/repository/config/ResourceReaderRepositoryPopulatorBeanDefinitionParserIntegrationTests.java index 5d8d9cd89..096af2af4 100755 --- a/src/test/java/org/springframework/data/repository/config/ResourceReaderRepositoryPopulatorBeanDefinitionParserIntegrationTests.java +++ b/src/test/java/org/springframework/data/repository/config/ResourceReaderRepositoryPopulatorBeanDefinitionParserIntegrationTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*; import java.util.List; -import org.junit.Test; +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; @@ -36,10 +36,10 @@ import org.springframework.test.util.ReflectionTestUtils; * @author Oliver Gierke * @author Thomas Darimont */ -public class ResourceReaderRepositoryPopulatorBeanDefinitionParserIntegrationTests { +class ResourceReaderRepositoryPopulatorBeanDefinitionParserIntegrationTests { @Test // DATACMNS-333 - public void registersJackson2InitializerCorrectly() { + void registersJackson2InitializerCorrectly() { DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(beanFactory); @@ -58,7 +58,7 @@ public class ResourceReaderRepositoryPopulatorBeanDefinitionParserIntegrationTes } @Test // DATACMNS-58 - public void registersXmlInitializerCorrectly() { + void registersXmlInitializerCorrectly() { DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(beanFactory); diff --git a/src/test/java/org/springframework/data/repository/config/SelectionSetUnitTests.java b/src/test/java/org/springframework/data/repository/config/SelectionSetUnitTests.java index 2a61f5691..fdde27909 100644 --- a/src/test/java/org/springframework/data/repository/config/SelectionSetUnitTests.java +++ b/src/test/java/org/springframework/data/repository/config/SelectionSetUnitTests.java @@ -21,7 +21,7 @@ import static org.assertj.core.api.Assertions.*; import java.util.Optional; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Unit tests for {@link SelectionSet} @@ -29,25 +29,25 @@ import org.junit.Test; * @author Jens Schauder * @author Oliver Gierke */ -public class SelectionSetUnitTests { +class SelectionSetUnitTests { @Test // DATACMNS-764 - public void returnsUniqueResult() { + void returnsUniqueResult() { assertThat(SelectionSet.of(singleton("single value")).uniqueResult()).hasValue("single value"); } @Test // DATACMNS-764 - public void emptyCollectionReturnsNull() { + void emptyCollectionReturnsNull() { assertThat(SelectionSet.of(emptySet()).uniqueResult()).isEmpty(); } @Test // DATACMNS-764 - public void multipleElementsThrowException() { + void multipleElementsThrowException() { assertThatIllegalStateException().isThrownBy(() -> SelectionSet.of(asList("one", "two")).uniqueResult()); } @Test // DATACMNS-764 - public void throwsCustomExceptionWhenConfigured() { + void throwsCustomExceptionWhenConfigured() { assertThatExceptionOfType(NullPointerException.class).isThrownBy(() -> { SelectionSet.of(asList("one", "two"), c -> { @@ -57,13 +57,13 @@ public class SelectionSetUnitTests { } @Test // DATACMNS-764 - public void usesFallbackWhenConfigured() { + void usesFallbackWhenConfigured() { assertThat(SelectionSet.of(asList("one", "two"), c -> Optional.of(String.valueOf(c.size()))).uniqueResult()) .hasValue("2"); } @Test // DATACMNS-764 - public void returnsUniqueResultAfterFilter() { + void returnsUniqueResultAfterFilter() { SelectionSet selection = SelectionSet.of(asList("one", "two", "three")) .filterIfNecessary(s -> s.contains("w")); @@ -72,7 +72,7 @@ public class SelectionSetUnitTests { } @Test // DATACMNS-764 - public void ignoresFilterWhenResultIsAlreadyUnique() { + void ignoresFilterWhenResultIsAlreadyUnique() { SelectionSet selection = SelectionSet.of(asList("one")).filterIfNecessary(s -> s.contains("w")); diff --git a/src/test/java/org/springframework/data/repository/config/XmlRepositoryConfigurationSourceUnitTests.java b/src/test/java/org/springframework/data/repository/config/XmlRepositoryConfigurationSourceUnitTests.java index 5b4674169..28e9c41f1 100755 --- a/src/test/java/org/springframework/data/repository/config/XmlRepositoryConfigurationSourceUnitTests.java +++ b/src/test/java/org/springframework/data/repository/config/XmlRepositoryConfigurationSourceUnitTests.java @@ -19,11 +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.springframework.test.util.ReflectionTestUtils; + import org.w3c.dom.Element; /** @@ -31,13 +33,13 @@ import org.w3c.dom.Element; * * @author Oliver Gierke */ -@RunWith(MockitoJUnitRunner.class) -public class XmlRepositoryConfigurationSourceUnitTests { +@ExtendWith(MockitoExtension.class) +class XmlRepositoryConfigurationSourceUnitTests { @Mock Element element; @Test // DATACMNS-456 - public void translatesCamelCaseAttributeNameIntoXmlEquivalent() { + void translatesCamelCaseAttributeNameIntoXmlEquivalent() { RepositoryConfigurationSource source = mock(XmlRepositoryConfigurationSource.class); ReflectionTestUtils.setField(source, "element", element); diff --git a/src/test/java/org/springframework/data/repository/core/support/AbstractEntityInformationUnitTests.java b/src/test/java/org/springframework/data/repository/core/support/AbstractEntityInformationUnitTests.java index c8d79fd5e..b339e57bd 100755 --- a/src/test/java/org/springframework/data/repository/core/support/AbstractEntityInformationUnitTests.java +++ b/src/test/java/org/springframework/data/repository/core/support/AbstractEntityInformationUnitTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*; import java.io.Serializable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.annotation.Id; import org.springframework.data.repository.core.EntityInformation; @@ -33,15 +33,15 @@ import org.springframework.util.ReflectionUtils; * @author Nick Williams * @author Mark Paluch */ -public class AbstractEntityInformationUnitTests { +class AbstractEntityInformationUnitTests { @Test - public void rejectsNullDomainClass() { + void rejectsNullDomainClass() { assertThatIllegalArgumentException().isThrownBy(() -> new DummyEntityInformation<>(null)); } @Test - public void considersEntityNewIfGetIdReturnsNull() throws Exception { + void considersEntityNewIfGetIdReturnsNull() throws Exception { EntityInformation metadata = new DummyEntityInformation<>(Object.class); @@ -50,7 +50,7 @@ public class AbstractEntityInformationUnitTests { } @Test // DATACMNS-357 - public void detectsNewStateForPrimitiveIds() { + void detectsNewStateForPrimitiveIds() { CustomEntityInformation fooEn = new CustomEntityInformation<>( PrimitiveIdEntity.class); @@ -63,7 +63,7 @@ public class AbstractEntityInformationUnitTests { } @Test // DATACMNS-357 - public void detectsNewStateForPrimitiveWrapperIds() { + void detectsNewStateForPrimitiveWrapperIds() { CustomEntityInformation fooEn = new CustomEntityInformation<>( PrimitiveWrapperIdEntity.class); @@ -76,7 +76,7 @@ public class AbstractEntityInformationUnitTests { } @Test // DATACMNS-357 - public void rejectsUnsupportedPrimitiveIdType() { + void rejectsUnsupportedPrimitiveIdType() { CustomEntityInformation information = new CustomEntityInformation( UnsupportedPrimitiveIdEntity.class); diff --git a/src/test/java/org/springframework/data/repository/core/support/AbstractRepositoryMetadataUnitTests.java b/src/test/java/org/springframework/data/repository/core/support/AbstractRepositoryMetadataUnitTests.java index c66290a04..67078dab5 100755 --- a/src/test/java/org/springframework/data/repository/core/support/AbstractRepositoryMetadataUnitTests.java +++ b/src/test/java/org/springframework/data/repository/core/support/AbstractRepositoryMetadataUnitTests.java @@ -22,7 +22,7 @@ import java.lang.reflect.Method; import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.core.ResolvableType; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -38,10 +38,10 @@ import org.springframework.data.repository.core.RepositoryMetadata; * @author Thomas Darimont * @author Fabian Buch */ -public class AbstractRepositoryMetadataUnitTests { +class AbstractRepositoryMetadataUnitTests { @Test // DATACMNS-98 - public void discoversSimpleReturnTypeCorrectly() throws Exception { + void discoversSimpleReturnTypeCorrectly() throws Exception { RepositoryMetadata metadata = new DummyRepositoryMetadata(UserRepository.class); Method method = UserRepository.class.getMethod("findSingle"); @@ -49,14 +49,14 @@ public class AbstractRepositoryMetadataUnitTests { } @Test // DATACMNS-98 - public void resolvesTypeParameterReturnType() throws Exception { + void resolvesTypeParameterReturnType() throws Exception { RepositoryMetadata metadata = new DummyRepositoryMetadata(ConcreteRepository.class); Method method = ConcreteRepository.class.getMethod("intermediateMethod"); assertThat(metadata.getReturnedDomainClass(method)).isEqualTo(User.class); } @Test // DATACMNS-98 - public void determinesReturnTypeFromPageable() throws Exception { + void determinesReturnTypeFromPageable() throws Exception { RepositoryMetadata metadata = new DummyRepositoryMetadata(ExtendingRepository.class); Method method = ExtendingRepository.class.getMethod("findByFirstname", Pageable.class, String.class); @@ -64,28 +64,28 @@ public class AbstractRepositoryMetadataUnitTests { } @Test // DATACMNS-453 - public void nonPageableRepository() { + void nonPageableRepository() { RepositoryMetadata metadata = new DummyRepositoryMetadata(UserRepository.class); assertThat(metadata.isPagingRepository()).isFalse(); } @Test // DATACMNS-453 - public void pageableRepository() { + void pageableRepository() { RepositoryMetadata metadata = new DummyRepositoryMetadata(PagedRepository.class); assertThat(metadata.isPagingRepository()).isTrue(); } @Test // DATACMNS-98 - public void determinesReturnTypeFromGenericType() throws Exception { + void determinesReturnTypeFromGenericType() throws Exception { RepositoryMetadata metadata = new DummyRepositoryMetadata(ExtendingRepository.class); Method method = ExtendingRepository.class.getMethod("someMethod"); assertThat(metadata.getReturnedDomainClass(method)).isEqualTo(GenericType.class); } @Test // DATACMNS-98 - public void handlesGenericTypeInReturnedCollectionCorrectly() throws SecurityException, NoSuchMethodException { + void handlesGenericTypeInReturnedCollectionCorrectly() throws SecurityException, NoSuchMethodException { RepositoryMetadata metadata = new DummyRepositoryMetadata(ExtendingRepository.class); Method method = ExtendingRepository.class.getMethod("anotherMethod"); @@ -93,7 +93,7 @@ public class AbstractRepositoryMetadataUnitTests { } @Test // DATACMNS-471 - public void detectsArrayReturnTypeCorrectly() throws Exception { + void detectsArrayReturnTypeCorrectly() throws Exception { RepositoryMetadata metadata = new DefaultRepositoryMetadata(PagedRepository.class); Method method = PagedRepository.class.getMethod("returnsArray"); @@ -102,7 +102,7 @@ public class AbstractRepositoryMetadataUnitTests { } @Test // DATACMNS-1299 - public void doesNotUnwrapCustomTypeImplementingIterable() throws Exception { + void doesNotUnwrapCustomTypeImplementingIterable() throws Exception { RepositoryMetadata metadata = AbstractRepositoryMetadata.getMetadata(ContainerRepository.class); @@ -145,7 +145,7 @@ public class AbstractRepositoryMetadataUnitTests { class DummyRepositoryMetadata extends AbstractRepositoryMetadata { - public DummyRepositoryMetadata(Class repositoryInterface) { + DummyRepositoryMetadata(Class repositoryInterface) { super(repositoryInterface); } diff --git a/src/test/java/org/springframework/data/repository/core/support/AnnotationRepositoryMetadataUnitTests.java b/src/test/java/org/springframework/data/repository/core/support/AnnotationRepositoryMetadataUnitTests.java index 5e5825542..113011b51 100755 --- a/src/test/java/org/springframework/data/repository/core/support/AnnotationRepositoryMetadataUnitTests.java +++ b/src/test/java/org/springframework/data/repository/core/support/AnnotationRepositoryMetadataUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.repository.core.support; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.repository.RepositoryDefinition; import org.springframework.data.repository.core.RepositoryMetadata; @@ -26,10 +26,10 @@ import org.springframework.data.repository.core.RepositoryMetadata; * * @author Oliver Gierke */ -public class AnnotationRepositoryMetadataUnitTests { +class AnnotationRepositoryMetadataUnitTests { @Test - public void handlesRepositoryProxyAnnotationCorrectly() { + void handlesRepositoryProxyAnnotationCorrectly() { RepositoryMetadata metadata = new AnnotationRepositoryMetadata(AnnotatedRepository.class); @@ -38,7 +38,7 @@ public class AnnotationRepositoryMetadataUnitTests { } @Test // DATACMNS-37, DATACMNS-1375 - public void preventsUnannotatedInterface() { + void preventsUnannotatedInterface() { assertThatExceptionOfType(IllegalArgumentException.class) // .isThrownBy(() -> new AnnotationRepositoryMetadata(UnannotatedRepository.class)) // @@ -50,7 +50,7 @@ public class AnnotationRepositoryMetadataUnitTests { private String firstname; - public String getAddress() { + String getAddress() { return null; } diff --git a/src/test/java/org/springframework/data/repository/core/support/CustomAnnotationTransactionAttributeSourceUnitTests.java b/src/test/java/org/springframework/data/repository/core/support/CustomAnnotationTransactionAttributeSourceUnitTests.java index bdee4c750..7a102ff72 100755 --- a/src/test/java/org/springframework/data/repository/core/support/CustomAnnotationTransactionAttributeSourceUnitTests.java +++ b/src/test/java/org/springframework/data/repository/core/support/CustomAnnotationTransactionAttributeSourceUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.repository.core.support; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.repository.core.support.TransactionalRepositoryProxyPostProcessor.CustomAnnotationTransactionAttributeSource; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAttribute; @@ -27,10 +27,10 @@ import org.springframework.transaction.interceptor.TransactionAttribute; * * @author Oliver Gierke */ -public class CustomAnnotationTransactionAttributeSourceUnitTests { +class CustomAnnotationTransactionAttributeSourceUnitTests { @Test - public void usesCustomTransactionConfigurationOnInterface() throws SecurityException, NoSuchMethodException { + void usesCustomTransactionConfigurationOnInterface() throws SecurityException, NoSuchMethodException { CustomAnnotationTransactionAttributeSource source = new TransactionalRepositoryProxyPostProcessor.CustomAnnotationTransactionAttributeSource(); diff --git a/src/test/java/org/springframework/data/repository/core/support/DefaultCrudMethodsUnitTests.java b/src/test/java/org/springframework/data/repository/core/support/DefaultCrudMethodsUnitTests.java index 5883b1bec..fcbc79a18 100755 --- a/src/test/java/org/springframework/data/repository/core/support/DefaultCrudMethodsUnitTests.java +++ b/src/test/java/org/springframework/data/repository/core/support/DefaultCrudMethodsUnitTests.java @@ -23,7 +23,7 @@ import java.util.Arrays; import java.util.List; import java.util.Optional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.repository.CrudRepository; @@ -40,10 +40,10 @@ import org.springframework.data.repository.core.RepositoryMetadata; * @author Thomas Darimont * @author Mark Paluch */ -public class DefaultCrudMethodsUnitTests { +class DefaultCrudMethodsUnitTests { @Test - public void detectsMethodsOnCrudRepository() throws Exception { + void detectsMethodsOnCrudRepository() throws Exception { Class type = DomainCrudRepository.class; @@ -53,7 +53,7 @@ public class DefaultCrudMethodsUnitTests { } @Test - public void detectsMethodsOnPagingAndSortingRepository() throws Exception { + void detectsMethodsOnPagingAndSortingRepository() throws Exception { Class type = DomainPagingAndSortingRepository.class; @@ -63,7 +63,7 @@ public class DefaultCrudMethodsUnitTests { } @Test - public void detectsFindAllWithSortParameterOnSortingRepository() throws Exception { + void detectsFindAllWithSortParameterOnSortingRepository() throws Exception { Class type = RepositoryWithCustomSortingFindAll.class; @@ -72,7 +72,7 @@ public class DefaultCrudMethodsUnitTests { } @Test // DATACMNS-393 - public void selectsFindAllWithSortParameterOnRepositoryAmongUnsuitableAlternatives() throws Exception { + void selectsFindAllWithSortParameterOnRepositoryAmongUnsuitableAlternatives() throws Exception { Class type = RepositoryWithInvalidPagingFallbackToSortFindAll.class; @@ -81,7 +81,7 @@ public class DefaultCrudMethodsUnitTests { } @Test - public void detectsMethodsOnCustomRepository() throws Exception { + void detectsMethodsOnCustomRepository() throws Exception { Class type = RepositoryWithCustomSortingAndPagingFindAll.class; assertFindAllMethodOn(type, type.getMethod("findAll", Pageable.class)); @@ -91,14 +91,14 @@ public class DefaultCrudMethodsUnitTests { } @Test - public void doesNotDetectInvalidlyDeclaredMethods() throws Exception { + void doesNotDetectInvalidlyDeclaredMethods() throws Exception { Class type = RepositoryWithInvalidPagingFindAll.class; assertFindAllMethodOn(type, Optional.empty()); } @Test // DATACMNS-393 - public void detectsOverloadedMethodsCorrectly() throws Exception { + void detectsOverloadedMethodsCorrectly() throws Exception { Class type = RepositoryWithAllCrudMethodOverloaded.class; assertFindOneMethodOn(type, type.getDeclaredMethod("findById", Long.class)); @@ -108,7 +108,7 @@ public class DefaultCrudMethodsUnitTests { } @Test // DATACMNS-393 - public void ignoresWrongOverloadedMethods() throws Exception { + void ignoresWrongOverloadedMethods() throws Exception { Class type = RepositoryWithAllCrudMethodOverloadedWrong.class; assertFindOneMethodOn(type, CrudRepository.class.getDeclaredMethod("findById", Object.class)); @@ -118,19 +118,19 @@ public class DefaultCrudMethodsUnitTests { } @Test // DATACMNS-464 - public void detectsCustomSaveMethod() throws Exception { + void detectsCustomSaveMethod() throws Exception { assertSaveMethodOn(RepositoryWithCustomSave.class, RepositoryWithCustomSave.class.getMethod("save", Domain.class)); } @Test // DATACMNS-539 - public void detectsOverriddenDeleteMethodForEntity() throws Exception { + void detectsOverriddenDeleteMethodForEntity() throws Exception { assertDeleteMethodOn(RepositoryWithDeleteMethodForEntityOverloaded.class, RepositoryWithDeleteMethodForEntityOverloaded.class.getMethod("delete", Domain.class)); } @Test // DATACMNS-619 - public void exposedMethodsAreAccessible() { + void exposedMethodsAreAccessible() { CrudMethods methods = getMethodsFor(RepositoryWithAllCrudMethodOverloaded.class); diff --git a/src/test/java/org/springframework/data/repository/core/support/DefaultRepositoryInformationUnitTests.java b/src/test/java/org/springframework/data/repository/core/support/DefaultRepositoryInformationUnitTests.java index 0868ea7f5..84a59822b 100755 --- a/src/test/java/org/springframework/data/repository/core/support/DefaultRepositoryInformationUnitTests.java +++ b/src/test/java/org/springframework/data/repository/core/support/DefaultRepositoryInformationUnitTests.java @@ -30,10 +30,13 @@ import java.util.Iterator; import java.util.List; 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.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.QueryAnnotation; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -52,15 +55,16 @@ import org.springframework.data.repository.core.support.DefaultRepositoryMetadat * @author Thomas Darimont * @author Mark Paluch */ -@RunWith(MockitoJUnitRunner.class) -public class DefaultRepositoryInformationUnitTests { +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) +class DefaultRepositoryInformationUnitTests { @SuppressWarnings("rawtypes") static final Class REPOSITORY = DummyGenericRepositorySupport.class; @Mock FooRepositoryCustom customImplementation; @Test - public void discoversRepositoryBaseClassMethod() throws Exception { + void discoversRepositoryBaseClassMethod() throws Exception { Method method = FooRepository.class.getMethod("findById", Integer.class); RepositoryMetadata metadata = new DefaultRepositoryMetadata(FooRepository.class); @@ -73,7 +77,7 @@ public class DefaultRepositoryInformationUnitTests { } @Test - public void discoveresNonRepositoryBaseClassMethod() throws Exception { + void discoveresNonRepositoryBaseClassMethod() throws Exception { Method method = FooRepository.class.getMethod("findById", Long.class); @@ -85,7 +89,7 @@ public class DefaultRepositoryInformationUnitTests { } @Test - public void discoversCustomlyImplementedCrudMethod() throws SecurityException, NoSuchMethodException { + void discoversCustomlyImplementedCrudMethod() throws SecurityException, NoSuchMethodException { RepositoryMetadata metadata = new DefaultRepositoryMetadata(FooRepository.class); RepositoryInformation information = new DefaultRepositoryInformation(metadata, CrudRepository.class, @@ -98,7 +102,7 @@ public class DefaultRepositoryInformationUnitTests { } @Test - public void considersIntermediateMethodsAsFinderMethods() { + void considersIntermediateMethodsAsFinderMethods() { RepositoryMetadata metadata = new DefaultRepositoryMetadata(ConcreteRepository.class); RepositoryInformation information = new DefaultRepositoryInformation(metadata, CrudRepository.class, @@ -108,7 +112,7 @@ public class DefaultRepositoryInformationUnitTests { } @Test - public void discoversIntermediateMethodsAsBackingMethods() throws NoSuchMethodException, SecurityException { + void discoversIntermediateMethodsAsBackingMethods() throws NoSuchMethodException, SecurityException { DefaultRepositoryMetadata metadata = new DefaultRepositoryMetadata(CustomRepository.class); DefaultRepositoryInformation information = new DefaultRepositoryInformation(metadata, @@ -124,7 +128,7 @@ public class DefaultRepositoryInformationUnitTests { } @Test // DATACMNS-151 - public void doesNotConsiderManuallyDefinedSaveMethodAQueryMethod() { + void doesNotConsiderManuallyDefinedSaveMethodAQueryMethod() { RepositoryMetadata metadata = new DefaultRepositoryMetadata(CustomRepository.class); RepositoryInformation information = new DefaultRepositoryInformation(metadata, PagingAndSortingRepository.class, @@ -134,7 +138,7 @@ public class DefaultRepositoryInformationUnitTests { } @Test // DATACMNS-151 - public void doesNotConsiderRedeclaredSaveMethodAQueryMethod() throws Exception { + void doesNotConsiderRedeclaredSaveMethodAQueryMethod() throws Exception { RepositoryMetadata metadata = new DefaultRepositoryMetadata(ConcreteRepository.class); RepositoryInformation information = new DefaultRepositoryInformation(metadata, CrudRepository.class, @@ -149,7 +153,7 @@ public class DefaultRepositoryInformationUnitTests { } @Test - public void onlyReturnsMostConcreteQueryMethod() throws Exception { + void onlyReturnsMostConcreteQueryMethod() throws Exception { RepositoryMetadata metadata = new DefaultRepositoryMetadata(ConcreteRepository.class); RepositoryInformation information = new DefaultRepositoryInformation(metadata, CrudRepository.class, @@ -165,7 +169,7 @@ public class DefaultRepositoryInformationUnitTests { } @Test // DATACMNS-193 - public void detectsQueryMethodCorrectly() { + void detectsQueryMethodCorrectly() { RepositoryMetadata metadata = new DefaultRepositoryMetadata(ConcreteRepository.class); RepositoryInformation information = new DefaultRepositoryInformation(metadata, CrudRepository.class, @@ -178,7 +182,7 @@ public class DefaultRepositoryInformationUnitTests { } @Test // DATACMNS-364 - public void ignoresCrudMethodsAnnotatedWithQuery() throws Exception { + void ignoresCrudMethodsAnnotatedWithQuery() throws Exception { RepositoryMetadata metadata = new DefaultRepositoryMetadata(ConcreteRepository.class); RepositoryInformation information = new DefaultRepositoryInformation(metadata, CrudRepository.class, @@ -190,7 +194,7 @@ public class DefaultRepositoryInformationUnitTests { } @Test // DATACMNS-385 - public void findsTargetSaveForIterableIfEntityImplementsIterable() throws Exception { + void findsTargetSaveForIterableIfEntityImplementsIterable() throws Exception { RepositoryMetadata metadata = new DefaultRepositoryMetadata(BossRepository.class); RepositoryInformation information = new DefaultRepositoryInformation(metadata, CrudRepository.class, @@ -203,7 +207,7 @@ public class DefaultRepositoryInformationUnitTests { } @Test // DATACMNS-441 - public void getQueryShouldNotReturnAnyBridgeMethods() { + void getQueryShouldNotReturnAnyBridgeMethods() { RepositoryMetadata metadata = new DefaultRepositoryMetadata(CustomDefaultRepositoryMethodsRepository.class); RepositoryInformation information = new DefaultRepositoryInformation(metadata, CrudRepository.class, @@ -213,7 +217,7 @@ public class DefaultRepositoryInformationUnitTests { } @Test // DATACMNS-854 - public void discoversCustomlyImplementedCrudMethodWithGenerics() throws SecurityException, NoSuchMethodException { + void discoversCustomlyImplementedCrudMethodWithGenerics() throws SecurityException, NoSuchMethodException { RepositoryMetadata metadata = new DefaultRepositoryMetadata(FooRepository.class); RepositoryInformation information = new DefaultRepositoryInformation(metadata, CrudRepository.class, @@ -226,7 +230,7 @@ public class DefaultRepositoryInformationUnitTests { } @Test // DATACMNS-912 - public void discoversCustomlyImplementedCrudMethodWithGenericParameters() throws Exception { + void discoversCustomlyImplementedCrudMethodWithGenericParameters() throws Exception { GenericsSaveRepositoryImpl customImplementation = new GenericsSaveRepositoryImpl(); RepositoryMetadata metadata = new DefaultRepositoryMetadata(GenericsSaveRepository.class); @@ -238,7 +242,7 @@ public class DefaultRepositoryInformationUnitTests { } @Test // DATACMNS-939 - public void ignoresStaticMethod() throws SecurityException, NoSuchMethodException { + void ignoresStaticMethod() throws SecurityException, NoSuchMethodException { RepositoryMetadata metadata = new DefaultRepositoryMetadata(FooRepository.class); RepositoryInformation information = new DefaultRepositoryInformation(metadata, CrudRepository.class, @@ -250,7 +254,7 @@ public class DefaultRepositoryInformationUnitTests { } @Test // DATACMNS-939 - public void ignoresDefaultMethod() throws SecurityException, NoSuchMethodException { + void ignoresDefaultMethod() throws SecurityException, NoSuchMethodException { RepositoryMetadata metadata = new DefaultRepositoryMetadata(FooRepository.class); RepositoryInformation information = new DefaultRepositoryInformation(metadata, CrudRepository.class, @@ -262,7 +266,7 @@ public class DefaultRepositoryInformationUnitTests { } @Test // DATACMNS-943 - public void usesCorrectSaveOverload() throws Exception { + void usesCorrectSaveOverload() throws Exception { RepositoryMetadata metadata = new DefaultRepositoryMetadata(DummyRepository.class); RepositoryInformation information = new DefaultRepositoryInformation(metadata, DummyRepositoryImpl.class, @@ -275,7 +279,7 @@ public class DefaultRepositoryInformationUnitTests { } @Test // DATACMNS-1008, DATACMNS-912, DATACMNS-854 - public void discoversCustomlyImplementedCrudMethodWithoutGenericParameters() throws Exception { + void discoversCustomlyImplementedCrudMethodWithoutGenericParameters() throws Exception { SimpleSaveRepositoryImpl customImplementation = new SimpleSaveRepositoryImpl(); RepositoryMetadata metadata = new DefaultRepositoryMetadata(SimpleSaveRepository.class); @@ -326,7 +330,7 @@ public class DefaultRepositoryInformationUnitTests { private String firstname; - public String getAddress() { + String getAddress() { return null; } diff --git a/src/test/java/org/springframework/data/repository/core/support/DefaultRepositoryMetadataUnitTests.java b/src/test/java/org/springframework/data/repository/core/support/DefaultRepositoryMetadataUnitTests.java index ce3d6eaf0..7e628d174 100755 --- a/src/test/java/org/springframework/data/repository/core/support/DefaultRepositoryMetadataUnitTests.java +++ b/src/test/java/org/springframework/data/repository/core/support/DefaultRepositoryMetadataUnitTests.java @@ -21,7 +21,7 @@ import java.io.Serializable; import java.lang.reflect.Method; import java.util.Collection; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.repository.CrudRepository; @@ -37,30 +37,30 @@ import com.google.common.base.Optional; * @author Oliver Gierke * @author Thomas Darimont */ -public class DefaultRepositoryMetadataUnitTests { +class DefaultRepositoryMetadataUnitTests { @Test - public void preventsNullRepositoryInterface() { + void preventsNullRepositoryInterface() { assertThatIllegalArgumentException().isThrownBy(() -> new DefaultRepositoryMetadata(null)); } @Test - public void rejectsNonInterface() { + void rejectsNonInterface() { assertThatIllegalArgumentException().isThrownBy(() -> new DefaultRepositoryMetadata(Object.class)); } @Test - public void rejectsNonRepositoryInterface() { + void rejectsNonRepositoryInterface() { assertThatIllegalArgumentException().isThrownBy(() -> new DefaultRepositoryMetadata(Collection.class)); } @Test // DATACMNS-406 - public void rejectsUnparameterizedRepositoryInterface() { + void rejectsUnparameterizedRepositoryInterface() { assertThatIllegalArgumentException().isThrownBy(() -> new DefaultRepositoryMetadata(Repository.class)); } @Test - public void looksUpDomainClassCorrectly() throws Exception { + void looksUpDomainClassCorrectly() throws Exception { RepositoryMetadata metadata = new DefaultRepositoryMetadata(UserRepository.class); assertThat(metadata.getDomainType()).isEqualTo(User.class); @@ -70,35 +70,35 @@ public class DefaultRepositoryMetadataUnitTests { } @Test - public void findsDomainClassOnExtensionOfDaoInterface() throws Exception { + void findsDomainClassOnExtensionOfDaoInterface() throws Exception { RepositoryMetadata metadata = new DefaultRepositoryMetadata(ExtensionOfUserCustomExtendedDao.class); assertThat(metadata.getDomainType()).isEqualTo(User.class); } @Test - public void detectsParameterizedEntitiesCorrectly() { + void detectsParameterizedEntitiesCorrectly() { RepositoryMetadata metadata = new DefaultRepositoryMetadata(GenericEntityRepository.class); assertThat(metadata.getDomainType()).isEqualTo(GenericEntity.class); } @Test - public void looksUpIdClassCorrectly() throws Exception { + void looksUpIdClassCorrectly() throws Exception { RepositoryMetadata metadata = new DefaultRepositoryMetadata(UserRepository.class); assertThat(metadata.getIdType()).isEqualTo(Integer.class); } @Test // DATACMNS-442 - public void detectsIdTypeOnIntermediateRepository() { + void detectsIdTypeOnIntermediateRepository() { RepositoryMetadata metadata = new DefaultRepositoryMetadata(ConcreteRepository.class); assertThat(metadata.getIdType()).isEqualTo(Long.class); } @Test // DATACMNS-483 - public void discoversDomainTypeOnReturnTypeWrapper() throws Exception { + void discoversDomainTypeOnReturnTypeWrapper() throws Exception { RepositoryMetadata metadata = new DefaultRepositoryMetadata(OptionalRepository.class); @@ -107,7 +107,7 @@ public class DefaultRepositoryMetadataUnitTests { } @Test // DATACMNS-483 - public void discoversDomainTypeOnNestedReturnTypeWrapper() throws Exception { + void discoversDomainTypeOnNestedReturnTypeWrapper() throws Exception { RepositoryMetadata metadata = new DefaultRepositoryMetadata(OptionalRepository.class); @@ -116,7 +116,7 @@ public class DefaultRepositoryMetadataUnitTests { } @Test // DATACMNS-501 - public void discoversDomainAndIdTypeForIntermediateRepository() { + void discoversDomainAndIdTypeForIntermediateRepository() { RepositoryMetadata metadata = new DefaultRepositoryMetadata(IdTypeFixingRepository.class); @@ -129,7 +129,7 @@ public class DefaultRepositoryMetadataUnitTests { private String firstname; - public String getAddress() { + String getAddress() { return null; } diff --git a/src/test/java/org/springframework/data/repository/core/support/DummyReactiveRepositoryFactory.java b/src/test/java/org/springframework/data/repository/core/support/DummyReactiveRepositoryFactory.java index 162d648e0..3e91d338d 100644 --- a/src/test/java/org/springframework/data/repository/core/support/DummyReactiveRepositoryFactory.java +++ b/src/test/java/org/springframework/data/repository/core/support/DummyReactiveRepositoryFactory.java @@ -40,7 +40,7 @@ public class DummyReactiveRepositoryFactory extends ReactiveRepositoryFactorySup public final DummyRepositoryFactory.MyRepositoryQuery queryOne = mock(DummyRepositoryFactory.MyRepositoryQuery.class); public final RepositoryQuery queryTwo = mock(RepositoryQuery.class); - public final QueryLookupStrategy strategy = mock(QueryLookupStrategy.class); + final QueryLookupStrategy strategy = mock(QueryLookupStrategy.class); @SuppressWarnings("unchecked") private final QuerydslPredicateExecutor querydsl = mock( QuerydslPredicateExecutor.class); diff --git a/src/test/java/org/springframework/data/repository/core/support/DummyRepositoryFactoryBean.java b/src/test/java/org/springframework/data/repository/core/support/DummyRepositoryFactoryBean.java index 3ea181024..53cd5688e 100644 --- a/src/test/java/org/springframework/data/repository/core/support/DummyRepositoryFactoryBean.java +++ b/src/test/java/org/springframework/data/repository/core/support/DummyRepositoryFactoryBean.java @@ -28,7 +28,7 @@ import org.springframework.data.repository.Repository; public class DummyRepositoryFactoryBean, S, ID extends Serializable> extends RepositoryFactoryBeanSupport { - private T repository; + private final T repository; public DummyRepositoryFactoryBean(Class repositoryInterface) { diff --git a/src/test/java/org/springframework/data/repository/core/support/EventPublishingRepositoryProxyPostProcessorUnitTests.java b/src/test/java/org/springframework/data/repository/core/support/EventPublishingRepositoryProxyPostProcessorUnitTests.java index 3cf5156a0..6ad337069 100644 --- a/src/test/java/org/springframework/data/repository/core/support/EventPublishingRepositoryProxyPostProcessorUnitTests.java +++ b/src/test/java/org/springframework/data/repository/core/support/EventPublishingRepositoryProxyPostProcessorUnitTests.java @@ -31,10 +31,12 @@ import java.util.UUID; import org.aopalliance.aop.Advice; 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.context.ApplicationEventPublisher; @@ -53,24 +55,25 @@ import org.springframework.data.repository.core.support.EventPublishingRepositor * @author Yuki Yoshida * @soundtrack Henrik Freischlader Trio - Nobody Else To Blame (Openness) */ -@RunWith(MockitoJUnitRunner.Silent.class) -public class EventPublishingRepositoryProxyPostProcessorUnitTests { +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) +class EventPublishingRepositoryProxyPostProcessorUnitTests { @Mock ApplicationEventPublisher publisher; @Mock MethodInvocation invocation; @Test // DATACMNS-928 - public void rejectsNullAggregateTypes() { + void rejectsNullAggregateTypes() { assertThatIllegalArgumentException().isThrownBy(() -> EventPublishingMethod.of(null)); } @Test // DATACMNS-928 - public void publishingEventsForNullIsNoOp() { + void publishingEventsForNullIsNoOp() { EventPublishingMethod.of(OneEvent.class).publishEventsFrom(null, publisher); } @Test // DATACMNS-928 - public void exposesEventsExposedByEntityToPublisher() { + void exposesEventsExposedByEntityToPublisher() { SomeEvent first = new SomeEvent(); SomeEvent second = new SomeEvent(); @@ -83,7 +86,7 @@ public class EventPublishingRepositoryProxyPostProcessorUnitTests { } @Test // DATACMNS-928 - public void exposesSingleEventByEntityToPublisher() { + void exposesSingleEventByEntityToPublisher() { SomeEvent event = new SomeEvent(); OneEvent entity = OneEvent.of(event); @@ -94,7 +97,7 @@ public class EventPublishingRepositoryProxyPostProcessorUnitTests { } @Test // DATACMNS-928 - public void doesNotExposeNullEvent() { + void doesNotExposeNullEvent() { OneEvent entity = OneEvent.of(null); @@ -104,12 +107,12 @@ public class EventPublishingRepositoryProxyPostProcessorUnitTests { } @Test // DATACMNS-928 - public void doesNotCreatePublishingMethodIfNoAnnotationDetected() { + void doesNotCreatePublishingMethodIfNoAnnotationDetected() { assertThat(EventPublishingMethod.of(Object.class)).isNull(); } @Test // DATACMNS-928 - public void interceptsSaveMethod() throws Throwable { + void interceptsSaveMethod() throws Throwable { SomeEvent event = new SomeEvent(); MultipleEvents sample = MultipleEvents.of(Collections.singletonList(event)); @@ -123,7 +126,7 @@ public class EventPublishingRepositoryProxyPostProcessorUnitTests { } @Test // DATACMNS-928 - public void doesNotInterceptNonSaveMethod() throws Throwable { + void doesNotInterceptNonSaveMethod() throws Throwable { doReturn(SampleRepository.class.getMethod("findById", Object.class)).when(invocation).getMethod(); @@ -135,7 +138,7 @@ public class EventPublishingRepositoryProxyPostProcessorUnitTests { } @Test // DATACMNS-928 - public void registersAdviceIfDomainTypeExposesEvents() { + void registersAdviceIfDomainTypeExposesEvents() { RepositoryInformation information = new DummyRepositoryInformation(SampleRepository.class); RepositoryProxyPostProcessor processor = new EventPublishingRepositoryProxyPostProcessor(publisher); @@ -148,7 +151,7 @@ public class EventPublishingRepositoryProxyPostProcessorUnitTests { } @Test // DATACMNS-928 - public void doesNotAddAdviceIfDomainTypeDoesNotExposeEvents() { + void doesNotAddAdviceIfDomainTypeDoesNotExposeEvents() { RepositoryInformation information = new DummyRepositoryInformation(CrudRepository.class); RepositoryProxyPostProcessor processor = new EventPublishingRepositoryProxyPostProcessor(publisher); @@ -161,7 +164,7 @@ public class EventPublishingRepositoryProxyPostProcessorUnitTests { } @Test // DATACMNS-928 - public void publishesEventsForCallToSaveWithIterable() throws Throwable { + void publishesEventsForCallToSaveWithIterable() throws Throwable { SomeEvent event = new SomeEvent(); MultipleEvents sample = MultipleEvents.of(Collections.singletonList(event)); @@ -175,7 +178,7 @@ public class EventPublishingRepositoryProxyPostProcessorUnitTests { } @Test // DATACMNS-975 - public void publishesEventsAfterSaveInvocation() throws Throwable { + void publishesEventsAfterSaveInvocation() throws Throwable { doThrow(new IllegalStateException()).when(invocation).proceed(); @@ -189,7 +192,7 @@ public class EventPublishingRepositoryProxyPostProcessorUnitTests { } @Test // DATACMNS-1113 - public void invokesEventsForMethodsThatStartsWithSave() throws Throwable { + void invokesEventsForMethodsThatStartsWithSave() throws Throwable { SomeEvent event = new SomeEvent(); MultipleEvents sample = MultipleEvents.of(Collections.singletonList(event)); @@ -203,7 +206,7 @@ public class EventPublishingRepositoryProxyPostProcessorUnitTests { } @Test // DATACMNS-1067 - public void clearsEventsEvenIfNoneWereExposedToPublish() { + void clearsEventsEvenIfNoneWereExposedToPublish() { EventsWithClearing entity = spy(EventsWithClearing.of(Collections.emptyList())); @@ -213,7 +216,7 @@ public class EventPublishingRepositoryProxyPostProcessorUnitTests { } @Test // DATACMNS-1067 - public void clearsEventsIfThereWereSomeToBePublished() { + void clearsEventsIfThereWereSomeToBePublished() { EventsWithClearing entity = spy(EventsWithClearing.of(Collections.singletonList(new SomeEvent()))); @@ -223,7 +226,7 @@ public class EventPublishingRepositoryProxyPostProcessorUnitTests { } @Test // DATACMNS-1067 - public void clearsEventsForOperationOnMutlipleAggregates() { + void clearsEventsForOperationOnMutlipleAggregates() { EventsWithClearing firstEntity = spy(EventsWithClearing.of(Collections.emptyList())); EventsWithClearing secondEntity = spy(EventsWithClearing.of(Collections.singletonList(new SomeEvent()))); @@ -237,7 +240,7 @@ public class EventPublishingRepositoryProxyPostProcessorUnitTests { } @Test // DATACMNS-1163 - public void publishesEventFromParameter() throws Throwable { + void publishesEventFromParameter() throws Throwable { Object event = new Object(); MultipleEvents parameter = MultipleEvents.of(Collections.singleton(event)); diff --git a/src/test/java/org/springframework/data/repository/core/support/ExampleSpecificationAccessorUnitTests.java b/src/test/java/org/springframework/data/repository/core/support/ExampleSpecificationAccessorUnitTests.java index 0f03e3713..d02a2a914 100755 --- a/src/test/java/org/springframework/data/repository/core/support/ExampleSpecificationAccessorUnitTests.java +++ b/src/test/java/org/springframework/data/repository/core/support/ExampleSpecificationAccessorUnitTests.java @@ -18,8 +18,8 @@ package org.springframework.data.repository.core.support; import static org.assertj.core.api.Assertions.*; import static org.springframework.data.domain.ExampleMatcher.GenericPropertyMatchers.*; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.data.domain.ExampleMatcher; import org.springframework.data.domain.ExampleMatcher.GenericPropertyMatcher; import org.springframework.data.domain.ExampleMatcher.NoOpPropertyValueTransformer; @@ -35,14 +35,14 @@ import org.springframework.data.support.ExampleMatcherAccessor; * @author Mark Paluch * @soundtrack Ron Spielman Trio - Fretboard Highway (Electric Tales) */ -public class ExampleSpecificationAccessorUnitTests { +class ExampleSpecificationAccessorUnitTests { Person person; ExampleMatcher specification; ExampleMatcherAccessor exampleSpecificationAccessor; - @Before - public void setUp() { + @BeforeEach + void setUp() { person = new Person(); person.firstname = "rand"; @@ -52,12 +52,12 @@ public class ExampleSpecificationAccessorUnitTests { } @Test // DATACMNS-810 - public void defaultStringMatcherShouldReturnDefault() { + void defaultStringMatcherShouldReturnDefault() { assertThat(exampleSpecificationAccessor.getDefaultStringMatcher()).isEqualTo(StringMatcher.DEFAULT); } @Test // DATACMNS-810 - public void nullHandlerShouldReturnInclude() { + void nullHandlerShouldReturnInclude() { specification = ExampleMatcher.matching().// withIncludeNullValues(); @@ -67,7 +67,7 @@ public class ExampleSpecificationAccessorUnitTests { } @Test // DATACMNS-810 - public void exampleShouldIgnorePaths() { + void exampleShouldIgnorePaths() { specification = ExampleMatcher.matching().withIgnorePaths("firstname"); exampleSpecificationAccessor = new ExampleMatcherAccessor(specification); @@ -77,13 +77,13 @@ public class ExampleSpecificationAccessorUnitTests { } @Test // DATACMNS-810 - public void exampleShouldUseDefaultStringMatcherForPathThatDoesNotHavePropertySpecifier() { + void exampleShouldUseDefaultStringMatcherForPathThatDoesNotHavePropertySpecifier() { assertThat(exampleSpecificationAccessor.getStringMatcherForPath("firstname")) .isEqualTo(specification.getDefaultStringMatcher()); } @Test // DATACMNS-810 - public void exampleShouldUseConfiguredStringMatcherAsDefaultForPathThatDoesNotHavePropertySpecifier() { + void exampleShouldUseConfiguredStringMatcherAsDefaultForPathThatDoesNotHavePropertySpecifier() { specification = ExampleMatcher.matching().// withStringMatcher(StringMatcher.CONTAINING); @@ -94,7 +94,7 @@ public class ExampleSpecificationAccessorUnitTests { } @Test // DATACMNS-810 - public void exampleShouldUseDefaultIgnoreCaseForPathThatDoesHavePropertySpecifierWithMatcher() { + void exampleShouldUseDefaultIgnoreCaseForPathThatDoesHavePropertySpecifierWithMatcher() { specification = ExampleMatcher.matching().// withIgnoreCase().// @@ -106,7 +106,7 @@ public class ExampleSpecificationAccessorUnitTests { } @Test // DATACMNS-810 - public void exampleShouldUseConfiguredIgnoreCaseForPathThatDoesHavePropertySpecifierWithMatcher() { + void exampleShouldUseConfiguredIgnoreCaseForPathThatDoesHavePropertySpecifierWithMatcher() { specification = ExampleMatcher.matching().// withIgnoreCase().// @@ -118,7 +118,7 @@ public class ExampleSpecificationAccessorUnitTests { } @Test // DATACMNS-810 - public void exampleShouldUseDefinedStringMatcherForPathThatDoesHavePropertySpecifierWithStringMatcherStarting() { + void exampleShouldUseDefinedStringMatcherForPathThatDoesHavePropertySpecifierWithStringMatcherStarting() { specification = ExampleMatcher.matching().// withMatcher("firstname", startsWith()); @@ -129,7 +129,7 @@ public class ExampleSpecificationAccessorUnitTests { } @Test // DATACMNS-810 - public void exampleShouldUseDefinedStringMatcherForPathThatDoesHavePropertySpecifierWithStringMatcherContaining() { + void exampleShouldUseDefinedStringMatcherForPathThatDoesHavePropertySpecifierWithStringMatcherContaining() { specification = ExampleMatcher.matching().// withMatcher("firstname", contains()); @@ -140,7 +140,7 @@ public class ExampleSpecificationAccessorUnitTests { } @Test // DATACMNS-810 - public void exampleShouldUseDefinedStringMatcherForPathThatDoesHavePropertySpecifierWithStringMatcherRegex() { + void exampleShouldUseDefinedStringMatcherForPathThatDoesHavePropertySpecifierWithStringMatcherRegex() { specification = ExampleMatcher.matching().// withMatcher("firstname", regex()); @@ -151,7 +151,7 @@ public class ExampleSpecificationAccessorUnitTests { } @Test // DATACMNS-810 - public void exampleShouldFavorStringMatcherDefinedForPathOverConfiguredDefaultStringMatcher() { + void exampleShouldFavorStringMatcherDefinedForPathOverConfiguredDefaultStringMatcher() { specification = ExampleMatcher.matching().withStringMatcher(StringMatcher.ENDING) .withMatcher("firstname", contains()).withMatcher("address.city", startsWith()) @@ -166,7 +166,7 @@ public class ExampleSpecificationAccessorUnitTests { } @Test // DATACMNS-810 - public void exampleShouldUseDefaultStringMatcherForPathThatHasPropertySpecifierWithoutStringMatcher() { + void exampleShouldUseDefaultStringMatcherForPathThatHasPropertySpecifierWithoutStringMatcher() { specification = ExampleMatcher.matching().// withStringMatcher(StringMatcher.STARTING).// @@ -180,14 +180,14 @@ public class ExampleSpecificationAccessorUnitTests { } @Test // DATACMNS-810 - public void ignoreCaseShouldReturnFalseByDefault() { + void ignoreCaseShouldReturnFalseByDefault() { assertThat(specification.isIgnoreCaseEnabled()).isFalse(); assertThat(exampleSpecificationAccessor.isIgnoreCaseForPath("firstname")).isFalse(); } @Test // DATACMNS-810 - public void ignoreCaseShouldReturnTrueWhenIgnoreCaseIsEnabled() { + void ignoreCaseShouldReturnTrueWhenIgnoreCaseIsEnabled() { specification = ExampleMatcher.matching().// withIgnoreCase(); @@ -199,7 +199,7 @@ public class ExampleSpecificationAccessorUnitTests { } @Test // DATACMNS-810 - public void ignoreCaseShouldFavorPathSpecificSettings() { + void ignoreCaseShouldFavorPathSpecificSettings() { specification = ExampleMatcher.matching().// withIgnoreCase("firstname"); @@ -211,13 +211,13 @@ public class ExampleSpecificationAccessorUnitTests { } @Test // DATACMNS-810 - public void getValueTransformerForPathReturnsNoOpValueTransformerByDefault() { + void getValueTransformerForPathReturnsNoOpValueTransformerByDefault() { assertThat(exampleSpecificationAccessor.getValueTransformerForPath("firstname")) .isInstanceOf(NoOpPropertyValueTransformer.class); } @Test // DATACMNS-810 - public void getValueTransformerForPathReturnsConfigurtedTransformerForPath() { + void getValueTransformerForPathReturnsConfigurtedTransformerForPath() { PropertyValueTransformer transformer = source -> source.map(Object::toString); @@ -229,12 +229,12 @@ public class ExampleSpecificationAccessorUnitTests { } @Test // DATACMNS-810 - public void hasPropertySpecifiersReturnsFalseIfNoneDefined() { + void hasPropertySpecifiersReturnsFalseIfNoneDefined() { assertThat(exampleSpecificationAccessor.hasPropertySpecifiers()).isFalse(); } @Test // DATACMNS-810 - public void hasPropertySpecifiersReturnsTrueWhenAtLeastOneIsSet() { + void hasPropertySpecifiersReturnsTrueWhenAtLeastOneIsSet() { specification = ExampleMatcher.matching().// withStringMatcher(StringMatcher.STARTING).// @@ -246,7 +246,7 @@ public class ExampleSpecificationAccessorUnitTests { } @Test // DATACMNS-953 - public void exactMatcherUsesExactMatching() { + void exactMatcherUsesExactMatching() { ExampleMatcher matcher = ExampleMatcher.matching()// .withMatcher("firstname", exact()); diff --git a/src/test/java/org/springframework/data/repository/core/support/PersistenceExceptionTranslationRepositoryProxyPostProcessorUnitTests.java b/src/test/java/org/springframework/data/repository/core/support/PersistenceExceptionTranslationRepositoryProxyPostProcessorUnitTests.java index bd554bfaa..d0fd27294 100755 --- a/src/test/java/org/springframework/data/repository/core/support/PersistenceExceptionTranslationRepositoryProxyPostProcessorUnitTests.java +++ b/src/test/java/org/springframework/data/repository/core/support/PersistenceExceptionTranslationRepositoryProxyPostProcessorUnitTests.java @@ -18,10 +18,11 @@ package org.springframework.data.repository.core.support; 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.springframework.aop.framework.ProxyFactory; import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.dao.support.PersistenceExceptionTranslationInterceptor; @@ -32,20 +33,20 @@ import org.springframework.dao.support.PersistenceExceptionTranslationIntercepto * @author Oliver Gierke * @since 1.6 */ -@RunWith(MockitoJUnitRunner.class) -public class PersistenceExceptionTranslationRepositoryProxyPostProcessorUnitTests { +@ExtendWith(MockitoExtension.class) +class PersistenceExceptionTranslationRepositoryProxyPostProcessorUnitTests { @Mock ListableBeanFactory beanFactory; @Mock ProxyFactory proxyFactory; @Test // DATACMNS-318 - public void rejectsNullBeanFactory() { + void rejectsNullBeanFactory() { assertThatIllegalArgumentException() .isThrownBy(() -> new PersistenceExceptionTranslationRepositoryProxyPostProcessor(null)); } @Test // DATACMNS-318 - public void setsUpBasicInstance() throws Exception { + void setsUpBasicInstance() throws Exception { RepositoryProxyPostProcessor postProcessor = new PersistenceExceptionTranslationRepositoryProxyPostProcessor( beanFactory); diff --git a/src/test/java/org/springframework/data/repository/core/support/PersistentEntityInformationUnitTests.java b/src/test/java/org/springframework/data/repository/core/support/PersistentEntityInformationUnitTests.java index c30a247f2..9e0b3e767 100755 --- a/src/test/java/org/springframework/data/repository/core/support/PersistentEntityInformationUnitTests.java +++ b/src/test/java/org/springframework/data/repository/core/support/PersistentEntityInformationUnitTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*; import java.io.Serializable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.annotation.Id; import org.springframework.data.mapping.PersistentEntity; import org.springframework.data.mapping.context.SampleMappingContext; @@ -31,10 +31,10 @@ import org.springframework.data.repository.core.EntityInformation; * * @author Oliver Gierke */ -public class PersistentEntityInformationUnitTests { +class PersistentEntityInformationUnitTests { @Test // DATACMNS-480 - public void obtainsIdAndIdTypeInformationFromPersistentEntity() { + void obtainsIdAndIdTypeInformationFromPersistentEntity() { SampleMappingContext context = new SampleMappingContext(); PersistentEntity entity = context.getRequiredPersistentEntity(Sample.class); @@ -49,7 +49,7 @@ public class PersistentEntityInformationUnitTests { } @Test // DATACMNS-596 - public void returnsNullIfNoIdPropertyPresent() { + void returnsNullIfNoIdPropertyPresent() { SampleMappingContext context = new SampleMappingContext(); PersistentEntity entity = context diff --git a/src/test/java/org/springframework/data/repository/core/support/QueryExecutionResultHandlerUnitTests.java b/src/test/java/org/springframework/data/repository/core/support/QueryExecutionResultHandlerUnitTests.java index 06bd8a937..e8773bcfc 100755 --- a/src/test/java/org/springframework/data/repository/core/support/QueryExecutionResultHandlerUnitTests.java +++ b/src/test/java/org/springframework/data/repository/core/support/QueryExecutionResultHandlerUnitTests.java @@ -39,7 +39,7 @@ import java.util.Set; import java.util.stream.Collectors; import org.assertj.core.api.SoftAssertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.reactivestreams.Publisher; import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.data.repository.Repository; @@ -52,12 +52,12 @@ import org.springframework.data.util.Streamable; * @author Mark Paluch * @author Jens Schauder */ -public class QueryExecutionResultHandlerUnitTests { +class QueryExecutionResultHandlerUnitTests { QueryExecutionResultHandler handler = new QueryExecutionResultHandler(RepositoryFactorySupport.CONVERSION_SERVICE); @Test // DATACMNS-610 - public void convertsListsToSet() throws Exception { + void convertsListsToSet() throws Exception { Method method = getMethod("set"); List source = Collections.singletonList(new Entity()); @@ -66,7 +66,7 @@ public class QueryExecutionResultHandlerUnitTests { } @Test // DATACMNS-483 - public void turnsNullIntoJdk8Optional() throws Exception { + void turnsNullIntoJdk8Optional() throws Exception { Object result = handler.postProcessInvocationResult(null, getMethod("jdk8Optional")); assertThat(result).isEqualTo(Optional.empty()); @@ -74,7 +74,7 @@ public class QueryExecutionResultHandlerUnitTests { @Test // DATACMNS-483 @SuppressWarnings("unchecked") - public void wrapsValueIntoJdk8Optional() throws Exception { + void wrapsValueIntoJdk8Optional() throws Exception { Entity entity = new Entity(); @@ -86,7 +86,7 @@ public class QueryExecutionResultHandlerUnitTests { } @Test // DATACMNS-483 - public void turnsNullIntoGuavaOptional() throws Exception { + void turnsNullIntoGuavaOptional() throws Exception { Object result = handler.postProcessInvocationResult(null, getMethod("guavaOptional")); assertThat(result).isEqualTo(com.google.common.base.Optional.absent()); @@ -94,7 +94,7 @@ public class QueryExecutionResultHandlerUnitTests { @Test // DATACMNS-483 @SuppressWarnings("unchecked") - public void wrapsValueIntoGuavaOptional() throws Exception { + void wrapsValueIntoGuavaOptional() throws Exception { Entity entity = new Entity(); @@ -106,13 +106,13 @@ public class QueryExecutionResultHandlerUnitTests { } @Test // DATACMNS-917 - public void defaultsNullToEmptyMap() throws Exception { + void defaultsNullToEmptyMap() throws Exception { assertThat(handler.postProcessInvocationResult(null, getMethod("map"))).isInstanceOf(Map.class); } @Test // DATACMNS-836 @SuppressWarnings("unchecked") - public void convertsRxJavaSingleIntoPublisher() throws Exception { + void convertsRxJavaSingleIntoPublisher() throws Exception { Single entity = Single.just(new Entity()); @@ -125,7 +125,7 @@ public class QueryExecutionResultHandlerUnitTests { @Test // DATACMNS-836 @SuppressWarnings("unchecked") - public void convertsRxJavaSingleIntoMono() throws Exception { + void convertsRxJavaSingleIntoMono() throws Exception { Single entity = Single.just(new Entity()); @@ -138,7 +138,7 @@ public class QueryExecutionResultHandlerUnitTests { @Test // DATACMNS-836 @SuppressWarnings("unchecked") - public void convertsRxJavaSingleIntoFlux() throws Exception { + void convertsRxJavaSingleIntoFlux() throws Exception { Single entity = Single.just(new Entity()); @@ -151,7 +151,7 @@ public class QueryExecutionResultHandlerUnitTests { @Test // DATACMNS-836 @SuppressWarnings("unchecked") - public void convertsRxJavaObservableIntoPublisher() throws Exception { + void convertsRxJavaObservableIntoPublisher() throws Exception { Observable entity = Observable.just(new Entity()); @@ -164,7 +164,7 @@ public class QueryExecutionResultHandlerUnitTests { @Test // DATACMNS-836 @SuppressWarnings("unchecked") - public void convertsRxJavaObservableIntoMono() throws Exception { + void convertsRxJavaObservableIntoMono() throws Exception { Observable entity = Observable.just(new Entity()); @@ -177,7 +177,7 @@ public class QueryExecutionResultHandlerUnitTests { @Test // DATACMNS-836 @SuppressWarnings("unchecked") - public void convertsRxJavaObservableIntoFlux() throws Exception { + void convertsRxJavaObservableIntoFlux() throws Exception { Observable entity = Observable.just(new Entity()); @@ -190,7 +190,7 @@ public class QueryExecutionResultHandlerUnitTests { @Test // DATACMNS-836 @SuppressWarnings("unchecked") - public void convertsRxJavaObservableIntoSingle() throws Exception { + void convertsRxJavaObservableIntoSingle() throws Exception { Observable entity = Observable.just(new Entity()); @@ -203,7 +203,7 @@ public class QueryExecutionResultHandlerUnitTests { @Test // DATACMNS-836 @SuppressWarnings("unchecked") - public void convertsRxJavaSingleIntoObservable() throws Exception { + void convertsRxJavaSingleIntoObservable() throws Exception { Single entity = Single.just(new Entity()); @@ -216,7 +216,7 @@ public class QueryExecutionResultHandlerUnitTests { @Test // DATACMNS-836 @SuppressWarnings("unchecked") - public void convertsReactorMonoIntoSingle() throws Exception { + void convertsReactorMonoIntoSingle() throws Exception { Mono entity = Mono.just(new Entity()); @@ -229,7 +229,7 @@ public class QueryExecutionResultHandlerUnitTests { @Test // DATACMNS-836 @SuppressWarnings("unchecked") - public void convertsReactorMonoIntoCompletable() throws Exception { + void convertsReactorMonoIntoCompletable() throws Exception { Mono entity = Mono.just(new Entity()); @@ -242,7 +242,7 @@ public class QueryExecutionResultHandlerUnitTests { @Test // DATACMNS-836 @SuppressWarnings("unchecked") - public void convertsReactorMonoIntoCompletableWithException() throws Exception { + void convertsReactorMonoIntoCompletableWithException() throws Exception { Mono entity = Mono.error(new InvalidDataAccessApiUsageException("err")); @@ -255,7 +255,7 @@ public class QueryExecutionResultHandlerUnitTests { @Test // DATACMNS-836 @SuppressWarnings("unchecked") - public void convertsRxJavaCompletableIntoMono() throws Exception { + void convertsRxJavaCompletableIntoMono() throws Exception { Completable entity = Completable.complete(); @@ -268,7 +268,7 @@ public class QueryExecutionResultHandlerUnitTests { @Test // DATACMNS-836 @SuppressWarnings("unchecked") - public void convertsRxJavaCompletableIntoMonoWithException() throws Exception { + void convertsRxJavaCompletableIntoMonoWithException() throws Exception { Completable entity = Completable.error(new InvalidDataAccessApiUsageException("err")); @@ -282,7 +282,7 @@ public class QueryExecutionResultHandlerUnitTests { @Test // DATACMNS-836 @SuppressWarnings("unchecked") - public void convertsReactorMonoIntoObservable() throws Exception { + void convertsReactorMonoIntoObservable() throws Exception { Mono entity = Mono.just(new Entity()); @@ -295,7 +295,7 @@ public class QueryExecutionResultHandlerUnitTests { @Test // DATACMNS-836 @SuppressWarnings("unchecked") - public void convertsReactorFluxIntoSingle() throws Exception { + void convertsReactorFluxIntoSingle() throws Exception { Flux entity = Flux.just(new Entity()); @@ -308,7 +308,7 @@ public class QueryExecutionResultHandlerUnitTests { @Test // DATACMNS-836 @SuppressWarnings("unchecked") - public void convertsReactorFluxIntoObservable() throws Exception { + void convertsReactorFluxIntoObservable() throws Exception { Flux entity = Flux.just(new Entity()); @@ -321,7 +321,7 @@ public class QueryExecutionResultHandlerUnitTests { @Test // DATACMNS-836 @SuppressWarnings("unchecked") - public void convertsReactorFluxIntoMono() throws Exception { + void convertsReactorFluxIntoMono() throws Exception { Flux entity = Flux.just(new Entity()); @@ -334,7 +334,7 @@ public class QueryExecutionResultHandlerUnitTests { @Test // DATACMNS-836 @SuppressWarnings("unchecked") - public void convertsReactorMonoIntoFlux() throws Exception { + void convertsReactorMonoIntoFlux() throws Exception { Mono entity = Mono.just(new Entity()); @@ -346,7 +346,7 @@ public class QueryExecutionResultHandlerUnitTests { } @Test // DATACMNS-1056 - public void convertsOptionalToThirdPartyOption() throws Exception { + void convertsOptionalToThirdPartyOption() throws Exception { Entity value = new Entity(); Optional entity = Optional.of(value); @@ -358,7 +358,7 @@ public class QueryExecutionResultHandlerUnitTests { @Test // DATACMNS-1165 @SuppressWarnings("unchecked") - public void convertsIterableIntoStreamable() throws Exception { + void convertsIterableIntoStreamable() throws Exception { Iterable source = asList(new Object()); @@ -369,7 +369,7 @@ public class QueryExecutionResultHandlerUnitTests { } @Test // DATACMNS-938 - public void resolvesNestedWrapperIfOuterDoesntNeedConversion() throws Exception { + void resolvesNestedWrapperIfOuterDoesntNeedConversion() throws Exception { Entity entity = new Entity(); @@ -379,7 +379,7 @@ public class QueryExecutionResultHandlerUnitTests { } @Test // DATACMNS-1430 - public void convertsElementsAndValueIntoCustomStreamable() throws Exception { + void convertsElementsAndValueIntoCustomStreamable() throws Exception { Object result = handler.postProcessInvocationResult(Arrays.asList("foo"), getMethod("customStreamable")); @@ -389,7 +389,7 @@ public class QueryExecutionResultHandlerUnitTests { } @Test // DATACMNS-1482 - public void nestedConversion() throws Exception { + void nestedConversion() throws Exception { Object result = handler.postProcessInvocationResult(asList(BigDecimal.ZERO, BigDecimal.ONE), getMethod("listOfInteger")); @@ -406,7 +406,7 @@ public class QueryExecutionResultHandlerUnitTests { } @Test // DATACMNS-1552 - public void keepsVavrOptionType() throws Exception { + void keepsVavrOptionType() throws Exception { Option source = Option.of(new Entity()); diff --git a/src/test/java/org/springframework/data/repository/core/support/QueryExecutorMethodInterceptorUnitTests.java b/src/test/java/org/springframework/data/repository/core/support/QueryExecutorMethodInterceptorUnitTests.java index 15cc8dd62..b1ea6b4b1 100755 --- a/src/test/java/org/springframework/data/repository/core/support/QueryExecutorMethodInterceptorUnitTests.java +++ b/src/test/java/org/springframework/data/repository/core/support/QueryExecutorMethodInterceptorUnitTests.java @@ -21,10 +21,10 @@ import static org.mockito.Mockito.*; import java.util.Collections; 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.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.data.projection.SpelAwareProxyProjectionFactory; import org.springframework.data.repository.core.RepositoryInformation; @@ -37,14 +37,14 @@ import org.springframework.data.repository.query.QueryLookupStrategy; * @author Mark Paluch * @author Jens Schauder */ -@RunWith(MockitoJUnitRunner.class) -public class QueryExecutorMethodInterceptorUnitTests { +@ExtendWith(MockitoExtension.class) +class QueryExecutorMethodInterceptorUnitTests { @Mock RepositoryInformation information; @Mock QueryLookupStrategy strategy; @Test // DATACMNS-1508 - public void rejectsRepositoryInterfaceWithQueryMethodsIfNoQueryLookupStrategyIsDefined() { + void rejectsRepositoryInterfaceWithQueryMethodsIfNoQueryLookupStrategyIsDefined() { when(information.hasQueryMethods()).thenReturn(true); @@ -54,7 +54,7 @@ public class QueryExecutorMethodInterceptorUnitTests { } @Test // DATACMNS-1508 - public void skipsQueryLookupsIfQueryLookupStrategyIsNotPresent() { + void skipsQueryLookupsIfQueryLookupStrategyIsNotPresent() { new QueryExecutorMethodInterceptor(information, new SpelAwareProxyProjectionFactory(), Optional.empty(), PropertiesBasedNamedQueries.EMPTY, Collections.emptyList()); diff --git a/src/test/java/org/springframework/data/repository/core/support/ReactiveRepositoryInformationUnitTests.java b/src/test/java/org/springframework/data/repository/core/support/ReactiveRepositoryInformationUnitTests.java index 5ccba46da..5727ed264 100644 --- a/src/test/java/org/springframework/data/repository/core/support/ReactiveRepositoryInformationUnitTests.java +++ b/src/test/java/org/springframework/data/repository/core/support/ReactiveRepositoryInformationUnitTests.java @@ -24,9 +24,9 @@ import rx.Observable; import java.lang.reflect.Method; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; import org.reactivestreams.Publisher; import org.springframework.data.repository.Repository; @@ -42,13 +42,13 @@ import org.springframework.data.repository.reactive.RxJava2CrudRepository; * @author Oliver Gierke * @author Christoph Strobl */ -@RunWith(MockitoJUnitRunner.class) -public class ReactiveRepositoryInformationUnitTests { +@ExtendWith(MockitoExtension.class) +class ReactiveRepositoryInformationUnitTests { static final Class BASE_CLASS = ReactiveJavaInterfaceWithGenerics.class; @Test // DATACMNS-836 - public void discoversRxJava1MethodWithoutComparingReturnType() throws Exception { + void discoversRxJava1MethodWithoutComparingReturnType() throws Exception { Method reference = extractTargetMethodFromRepository(RxJava1InterfaceWithGenerics.class, "deleteAll"); @@ -57,7 +57,7 @@ public class ReactiveRepositoryInformationUnitTests { } @Test // DATACMNS-836 - public void discoversRxJava1MethodWithConvertibleArguments() throws Exception { + void discoversRxJava1MethodWithConvertibleArguments() throws Exception { Method reference = extractTargetMethodFromRepository(RxJava1InterfaceWithGenerics.class, "saveAll", Observable.class); @@ -68,7 +68,7 @@ public class ReactiveRepositoryInformationUnitTests { } @Test // DATACMNS-988 - public void discoversRxJava2MethodWithoutComparingReturnType() throws Exception { + void discoversRxJava2MethodWithoutComparingReturnType() throws Exception { Method reference = extractTargetMethodFromRepository(RxJava2InterfaceWithGenerics.class, "deleteAll"); @@ -77,7 +77,7 @@ public class ReactiveRepositoryInformationUnitTests { } @Test // DATACMNS-988 - public void discoversRxJava2MethodWithConvertibleArguments() throws Exception { + void discoversRxJava2MethodWithConvertibleArguments() throws Exception { Method reference = extractTargetMethodFromRepository(RxJava2InterfaceWithGenerics.class, "saveAll", Flowable.class); @@ -87,7 +87,7 @@ public class ReactiveRepositoryInformationUnitTests { } @Test // DATACMNS-836 - public void discoversMethodAssignableArguments() throws Exception { + void discoversMethodAssignableArguments() throws Exception { Method reference = extractTargetMethodFromRepository(ReactiveSortingRepository.class, "saveAll", Publisher.class); @@ -97,7 +97,7 @@ public class ReactiveRepositoryInformationUnitTests { } @Test // DATACMNS-836 - public void discoversMethodExactIterableArguments() throws Exception { + void discoversMethodExactIterableArguments() throws Exception { Method reference = extractTargetMethodFromRepository(ReactiveJavaInterfaceWithGenerics.class, "saveAll", Iterable.class); @@ -108,7 +108,7 @@ public class ReactiveRepositoryInformationUnitTests { } @Test // DATACMNS-836 - public void discoversMethodExactObjectArguments() throws Exception { + void discoversMethodExactObjectArguments() throws Exception { Method reference = extractTargetMethodFromRepository(ReactiveJavaInterfaceWithGenerics.class, "save", Object.class); @@ -118,7 +118,7 @@ public class ReactiveRepositoryInformationUnitTests { } @Test // DATACMNS-1023 - public void usesCorrectSaveOverload() throws Exception { + void usesCorrectSaveOverload() throws Exception { Method reference = extractTargetMethodFromRepository(DummyRepository.class, "saveAll", Iterable.class); @@ -161,11 +161,11 @@ public class ReactiveRepositoryInformationUnitTests { String id; - public String getId() { + String getId() { return id; } - public void setId(String id) { + void setId(String id) { this.id = id; } diff --git a/src/test/java/org/springframework/data/repository/core/support/ReactiveWrapperRepositoryFactorySupportUnitTests.java b/src/test/java/org/springframework/data/repository/core/support/ReactiveWrapperRepositoryFactorySupportUnitTests.java index 94cfca5d4..29aafc739 100644 --- a/src/test/java/org/springframework/data/repository/core/support/ReactiveWrapperRepositoryFactorySupportUnitTests.java +++ b/src/test/java/org/springframework/data/repository/core/support/ReactiveWrapperRepositoryFactorySupportUnitTests.java @@ -25,11 +25,13 @@ import rx.Single; import java.io.Serializable; -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.reactivestreams.Publisher; import org.springframework.data.repository.Repository; @@ -41,21 +43,22 @@ import org.springframework.data.repository.reactive.ReactiveSortingRepository; * @author Mark Paluch * @author Christoph Strobl */ -@RunWith(MockitoJUnitRunner.Silent.class) -public class ReactiveWrapperRepositoryFactorySupportUnitTests { +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) +class ReactiveWrapperRepositoryFactorySupportUnitTests { DummyRepositoryFactory factory; @Mock ReactiveSortingRepository backingRepo; @Mock ObjectRepositoryCustom customImplementation; - @Before - public void setUp() { + @BeforeEach + void setUp() { factory = new DummyRepositoryFactory(backingRepo); } @Test // DATACMNS-836 - public void invokesCustomMethodIfItRedeclaresACRUDOne() { + void invokesCustomMethodIfItRedeclaresACRUDOne() { ObjectRepository repository = factory.getRepository(ObjectRepository.class, customImplementation); repository.findById(1); @@ -65,7 +68,7 @@ public class ReactiveWrapperRepositoryFactorySupportUnitTests { } @Test // DATACMNS-836, DATACMNS-1154 - public void callsRxJava1MethodOnBaseImplementationWithExactArguments() { + void callsRxJava1MethodOnBaseImplementationWithExactArguments() { Serializable id = 1L; when(backingRepo.existsById(id)).thenReturn(Mono.just(true)); @@ -79,7 +82,7 @@ public class ReactiveWrapperRepositoryFactorySupportUnitTests { @Test // DATACMNS-836, DATACMNS-1063, DATACMNS-1154 @SuppressWarnings("unchecked") - public void callsRxJava1MethodOnBaseImplementationWithTypeConversion() { + void callsRxJava1MethodOnBaseImplementationWithTypeConversion() { when(backingRepo.existsById(any(Publisher.class))).thenReturn(Mono.just(true)); @@ -92,7 +95,7 @@ public class ReactiveWrapperRepositoryFactorySupportUnitTests { } @Test // DATACMNS-988, DATACMNS-1154 - public void callsRxJava2MethodOnBaseImplementationWithExactArguments() { + void callsRxJava2MethodOnBaseImplementationWithExactArguments() { Long id = 1L; when(backingRepo.findById(id)).thenReturn(Mono.just(true)); @@ -104,7 +107,7 @@ public class ReactiveWrapperRepositoryFactorySupportUnitTests { } @Test // DATACMNS-988, DATACMNS-1154 - public void callsRxJava2MethodOnBaseImplementationWithTypeConversion() { + void callsRxJava2MethodOnBaseImplementationWithTypeConversion() { Serializable id = 1L; when(backingRepo.deleteById(id)).thenReturn(Mono.empty()); diff --git a/src/test/java/org/springframework/data/repository/core/support/RepositoryCompositionUnitTests.java b/src/test/java/org/springframework/data/repository/core/support/RepositoryCompositionUnitTests.java index c2420c08d..279f0fcce 100644 --- a/src/test/java/org/springframework/data/repository/core/support/RepositoryCompositionUnitTests.java +++ b/src/test/java/org/springframework/data/repository/core/support/RepositoryCompositionUnitTests.java @@ -22,11 +22,12 @@ import lombok.Data; import java.lang.reflect.Method; -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.springframework.data.annotation.Id; import org.springframework.data.domain.Example; import org.springframework.data.repository.Repository; @@ -41,17 +42,17 @@ import org.springframework.util.ReflectionUtils; * @author Mark Paluch * @author Oliver Gierke */ -@RunWith(MockitoJUnitRunner.class) -public class RepositoryCompositionUnitTests { +@ExtendWith(MockitoExtension.class) +class RepositoryCompositionUnitTests { @Mock QueryByExampleExecutor queryByExampleExecutor; @Mock PersonRepository backingRepo; RepositoryComposition repositoryComposition; - @Before + @BeforeEach @SuppressWarnings("rawtypes") - public void before() { + void before() { RepositoryInformation repositoryInformation = new DefaultRepositoryInformation( new DefaultRepositoryMetadata(PersonRepository.class), backingRepo.getClass(), RepositoryComposition.empty()); @@ -66,14 +67,14 @@ public class RepositoryCompositionUnitTests { } @Test // DATACMNS-102 - public void shouldReportIfEmpty() { + void shouldReportIfEmpty() { assertThat(RepositoryComposition.empty().isEmpty()).isTrue(); assertThat(repositoryComposition.isEmpty()).isFalse(); } @Test // DATACMNS-102 - public void shouldCallSaveOnBackingRepo() throws Throwable { + void shouldCallSaveOnBackingRepo() throws Throwable { Method save = ReflectionUtils.findMethod(PersonRepository.class, "save", Person.class); @@ -86,7 +87,7 @@ public class RepositoryCompositionUnitTests { } @Test // DATACMNS-102 - public void shouldCallObjectSaveOnBackingRepo() throws Throwable { + void shouldCallObjectSaveOnBackingRepo() throws Throwable { Method save = ReflectionUtils.findMethod(PersonRepository.class, "save", Object.class); @@ -99,7 +100,7 @@ public class RepositoryCompositionUnitTests { } @Test // DATACMNS-102 - public void shouldCallFindOneOnMixin() throws Throwable { + void shouldCallFindOneOnMixin() throws Throwable { Method findOne = ReflectionUtils.findMethod(PersonRepository.class, "findOne", Example.class); @@ -114,7 +115,7 @@ public class RepositoryCompositionUnitTests { } @Test // DATACMNS-102 - public void shouldCallMethodsInOrder() throws Throwable { + void shouldCallMethodsInOrder() throws Throwable { RepositoryInformation repositoryInformation = new DefaultRepositoryInformation( new DefaultRepositoryMetadata(OrderedRepository.class), OrderedRepository.class, RepositoryComposition.empty()); @@ -136,7 +137,7 @@ public class RepositoryCompositionUnitTests { } @Test // DATACMNS-102 - public void shouldValidateStructuralFragments() { + void shouldValidateStructuralFragments() { RepositoryComposition mixed = RepositoryComposition.of(RepositoryFragment.structural(QueryByExampleExecutor.class), RepositoryFragment.implemented(backingRepo)); @@ -148,7 +149,7 @@ public class RepositoryCompositionUnitTests { } @Test // DATACMNS-102 - public void shouldValidateImplementationFragments() { + void shouldValidateImplementationFragments() { RepositoryComposition mixed = RepositoryComposition.of(RepositoryFragment.implemented(backingRepo)); @@ -157,7 +158,7 @@ public class RepositoryCompositionUnitTests { @Test // DATACMNS-102 @SuppressWarnings("rawtypes") - public void shouldAppendCorrectly() { + void shouldAppendCorrectly() { RepositoryFragment initial = RepositoryFragment.implemented(backingRepo); RepositoryFragment structural = RepositoryFragment.structural(QueryByExampleExecutor.class); diff --git a/src/test/java/org/springframework/data/repository/core/support/RepositoryFactoryBeanSupportUnitTests.java b/src/test/java/org/springframework/data/repository/core/support/RepositoryFactoryBeanSupportUnitTests.java index 43fe67d4b..f9577500c 100755 --- a/src/test/java/org/springframework/data/repository/core/support/RepositoryFactoryBeanSupportUnitTests.java +++ b/src/test/java/org/springframework/data/repository/core/support/RepositoryFactoryBeanSupportUnitTests.java @@ -18,7 +18,7 @@ package org.springframework.data.repository.core.support; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.querydsl.QuerydslPredicateExecutor; import org.springframework.data.repository.Repository; @@ -31,11 +31,11 @@ import org.springframework.test.util.ReflectionTestUtils; * @author Oliver Gierke * @author Thomas Darimont */ -public class RepositoryFactoryBeanSupportUnitTests { +class RepositoryFactoryBeanSupportUnitTests { @Test // DATACMNS-341 @SuppressWarnings({ "rawtypes", "unchecked" }) - public void setsConfiguredClassLoaderOnRepositoryFactory() { + void setsConfiguredClassLoaderOnRepositoryFactory() { ClassLoader classLoader = mock(ClassLoader.class); @@ -50,7 +50,7 @@ public class RepositoryFactoryBeanSupportUnitTests { @Test // DATACMNS-432 @SuppressWarnings({ "rawtypes", "unchecked" }) - public void initializationFailsWithMissingRepositoryInterface() { + void initializationFailsWithMissingRepositoryInterface() { assertThatExceptionOfType(IllegalArgumentException.class)// .isThrownBy(() -> new DummyRepositoryFactoryBean(null))// @@ -58,7 +58,7 @@ public class RepositoryFactoryBeanSupportUnitTests { } @Test // DATACMNS-1117 - public void returnsRepositoryInformationForFragmentSetup() { + void returnsRepositoryInformationForFragmentSetup() { RepositoryFactoryBeanSupport factoryBean = // new DummyRepositoryFactoryBean<>(SampleWithQuerydslRepository.class); @@ -70,7 +70,7 @@ public class RepositoryFactoryBeanSupportUnitTests { } @Test // DATACMNS-1345 - public void reportsMappingContextUnavailableForPersistentEntityLookup() { + void reportsMappingContextUnavailableForPersistentEntityLookup() { RepositoryFactoryBeanSupport bean = new RepositoryFactoryBeanSupport( SampleRepository.class) { diff --git a/src/test/java/org/springframework/data/repository/core/support/RepositoryFactorySupportUnitTests.java b/src/test/java/org/springframework/data/repository/core/support/RepositoryFactorySupportUnitTests.java index c72d0498e..3c5285169 100755 --- a/src/test/java/org/springframework/data/repository/core/support/RepositoryFactorySupportUnitTests.java +++ b/src/test/java/org/springframework/data/repository/core/support/RepositoryFactorySupportUnitTests.java @@ -30,12 +30,15 @@ import java.util.Set; import java.util.concurrent.CompletableFuture; import java.util.concurrent.Future; -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.aop.framework.ProxyFactory; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.dao.EmptyResultDataAccessException; @@ -70,8 +73,9 @@ import org.springframework.util.concurrent.ListenableFuture; * @author Mark Paluch * @author Ariel Carrera */ -@RunWith(MockitoJUnitRunner.class) -public class RepositoryFactorySupportUnitTests { +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) +class RepositoryFactorySupportUnitTests { DummyRepositoryFactory factory; @@ -83,13 +87,13 @@ public class RepositoryFactorySupportUnitTests { @Mock RepositoryProxyPostProcessor repositoryPostProcessor; - @Before - public void setUp() { + @BeforeEach + void setUp() { factory = new DummyRepositoryFactory(backingRepo); } @Test - public void invokesCustomQueryCreationListenerForSpecialRepositoryQueryOnly() { + void invokesCustomQueryCreationListenerForSpecialRepositoryQueryOnly() { Mockito.reset(factory.strategy); @@ -106,7 +110,7 @@ public class RepositoryFactorySupportUnitTests { } @Test // DATACMNS-1538 - public void invokesCustomRepositoryProxyPostProcessor() { + void invokesCustomRepositoryProxyPostProcessor() { factory.addRepositoryProxyPostProcessor(repositoryPostProcessor); factory.getRepository(ObjectRepository.class); @@ -115,7 +119,7 @@ public class RepositoryFactorySupportUnitTests { } @Test - public void routesCallToRedeclaredMethodIntoTarget() { + void routesCallToRedeclaredMethodIntoTarget() { ObjectRepository repository = factory.getRepository(ObjectRepository.class); repository.save(repository); @@ -124,7 +128,7 @@ public class RepositoryFactorySupportUnitTests { } @Test - public void invokesCustomMethodIfItRedeclaresACRUDOne() { + void invokesCustomMethodIfItRedeclaresACRUDOne() { ObjectRepository repository = factory.getRepository(ObjectRepository.class, customImplementation); repository.findById(1); @@ -134,7 +138,7 @@ public class RepositoryFactorySupportUnitTests { } @Test // DATACMNS-102 - public void invokesCustomMethodCompositionMethodIfItRedeclaresACRUDOne() { + void invokesCustomMethodCompositionMethodIfItRedeclaresACRUDOne() { ObjectRepository repository = factory.getRepository(ObjectRepository.class, RepositoryFragments.just(customImplementation)); @@ -145,7 +149,7 @@ public class RepositoryFactorySupportUnitTests { } @Test - public void createsRepositoryInstanceWithCustomIntermediateRepository() { + void createsRepositoryInstanceWithCustomIntermediateRepository() { CustomRepository repository = factory.getRepository(CustomRepository.class); Pageable pageable = PageRequest.of(0, 10); @@ -158,7 +162,7 @@ public class RepositoryFactorySupportUnitTests { @Test @SuppressWarnings("unchecked") - public void createsProxyForAnnotatedRepository() { + void createsProxyForAnnotatedRepository() { Class repositoryInterface = AnnotatedRepository.class; Class> foo = (Class>) repositoryInterface; @@ -167,14 +171,14 @@ public class RepositoryFactorySupportUnitTests { } @Test // DATACMNS-341 - public void usesDefaultClassLoaderIfNullConfigured() { + void usesDefaultClassLoaderIfNullConfigured() { factory.setBeanClassLoader(null); assertThat(ReflectionTestUtils.getField(factory, "classLoader")).isEqualTo(ClassUtils.getDefaultClassLoader()); } @Test // DATACMNS-489 - public void wrapsExecutionResultIntoFutureIfConfigured() throws Exception { + void wrapsExecutionResultIntoFutureIfConfigured() throws Exception { final Object reference = new Object(); @@ -203,7 +207,7 @@ public class RepositoryFactorySupportUnitTests { } @Test // DATACMNS-509 - public void convertsWithSameElementType() { + void convertsWithSameElementType() { List names = singletonList("Dave"); @@ -217,7 +221,7 @@ public class RepositoryFactorySupportUnitTests { } @Test // DATACMNS-509 - public void convertsCollectionToOtherCollectionWithElementSuperType() { + void convertsCollectionToOtherCollectionWithElementSuperType() { List names = singletonList("Dave"); @@ -230,7 +234,7 @@ public class RepositoryFactorySupportUnitTests { } @Test // DATACMNS-656 - public void rejectsNullRepositoryProxyPostProcessor() { + void rejectsNullRepositoryProxyPostProcessor() { assertThatThrownBy( // () -> factory.addRepositoryProxyPostProcessor(null)) // @@ -239,12 +243,12 @@ public class RepositoryFactorySupportUnitTests { } @Test // DATACMNS-715, SPR-13109 - public void addsTransactionProxyInterfaceIfAvailable() { + void addsTransactionProxyInterfaceIfAvailable() { assertThat(factory.getRepository(SimpleRepository.class)).isInstanceOf(TransactionalProxy.class); } @Test // DATACMNS-714 - public void wrapsExecutionResultIntoCompletableFutureIfConfigured() throws Exception { + void wrapsExecutionResultIntoCompletableFutureIfConfigured() throws Exception { User reference = new User(); @@ -252,7 +256,7 @@ public class RepositoryFactorySupportUnitTests { } @Test // DATACMNS-714 - public void wrapsExecutionResultIntoListenableFutureIfConfigured() throws Exception { + void wrapsExecutionResultIntoListenableFutureIfConfigured() throws Exception { User reference = new User(); @@ -260,7 +264,7 @@ public class RepositoryFactorySupportUnitTests { } @Test // DATACMNS-714 - public void wrapsExecutionResultIntoCompletableFutureWithEntityCollectionIfConfigured() throws Exception { + void wrapsExecutionResultIntoCompletableFutureWithEntityCollectionIfConfigured() throws Exception { List reference = singletonList(new User()); @@ -268,7 +272,7 @@ public class RepositoryFactorySupportUnitTests { } @Test // DATACMNS-714 - public void wrapsExecutionResultIntoListenableFutureWithEntityCollectionIfConfigured() throws Exception { + void wrapsExecutionResultIntoListenableFutureWithEntityCollectionIfConfigured() throws Exception { List reference = singletonList(new User()); @@ -277,7 +281,7 @@ public class RepositoryFactorySupportUnitTests { @Test // DATACMNS-763 @SuppressWarnings("rawtypes") - public void rejectsRepositoryBaseClassWithInvalidConstructor() { + void rejectsRepositoryBaseClassWithInvalidConstructor() { RepositoryInformation information = mock(RepositoryInformation.class); doReturn(CustomRepositoryBaseClass.class).when(information).getRepositoryBaseClass(); @@ -291,18 +295,18 @@ public class RepositoryFactorySupportUnitTests { } @Test - public void callsStaticMethodOnInterface() { + void callsStaticMethodOnInterface() { ObjectRepository repository = factory.getRepository(ObjectRepository.class, customImplementation); assertThat(repository.staticMethodDelegate()).isEqualTo("OK"); - verifyZeroInteractions(customImplementation); - verifyZeroInteractions(backingRepo); + verifyNoInteractions(customImplementation); + verifyNoInteractions(backingRepo); } @Test // DATACMNS-1154 - public void considersRequiredReturnValue() { + void considersRequiredReturnValue() { KotlinUserRepository repository = factory.getRepository(KotlinUserRepository.class); @@ -315,7 +319,7 @@ public class RepositoryFactorySupportUnitTests { } @Test // DATACMNS-1154 - public void considersRequiredParameter() { + void considersRequiredParameter() { ObjectRepository repository = factory.getRepository(ObjectRepository.class); @@ -326,7 +330,7 @@ public class RepositoryFactorySupportUnitTests { } @Test // DATACMNS-1154 - public void shouldAllowVoidMethods() { + void shouldAllowVoidMethods() { ObjectRepository repository = factory.getRepository(ObjectRepository.class, backingRepo); @@ -336,7 +340,7 @@ public class RepositoryFactorySupportUnitTests { } @Test // DATACMNS-1154 - public void considersRequiredKotlinParameter() { + void considersRequiredKotlinParameter() { KotlinUserRepository repository = factory.getRepository(KotlinUserRepository.class); @@ -347,7 +351,7 @@ public class RepositoryFactorySupportUnitTests { } @Test // DATACMNS-1154 - public void considersRequiredKotlinNullableParameter() { + void considersRequiredKotlinNullableParameter() { KotlinUserRepository repository = factory.getRepository(KotlinUserRepository.class); @@ -355,7 +359,7 @@ public class RepositoryFactorySupportUnitTests { } @Test // DATACMNS-1197 - public void considersNullabilityForKotlinInterfaceProperties() { + void considersNullabilityForKotlinInterfaceProperties() { KotlinUserRepository repository = factory.getRepository(KotlinUserRepository.class); @@ -479,6 +483,6 @@ public class RepositoryFactorySupportUnitTests { static class CustomRepositoryBaseClass { - public CustomRepositoryBaseClass(EntityInformation information) {} + CustomRepositoryBaseClass(EntityInformation information) {} } } diff --git a/src/test/java/org/springframework/data/repository/core/support/RepositoryFragmentUnitTests.java b/src/test/java/org/springframework/data/repository/core/support/RepositoryFragmentUnitTests.java index be829c0b8..aeee77d88 100644 --- a/src/test/java/org/springframework/data/repository/core/support/RepositoryFragmentUnitTests.java +++ b/src/test/java/org/springframework/data/repository/core/support/RepositoryFragmentUnitTests.java @@ -17,18 +17,18 @@ package org.springframework.data.repository.core.support; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Unit tests for {@link RepositoryFragment}. * * @author Mark Paluch */ -public class RepositoryFragmentUnitTests { +class RepositoryFragmentUnitTests { @Test // DATACMNS-1289 @SuppressWarnings("unchecked") - public void fragmentCreationFromUnrelatedTypesShouldFail() { + void fragmentCreationFromUnrelatedTypesShouldFail() { assertThatThrownBy(() -> RepositoryFragment.implemented((Class) CustomFragment.class, new UnrelatedImpl())) .hasMessageMatching("Fragment implementation .*UnrelatedImpl does not implement .*!") @@ -36,7 +36,7 @@ public class RepositoryFragmentUnitTests { } @Test // DATACMNS-1289 - public void fragmentCreationFromRelatedTypesShouldCreateNewFragment() { + void fragmentCreationFromRelatedTypesShouldCreateNewFragment() { assertThat(RepositoryFragment.implemented(CustomFragment.class, new CustomFragmentImpl())).isNotNull(); } diff --git a/src/test/java/org/springframework/data/repository/core/support/SurroundingTransactionDetectorMethodInterceptorUnitTests.java b/src/test/java/org/springframework/data/repository/core/support/SurroundingTransactionDetectorMethodInterceptorUnitTests.java index b63843b94..ad1d0a5fa 100644 --- a/src/test/java/org/springframework/data/repository/core/support/SurroundingTransactionDetectorMethodInterceptorUnitTests.java +++ b/src/test/java/org/springframework/data/repository/core/support/SurroundingTransactionDetectorMethodInterceptorUnitTests.java @@ -18,7 +18,7 @@ package org.springframework.data.repository.core.support; import static org.assertj.core.api.Assertions.*; import static org.springframework.data.repository.core.support.SurroundingTransactionDetectorMethodInterceptor.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.aop.framework.ReflectiveMethodInvocation; import org.springframework.transaction.support.TransactionSynchronizationManager; @@ -28,10 +28,10 @@ import org.springframework.transaction.support.TransactionSynchronizationManager * @author Oliver Gierke * @soundtrack Hendrik Freischlader Trio - Openness (Openness) */ -public class SurroundingTransactionDetectorMethodInterceptorUnitTests { +class SurroundingTransactionDetectorMethodInterceptorUnitTests { @Test // DATACMNS-959 - public void registersActiveSurroundingTransaction() throws Throwable { + void registersActiveSurroundingTransaction() throws Throwable { TransactionSynchronizationManager.setActualTransactionActive(true); @@ -39,7 +39,7 @@ public class SurroundingTransactionDetectorMethodInterceptorUnitTests { } @Test // DATACMNS-959 - public void registersNoSurroundingTransaction() throws Throwable { + void registersNoSurroundingTransaction() throws Throwable { TransactionSynchronizationManager.setActualTransactionActive(false); diff --git a/src/test/java/org/springframework/data/repository/core/support/TransactionRepositoryFactoryBeanSupportUnitTests.java b/src/test/java/org/springframework/data/repository/core/support/TransactionRepositoryFactoryBeanSupportUnitTests.java index 27a00efe8..cfe4702c5 100755 --- a/src/test/java/org/springframework/data/repository/core/support/TransactionRepositoryFactoryBeanSupportUnitTests.java +++ b/src/test/java/org/springframework/data/repository/core/support/TransactionRepositoryFactoryBeanSupportUnitTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import static org.springframework.test.util.ReflectionTestUtils.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.aop.Advisor; import org.springframework.aop.framework.Advised; import org.springframework.beans.factory.support.DefaultListableBeanFactory; @@ -33,10 +33,10 @@ import org.springframework.transaction.interceptor.TransactionInterceptor; * @author Oliver Gierke * @soundtrack The Intersphere - Live in Mannheim */ -public class TransactionRepositoryFactoryBeanSupportUnitTests { +class TransactionRepositoryFactoryBeanSupportUnitTests { @Test // DATACMNS-656 - public void disablesDefaultTransactionsIfConfigured() { + void disablesDefaultTransactionsIfConfigured() { SampleTransactionalRepositoryFactoryBean factoryBean = new SampleTransactionalRepositoryFactoryBean(); factoryBean.setEnableDefaultTransactions(false); @@ -64,7 +64,7 @@ public class TransactionRepositoryFactoryBeanSupportUnitTests { } @Test // DATACMNS-880 - public void propagatesBeanFactoryToSuperClass() { + void propagatesBeanFactoryToSuperClass() { SampleTransactionalRepositoryFactoryBean factoryBean = new SampleTransactionalRepositoryFactoryBean(); factoryBean.setBeanFactory(new DefaultListableBeanFactory()); @@ -79,7 +79,7 @@ public class TransactionRepositoryFactoryBeanSupportUnitTests { private final CrudRepository repository = mock(CrudRepository.class); - public SampleTransactionalRepositoryFactoryBean() { + SampleTransactionalRepositoryFactoryBean() { super((Class) CrudRepository.class); } diff --git a/src/test/java/org/springframework/data/repository/core/support/TransactionRepositoryProxyPostProcessorUnitTests.java b/src/test/java/org/springframework/data/repository/core/support/TransactionRepositoryProxyPostProcessorUnitTests.java index 52ae7c888..a416a5112 100755 --- a/src/test/java/org/springframework/data/repository/core/support/TransactionRepositoryProxyPostProcessorUnitTests.java +++ b/src/test/java/org/springframework/data/repository/core/support/TransactionRepositoryProxyPostProcessorUnitTests.java @@ -22,10 +22,10 @@ import static org.mockito.Mockito.*; import java.io.Serializable; import java.lang.reflect.Method; -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.springframework.aop.framework.ProxyFactory; import org.springframework.beans.factory.ListableBeanFactory; @@ -42,27 +42,27 @@ import org.springframework.transaction.interceptor.TransactionInterceptor; * * @author Oliver Gierke */ -@RunWith(MockitoJUnitRunner.class) -public class TransactionRepositoryProxyPostProcessorUnitTests { +@ExtendWith(MockitoExtension.class) +class TransactionRepositoryProxyPostProcessorUnitTests { @Mock ListableBeanFactory beanFactory; @Mock ProxyFactory proxyFactory; @Mock RepositoryInformation repositoryInformation; @Test - public void rejectsNullBeanFactory() { + void rejectsNullBeanFactory() { assertThatIllegalArgumentException() .isThrownBy(() -> new TransactionalRepositoryProxyPostProcessor(null, "transactionManager", true)); } @Test - public void rejectsNullTxManagerName() { + void rejectsNullTxManagerName() { assertThatIllegalArgumentException() .isThrownBy(() -> new TransactionalRepositoryProxyPostProcessor(beanFactory, null, true)); } @Test - public void setsUpBasicInstance() throws Exception { + void setsUpBasicInstance() throws Exception { RepositoryProxyPostProcessor postProcessor = new TransactionalRepositoryProxyPostProcessor(beanFactory, "txManager", true); @@ -72,17 +72,17 @@ public class TransactionRepositoryProxyPostProcessorUnitTests { } @Test // DATACMNS-464 - public void fallsBackToTargetMethodTransactionSettings() throws Exception { + void fallsBackToTargetMethodTransactionSettings() throws Exception { assertTransactionAttributeFor(SampleImplementation.class); } @Test // DATACMNS-464 - public void fallsBackToTargetClassTransactionSettings() throws Exception { + void fallsBackToTargetClassTransactionSettings() throws Exception { assertTransactionAttributeFor(SampleImplementationWithClassAnnotation.class); } @Test // DATACMNS-732 - public void considersJtaTransactional() throws Exception { + void considersJtaTransactional() throws Exception { Method method = SampleRepository.class.getMethod("methodWithJtaOneDotTwoAtTransactional"); diff --git a/src/test/java/org/springframework/data/repository/init/Jackson2ResourceReaderIntegrationTests.java b/src/test/java/org/springframework/data/repository/init/Jackson2ResourceReaderIntegrationTests.java index 38cceee72..3542dd909 100755 --- a/src/test/java/org/springframework/data/repository/init/Jackson2ResourceReaderIntegrationTests.java +++ b/src/test/java/org/springframework/data/repository/init/Jackson2ResourceReaderIntegrationTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*; import java.util.Collection; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.core.io.ClassPathResource; /** @@ -28,10 +28,10 @@ import org.springframework.core.io.ClassPathResource; * @author Oliver Gierke * @since 1.6 */ -public class Jackson2ResourceReaderIntegrationTests { +class Jackson2ResourceReaderIntegrationTests { @Test - public void readsFileWithMultipleObjects() throws Exception { + void readsFileWithMultipleObjects() throws Exception { ResourceReader reader = new Jackson2ResourceReader(); Object result = reader.readFrom(new ClassPathResource("data.json", getClass()), null); diff --git a/src/test/java/org/springframework/data/repository/init/Person.java b/src/test/java/org/springframework/data/repository/init/Person.java index 0888fc27c..a097d51b5 100644 --- a/src/test/java/org/springframework/data/repository/init/Person.java +++ b/src/test/java/org/springframework/data/repository/init/Person.java @@ -18,7 +18,7 @@ package org.springframework.data.repository.init; /** * @author Oliver Gierke */ -public class Person { +class Person { String firstname; String lastname; diff --git a/src/test/java/org/springframework/data/repository/init/ResourceReaderRepositoryInitializerUnitTests.java b/src/test/java/org/springframework/data/repository/init/ResourceReaderRepositoryInitializerUnitTests.java index bea81ce5a..87673f5b2 100755 --- a/src/test/java/org/springframework/data/repository/init/ResourceReaderRepositoryInitializerUnitTests.java +++ b/src/test/java/org/springframework/data/repository/init/ResourceReaderRepositoryInitializerUnitTests.java @@ -21,10 +21,10 @@ import static org.mockito.Mockito.*; import java.util.Collection; import java.util.Collections; -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.mockito.AdditionalAnswers; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; @@ -34,17 +34,15 @@ import org.springframework.data.repository.sample.ProductRepository; import org.springframework.data.repository.sample.SampleConfiguration; import org.springframework.data.repository.sample.User; 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.SpringJUnitConfig; /** * Unit tests for {@link UnmarshallingRepositoryInitializer}. * * @author Oliver Gierke */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = SampleConfiguration.class) -public class ResourceReaderRepositoryInitializerUnitTests { +@SpringJUnitConfig(classes = SampleConfiguration.class) +class ResourceReaderRepositoryInitializerUnitTests { @Autowired ProductRepository productRepository; @Autowired Repositories repositories; @@ -53,8 +51,8 @@ public class ResourceReaderRepositoryInitializerUnitTests { ResourceReader reader; Resource resource; - @Before - public void setUp() { + @BeforeEach + void setUp() { this.reader = mock(ResourceReader.class); this.publisher = mock(ApplicationEventPublisher.class); @@ -62,7 +60,7 @@ public class ResourceReaderRepositoryInitializerUnitTests { } @Test - public void storesSingleObjectCorrectly() throws Exception { + void storesSingleObjectCorrectly() throws Exception { Product reference = new Product(); setUpReferenceAndInititalize(reference); @@ -71,7 +69,7 @@ public class ResourceReaderRepositoryInitializerUnitTests { } @Test - public void storesCollectionOfObjectsCorrectly() throws Exception { + void storesCollectionOfObjectsCorrectly() throws Exception { Product product = new Product(); Collection reference = Collections.singletonList(product); @@ -82,7 +80,7 @@ public class ResourceReaderRepositoryInitializerUnitTests { } @Test // DATACMNS-224 - public void emitsRepositoriesPopulatedEventIfPublisherConfigured() throws Exception { + void emitsRepositoriesPopulatedEventIfPublisherConfigured() throws Exception { RepositoryPopulator populator = setUpReferenceAndInititalize(new User(), publisher); diff --git a/src/test/java/org/springframework/data/repository/query/ExtensionAwareEvaluationContextProviderUnitTests.java b/src/test/java/org/springframework/data/repository/query/ExtensionAwareEvaluationContextProviderUnitTests.java index a47796711..1f87b454d 100755 --- a/src/test/java/org/springframework/data/repository/query/ExtensionAwareEvaluationContextProviderUnitTests.java +++ b/src/test/java/org/springframework/data/repository/query/ExtensionAwareEvaluationContextProviderUnitTests.java @@ -16,8 +16,7 @@ package org.springframework.data.repository.query; import static org.assertj.core.api.Assertions.*; -import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import lombok.RequiredArgsConstructor; @@ -32,9 +31,10 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -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.beans.factory.ListableBeanFactory; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; @@ -53,20 +53,20 @@ import org.springframework.expression.spel.standard.SpelExpressionParser; * @author Thomas Darimont * @author Jens Schauder */ -public class ExtensionAwareEvaluationContextProviderUnitTests { +class ExtensionAwareEvaluationContextProviderUnitTests { Method method; QueryMethodEvaluationContextProvider provider; - @Before - public void setUp() throws Exception { + @BeforeEach + void setUp() throws Exception { this.method = SampleRepo.class.getMethod("findByFirstname", String.class); this.provider = new ExtensionAwareQueryMethodEvaluationContextProvider(Collections.emptyList()); } @Test // DATACMNS-533 - public void usesPropertyDefinedByExtension() { + void usesPropertyDefinedByExtension() { this.provider = new ExtensionAwareQueryMethodEvaluationContextProvider( Collections.singletonList(new DummyExtension("_first", "first"))); @@ -75,7 +75,7 @@ public class ExtensionAwareEvaluationContextProviderUnitTests { } @Test // DATACMNS-533 - public void secondExtensionOverridesFirstOne() { + void secondExtensionOverridesFirstOne() { List extensions = new ArrayList<>(); extensions.add(new DummyExtension("_first", "first")); @@ -87,7 +87,7 @@ public class ExtensionAwareEvaluationContextProviderUnitTests { } @Test // DATACMNS-533 - public void allowsDirectAccessToExtensionViaKey() { + void allowsDirectAccessToExtensionViaKey() { List extensions = new ArrayList<>(); extensions.add(new DummyExtension("_first", "first")); @@ -98,12 +98,12 @@ public class ExtensionAwareEvaluationContextProviderUnitTests { } @Test // DATACMNS-533 - public void exposesParametersAsVariables() { + void exposesParametersAsVariables() { assertThat(evaluateExpression("#firstname")).isEqualTo("parameterValue"); } @Test // DATACMNS-533 - public void exposesMethodDefinedByExtension() { + void exposesMethodDefinedByExtension() { this.provider = new ExtensionAwareQueryMethodEvaluationContextProvider( Collections.singletonList(new DummyExtension("_first", "first"))); @@ -115,7 +115,7 @@ public class ExtensionAwareEvaluationContextProviderUnitTests { } @Test // DATACMNS-533 - public void exposesPropertiesDefinedByExtension() { + void exposesPropertiesDefinedByExtension() { this.provider = new ExtensionAwareQueryMethodEvaluationContextProvider( Collections.singletonList(new DummyExtension("_first", "first"))); @@ -125,7 +125,7 @@ public class ExtensionAwareEvaluationContextProviderUnitTests { } @Test // DATACMNS-533 - public void exposesPageableParameter() throws Exception { + void exposesPageableParameter() throws Exception { this.method = SampleRepo.class.getMethod("findByFirstname", String.class, Pageable.class); PageRequest pageable = PageRequest.of(2, 3, Sort.by(Direction.DESC, "lastname")); @@ -137,7 +137,7 @@ public class ExtensionAwareEvaluationContextProviderUnitTests { } @Test // DATACMNS-533 - public void exposesSortParameter() throws Exception { + void exposesSortParameter() throws Exception { this.method = SampleRepo.class.getMethod("findByFirstname", String.class, Sort.class); Sort sort = Sort.by(Direction.DESC, "lastname"); @@ -146,7 +146,7 @@ public class ExtensionAwareEvaluationContextProviderUnitTests { } @Test // DATACMNS-533 - public void exposesSpecialParameterEvenIfItsNull() throws Exception { + void exposesSpecialParameterEvenIfItsNull() throws Exception { this.method = SampleRepo.class.getMethod("findByFirstname", String.class, Sort.class); @@ -154,7 +154,7 @@ public class ExtensionAwareEvaluationContextProviderUnitTests { } @Test // DATACMNS-533 - public void shouldBeAbleToAccessCustomRootObjectPropertiesAndFunctions() { + void shouldBeAbleToAccessCustomRootObjectPropertiesAndFunctions() { this.provider = new ExtensionAwareQueryMethodEvaluationContextProvider(Collections.singletonList( // new DummyExtension("_first", "first") { @@ -176,7 +176,7 @@ public class ExtensionAwareEvaluationContextProviderUnitTests { } @Test // DATACMNS-533 - public void shouldBeAbleToAccessCustomRootObjectPropertiesAndFunctionsInMultipleExtensions() { + void shouldBeAbleToAccessCustomRootObjectPropertiesAndFunctionsInMultipleExtensions() { this.provider = new ExtensionAwareQueryMethodEvaluationContextProvider(Arrays.asList( // new DummyExtension("_first", "first") { @@ -202,7 +202,7 @@ public class ExtensionAwareEvaluationContextProviderUnitTests { } @Test // DATACMNS-533 - public void shouldBeAbleToAccessCustomRootObjectPropertiesAndFunctionsFromDynamicTargetSource() { + void shouldBeAbleToAccessCustomRootObjectPropertiesAndFunctionsFromDynamicTargetSource() { final AtomicInteger counter = new AtomicInteger(); @@ -227,7 +227,7 @@ public class ExtensionAwareEvaluationContextProviderUnitTests { } @Test // DATACMNS-1026 - public void overloadedMethodsGetResolved() throws Exception { + void overloadedMethodsGetResolved() throws Exception { provider = createContextProviderWithOverloads(); @@ -243,7 +243,7 @@ public class ExtensionAwareEvaluationContextProviderUnitTests { } @Test // DATACMNS-1026 - public void methodFromRootObjectOverwritesMethodFromExtension() throws Exception { + void methodFromRootObjectOverwritesMethodFromExtension() throws Exception { provider = createContextProviderWithOverloads(); @@ -251,7 +251,7 @@ public class ExtensionAwareEvaluationContextProviderUnitTests { } @Test // DATACMNS-1026 - public void aliasedMethodOverwritesMethodFromRootObject() throws Exception { + void aliasedMethodOverwritesMethodFromRootObject() throws Exception { provider = createContextProviderWithOverloads(); @@ -259,7 +259,7 @@ public class ExtensionAwareEvaluationContextProviderUnitTests { } @Test // DATACMNS-1026 - public void exactMatchIsPreferred() throws Exception { + void exactMatchIsPreferred() throws Exception { provider = createContextProviderWithOverloads(); @@ -267,7 +267,7 @@ public class ExtensionAwareEvaluationContextProviderUnitTests { } @Test // DATACMNS-1026 - public void throwsExceptionWhenStillAmbiguous() throws Exception { + void throwsExceptionWhenStillAmbiguous() throws Exception { provider = createContextProviderWithOverloads(); @@ -278,7 +278,7 @@ public class ExtensionAwareEvaluationContextProviderUnitTests { } @Test // DATACMNS-1518 - public void invokesMethodWithVarArgs() { + void invokesMethodWithVarArgs() { provider = createContextProviderWithOverloads(); @@ -286,7 +286,7 @@ public class ExtensionAwareEvaluationContextProviderUnitTests { } @Test // DATACMNS-1534 - public void contextProviderShouldLazilyLookUpExtensions() { + void contextProviderShouldLazilyLookUpExtensions() { ListableBeanFactory beanFactory = Mockito.mock(ListableBeanFactory.class); @@ -300,7 +300,7 @@ public class ExtensionAwareEvaluationContextProviderUnitTests { } @Test // DATACMNS-1534 - public void contextProviderShouldLookupExtensionsOnlyOnce() { + void contextProviderShouldLookupExtensionsOnlyOnce() { ListableBeanFactory beanFactory = Mockito.mock(ListableBeanFactory.class); diff --git a/src/test/java/org/springframework/data/repository/query/ParameterUnitTests.java b/src/test/java/org/springframework/data/repository/query/ParameterUnitTests.java index 028f94458..1bdced7ee 100644 --- a/src/test/java/org/springframework/data/repository/query/ParameterUnitTests.java +++ b/src/test/java/org/springframework/data/repository/query/ParameterUnitTests.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.stream.Stream; import org.jetbrains.annotations.NotNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.core.MethodParameter; /** @@ -30,10 +30,10 @@ import org.springframework.core.MethodParameter; * * @author Jens Schauder */ -public class ParameterUnitTests { +class ParameterUnitTests { @Test // DATAJPA-1185 - public void classParameterWithSameTypeParameterAsReturnedListIsDynamicProjectionParameter() throws Exception { + void classParameterWithSameTypeParameterAsReturnedListIsDynamicProjectionParameter() throws Exception { Parameter parameter = new Parameter(getMethodParameter("dynamicProjectionWithList")); @@ -41,7 +41,7 @@ public class ParameterUnitTests { } @Test // DATAJPA-1185 - public void classParameterWithSameTypeParameterAsReturnedStreamIsDynamicProjectionParameter() throws Exception { + void classParameterWithSameTypeParameterAsReturnedStreamIsDynamicProjectionParameter() throws Exception { Parameter parameter = new Parameter(getMethodParameter("dynamicProjectionWithStream")); diff --git a/src/test/java/org/springframework/data/repository/query/ParametersParameterAccessorUnitTests.java b/src/test/java/org/springframework/data/repository/query/ParametersParameterAccessorUnitTests.java index 920f48b69..3e00017d8 100755 --- a/src/test/java/org/springframework/data/repository/query/ParametersParameterAccessorUnitTests.java +++ b/src/test/java/org/springframework/data/repository/query/ParametersParameterAccessorUnitTests.java @@ -20,8 +20,8 @@ import static org.assertj.core.api.Assertions.*; import java.lang.reflect.Method; import java.util.Iterator; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; @@ -30,17 +30,17 @@ import org.springframework.data.domain.Pageable; * * @author Oliver Gierke */ -public class ParametersParameterAccessorUnitTests { +class ParametersParameterAccessorUnitTests { Parameters parameters; - @Before - public void setUp() throws Exception { + @BeforeEach + void setUp() throws Exception { parameters = new DefaultParameters(Sample.class.getMethod("method", String.class, int.class)); } @Test - public void accessorIteratorHasNext() throws SecurityException, NoSuchMethodException { + void accessorIteratorHasNext() throws SecurityException, NoSuchMethodException { ParameterAccessor accessor = new ParametersParameterAccessor(parameters, new Object[] { "Foo", 2 }); @@ -53,7 +53,7 @@ public class ParametersParameterAccessorUnitTests { } @Test - public void detectsNullValue() throws Exception { + void detectsNullValue() throws Exception { ParameterAccessor accessor = new ParametersParameterAccessor(parameters, new Object[] { null, 5 }); assertThat(accessor.hasBindableNullValue()).isTrue(); @@ -66,7 +66,7 @@ public class ParametersParameterAccessorUnitTests { } @Test // DATACMNS-804 - public void iteratesonlyOverBindableValues() throws Exception { + void iteratesonlyOverBindableValues() throws Exception { Method method = Sample.class.getMethod("method", Pageable.class, String.class); DefaultParameters parameters = new DefaultParameters(method); diff --git a/src/test/java/org/springframework/data/repository/query/ParametersUnitTests.java b/src/test/java/org/springframework/data/repository/query/ParametersUnitTests.java index 8657fa6bf..76af9fba4 100755 --- a/src/test/java/org/springframework/data/repository/query/ParametersUnitTests.java +++ b/src/test/java/org/springframework/data/repository/query/ParametersUnitTests.java @@ -23,8 +23,8 @@ import scala.collection.mutable.Publisher; import java.lang.reflect.Method; import java.util.Optional; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -37,18 +37,18 @@ import org.springframework.test.util.ReflectionTestUtils; * @author Oliver Gierke * @author Mark Paluch */ -public class ParametersUnitTests { +class ParametersUnitTests { private Method valid; - @Before - public void setUp() throws SecurityException, NoSuchMethodException { + @BeforeEach + void setUp() throws SecurityException, NoSuchMethodException { valid = SampleDao.class.getMethod("valid", String.class); } @Test - public void checksValidMethodCorrectly() throws Exception { + void checksValidMethodCorrectly() throws Exception { Method validWithPageable = SampleDao.class.getMethod("validWithPageable", String.class, Pageable.class); Method validWithSort = SampleDao.class.getMethod("validWithSort", String.class, Sort.class); @@ -59,7 +59,7 @@ public class ParametersUnitTests { } @Test - public void rejectsInvalidMethodWithParamMissing() throws Exception { + void rejectsInvalidMethodWithParamMissing() throws Exception { Method method = SampleDao.class.getMethod("invalidParamMissing", String.class, String.class); @@ -67,12 +67,12 @@ public class ParametersUnitTests { } @Test - public void rejectsNullMethod() { + void rejectsNullMethod() { assertThatIllegalArgumentException().isThrownBy(() -> new DefaultParameters(null)); } @Test - public void detectsNamedParameterCorrectly() throws Exception { + void detectsNamedParameterCorrectly() throws Exception { Parameters parameters = getParametersFor("validWithSort", String.class, Sort.class); @@ -88,7 +88,7 @@ public class ParametersUnitTests { } @Test - public void calculatesPlaceholderPositionCorrectly() throws Exception { + void calculatesPlaceholderPositionCorrectly() throws Exception { Method method = SampleDao.class.getMethod("validWithSortFirst", Sort.class, String.class); @@ -104,31 +104,31 @@ public class ParametersUnitTests { } @Test - public void detectsEmptyParameterListCorrectly() throws Exception { + void detectsEmptyParameterListCorrectly() throws Exception { Parameters parameters = getParametersFor("emptyParameters"); assertThat(parameters.hasParameterAt(0)).isFalse(); } @Test - public void detectsPageableParameter() throws Exception { + void detectsPageableParameter() throws Exception { Parameters parameters = getParametersFor("validWithPageable", String.class, Pageable.class); assertThat(parameters.getPageableIndex()).isEqualTo(1); } @Test - public void detectsSortParameter() throws Exception { + void detectsSortParameter() throws Exception { Parameters parameters = getParametersFor("validWithSort", String.class, Sort.class); assertThat(parameters.getSortIndex()).isEqualTo(1); } @Test // DATACMNS-520 - public void doesNotRejectParameterIfPageableComesFirst() throws Exception { + void doesNotRejectParameterIfPageableComesFirst() throws Exception { getParametersFor("validWithPageableFirst", Pageable.class, String.class); } @Test // DATACMNS-731 - public void detectsExplicitlyNamedParameter() throws Exception { + void detectsExplicitlyNamedParameter() throws Exception { Parameter parameter = getParametersFor("valid", String.class).getBindableParameter(0); @@ -137,7 +137,7 @@ public class ParametersUnitTests { } @Test // DATACMNS-731 - public void doesNotConsiderParameterExplicitlyNamedEvenIfNamePresent() throws Exception { + void doesNotConsiderParameterExplicitlyNamedEvenIfNamePresent() throws Exception { Parameter parameter = getParametersFor("validWithSortFirst", Sort.class, String.class).getBindableParameter(0); @@ -149,7 +149,7 @@ public class ParametersUnitTests { } @Test // DATACMNS-89 - public void detectsDynamicProjectionParameter() throws Exception { + void detectsDynamicProjectionParameter() throws Exception { Parameters parameters = getParametersFor("dynamicBind", Class.class, Class.class, Class.class); @@ -159,7 +159,7 @@ public class ParametersUnitTests { } @Test // DATACMNS-863 - public void unwrapsOptionals() throws Exception { + void unwrapsOptionals() throws Exception { Parameters parameters = getParametersFor("methodWithOptional", Optional.class); @@ -167,7 +167,7 @@ public class ParametersUnitTests { } @Test // DATACMNS-836 - public void keepsReactiveStreamsWrapper() throws Exception { + void keepsReactiveStreamsWrapper() throws Exception { Parameters parameters = getParametersFor("methodWithPublisher", Publisher.class); @@ -175,7 +175,7 @@ public class ParametersUnitTests { } @Test // DATACMNS-836 - public void keepsRxJavaWrapper() throws Exception { + void keepsRxJavaWrapper() throws Exception { Parameters parameters = getParametersFor("methodWithSingle", Single.class); @@ -183,7 +183,7 @@ public class ParametersUnitTests { } @Test // DATACMNS-1383 - public void acceptsCustomPageableParameter() throws Exception { + void acceptsCustomPageableParameter() throws Exception { Parameters parameters = getParametersFor("customPageable", SomePageable.class); diff --git a/src/test/java/org/springframework/data/repository/query/QueryMethodUnitTests.java b/src/test/java/org/springframework/data/repository/query/QueryMethodUnitTests.java index e0c2347a3..94d1d78b2 100755 --- a/src/test/java/org/springframework/data/repository/query/QueryMethodUnitTests.java +++ b/src/test/java/org/springframework/data/repository/query/QueryMethodUnitTests.java @@ -27,7 +27,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.Future; import java.util.stream.Stream; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -46,13 +46,13 @@ import org.springframework.data.repository.core.support.DefaultRepositoryMetadat * @author Thomas Darimont * @author Maciek Opała */ -public class QueryMethodUnitTests { +class QueryMethodUnitTests { RepositoryMetadata metadata = new DefaultRepositoryMetadata(SampleRepository.class); ProjectionFactory factory = new SpelAwareProxyProjectionFactory(); @Test // DATAJPA-59 - public void rejectsPagingMethodWithInvalidReturnType() throws Exception { + void rejectsPagingMethodWithInvalidReturnType() throws Exception { Method method = SampleRepository.class.getMethod("pagingMethodWithInvalidReturnType", Pageable.class); @@ -60,27 +60,27 @@ public class QueryMethodUnitTests { } @Test // DATAJPA-59 - public void rejectsPagingMethodWithoutPageable() throws Exception { + void rejectsPagingMethodWithoutPageable() throws Exception { Method method = SampleRepository.class.getMethod("pagingMethodWithoutPageable"); assertThatIllegalArgumentException().isThrownBy(() -> new QueryMethod(method, metadata, factory)); } @Test // DATACMNS-64 - public void setsUpSimpleQueryMethodCorrectly() throws Exception { + void setsUpSimpleQueryMethodCorrectly() throws Exception { Method method = SampleRepository.class.getMethod("findByUsername", String.class); new QueryMethod(method, metadata, factory); } @Test // DATACMNS-61 - public void considersIterableMethodForCollectionQuery() throws Exception { + void considersIterableMethodForCollectionQuery() throws Exception { Method method = SampleRepository.class.getMethod("sampleMethod"); QueryMethod queryMethod = new QueryMethod(method, metadata, factory); assertThat(queryMethod.isCollectionQuery()).isTrue(); } @Test // DATACMNS-67 - public void doesNotConsiderPageMethodCollectionQuery() throws Exception { + void doesNotConsiderPageMethodCollectionQuery() throws Exception { Method method = SampleRepository.class.getMethod("anotherSampleMethod", Pageable.class); QueryMethod queryMethod = new QueryMethod(method, metadata, factory); assertThat(queryMethod.isPageQuery()).isTrue(); @@ -88,7 +88,7 @@ public class QueryMethodUnitTests { } @Test // DATACMNS-171 - public void detectsAnEntityBeingReturned() throws Exception { + void detectsAnEntityBeingReturned() throws Exception { Method method = SampleRepository.class.getMethod("returnsEntitySubclass"); QueryMethod queryMethod = new QueryMethod(method, metadata, factory); @@ -97,7 +97,7 @@ public class QueryMethodUnitTests { } @Test // DATACMNS-171 - public void detectsNonEntityBeingReturned() throws Exception { + void detectsNonEntityBeingReturned() throws Exception { Method method = SampleRepository.class.getMethod("returnsProjection"); QueryMethod queryMethod = new QueryMethod(method, metadata, factory); @@ -106,7 +106,7 @@ public class QueryMethodUnitTests { } @Test // DATACMNS-397 - public void detectsSliceMethod() throws Exception { + void detectsSliceMethod() throws Exception { RepositoryMetadata repositoryMetadata = new DefaultRepositoryMetadata(SampleRepository.class); Method method = SampleRepository.class.getMethod("sliceOfUsers"); @@ -118,7 +118,7 @@ public class QueryMethodUnitTests { } @Test // DATACMNS-471 - public void detectsCollectionMethodForArrayRetrunType() throws Exception { + void detectsCollectionMethodForArrayRetrunType() throws Exception { RepositoryMetadata repositoryMetadata = new DefaultRepositoryMetadata(SampleRepository.class); Method method = SampleRepository.class.getMethod("arrayOfUsers"); @@ -127,7 +127,7 @@ public class QueryMethodUnitTests { } @Test // DATACMNS-650 - public void considersMethodReturningAStreamStreaming() throws Exception { + void considersMethodReturningAStreamStreaming() throws Exception { RepositoryMetadata repositoryMetadata = new DefaultRepositoryMetadata(SampleRepository.class); Method method = SampleRepository.class.getMethod("streaming"); @@ -136,7 +136,7 @@ public class QueryMethodUnitTests { } @Test // DATACMNS-650 - public void doesNotRejectStreamingForPagination() throws Exception { + void doesNotRejectStreamingForPagination() throws Exception { RepositoryMetadata repositoryMetadata = new DefaultRepositoryMetadata(SampleRepository.class); Method method = SampleRepository.class.getMethod("streaming", Pageable.class); @@ -145,7 +145,7 @@ public class QueryMethodUnitTests { } @Test // DATACMNS-716 - public void doesNotRejectCompletableFutureQueryForSingleEntity() throws Exception { + void doesNotRejectCompletableFutureQueryForSingleEntity() throws Exception { RepositoryMetadata repositoryMetadata = new DefaultRepositoryMetadata(SampleRepository.class); Method method = SampleRepository.class.getMethod("returnsCompletableFutureForSingleEntity"); @@ -154,7 +154,7 @@ public class QueryMethodUnitTests { } @Test // DATACMNS-716 - public void doesNotRejectCompletableFutureQueryForEntityCollection() throws Exception { + void doesNotRejectCompletableFutureQueryForEntityCollection() throws Exception { RepositoryMetadata repositoryMetadata = new DefaultRepositoryMetadata(SampleRepository.class); Method method = SampleRepository.class.getMethod("returnsCompletableFutureForEntityCollection"); @@ -163,7 +163,7 @@ public class QueryMethodUnitTests { } @Test // DATACMNS-716 - public void doesNotRejectFutureQueryForSingleEntity() throws Exception { + void doesNotRejectFutureQueryForSingleEntity() throws Exception { RepositoryMetadata repositoryMetadata = new DefaultRepositoryMetadata(SampleRepository.class); Method method = SampleRepository.class.getMethod("returnsFutureForSingleEntity"); @@ -172,7 +172,7 @@ public class QueryMethodUnitTests { } @Test // DATACMNS-716 - public void doesNotRejectFutureQueryForEntityCollection() throws Exception { + void doesNotRejectFutureQueryForEntityCollection() throws Exception { RepositoryMetadata repositoryMetadata = new DefaultRepositoryMetadata(SampleRepository.class); Method method = SampleRepository.class.getMethod("returnsFutureForEntityCollection"); @@ -184,7 +184,7 @@ public class QueryMethodUnitTests { * @see DATACMNS-940 */ @Test - public void detectsCustomCollectionReturnType() throws Exception { + void detectsCustomCollectionReturnType() throws Exception { RepositoryMetadata repositoryMetadata = new DefaultRepositoryMetadata(SampleRepository.class); Method method = SampleRepository.class.getMethod("returnsSeq"); @@ -196,7 +196,7 @@ public class QueryMethodUnitTests { * @see DATACMNS-940 */ @Test - public void detectsWrapperWithinWrapper() throws Exception { + void detectsWrapperWithinWrapper() throws Exception { RepositoryMetadata repositoryMetadata = new DefaultRepositoryMetadata(SampleRepository.class); Method method = SampleRepository.class.getMethod("returnsFutureOfSeq"); @@ -208,7 +208,7 @@ public class QueryMethodUnitTests { * @see DATACMNS-940 */ @Test - public void detectsSinglValueWrapperWithinWrapper() throws Exception { + void detectsSinglValueWrapperWithinWrapper() throws Exception { RepositoryMetadata repositoryMetadata = new DefaultRepositoryMetadata(SampleRepository.class); Method method = SampleRepository.class.getMethod("returnsFutureOfOption"); @@ -217,7 +217,7 @@ public class QueryMethodUnitTests { } @Test // DATACMNS-1005 - public void doesNotRejectSeqForPagination() throws Exception { + void doesNotRejectSeqForPagination() throws Exception { RepositoryMetadata repositoryMetadata = new DefaultRepositoryMetadata(SampleRepository.class); Method method = SampleRepository.class.getMethod("returnsSeq", Pageable.class); @@ -226,7 +226,7 @@ public class QueryMethodUnitTests { } @Test // DATACMNS-1300 - public void doesNotConsiderMethodForIterableAggregateACollectionQuery() throws Exception { + void doesNotConsiderMethodForIterableAggregateACollectionQuery() throws Exception { RepositoryMetadata metadata = AbstractRepositoryMetadata.getMetadata(ContainerRepository.class); Method method = ContainerRepository.class.getMethod("someMethod"); diff --git a/src/test/java/org/springframework/data/repository/query/QuotationMapUnitTests.java b/src/test/java/org/springframework/data/repository/query/QuotationMapUnitTests.java index 58ecc401d..c9323871c 100644 --- a/src/test/java/org/springframework/data/repository/query/QuotationMapUnitTests.java +++ b/src/test/java/org/springframework/data/repository/query/QuotationMapUnitTests.java @@ -18,7 +18,7 @@ package org.springframework.data.repository.query; import static 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.repository.query.SpelQueryContext.QuotationMap; /** @@ -26,22 +26,22 @@ import org.springframework.data.repository.query.SpelQueryContext.QuotationMap; * * @author Jens Schauder */ -public class QuotationMapUnitTests { +class QuotationMapUnitTests { SoftAssertions softly = new SoftAssertions(); @Test // DATAJPA-1235 - public void emptyStringDoesNotContainQuotes() { + void emptyStringDoesNotContainQuotes() { isNotQuoted("", "empty String", -1, 0, 1); } @Test // DATAJPA-1235 - public void nullStringDoesNotContainQuotes() { + void nullStringDoesNotContainQuotes() { isNotQuoted(null, "null String", -1, 0, 1); } @Test // DATAJPA-1235 - public void simpleStringDoesNotContainQuotes() { + void simpleStringDoesNotContainQuotes() { String query = "something"; @@ -49,7 +49,7 @@ public class QuotationMapUnitTests { } @Test // DATAJPA-1235 - public void fullySingleQuotedStringDoesContainQuotes() { + void fullySingleQuotedStringDoesContainQuotes() { String query = "'something'"; @@ -58,7 +58,7 @@ public class QuotationMapUnitTests { } @Test // DATAJPA-1235 - public void fullyDoubleQuotedStringDoesContainQuotes() { + void fullyDoubleQuotedStringDoesContainQuotes() { String query = "\"something\""; @@ -67,7 +67,7 @@ public class QuotationMapUnitTests { } @Test // DATAJPA-1235 - public void stringWithEmptyQuotes() { + void stringWithEmptyQuotes() { String query = "abc''def"; @@ -76,7 +76,7 @@ public class QuotationMapUnitTests { } @Test // DATAJPA-1235 - public void doubleInSingleQuotes() { + void doubleInSingleQuotes() { String query = "abc'\"'def"; @@ -85,7 +85,7 @@ public class QuotationMapUnitTests { } @Test // DATAJPA-1235 - public void singleQuotesInDoubleQuotes() { + void singleQuotesInDoubleQuotes() { String query = "abc\"'\"def"; @@ -94,7 +94,7 @@ public class QuotationMapUnitTests { } @Test // DATAJPA-1235 - public void escapedQuotes() { + void escapedQuotes() { String query = "a'b''cd''e'f"; isNotQuoted(query, "escaped quote", -1, 0, 11, 12); @@ -102,7 +102,7 @@ public class QuotationMapUnitTests { } @Test // DATAJPA-1235 - public void openEndedQuoteThrowsException() { + void openEndedQuoteThrowsException() { assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> new QuotationMap("a'b")); } diff --git a/src/test/java/org/springframework/data/repository/query/ResultProcessorUnitTests.java b/src/test/java/org/springframework/data/repository/query/ResultProcessorUnitTests.java index efa1a2d7d..c234cfead 100755 --- a/src/test/java/org/springframework/data/repository/query/ResultProcessorUnitTests.java +++ b/src/test/java/org/springframework/data/repository/query/ResultProcessorUnitTests.java @@ -29,11 +29,11 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.Optional; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.junit.Test; +import org.junit.jupiter.api.Test; + import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; @@ -51,10 +51,10 @@ import org.springframework.data.repository.core.support.DefaultRepositoryMetadat * @author Mark Paluch * @author Christoph Strobl */ -public class ResultProcessorUnitTests { +class ResultProcessorUnitTests { @Test // DATACMNS-89 - public void leavesNonProjectingResultUntouched() throws Exception { + void leavesNonProjectingResultUntouched() throws Exception { ResultProcessor information = new ResultProcessor(getQueryMethod("findAll"), new SpelAwareProxyProjectionFactory()); @@ -66,7 +66,7 @@ public class ResultProcessorUnitTests { } @Test // DATACMNS-89 - public void createsProjectionFromProperties() throws Exception { + void createsProjectionFromProperties() throws Exception { ResultProcessor information = getProcessor("findOneProjection"); @@ -76,7 +76,7 @@ public class ResultProcessorUnitTests { } @Test // DATACMNS-89 - public void createsListOfProjectionsFormNestedLists() throws Exception { + void createsListOfProjectionsFormNestedLists() throws Exception { ResultProcessor information = getProcessor("findAllProjection"); @@ -90,7 +90,7 @@ public class ResultProcessorUnitTests { @Test // DATACMNS-89 @SuppressWarnings("unchecked") - public void createsListOfProjectionsFromMaps() throws Exception { + void createsListOfProjectionsFromMaps() throws Exception { ResultProcessor information = getProcessor("findAllProjection"); @@ -104,7 +104,7 @@ public class ResultProcessorUnitTests { } @Test // DATACMNS-89 - public void createsListOfProjectionsFromEntity() throws Exception { + void createsListOfProjectionsFromEntity() throws Exception { ResultProcessor information = getProcessor("findAllProjection"); @@ -116,7 +116,7 @@ public class ResultProcessorUnitTests { } @Test // DATACMNS-89 - public void createsPageOfProjectionsFromEntity() throws Exception { + void createsPageOfProjectionsFromEntity() throws Exception { ResultProcessor information = getProcessor("findPageProjection", Pageable.class); @@ -128,7 +128,7 @@ public class ResultProcessorUnitTests { } @Test // DATACMNS-89 - public void createsDynamicProjectionFromEntity() throws Exception { + void createsDynamicProjectionFromEntity() throws Exception { ResultProcessor information = getProcessor("findOneOpenProjection"); @@ -139,7 +139,7 @@ public class ResultProcessorUnitTests { } @Test // DATACMNS-89 - public void findsDynamicProjection() throws Exception { + void findsDynamicProjection() throws Exception { ParameterAccessor accessor = mock(ParameterAccessor.class); @@ -153,7 +153,7 @@ public class ResultProcessorUnitTests { } @Test // DATACMNS-89 - public void refrainsFromProjectingIfThePreparingConverterReturnsACompatibleInstance() throws Exception { + void refrainsFromProjectingIfThePreparingConverterReturnsACompatibleInstance() throws Exception { Object result = getProcessor("findAllDtos").processResult(new Sample("Dave", "Matthews"), source -> new SampleDto()); @@ -162,13 +162,13 @@ public class ResultProcessorUnitTests { } @Test // DATACMNS-828 - public void returnsNullResultAsIs() throws Exception { + void returnsNullResultAsIs() throws Exception { Object result = getProcessor("findOneDto").processResult(null); assertThat(result).isNull(); } @Test // DATACMNS-842 - public void supportsSlicesAsReturnWrapper() throws Exception { + void supportsSlicesAsReturnWrapper() throws Exception { Slice slice = new SliceImpl<>(Collections.singletonList(new Sample("Dave", "Matthews"))); @@ -183,7 +183,7 @@ public class ResultProcessorUnitTests { @Test // DATACMNS-859 @SuppressWarnings("unchecked") - public void supportsStreamAsReturnWrapper() throws Exception { + void supportsStreamAsReturnWrapper() throws Exception { Stream samples = Collections.singletonList(new Sample("Dave", "Matthews")).stream(); @@ -196,7 +196,7 @@ public class ResultProcessorUnitTests { } @Test // DATACMNS-860 - public void supportsWrappingDto() throws Exception { + void supportsWrappingDto() throws Exception { Object result = getProcessor("findOneWrappingDto").processResult(new Sample("Dave", "Matthews")); @@ -204,7 +204,7 @@ public class ResultProcessorUnitTests { } @Test // DATACMNS-921 - public void fallsBackToApproximateCollectionIfNecessary() throws Exception { + void fallsBackToApproximateCollectionIfNecessary() throws Exception { ResultProcessor processor = getProcessor("findAllProjection"); @@ -216,7 +216,7 @@ public class ResultProcessorUnitTests { @Test // DATACMNS-836 @SuppressWarnings("unchecked") - public void supportsMonoWrapper() throws Exception { + void supportsMonoWrapper() throws Exception { Mono samples = Mono.just(new Sample("Dave", "Matthews")); @@ -231,7 +231,7 @@ public class ResultProcessorUnitTests { @Test // DATACMNS-836 @SuppressWarnings("unchecked") - public void supportsSingleWrapper() throws Exception { + void supportsSingleWrapper() throws Exception { Single samples = Single.just(new Sample("Dave", "Matthews")); @@ -246,7 +246,7 @@ public class ResultProcessorUnitTests { @Test // DATACMNS-836 @SuppressWarnings("unchecked") - public void refrainsFromProjectingUsingReactiveWrappersIfThePreparingConverterReturnsACompatibleInstance() + void refrainsFromProjectingUsingReactiveWrappersIfThePreparingConverterReturnsACompatibleInstance() throws Exception { ResultProcessor processor = getProcessor("findMonoSampleDto"); @@ -262,7 +262,7 @@ public class ResultProcessorUnitTests { @Test // DATACMNS-836 @SuppressWarnings("unchecked") - public void supportsFluxProjections() throws Exception { + void supportsFluxProjections() throws Exception { Flux samples = Flux.just(new Sample("Dave", "Matthews")); @@ -278,7 +278,7 @@ public class ResultProcessorUnitTests { @Test // DATACMNS-836 @SuppressWarnings("unchecked") - public void supportsObservableProjections() throws Exception { + void supportsObservableProjections() throws Exception { Observable samples = Observable.just(new Sample("Dave", "Matthews")); @@ -294,7 +294,7 @@ public class ResultProcessorUnitTests { @Test // DATACMNS-988 @SuppressWarnings("unchecked") - public void supportsFlowableProjections() throws Exception { + void supportsFlowableProjections() throws Exception { Flowable samples = Flowable.just(new Sample("Dave", "Matthews")); diff --git a/src/test/java/org/springframework/data/repository/query/ReturnedTypeUnitTests.java b/src/test/java/org/springframework/data/repository/query/ReturnedTypeUnitTests.java index 5e7bbbbb0..c2b53b2ae 100755 --- a/src/test/java/org/springframework/data/repository/query/ReturnedTypeUnitTests.java +++ b/src/test/java/org/springframework/data/repository/query/ReturnedTypeUnitTests.java @@ -22,7 +22,7 @@ import java.math.BigInteger; import java.time.LocalDateTime; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -36,10 +36,10 @@ import org.springframework.data.repository.core.support.DefaultRepositoryMetadat * @author Oliver Gierke * @author Mark Paluch */ -public class ReturnedTypeUnitTests { +class ReturnedTypeUnitTests { @Test // DATACMNS-89 - public void treatsSimpleDomainTypeAsIs() throws Exception { + void treatsSimpleDomainTypeAsIs() throws Exception { ReturnedType type = getReturnedType("findAll"); @@ -50,7 +50,7 @@ public class ReturnedTypeUnitTests { } @Test // DATACMNS-89 - public void detectsDto() throws Exception { + void detectsDto() throws Exception { ReturnedType type = getReturnedType("findAllDtos"); @@ -62,7 +62,7 @@ public class ReturnedTypeUnitTests { } @Test // DATACMNS-89 - public void detectsProjection() throws Exception { + void detectsProjection() throws Exception { ReturnedType type = getReturnedType("findAllProjection"); @@ -71,7 +71,7 @@ public class ReturnedTypeUnitTests { } @Test // DATACMNS-89 - public void detectsVoidMethod() throws Exception { + void detectsVoidMethod() throws Exception { ReturnedType type = getReturnedType("voidMethod"); @@ -80,7 +80,7 @@ public class ReturnedTypeUnitTests { } @Test // DATACMNS-89 - public void detectsClosedProjection() throws Exception { + void detectsClosedProjection() throws Exception { ReturnedType type = getReturnedType("findOneProjection"); @@ -90,7 +90,7 @@ public class ReturnedTypeUnitTests { } @Test // DATACMNS-89 - public void detectsOpenProjection() throws Exception { + void detectsOpenProjection() throws Exception { ReturnedType type = getReturnedType("findOneOpenProjection"); @@ -101,7 +101,7 @@ public class ReturnedTypeUnitTests { } @Test // DATACMNS-89 - public void detectsComplexNumberTypes() throws Exception { + void detectsComplexNumberTypes() throws Exception { ReturnedType type = getReturnedType("countQuery"); @@ -111,7 +111,7 @@ public class ReturnedTypeUnitTests { } @Test // DATACMNS-840 - public void detectsSampleDtoWithDefaultConstructor() throws Exception { + void detectsSampleDtoWithDefaultConstructor() throws Exception { ReturnedType type = getReturnedType("dtoWithMultipleConstructors"); @@ -120,7 +120,7 @@ public class ReturnedTypeUnitTests { } @Test // DATACMNS-840 - public void doesNotConsiderAnEnumProjecting() throws Exception { + void doesNotConsiderAnEnumProjecting() throws Exception { ReturnedType type = getReturnedType("findEnum"); @@ -129,7 +129,7 @@ public class ReturnedTypeUnitTests { } @Test // DATACMNS-850 - public void considersAllJavaTypesAsNotProjecting() throws Exception { + void considersAllJavaTypesAsNotProjecting() throws Exception { ReturnedType type = getReturnedType("timeQuery"); @@ -138,7 +138,7 @@ public class ReturnedTypeUnitTests { } @Test // DATACMNS-862 - public void considersInterfaceImplementedByDomainTypeNotProjecting() throws Exception { + void considersInterfaceImplementedByDomainTypeNotProjecting() throws Exception { ReturnedType type = getReturnedType("findOneInterface"); @@ -147,7 +147,7 @@ public class ReturnedTypeUnitTests { } @Test // DATACMNS-963 - public void detectsDistinctInputProperties() { + void detectsDistinctInputProperties() { ReturnedType type = ReturnedType.of(Child.class, Object.class, new SpelAwareProxyProjectionFactory()); @@ -158,7 +158,7 @@ public class ReturnedTypeUnitTests { } @Test // DATACMNS-1112 - public void cachesInstancesBySourceTypes() { + void cachesInstancesBySourceTypes() { SpelAwareProxyProjectionFactory factory = new SpelAwareProxyProjectionFactory(); @@ -217,9 +217,9 @@ public class ReturnedTypeUnitTests { static interface SampleInterface {} static class Sample implements SampleInterface { - public String firstname, lastname; + String firstname, lastname; - public Sample(String firstname, String lastname) { + Sample(String firstname, String lastname) { this.firstname = firstname; this.lastname = lastname; } @@ -227,7 +227,7 @@ public class ReturnedTypeUnitTests { static class SampleDto { - public SampleDto(String firstname) { + SampleDto(String firstname) { } } diff --git a/src/test/java/org/springframework/data/repository/query/SimpleParameterAccessorUnitTests.java b/src/test/java/org/springframework/data/repository/query/SimpleParameterAccessorUnitTests.java index 4d4ecad43..4c5f427e7 100755 --- a/src/test/java/org/springframework/data/repository/query/SimpleParameterAccessorUnitTests.java +++ b/src/test/java/org/springframework/data/repository/query/SimpleParameterAccessorUnitTests.java @@ -17,8 +17,8 @@ package org.springframework.data.repository.query; import static org.assertj.core.api.Assertions.*; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; @@ -28,12 +28,12 @@ import org.springframework.data.domain.Sort; * * @author Oliver Gierke */ -public class SimpleParameterAccessorUnitTests { +class SimpleParameterAccessorUnitTests { Parameters parameters, sortParameters, pageableParameters; - @Before - public void setUp() throws SecurityException, NoSuchMethodException { + @BeforeEach + void setUp() throws SecurityException, NoSuchMethodException { parameters = new DefaultParameters(Sample.class.getMethod("sample", String.class)); sortParameters = new DefaultParameters(Sample.class.getMethod("sample1", String.class, Sort.class)); @@ -41,33 +41,33 @@ public class SimpleParameterAccessorUnitTests { } @Test - public void testname() throws Exception { + void testname() throws Exception { new ParametersParameterAccessor(parameters, new Object[] { "test" }); } @Test - public void rejectsNullParameters() { + void rejectsNullParameters() { assertThatIllegalArgumentException().isThrownBy(() -> new ParametersParameterAccessor(null, new Object[0])); } @Test - public void rejectsNullValues() { + void rejectsNullValues() { assertThatIllegalArgumentException().isThrownBy(() -> new ParametersParameterAccessor(parameters, null)); } @Test - public void rejectsTooLittleNumberOfArguments() { + void rejectsTooLittleNumberOfArguments() { assertThatIllegalArgumentException().isThrownBy(() -> new ParametersParameterAccessor(parameters, new Object[0])); } @Test - public void rejectsTooManyArguments() { + void rejectsTooManyArguments() { assertThatIllegalArgumentException() .isThrownBy(() -> new ParametersParameterAccessor(parameters, new Object[] { "test", "test" })); } @Test - public void returnsNullForPageableAndSortIfNoneAvailable() throws Exception { + void returnsNullForPageableAndSortIfNoneAvailable() throws Exception { ParameterAccessor accessor = new ParametersParameterAccessor(parameters, new Object[] { "test" }); @@ -76,7 +76,7 @@ public class SimpleParameterAccessorUnitTests { } @Test - public void returnsSortIfAvailable() { + void returnsSortIfAvailable() { Sort sort = Sort.by("foo"); ParameterAccessor accessor = new ParametersParameterAccessor(sortParameters, new Object[] { "test", sort }); @@ -86,7 +86,7 @@ public class SimpleParameterAccessorUnitTests { } @Test - public void returnsPageableIfAvailable() { + void returnsPageableIfAvailable() { Pageable pageable = PageRequest.of(0, 10); ParameterAccessor accessor = new ParametersParameterAccessor(pageableParameters, new Object[] { "test", pageable }); @@ -96,7 +96,7 @@ public class SimpleParameterAccessorUnitTests { } @Test - public void returnsSortFromPageableIfAvailable() throws Exception { + void returnsSortFromPageableIfAvailable() throws Exception { Sort sort = Sort.by("foo"); Pageable pageable = PageRequest.of(0, 10, sort); diff --git a/src/test/java/org/springframework/data/repository/query/SpelExtractorUnitTests.java b/src/test/java/org/springframework/data/repository/query/SpelExtractorUnitTests.java index e36891156..b8813b4c7 100644 --- a/src/test/java/org/springframework/data/repository/query/SpelExtractorUnitTests.java +++ b/src/test/java/org/springframework/data/repository/query/SpelExtractorUnitTests.java @@ -24,7 +24,7 @@ import java.util.function.BiFunction; import org.assertj.core.api.SoftAssertions; import org.assertj.core.groups.Tuple; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.repository.query.SpelQueryContext.SpelExtractor; /** @@ -33,7 +33,7 @@ import org.springframework.data.repository.query.SpelQueryContext.SpelExtractor; * @author Jens Schauder * @author Oliver Gierke */ -public class SpelExtractorUnitTests { +class SpelExtractorUnitTests { static final BiFunction PARAMETER_NAME_SOURCE = (index, spel) -> "EPP" + index; static final BiFunction REPLACEMENT_SOURCE = (prefix, name) -> prefix + name; @@ -41,7 +41,7 @@ public class SpelExtractorUnitTests { final SoftAssertions softly = new SoftAssertions(); @Test // DATACMNS-1258 - public void nullQueryThrowsException() { + void nullQueryThrowsException() { SpelQueryContext context = SpelQueryContext.of(PARAMETER_NAME_SOURCE, REPLACEMENT_SOURCE); @@ -49,7 +49,7 @@ public class SpelExtractorUnitTests { } @Test // DATACMNS-1258 - public void emptyStringGetsParsedCorrectly() { + void emptyStringGetsParsedCorrectly() { SpelQueryContext context = SpelQueryContext.of(PARAMETER_NAME_SOURCE, REPLACEMENT_SOURCE); SpelExtractor extractor = context.parse(""); @@ -61,7 +61,7 @@ public class SpelExtractorUnitTests { } @Test // DATACMNS-1258 - public void findsAndReplacesExpressions() { + void findsAndReplacesExpressions() { SpelQueryContext context = SpelQueryContext.of(PARAMETER_NAME_SOURCE, REPLACEMENT_SOURCE); SpelExtractor extractor = context.parse(":#{one} ?#{two}"); @@ -78,7 +78,7 @@ public class SpelExtractorUnitTests { } @Test // DATACMNS-1258 - public void keepsStringWhenNoMatchIsFound() { + void keepsStringWhenNoMatchIsFound() { SpelQueryContext context = SpelQueryContext.of(PARAMETER_NAME_SOURCE, REPLACEMENT_SOURCE); SpelExtractor extractor = context.parse("abcdef"); @@ -90,7 +90,7 @@ public class SpelExtractorUnitTests { } @Test // DATACMNS-1258 - public void spelsInQuotesGetIgnored() { + void spelsInQuotesGetIgnored() { List queries = Arrays.asList(// "a'b:#{one}cd'ef", // diff --git a/src/test/java/org/springframework/data/repository/query/SpelQueryContextUnitTests.java b/src/test/java/org/springframework/data/repository/query/SpelQueryContextUnitTests.java index 927ebf89a..45160eeee 100644 --- a/src/test/java/org/springframework/data/repository/query/SpelQueryContextUnitTests.java +++ b/src/test/java/org/springframework/data/repository/query/SpelQueryContextUnitTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*; import java.util.function.BiFunction; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Unit tests for {@link SpelQueryContext}. @@ -28,28 +28,28 @@ import org.junit.Test; * @author Jens Schauder * @author Mark Paluch */ -public class SpelQueryContextUnitTests { +class SpelQueryContextUnitTests { static final QueryMethodEvaluationContextProvider EVALUATION_CONTEXT_PROVIDER = QueryMethodEvaluationContextProvider.DEFAULT; static final BiFunction PARAMETER_NAME_SOURCE = (index, spel) -> "__$synthetic$__" + index; static final BiFunction REPLACEMENT_SOURCE = (prefix, name) -> prefix + name; @Test // DATACMNS-1258 - public void nullParameterNameSourceThrowsException() { + void nullParameterNameSourceThrowsException() { assertThatExceptionOfType(IllegalArgumentException.class) // .isThrownBy(() -> SpelQueryContext.of(null, REPLACEMENT_SOURCE)); } @Test // DATACMNS-1258 - public void nullReplacementSourceThrowsException() { + void nullReplacementSourceThrowsException() { assertThatExceptionOfType(IllegalArgumentException.class) // .isThrownBy(() -> SpelQueryContext.of(PARAMETER_NAME_SOURCE, null)); } @Test // DATACMNS-1258 - public void rejectsNullEvaluationContextProvider() { + void rejectsNullEvaluationContextProvider() { SpelQueryContext context = SpelQueryContext.of(PARAMETER_NAME_SOURCE, REPLACEMENT_SOURCE); @@ -58,7 +58,7 @@ public class SpelQueryContextUnitTests { } @Test // DATACMNS-1258 - public void createsEvaluatingContextUsingProvider() { + void createsEvaluatingContextUsingProvider() { SpelQueryContext context = SpelQueryContext.of(PARAMETER_NAME_SOURCE, REPLACEMENT_SOURCE); @@ -66,7 +66,7 @@ public class SpelQueryContextUnitTests { } @Test // DATACMNS-1683 - public void reportsQuotationCorrectly() { + void reportsQuotationCorrectly() { SpelQueryContext context = SpelQueryContext.of(PARAMETER_NAME_SOURCE, REPLACEMENT_SOURCE); diff --git a/src/test/java/org/springframework/data/repository/query/parser/OrderBySourceUnitTests.java b/src/test/java/org/springframework/data/repository/query/parser/OrderBySourceUnitTests.java index 8aa1c4e5b..e6030811d 100755 --- a/src/test/java/org/springframework/data/repository/query/parser/OrderBySourceUnitTests.java +++ b/src/test/java/org/springframework/data/repository/query/parser/OrderBySourceUnitTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*; import java.util.Optional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.domain.Sort; /** @@ -27,46 +27,46 @@ import org.springframework.data.domain.Sort; * * @author Oliver Gierke */ -public class OrderBySourceUnitTests { +class OrderBySourceUnitTests { @Test - public void handlesSingleDirectionAndPropertyCorrectly() { + void handlesSingleDirectionAndPropertyCorrectly() { assertThat(new OrderBySource("UsernameDesc").toSort()).isEqualTo(Sort.by("username").descending()); } @Test - public void handlesCamelCasePropertyCorrecty() { + void handlesCamelCasePropertyCorrecty() { assertThat(new OrderBySource("LastnameUsernameDesc").toSort()).isEqualTo(Sort.by("lastnameUsername").descending()); } @Test - public void handlesMultipleDirectionsCorrectly() { + void handlesMultipleDirectionsCorrectly() { OrderBySource orderBySource = new OrderBySource("LastnameAscUsernameDesc"); assertThat(orderBySource.toSort()).isEqualTo(Sort.by("lastname").ascending().and(Sort.by("username").descending())); } @Test - public void rejectsMissingProperty() { + void rejectsMissingProperty() { assertThatIllegalArgumentException().isThrownBy(() -> new OrderBySource("Desc")); } @Test - public void usesNestedPropertyCorrectly() throws Exception { + void usesNestedPropertyCorrectly() throws Exception { OrderBySource source = new OrderBySource("BarNameDesc", Optional.of(Foo.class)); assertThat(source.toSort()).isEqualTo(Sort.by("bar.name").descending()); } @Test // DATACMNS-641 - public void defaultsSortOrderToAscendingSort() { + void defaultsSortOrderToAscendingSort() { OrderBySource source = new OrderBySource("lastname"); assertThat(source.toSort()).isEqualTo(Sort.by("lastname")); } @Test - public void orderBySourceFromEmptyStringResultsInUnsorted() { + void orderBySourceFromEmptyStringResultsInUnsorted() { assertThat(new OrderBySource("").toSort()).isEqualTo(Sort.unsorted()); } diff --git a/src/test/java/org/springframework/data/repository/query/parser/PartTreeUnitTests.java b/src/test/java/org/springframework/data/repository/query/parser/PartTreeUnitTests.java index 4dd4208f6..6165d6217 100755 --- a/src/test/java/org/springframework/data/repository/query/parser/PartTreeUnitTests.java +++ b/src/test/java/org/springframework/data/repository/query/parser/PartTreeUnitTests.java @@ -27,7 +27,7 @@ import java.util.Date; import java.util.Iterator; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.domain.Sort; import org.springframework.data.mapping.PropertyPath; import org.springframework.data.mapping.PropertyReferenceException; @@ -48,59 +48,59 @@ import org.springframework.data.repository.query.parser.PartTree.OrPart; * @author Mariusz Mączkowski * @author Jens Schauder */ -public class PartTreeUnitTests { +class PartTreeUnitTests { private String[] PREFIXES = { "find", "read", "get", "query", "search", "stream", "count", "delete", "remove", "exists" }; @Test - public void rejectsNullSource() { + void rejectsNullSource() { assertThatIllegalArgumentException().isThrownBy(() -> new PartTree(null, getClass())); } @Test - public void rejectsNullDomainClass() { + void rejectsNullDomainClass() { assertThatIllegalArgumentException().isThrownBy(() -> new PartTree("test", null)); } @Test - public void rejectsMultipleOrderBy() { + void rejectsMultipleOrderBy() { assertThatIllegalArgumentException().isThrownBy(() -> partTree("firstnameOrderByLastnameOrderByFirstname")); } @Test - public void parsesSimplePropertyCorrectly() throws Exception { + void parsesSimplePropertyCorrectly() throws Exception { PartTree partTree = partTree("firstname"); assertPart(partTree, parts("firstname")); } @Test - public void parsesAndPropertiesCorrectly() throws Exception { + void parsesAndPropertiesCorrectly() throws Exception { PartTree partTree = partTree("firstnameAndLastname"); assertPart(partTree, parts("firstname", "lastname")); assertThat(partTree.getSort().isSorted()).isFalse(); } @Test - public void parsesOrPropertiesCorrectly() throws Exception { + void parsesOrPropertiesCorrectly() throws Exception { PartTree partTree = partTree("firstnameOrLastname"); assertPart(partTree, parts("firstname"), parts("lastname")); assertThat(partTree.getSort().isSorted()).isFalse(); } @Test - public void parsesCombinedAndAndOrPropertiesCorrectly() throws Exception { + void parsesCombinedAndAndOrPropertiesCorrectly() throws Exception { PartTree tree = partTree("firstnameAndLastnameOrLastname"); assertPart(tree, parts("firstname", "lastname"), parts("lastname")); } @Test - public void hasSortIfOrderByIsGiven() throws Exception { + void hasSortIfOrderByIsGiven() throws Exception { assertThat(partTree("firstnameOrderByLastnameDesc").getSort()).isEqualTo(Sort.by("lastname").descending()); } @Test - public void hasSortIfOrderByIsGivenWithAllIgnoreCase() throws Exception { + void hasSortIfOrderByIsGivenWithAllIgnoreCase() throws Exception { hasSortIfOrderByIsGivenWithAllIgnoreCase("firstnameOrderByLastnameDescAllIgnoreCase"); hasSortIfOrderByIsGivenWithAllIgnoreCase("firstnameOrderByLastnameDescAllIgnoringCase"); hasSortIfOrderByIsGivenWithAllIgnoreCase("firstnameAllIgnoreCaseOrderByLastnameDesc"); @@ -112,7 +112,7 @@ public class PartTreeUnitTests { } @Test - public void detectsDistinctCorrectly() throws Exception { + void detectsDistinctCorrectly() throws Exception { for (String prefix : PREFIXES) { detectsDistinctCorrectly(prefix + "DistinctByLastname", true); detectsDistinctCorrectly(prefix + "UsersDistinctByLastname", true); @@ -133,7 +133,7 @@ public class PartTreeUnitTests { } @Test - public void parsesWithinCorrectly() { + void parsesWithinCorrectly() { PartTree tree = partTree("findByLocationWithin"); for (Part part : tree.getParts()) { assertThat(part.getType()).isEqualTo(Type.WITHIN); @@ -142,23 +142,23 @@ public class PartTreeUnitTests { } @Test - public void parsesNearCorrectly() { + void parsesNearCorrectly() { assertType(Collections.singletonList("locationNear"), NEAR, "location"); } @Test - public void supportToStringWithoutSortOrder() throws Exception { + void supportToStringWithoutSortOrder() throws Exception { assertType(Collections.singletonList("firstname"), SIMPLE_PROPERTY, "firstname"); } @Test - public void supportToStringWithSortOrder() throws Exception { + void supportToStringWithSortOrder() throws Exception { PartTree tree = partTree("firstnameOrderByLastnameDesc"); assertThat(tree.toString()).isEqualTo("firstname SIMPLE_PROPERTY (1): [Is, Equals] NEVER Order By lastname: DESC"); } @Test - public void detectsIgnoreAllCase() throws Exception { + void detectsIgnoreAllCase() throws Exception { detectsIgnoreAllCase("firstnameOrderByLastnameDescAllIgnoreCase", IgnoreCaseType.WHEN_POSSIBLE); detectsIgnoreAllCase("firstnameOrderByLastnameDescAllIgnoringCase", IgnoreCaseType.WHEN_POSSIBLE); detectsIgnoreAllCase("firstnameAllIgnoreCaseOrderByLastnameDesc", IgnoreCaseType.WHEN_POSSIBLE); @@ -175,7 +175,7 @@ public class PartTreeUnitTests { } @Test - public void detectsSpecificIgnoreCase() throws Exception { + void detectsSpecificIgnoreCase() throws Exception { PartTree tree = partTree("findByFirstnameIgnoreCaseAndLastname"); @@ -188,7 +188,7 @@ public class PartTreeUnitTests { } @Test - public void detectsSpecificIgnoringCase() throws Exception { + void detectsSpecificIgnoringCase() throws Exception { PartTree tree = partTree("findByFirstnameIgnoringCaseAndLastname"); assertPart(tree, parts("firstnameIgnoreCase", "lastname")); Iterator parts = tree.getParts().iterator(); @@ -197,24 +197,24 @@ public class PartTreeUnitTests { } @Test // DATACMNS-78 - public void parsesLessThanEqualCorrectly() { + void parsesLessThanEqualCorrectly() { assertType(Arrays.asList("lastnameLessThanEqual", "lastnameIsLessThanEqual"), LESS_THAN_EQUAL, "lastname"); } @Test // DATACMNS-78 - public void parsesGreaterThanEqualCorrectly() { + void parsesGreaterThanEqualCorrectly() { assertType(Arrays.asList("lastnameGreaterThanEqual", "lastnameIsGreaterThanEqual"), GREATER_THAN_EQUAL, "lastname"); } @Test - public void returnsAllParts() { + void returnsAllParts() { PartTree tree = partTree("findByLastnameAndFirstname"); assertPart(tree, parts("lastname", "firstname")); } @Test - public void returnsAllPartsOfType() { + void returnsAllPartsOfType() { PartTree tree = partTree("findByLastnameAndFirstnameGreaterThan"); @@ -226,63 +226,63 @@ public class PartTreeUnitTests { } @Test // DATACMNS-94 - public void parsesExistsKeywordCorrectly() { + void parsesExistsKeywordCorrectly() { assertType(Collections.singletonList("lastnameExists"), EXISTS, "lastname", 0, false); } @Test // DATACMNS-94 - public void parsesRegexKeywordCorrectly() { + void parsesRegexKeywordCorrectly() { assertType(asList("lastnameRegex", "lastnameMatchesRegex", "lastnameMatches"), REGEX, "lastname"); } @Test // DATACMNS-107 - public void parsesTrueKeywordCorrectly() { + void parsesTrueKeywordCorrectly() { assertType(asList("activeTrue", "activeIsTrue"), TRUE, "active", 0, false); } @Test // DATACMNS-107 - public void parsesFalseKeywordCorrectly() { + void parsesFalseKeywordCorrectly() { assertType(asList("activeFalse", "activeIsFalse"), FALSE, "active", 0, false); } @Test // DATACMNS-111 - public void parsesStartingWithKeywordCorrectly() { + void parsesStartingWithKeywordCorrectly() { assertType(asList("firstnameStartsWith", "firstnameStartingWith", "firstnameIsStartingWith"), STARTING_WITH, "firstname"); } @Test // DATACMNS-111 - public void parsesEndingWithKeywordCorrectly() { + void parsesEndingWithKeywordCorrectly() { assertType(asList("firstnameEndsWith", "firstnameEndingWith", "firstnameIsEndingWith"), ENDING_WITH, "firstname"); } @Test // DATACMNS-111 - public void parsesContainingKeywordCorrectly() { + void parsesContainingKeywordCorrectly() { assertType(asList("firstnameIsContaining", "firstnameContains", "firstnameContaining"), CONTAINING, "firstname"); } @Test // DATACMNS-141 - public void parsesAfterKeywordCorrectly() { + void parsesAfterKeywordCorrectly() { assertType(asList("birthdayAfter", "birthdayIsAfter"), Type.AFTER, "birthday"); } @Test // DATACMNS-141 - public void parsesBeforeKeywordCorrectly() { + void parsesBeforeKeywordCorrectly() { assertType(Arrays.asList("birthdayBefore", "birthdayIsBefore"), Type.BEFORE, "birthday"); } @Test // DATACMNS-433 - public void parsesLikeKeywordCorrectly() { + void parsesLikeKeywordCorrectly() { assertType(asList("activeLike", "activeIsLike"), LIKE, "active"); } @Test // DATACMNS-433 - public void parsesNotLikeKeywordCorrectly() { + void parsesNotLikeKeywordCorrectly() { assertType(asList("activeNotLike", "activeIsNotLike"), NOT_LIKE, "active"); } @Test // DATACMNS-182 - public void parsesContainingCorrectly() { + void parsesContainingCorrectly() { PartTree tree = new PartTree("findAllByLegalNameContainingOrCommonNameContainingAllIgnoringCase", Organization.class); @@ -291,7 +291,7 @@ public class PartTreeUnitTests { } @Test // DATACMNS-221 - public void parsesSpecialCharactersCorrectly() { + void parsesSpecialCharactersCorrectly() { PartTree tree = new PartTree("findByØreAndÅrOrderByÅrAsc", DomainObjectWithSpecialChars.class); @@ -301,7 +301,7 @@ public class PartTreeUnitTests { } @Test // DATACMNS-363 - public void parsesSpecialCharactersOnlyCorrectly_Korean() { + void parsesSpecialCharactersOnlyCorrectly_Korean() { PartTree tree = new PartTree("findBy이름And생일OrderBy생일Asc", DomainObjectWithSpecialChars.class); @@ -311,7 +311,7 @@ public class PartTreeUnitTests { } @Test // DATACMNS-363 - public void parsesSpecialUnicodeCharactersMixedWithRegularCharactersCorrectly_Korean() { + void parsesSpecialUnicodeCharactersMixedWithRegularCharactersCorrectly_Korean() { PartTree tree = new PartTree("findBy이름AndOrderIdOrderBy생일Asc", DomainObjectWithSpecialChars.class); @@ -321,7 +321,7 @@ public class PartTreeUnitTests { } @Test // DATACMNS-363 - public void parsesNestedSpecialUnicodeCharactersMixedWithRegularCharactersCorrectly_Korean() { + void parsesNestedSpecialUnicodeCharactersMixedWithRegularCharactersCorrectly_Korean() { PartTree tree = new PartTree( // "findBy" + "이름" // @@ -345,7 +345,7 @@ public class PartTreeUnitTests { } @Test // DATACMNS-363 - public void parsesNestedSpecialUnicodeCharactersMixedWithRegularCharactersCorrectly_KoreanNumbersSymbols() { + void parsesNestedSpecialUnicodeCharactersMixedWithRegularCharactersCorrectly_KoreanNumbersSymbols() { PartTree tree = new PartTree( // "findBy" + "이름" // @@ -379,21 +379,21 @@ public class PartTreeUnitTests { } @Test // DATACMNS-303 - public void identifiesSimpleCountByCorrectly() { + void identifiesSimpleCountByCorrectly() { PartTree tree = new PartTree("countByLastname", User.class); assertThat(tree.isCountProjection()).isTrue(); } @Test // DATACMNS-875 - public void identifiesSimpleExistsByCorrectly() { + void identifiesSimpleExistsByCorrectly() { PartTree tree = new PartTree("existsByLastname", User.class); assertThat(tree.isExistsProjection()).isEqualTo(true); } @Test // DATACMNS-399 - public void queryPrefixShouldBeSupportedInRepositoryQueryMethods() { + void queryPrefixShouldBeSupportedInRepositoryQueryMethods() { PartTree tree = new PartTree("queryByFirstnameAndLastname", User.class); Iterable parts = tree.getParts(); @@ -402,7 +402,7 @@ public class PartTreeUnitTests { } @Test // DATACMNS-1645 - public void searchPrefixShouldBeSupportedInRepositoryQueryMethods() { + void searchPrefixShouldBeSupportedInRepositoryQueryMethods() { PartTree tree = new PartTree("searchByFirstnameAndLastname", User.class); Iterable parts = tree.getParts(); @@ -411,14 +411,14 @@ public class PartTreeUnitTests { } @Test // DATACMNS-303 - public void identifiesExtendedCountByCorrectly() { + void identifiesExtendedCountByCorrectly() { PartTree tree = new PartTree("countUserByLastname", User.class); assertThat(tree.isCountProjection()).isTrue(); } @Test // DATACMNS-303 - public void identifiesCountAndDistinctByCorrectly() { + void identifiesCountAndDistinctByCorrectly() { PartTree tree = new PartTree("countDistinctUserByLastname", User.class); assertThat(tree.isCountProjection()).isTrue(); @@ -426,27 +426,27 @@ public class PartTreeUnitTests { } @Test // DATAJPA-324 - public void resolvesPropertyPathFromGettersOnInterfaces() { + void resolvesPropertyPathFromGettersOnInterfaces() { assertThat(new PartTree("findByCategoryId", Product.class)).isNotNull(); } @Test // DATACMNS-368 - public void detectPropertyWithOrKeywordPart() { + void detectPropertyWithOrKeywordPart() { assertThat(new PartTree("findByOrder", Product.class)).isNotNull(); } @Test // DATACMNS-368 - public void detectPropertyWithAndKeywordPart() { + void detectPropertyWithAndKeywordPart() { assertThat(new PartTree("findByAnders", Product.class)).isNotNull(); } @Test // DATACMNS-368 - public void detectPropertyPathWithOrKeywordPart() { + void detectPropertyPathWithOrKeywordPart() { assertThat(new PartTree("findByOrderId", Product.class)).isNotNull(); } @Test // DATACMNS-387 - public void buildsPartTreeFromEmptyPredicateCorrectly() { + void buildsPartTreeFromEmptyPredicateCorrectly() { PartTree tree = new PartTree("findAllByOrderByLastnameAsc", User.class); @@ -455,120 +455,120 @@ public class PartTreeUnitTests { } @Test // DATACMNS-448 - public void identifiesSimpleDeleteByCorrectly() { + void identifiesSimpleDeleteByCorrectly() { PartTree tree = new PartTree("deleteByLastname", User.class); assertThat(tree.isDelete()).isTrue(); } @Test // DATACMNS-448 - public void identifiesExtendedDeleteByCorrectly() { + void identifiesExtendedDeleteByCorrectly() { PartTree tree = new PartTree("deleteUserByLastname", User.class); assertThat(tree.isDelete()).isTrue(); } @Test // DATACMNS-448 - public void identifiesSimpleRemoveByCorrectly() { + void identifiesSimpleRemoveByCorrectly() { PartTree tree = new PartTree("removeByLastname", User.class); assertThat(tree.isDelete()).isTrue(); } @Test // DATACMNS-448 - public void identifiesExtendedRemoveByCorrectly() { + void identifiesExtendedRemoveByCorrectly() { PartTree tree = new PartTree("removeUserByLastname", User.class); assertThat(tree.isDelete()).isTrue(); } @Test // DATACMNS-516 - public void disablesFindFirstKImplicitIfNotPresent() { + void disablesFindFirstKImplicitIfNotPresent() { assertLimiting("findByLastname", User.class, false, null); } @Test // DATACMNS-516 - public void identifiesFindFirstImplicit() { + void identifiesFindFirstImplicit() { assertLimiting("findFirstByLastname", User.class, true, 1); } @Test // DATACMNS-516 - public void identifiesFindFirst1Explicit() { + void identifiesFindFirst1Explicit() { assertLimiting("findFirstByLastname", User.class, true, 1); } @Test // DATACMNS-516 - public void identifiesFindFirstKExplicit() { + void identifiesFindFirstKExplicit() { assertLimiting("findFirst10ByLastname", User.class, true, 10); } @Test // DATACMNS-516 - public void identifiesFindFirstKUsersExplicit() { + void identifiesFindFirstKUsersExplicit() { assertLimiting("findFirst10UsersByLastname", User.class, true, 10); } @Test // DATACMNS-516 - public void identifiesFindFirstKDistinctUsersExplicit() { + void identifiesFindFirstKDistinctUsersExplicit() { assertLimiting("findFirst10DistinctUsersByLastname", User.class, true, 10, true); assertLimiting("findDistinctFirst10UsersByLastname", User.class, true, 10, true); assertLimiting("findFirst10UsersDistinctByLastname", User.class, true, 10, true); } @Test // DATACMNS-516 - public void identifiesFindTopImplicit() { + void identifiesFindTopImplicit() { assertLimiting("findTopByLastname", User.class, true, 1); } @Test // DATACMNS-516 - public void identifiesFindTop1Explicit() { + void identifiesFindTop1Explicit() { assertLimiting("findTop1ByLastname", User.class, true, 1); } @Test // DATACMNS-516 - public void identifiesFindTopKExplicit() { + void identifiesFindTopKExplicit() { assertLimiting("findTop10ByLastname", User.class, true, 10); } @Test // DATACMNS-516 - public void identifiesFindTopKUsersExplicit() { + void identifiesFindTopKUsersExplicit() { assertLimiting("findTop10UsersByLastname", User.class, true, 10); } @Test // DATACMNS-516 - public void identifiesFindTopKDistinctUsersExplicit() { + void identifiesFindTopKDistinctUsersExplicit() { assertLimiting("findTop10DistinctUsersByLastname", User.class, true, 10, true); assertLimiting("findDistinctTop10UsersByLastname", User.class, true, 10, true); assertLimiting("findTop10UsersDistinctByLastname", User.class, true, 10, true); } @Test - public void shouldNotSupportLimitingCountQueries() { + void shouldNotSupportLimitingCountQueries() { assertLimiting("countFirst10DistinctUsersByLastname", User.class, false, null, true); assertLimiting("countTop10DistinctUsersByLastname", User.class, false, null, true); } @Test // DATACMNS-875 - public void shouldNotSupportLimitingExistQueries() { + void shouldNotSupportLimitingExistQueries() { assertLimiting("existsFirst10DistinctUsersByLastname", User.class, false, null, true); assertLimiting("existsTop10DistinctUsersByLastname", User.class, false, null, true); } @Test // DATACMNS-581 - public void parsesIsNotContainingCorrectly() throws Exception { + void parsesIsNotContainingCorrectly() throws Exception { assertType(asList("firstnameIsNotContaining", "firstnameNotContaining", "firstnameNotContains"), NOT_CONTAINING, "firstname"); } @Test // DATACMNS-581 - public void buildsPartTreeForNotContainingCorrectly() throws Exception { + void buildsPartTreeForNotContainingCorrectly() throws Exception { PartTree tree = new PartTree("findAllByLegalNameNotContaining", Organization.class); assertPart(tree, new Part[] { new Part("legalNameNotContaining", Organization.class) }); } @Test // DATACMNS-750 - public void doesNotFailOnPropertiesContainingAKeyword() { + void doesNotFailOnPropertiesContainingAKeyword() { PartTree partTree = new PartTree("findBySomeInfoIn", Category.class); @@ -583,24 +583,24 @@ public class PartTreeUnitTests { } @Test // DATACMNS-1007 - public void parsesEmptyKeywordCorrectly() { + void parsesEmptyKeywordCorrectly() { assertType(asList("friendsIsEmpty", "friendsEmpty"), IS_EMPTY, "friends", 0, false); } @Test // DATACMNS-1007 - public void parsesNotEmptyKeywordCorrectly() { + void parsesNotEmptyKeywordCorrectly() { assertType(asList("friendsIsNotEmpty", "friendsNotEmpty"), IS_NOT_EMPTY, "friends", 0, false); } @Test // DATACMNS-1007 - public void parsesEmptyAsPropertyIfDifferentKeywordIsUsed() { + void parsesEmptyAsPropertyIfDifferentKeywordIsUsed() { assertType(asList("emptyIsTrue"), TRUE, "empty", 0, false); assertType(asList("emptyIs"), SIMPLE_PROPERTY, "empty", 1, true); } @Test // DATACMNS-1129 - public void emptyTreeDoesNotContainParts() { + void emptyTreeDoesNotContainParts() { PartTree tree = partTree(""); @@ -618,7 +618,7 @@ public class PartTreeUnitTests { * is green, remove the expectation to fail with an exception. */ @Test // DATACMNS-1570 - public void specialCapitalizationInSubject() { + void specialCapitalizationInSubject() { assertThatThrownBy(() -> new PartTree("findByZIndex", SpecialCapitalization.class)) .isInstanceOf(PropertyReferenceException.class); @@ -629,14 +629,14 @@ public class PartTreeUnitTests { * is green, remove the expectation to fail with an exception. */ @Test // DATACMNS-1570 - public void specialCapitalizationInOrderBy() { + void specialCapitalizationInOrderBy() { assertThatThrownBy(() -> new PartTree("findByOrderByZIndex", SpecialCapitalization.class)) .isInstanceOf(PropertyReferenceException.class); } @Test // DATACMNS-1570 - public void allCapsInSubject() { + void allCapsInSubject() { PartTree tree = new PartTree("findByURL", SpecialCapitalization.class); @@ -644,7 +644,7 @@ public class PartTreeUnitTests { } @Test // DATACMNS-1570 - public void allCapsInOrderBy() { + void allCapsInOrderBy() { PartTree tree = new PartTree("findByOrderByURL", SpecialCapitalization.class); @@ -793,7 +793,7 @@ public class PartTreeUnitTests { Long getId(); } - public static class SpecialCapitalization { + static class SpecialCapitalization { int zIndex; int URL; diff --git a/src/test/java/org/springframework/data/repository/sample/SampleConfiguration.java b/src/test/java/org/springframework/data/repository/sample/SampleConfiguration.java index 405e3c1e2..47926d791 100644 --- a/src/test/java/org/springframework/data/repository/sample/SampleConfiguration.java +++ b/src/test/java/org/springframework/data/repository/sample/SampleConfiguration.java @@ -17,18 +17,18 @@ public class SampleConfiguration { @Autowired ApplicationContext context; @Bean - public Repositories repositories() { + Repositories repositories() { return new Repositories(context); } @Bean - public RepositoryFactoryBeanSupport, User, Long> userRepositoryFactory() { + RepositoryFactoryBeanSupport, User, Long> userRepositoryFactory() { return new DummyRepositoryFactoryBean<>(UserRepository.class); } @Bean - public RepositoryFactoryBeanSupport, Product, Long> productRepositoryFactory( + RepositoryFactoryBeanSupport, Product, Long> productRepositoryFactory( ProductRepository productRepository) { DummyRepositoryFactoryBean, Product, Long> factory = new DummyRepositoryFactoryBean<>( @@ -39,7 +39,7 @@ public class SampleConfiguration { } @Bean - public ProductRepository productRepository() { + ProductRepository productRepository() { return mock(ProductRepository.class); } } diff --git a/src/test/java/org/springframework/data/repository/sample/UserRepository.java b/src/test/java/org/springframework/data/repository/sample/UserRepository.java index 23a9c39d9..a0a1a20b2 100644 --- a/src/test/java/org/springframework/data/repository/sample/UserRepository.java +++ b/src/test/java/org/springframework/data/repository/sample/UserRepository.java @@ -2,6 +2,6 @@ package org.springframework.data.repository.sample; import org.springframework.data.repository.CrudRepository; -public interface UserRepository extends CrudRepository { +interface UserRepository extends CrudRepository { } diff --git a/src/test/java/org/springframework/data/repository/support/AnnotationAttributeUnitTests.java b/src/test/java/org/springframework/data/repository/support/AnnotationAttributeUnitTests.java index a3439777b..7b51a1718 100755 --- a/src/test/java/org/springframework/data/repository/support/AnnotationAttributeUnitTests.java +++ b/src/test/java/org/springframework/data/repository/support/AnnotationAttributeUnitTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*; import java.util.Optional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.stereotype.Component; /** @@ -27,20 +27,20 @@ import org.springframework.stereotype.Component; * * @author Oliver Gierke */ -public class AnnotationAttributeUnitTests { +class AnnotationAttributeUnitTests { @Test // DATACMNS-607 - public void rejectsNullAnnotationType() { + void rejectsNullAnnotationType() { assertThatIllegalArgumentException().isThrownBy(() -> new AnnotationAttribute(null)); } @Test // DATACMNS-607 - public void rejectsNullAnnotationTypeForAnnotationAndAttributeName() { + void rejectsNullAnnotationTypeForAnnotationAndAttributeName() { assertThatIllegalArgumentException().isThrownBy(() -> new AnnotationAttribute(null, Optional.of("name"))); } @Test // DATACMNS-607 - public void looksUpAttributeFromAnnotatedElement() { + void looksUpAttributeFromAnnotatedElement() { AnnotationAttribute attribute = new AnnotationAttribute(Component.class); assertThat(attribute.getValueFrom(Sample.class)).hasValue("foo"); diff --git a/src/test/java/org/springframework/data/repository/support/CrudRepositoryInvokerUnitTests.java b/src/test/java/org/springframework/data/repository/support/CrudRepositoryInvokerUnitTests.java index 8d245085a..93f44c92f 100755 --- a/src/test/java/org/springframework/data/repository/support/CrudRepositoryInvokerUnitTests.java +++ b/src/test/java/org/springframework/data/repository/support/CrudRepositoryInvokerUnitTests.java @@ -25,11 +25,12 @@ import java.util.Date; import java.util.List; 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.mockito.AdditionalAnswers; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; + import org.springframework.core.convert.support.GenericConversionService; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -40,7 +41,7 @@ import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.data.repository.core.RepositoryMetadata; import org.springframework.data.repository.core.support.DefaultRepositoryMetadata; import org.springframework.data.repository.query.Param; -import org.springframework.data.repository.support.RepositoryInvocationTestUtils.VerifyingMethodInterceptor; +import org.springframework.data.repository.support.RepositoryInvocationTestUtils.*; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat.ISO; import org.springframework.format.support.DefaultFormattingConversionService; @@ -50,14 +51,14 @@ import org.springframework.format.support.DefaultFormattingConversionService; * * @author Oliver Gierke */ -@RunWith(MockitoJUnitRunner.class) -public class CrudRepositoryInvokerUnitTests { +@ExtendWith(MockitoExtension.class) +class CrudRepositoryInvokerUnitTests { @Mock PersonRepository personRepository; @Mock OrderRepository orderRepository; @Test // DATACMNS-589, DATAREST-216 - public void invokesRedeclaredSave() { + void invokesRedeclaredSave() { when(orderRepository.save(any())).then(AdditionalAnswers.returnsFirstArg()); @@ -65,38 +66,38 @@ public class CrudRepositoryInvokerUnitTests { } @Test // DATACMNS-589, DATAREST-216 - public void invokesRedeclaredFindOne() { + void invokesRedeclaredFindOne() { getInvokerFor(orderRepository, expectInvocationOnType(OrderRepository.class)).invokeFindById(1L); } @Test // DATACMNS-589 - public void invokesRedeclaredDelete() throws Exception { + void invokesRedeclaredDelete() throws Exception { getInvokerFor(orderRepository, expectInvocationOnType(OrderRepository.class)).invokeDeleteById(1L); } @Test // DATACMNS-589 - public void invokesSaveOnCrudRepository() throws Exception { + void invokesSaveOnCrudRepository() throws Exception { Method method = CrudRepository.class.getMethod("save", Object.class); getInvokerFor(personRepository, expectInvocationOf(method)).invokeSave(new Person()); } @Test // DATACMNS-589 - public void invokesFindOneOnCrudRepository() throws Exception { + void invokesFindOneOnCrudRepository() throws Exception { Method method = CrudRepository.class.getMethod("findById", Object.class); getInvokerFor(personRepository, expectInvocationOf(method)).invokeFindById(1L); } @Test // DATACMNS-589, DATAREST-216 - public void invokesDeleteOnCrudRepository() throws Exception { + void invokesDeleteOnCrudRepository() throws Exception { Method method = CrudRepository.class.getMethod("deleteById", Object.class); getInvokerFor(personRepository, expectInvocationOf(method)).invokeDeleteById(1L); } @Test // DATACMNS-589 - public void invokesFindAllOnCrudRepository() throws Exception { + void invokesFindAllOnCrudRepository() throws Exception { Method method = CrudRepository.class.getMethod("findAll"); @@ -105,7 +106,7 @@ public class CrudRepositoryInvokerUnitTests { } @Test // DATACMNS-589 - public void invokesCustomFindAllTakingASort() throws Exception { + void invokesCustomFindAllTakingASort() throws Exception { CrudWithFindAllWithSort repository = mock(CrudWithFindAllWithSort.class); @@ -117,7 +118,7 @@ public class CrudRepositoryInvokerUnitTests { } @Test // DATACMNS-589 - public void invokesCustomFindAllTakingAPageable() throws Exception { + void invokesCustomFindAllTakingAPageable() throws Exception { CrudWithFindAllWithPageable repository = mock(CrudWithFindAllWithPageable.class); @@ -154,7 +155,7 @@ public class CrudRepositoryInvokerUnitTests { static class Person {} - public interface PersonRepository extends PagingAndSortingRepository { + interface PersonRepository extends PagingAndSortingRepository { Page findByFirstName(@Param("firstName") String firstName, Pageable pageable); diff --git a/src/test/java/org/springframework/data/repository/support/DefaultRepositoryInvokerFactoryIntegrationTests.java b/src/test/java/org/springframework/data/repository/support/DefaultRepositoryInvokerFactoryIntegrationTests.java index ed575d16b..c1831fb28 100755 --- a/src/test/java/org/springframework/data/repository/support/DefaultRepositoryInvokerFactoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/repository/support/DefaultRepositoryInvokerFactoryIntegrationTests.java @@ -20,39 +20,36 @@ import static org.mockito.Mockito.*; 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.springframework.beans.factory.annotation.Autowired; import org.springframework.data.repository.sample.Product; import org.springframework.data.repository.sample.ProductRepository; import org.springframework.data.repository.sample.SampleConfiguration; import org.springframework.data.repository.sample.User; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; /** * Integration tests for {@link DefaultRepositoryInvokerFactory}. * * @author Oliver Gierke */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = SampleConfiguration.class) -public class DefaultRepositoryInvokerFactoryIntegrationTests { +@SpringJUnitConfig(classes = SampleConfiguration.class) +class DefaultRepositoryInvokerFactoryIntegrationTests { @Autowired ProductRepository productRepository; @Autowired Repositories repositories; RepositoryInvokerFactory factory; - @Before - public void setUp() { + @BeforeEach + void setUp() { this.factory = new DefaultRepositoryInvokerFactory(repositories); } @Test // DATACMNS-410, DATACMNS-589 - public void findOneShouldDelegateToAppropriateRepository() { + void findOneShouldDelegateToAppropriateRepository() { // Mockito.reset(productRepository); Product product = new Product(); @@ -64,7 +61,7 @@ public class DefaultRepositoryInvokerFactoryIntegrationTests { } @Test // DATACMNS-374, DATACMNS-589 - public void shouldThrowMeaningfulExceptionWhenTheRepositoryForAGivenDomainClassCannotBeFound() { + void shouldThrowMeaningfulExceptionWhenTheRepositoryForAGivenDomainClassCannotBeFound() { assertThatIllegalArgumentException() // .isThrownBy(() -> factory.getInvokerFor(Object.class)) // @@ -73,7 +70,7 @@ public class DefaultRepositoryInvokerFactoryIntegrationTests { } @Test // DATACMNS-589 - public void returnsSameInvokerInstanceForSubsequentCalls() { + void returnsSameInvokerInstanceForSubsequentCalls() { RepositoryInvoker invoker = factory.getInvokerFor(Product.class); @@ -81,7 +78,7 @@ public class DefaultRepositoryInvokerFactoryIntegrationTests { } @Test // DATACMNS-589 - public void createsReflectionRepositoryInvokerForRepositoryNotExtendingADedicatedBaseRepository() { + void createsReflectionRepositoryInvokerForRepositoryNotExtendingADedicatedBaseRepository() { RepositoryInvoker invoker = factory.getInvokerFor(Product.class); @@ -91,7 +88,7 @@ public class DefaultRepositoryInvokerFactoryIntegrationTests { } @Test // DATACMNS-589 - public void createsCrudRepositoryInvokerForRepositoryExtendingCrudRepository() { + void createsCrudRepositoryInvokerForRepositoryExtendingCrudRepository() { RepositoryInvoker invoker = factory.getInvokerFor(User.class); diff --git a/src/test/java/org/springframework/data/repository/support/DomainClassConverterIntegrationTests.java b/src/test/java/org/springframework/data/repository/support/DomainClassConverterIntegrationTests.java index 1f82c133d..2f829cd09 100755 --- a/src/test/java/org/springframework/data/repository/support/DomainClassConverterIntegrationTests.java +++ b/src/test/java/org/springframework/data/repository/support/DomainClassConverterIntegrationTests.java @@ -20,10 +20,11 @@ import static org.mockito.Mockito.*; import java.io.Serializable; -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.springframework.beans.BeanWrapper; import org.springframework.beans.BeanWrapperImpl; import org.springframework.beans.factory.config.InstantiationAwareBeanPostProcessorAdapter; @@ -42,8 +43,8 @@ import org.springframework.data.repository.core.support.RepositoryFactoryInforma * * @author Oliver Gierke */ -@RunWith(MockitoJUnitRunner.class) -public class DomainClassConverterIntegrationTests { +@ExtendWith(MockitoExtension.class) +class DomainClassConverterIntegrationTests { @Mock @SuppressWarnings("rawtypes") RepositoryFactoryBeanSupport factory; @Mock PersonRepository repository; @@ -51,7 +52,7 @@ public class DomainClassConverterIntegrationTests { @Test @SuppressWarnings({ "rawtypes", "unchecked" }) - public void findsRepositoryFactories() { + void findsRepositoryFactories() { DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory() { @Override diff --git a/src/test/java/org/springframework/data/repository/support/DomainClassConverterUnitTests.java b/src/test/java/org/springframework/data/repository/support/DomainClassConverterUnitTests.java index 65f5ccb5d..65c1f9c94 100755 --- a/src/test/java/org/springframework/data/repository/support/DomainClassConverterUnitTests.java +++ b/src/test/java/org/springframework/data/repository/support/DomainClassConverterUnitTests.java @@ -22,11 +22,14 @@ import static org.mockito.Mockito.*; import java.lang.reflect.Method; 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.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.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.DefaultListableBeanFactory; @@ -47,8 +50,9 @@ import org.springframework.web.bind.annotation.ModelAttribute; * @author Oliver Gierke * @author Thomas Darimont */ -@RunWith(MockitoJUnitRunner.Silent.class) -public class DomainClassConverterUnitTests { +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) +class DomainClassConverterUnitTests { static final User USER = new User(); static final TypeDescriptor STRING_TYPE = TypeDescriptor.valueOf(String.class); @@ -60,14 +64,14 @@ public class DomainClassConverterUnitTests { @Mock DefaultConversionService service; - @Before + @BeforeEach @SuppressWarnings({ "unchecked", "rawtypes" }) - public void setUp() { + void setUp() { converter = new DomainClassConverter(service); } @Test - public void matchFailsIfNoDaoAvailable() throws Exception { + void matchFailsIfNoDaoAvailable() { GenericApplicationContext ctx = new GenericApplicationContext(); ctx.refresh(); @@ -76,7 +80,7 @@ public class DomainClassConverterUnitTests { } @Test - public void matchesIfConversionInBetweenIsPossible() throws Exception { + void matchesIfConversionInBetweenIsPossible() { converter.setApplicationContext(initContextWithRepo()); @@ -86,7 +90,7 @@ public class DomainClassConverterUnitTests { } @Test - public void matchFailsIfNoIntermediateConversionIsPossible() throws Exception { + void matchFailsIfNoIntermediateConversionIsPossible() { converter.setApplicationContext(initContextWithRepo()); @@ -96,12 +100,12 @@ public class DomainClassConverterUnitTests { } // DATACMNS-233 - public void returnsNullForNullSource() { + void returnsNullForNullSource() { assertThat(converter.convert(null, STRING_TYPE, USER_TYPE)).isNull(); } // DATACMNS-233 - public void returnsNullForEmptyStringSource() { + void returnsNullForEmptyStringSource() { assertThat(converter.convert("", STRING_TYPE, USER_TYPE)).isNull(); } @@ -111,7 +115,7 @@ public class DomainClassConverterUnitTests { } @Test - public void convertsStringToUserCorrectly() throws Exception { + void convertsStringToUserCorrectly() throws Exception { ApplicationContext context = initContextWithRepo(); converter.setApplicationContext(context); @@ -127,7 +131,7 @@ public class DomainClassConverterUnitTests { } @Test // DATACMNS-133 - public void discoversFactoryAndRepoFromParentApplicationContext() { + void discoversFactoryAndRepoFromParentApplicationContext() { ApplicationContext parent = initContextWithRepo(); GenericApplicationContext context = new GenericApplicationContext(parent); @@ -140,7 +144,7 @@ public class DomainClassConverterUnitTests { } @Test // DATACMNS-583 - public void converterDoesntMatchIfTargetTypeIsAssignableFromSource() { + void converterDoesntMatchIfTargetTypeIsAssignableFromSource() { converter.setApplicationContext(initContextWithRepo()); @@ -149,7 +153,7 @@ public class DomainClassConverterUnitTests { } @Test // DATACMNS-627 - public void supportsConversionFromIdType() { + void supportsConversionFromIdType() { converter.setApplicationContext(initContextWithRepo()); @@ -157,7 +161,7 @@ public class DomainClassConverterUnitTests { } @Test // DATACMNS-627 - public void supportsConversionFromEntityToIdType() { + void supportsConversionFromEntityToIdType() { converter.setApplicationContext(initContextWithRepo()); @@ -165,7 +169,7 @@ public class DomainClassConverterUnitTests { } @Test // DATACMNS-627 - public void supportsConversionFromEntityToString() { + void supportsConversionFromEntityToString() { converter.setApplicationContext(initContextWithRepo()); @@ -174,7 +178,7 @@ public class DomainClassConverterUnitTests { } @Test // DATACMNS-683 - public void toIdConverterDoesNotMatchIfTargetTypeIsAssignableFromSource() throws Exception { + void toIdConverterDoesNotMatchIfTargetTypeIsAssignableFromSource() throws NoSuchMethodException { converter.setApplicationContext(initContextWithRepo()); diff --git a/src/test/java/org/springframework/data/repository/support/MethodParametersUnitTests.java b/src/test/java/org/springframework/data/repository/support/MethodParametersUnitTests.java index cb6624ca2..3c6ae751d 100755 --- a/src/test/java/org/springframework/data/repository/support/MethodParametersUnitTests.java +++ b/src/test/java/org/springframework/data/repository/support/MethodParametersUnitTests.java @@ -21,7 +21,7 @@ import java.lang.reflect.Method; import java.util.List; import java.util.Optional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.core.MethodParameter; @@ -30,10 +30,10 @@ import org.springframework.core.MethodParameter; * * @author Oliver Gierke */ -public class MethodParametersUnitTests { +class MethodParametersUnitTests { @Test - public void prefersAnnotatedParameterOverDiscovered() throws Exception { + void prefersAnnotatedParameterOverDiscovered() throws Exception { Method method = Sample.class.getMethod("method", String.class, String.class, Object.class); MethodParameters parameters = new MethodParameters(method, Optional.of(new AnnotationAttribute(Qualifier.class))); @@ -47,7 +47,7 @@ public class MethodParametersUnitTests { * @see #138 */ @Test - public void returnsParametersOfAGivenType() throws Exception { + void returnsParametersOfAGivenType() throws Exception { Method method = Sample.class.getMethod("method", String.class, String.class, Object.class); MethodParameters methodParameters = new MethodParameters(method); diff --git a/src/test/java/org/springframework/data/repository/support/PageableExecutionUtilsUnitTests.java b/src/test/java/org/springframework/data/repository/support/PageableExecutionUtilsUnitTests.java index 81b3bfb1e..794150509 100755 --- a/src/test/java/org/springframework/data/repository/support/PageableExecutionUtilsUnitTests.java +++ b/src/test/java/org/springframework/data/repository/support/PageableExecutionUtilsUnitTests.java @@ -22,10 +22,11 @@ import java.util.Arrays; import java.util.Collections; import java.util.function.LongSupplier; -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.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; @@ -36,35 +37,35 @@ import org.springframework.data.domain.Pageable; * @author Mark Paluch * @author Oliver Gierke */ -@RunWith(MockitoJUnitRunner.class) -public class PageableExecutionUtilsUnitTests { +@ExtendWith(MockitoExtension.class) +class PageableExecutionUtilsUnitTests { @Mock LongSupplier totalSupplierMock; @Test // DATAMCNS-884 - public void firstPageRequestIsLessThanOneFullPageDoesNotRequireTotal() { + void firstPageRequestIsLessThanOneFullPageDoesNotRequireTotal() { Page page = PageableExecutionUtils.getPage(Arrays.asList(1, 2, 3), PageRequest.of(0, 10), totalSupplierMock); assertThat(page).contains(1, 2, 3); assertThat(page.getTotalElements()).isEqualTo(3L); - verifyZeroInteractions(totalSupplierMock); + verifyNoInteractions(totalSupplierMock); } @Test // DATAMCNS-884 - public void noPageableRequestDoesNotRequireTotal() { + void noPageableRequestDoesNotRequireTotal() { Page page = PageableExecutionUtils.getPage(Arrays.asList(1, 2, 3), Pageable.unpaged(), totalSupplierMock); assertThat(page).contains(1, 2, 3); assertThat(page.getTotalElements()).isEqualTo(3L); - verifyZeroInteractions(totalSupplierMock); + verifyNoInteractions(totalSupplierMock); } @Test // DATAMCNS-884 - public void subsequentPageRequestIsLessThanOneFullPageDoesNotRequireTotal() { + void subsequentPageRequestIsLessThanOneFullPageDoesNotRequireTotal() { Page page = PageableExecutionUtils.getPage(Arrays.asList(1, 2, 3), PageRequest.of(5, 10), totalSupplierMock); @@ -72,11 +73,11 @@ public class PageableExecutionUtilsUnitTests { assertThat(page).contains(1, 2, 3); assertThat(page.getTotalElements()).isEqualTo(53L); - verifyZeroInteractions(totalSupplierMock); + verifyNoInteractions(totalSupplierMock); } @Test // DATAMCNS-884 - public void firstPageRequestHitsUpperBoundRequiresTotal() { + void firstPageRequestHitsUpperBoundRequiresTotal() { doReturn(4L).when(totalSupplierMock).getAsLong(); @@ -90,7 +91,7 @@ public class PageableExecutionUtilsUnitTests { } @Test // DATAMCNS-884 - public void subsequentPageRequestHitsUpperBoundRequiresTotal() { + void subsequentPageRequestHitsUpperBoundRequiresTotal() { doReturn(7L).when(totalSupplierMock).getAsLong(); @@ -104,7 +105,7 @@ public class PageableExecutionUtilsUnitTests { } @Test // DATAMCNS-884 - public void subsequentPageRequestWithoutResultRequiresRequireTotal() { + void subsequentPageRequestWithoutResultRequiresRequireTotal() { doReturn(7L).when(totalSupplierMock).getAsLong(); Page page = PageableExecutionUtils.getPage(Collections. emptyList(), PageRequest.of(5, 10), diff --git a/src/test/java/org/springframework/data/repository/support/PaginginAndSortingRepositoryInvokerUnitTests.java b/src/test/java/org/springframework/data/repository/support/PaginginAndSortingRepositoryInvokerUnitTests.java index 87061b969..95b28fafc 100755 --- a/src/test/java/org/springframework/data/repository/support/PaginginAndSortingRepositoryInvokerUnitTests.java +++ b/src/test/java/org/springframework/data/repository/support/PaginginAndSortingRepositoryInvokerUnitTests.java @@ -21,7 +21,8 @@ import static org.springframework.data.repository.support.RepositoryInvocationTe import java.lang.reflect.Method; -import org.junit.Test; +import org.junit.jupiter.api.Test; + import org.springframework.core.convert.support.GenericConversionService; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -30,7 +31,7 @@ import org.springframework.data.domain.Sort; import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.data.repository.core.RepositoryMetadata; import org.springframework.data.repository.core.support.DefaultRepositoryMetadata; -import org.springframework.data.repository.support.RepositoryInvocationTestUtils.VerifyingMethodInterceptor; +import org.springframework.data.repository.support.RepositoryInvocationTestUtils.*; import org.springframework.format.support.DefaultFormattingConversionService; /** @@ -38,10 +39,10 @@ import org.springframework.format.support.DefaultFormattingConversionService; * * @author Oliver Gierke */ -public class PaginginAndSortingRepositoryInvokerUnitTests { +class PaginginAndSortingRepositoryInvokerUnitTests { @Test // DATACMNS-589 - public void invokesFindAllWithPageableByDefault() throws Exception { + void invokesFindAllWithPageableByDefault() throws Exception { Repository repository = mock(Repository.class); Method method = PagingAndSortingRepository.class.getMethod("findAll", Pageable.class); @@ -51,7 +52,7 @@ public class PaginginAndSortingRepositoryInvokerUnitTests { } @Test // DATACMNS-589 - public void invokesFindAllWithSortByDefault() throws Exception { + void invokesFindAllWithSortByDefault() throws Exception { Repository repository = mock(Repository.class); Method method = PagingAndSortingRepository.class.getMethod("findAll", Sort.class); @@ -61,7 +62,7 @@ public class PaginginAndSortingRepositoryInvokerUnitTests { } @Test // DATACMNS-589 - public void invokesRedeclaredFindAllWithPageable() throws Exception { + void invokesRedeclaredFindAllWithPageable() throws Exception { RepositoryWithRedeclaredFindAllWithPageable repository = mock(RepositoryWithRedeclaredFindAllWithPageable.class); Method method = RepositoryWithRedeclaredFindAllWithPageable.class.getMethod("findAll", Pageable.class); @@ -73,7 +74,7 @@ public class PaginginAndSortingRepositoryInvokerUnitTests { } @Test // DATACMNS-589 - public void invokesRedeclaredFindAllWithSort() throws Exception { + void invokesRedeclaredFindAllWithSort() throws Exception { RepositoryWithRedeclaredFindAllWithSort repository = mock(RepositoryWithRedeclaredFindAllWithSort.class); Method method = RepositoryWithRedeclaredFindAllWithSort.class.getMethod("findAll", Sort.class); diff --git a/src/test/java/org/springframework/data/repository/support/ReflectionRepositoryInvokerUnitTests.java b/src/test/java/org/springframework/data/repository/support/ReflectionRepositoryInvokerUnitTests.java index 87c5ea4bc..66497248a 100755 --- a/src/test/java/org/springframework/data/repository/support/ReflectionRepositoryInvokerUnitTests.java +++ b/src/test/java/org/springframework/data/repository/support/ReflectionRepositoryInvokerUnitTests.java @@ -27,11 +27,11 @@ import java.util.Date; import java.util.List; 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.mockito.AdditionalAnswers; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.core.convert.ConversionFailedException; import org.springframework.core.convert.ConversionService; @@ -56,18 +56,18 @@ import org.springframework.util.MultiValueMap; * * @author Oliver Gierke */ -@RunWith(MockitoJUnitRunner.class) -public class ReflectionRepositoryInvokerUnitTests { +@ExtendWith(MockitoExtension.class) +class ReflectionRepositoryInvokerUnitTests { ConversionService conversionService; - @Before - public void setUp() { + @BeforeEach + void setUp() { this.conversionService = new DefaultFormattingConversionService(); } @Test // DATACMNS-589 - public void invokesSaveMethodCorrectly() throws Exception { + void invokesSaveMethodCorrectly() throws Exception { ManualCrudRepository repository = mock(ManualCrudRepository.class); Method method = ManualCrudRepository.class.getMethod("save", Domain.class); @@ -78,7 +78,7 @@ public class ReflectionRepositoryInvokerUnitTests { } @Test // DATACMNS-589 - public void invokesFindOneCorrectly() throws Exception { + void invokesFindOneCorrectly() throws Exception { ManualCrudRepository repository = mock(ManualCrudRepository.class); Method method = ManualCrudRepository.class.getMethod("findById", Long.class); @@ -88,7 +88,7 @@ public class ReflectionRepositoryInvokerUnitTests { } @Test // DATACMNS-589 - public void invokesDeleteWithDomainCorrectly() throws Exception { + void invokesDeleteWithDomainCorrectly() throws Exception { RepoWithDomainDeleteAndFindOne repository = mock(RepoWithDomainDeleteAndFindOne.class); when(repository.findById(1L)).thenReturn(new Domain()); @@ -100,7 +100,7 @@ public class ReflectionRepositoryInvokerUnitTests { } @Test // DATACMNS-589 - public void invokesFindAllWithoutParameterCorrectly() throws Exception { + void invokesFindAllWithoutParameterCorrectly() throws Exception { Method method = ManualCrudRepository.class.getMethod("findAll"); ManualCrudRepository repository = mock(ManualCrudRepository.class); @@ -112,7 +112,7 @@ public class ReflectionRepositoryInvokerUnitTests { } @Test // DATACMNS-589 - public void invokesFindAllWithSortCorrectly() throws Exception { + void invokesFindAllWithSortCorrectly() throws Exception { Method method = RepoWithFindAllWithSort.class.getMethod("findAll", Sort.class); RepoWithFindAllWithSort repository = mock(RepoWithFindAllWithSort.class); @@ -126,7 +126,7 @@ public class ReflectionRepositoryInvokerUnitTests { } @Test // DATACMNS-589 - public void invokesFindAllWithPageableCorrectly() throws Exception { + void invokesFindAllWithPageableCorrectly() throws Exception { Method method = RepoWithFindAllWithPageable.class.getMethod("findAll", Pageable.class); RepoWithFindAllWithPageable repository = mock(RepoWithFindAllWithPageable.class); @@ -138,7 +138,7 @@ public class ReflectionRepositoryInvokerUnitTests { } @Test // DATACMNS-589 - public void invokesQueryMethod() throws Exception { + void invokesQueryMethod() throws Exception { MultiValueMap parameters = new LinkedMultiValueMap<>(); parameters.add("firstName", "John"); @@ -151,7 +151,7 @@ public class ReflectionRepositoryInvokerUnitTests { } @Test // DATACMNS-589 - public void considersFormattingAnnotationsOnQueryMethodParameters() throws Exception { + void considersFormattingAnnotationsOnQueryMethodParameters() throws Exception { MultiValueMap parameters = new LinkedMultiValueMap<>(); parameters.add("date", "2013-07-18T10:49:00.000+02:00"); @@ -164,7 +164,7 @@ public class ReflectionRepositoryInvokerUnitTests { } @Test // DATAREST-335, DATAREST-346, DATACMNS-589 - public void invokesOverriddenDeleteMethodCorrectly() throws Exception { + void invokesOverriddenDeleteMethodCorrectly() throws Exception { MyRepo repository = mock(MyRepo.class); Method method = CustomRepo.class.getMethod("deleteById", Long.class); @@ -173,7 +173,7 @@ public class ReflectionRepositoryInvokerUnitTests { } @Test // DATACMNS-589 - public void rejectsInvocationOfMissingDeleteMethod() { + void rejectsInvocationOfMissingDeleteMethod() { RepositoryInvoker invoker = getInvokerFor(mock(EmptyRepository.class)); @@ -182,7 +182,7 @@ public class ReflectionRepositoryInvokerUnitTests { } @Test // DATACMNS-589 - public void rejectsInvocationOfMissingFindOneMethod() { + void rejectsInvocationOfMissingFindOneMethod() { RepositoryInvoker invoker = getInvokerFor(mock(EmptyRepository.class)); @@ -191,7 +191,7 @@ public class ReflectionRepositoryInvokerUnitTests { } @Test // DATACMNS-589 - public void rejectsInvocationOfMissingFindAllMethod() { + void rejectsInvocationOfMissingFindAllMethod() { RepositoryInvoker invoker = getInvokerFor(mock(EmptyRepository.class)); @@ -200,7 +200,7 @@ public class ReflectionRepositoryInvokerUnitTests { } @Test // DATACMNS-589 - public void rejectsInvocationOfMissingSaveMethod() { + void rejectsInvocationOfMissingSaveMethod() { RepositoryInvoker invoker = getInvokerFor(mock(EmptyRepository.class)); @@ -209,7 +209,7 @@ public class ReflectionRepositoryInvokerUnitTests { } @Test // DATACMNS-647 - public void translatesCollectionRequestParametersCorrectly() throws Exception { + void translatesCollectionRequestParametersCorrectly() throws Exception { for (String[] ids : Arrays.asList(new String[] { "1,2" }, new String[] { "1", "2" })) { @@ -225,7 +225,7 @@ public class ReflectionRepositoryInvokerUnitTests { } @Test // DATACMNS-700 - public void failedParameterConversionCapturesContext() throws Exception { + void failedParameterConversionCapturesContext() throws Exception { RepositoryInvoker invoker = getInvokerFor(mock(SimpleRepository.class)); @@ -245,7 +245,7 @@ public class ReflectionRepositoryInvokerUnitTests { } @Test // DATACMNS-867 - public void convertsWrapperTypeToJdkOptional() { + void convertsWrapperTypeToJdkOptional() { GuavaRepository mock = mock(GuavaRepository.class); when(mock.findById(any())).thenReturn(com.google.common.base.Optional.of(new Domain())); @@ -258,7 +258,7 @@ public class ReflectionRepositoryInvokerUnitTests { } @Test // DATACMNS-867 - public void wrapsSingleElementCollectionIntoOptional() throws Exception { + void wrapsSingleElementCollectionIntoOptional() throws Exception { ManualCrudRepository mock = mock(ManualCrudRepository.class); when(mock.findAll()).thenReturn(Arrays.asList(new Domain())); @@ -274,7 +274,7 @@ public class ReflectionRepositoryInvokerUnitTests { } @Test // DATACMNS-1277 - public void invokesFindByIdBeforeDeletingOnOverride() { + void invokesFindByIdBeforeDeletingOnOverride() { DeleteByEntityOverrideSubRepository mock = mock(DeleteByEntityOverrideSubRepository.class); doReturn(Optional.of(new Domain())).when(mock).findById(any()); @@ -286,7 +286,7 @@ public class ReflectionRepositoryInvokerUnitTests { } @Test // DATACMNS-1277 - public void invokesDeleteByIdOnOverride() { + void invokesDeleteByIdOnOverride() { DeleteByIdOverrideSubRepository mock = mock(DeleteByIdOverrideSubRepository.class); diff --git a/src/test/java/org/springframework/data/repository/support/RepositoriesIntegrationTests.java b/src/test/java/org/springframework/data/repository/support/RepositoriesIntegrationTests.java index 94b2a7ff8..834660f5e 100755 --- a/src/test/java/org/springframework/data/repository/support/RepositoriesIntegrationTests.java +++ b/src/test/java/org/springframework/data/repository/support/RepositoriesIntegrationTests.java @@ -18,15 +18,14 @@ package org.springframework.data.repository.support; 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.springframework.beans.factory.annotation.Autowired; import org.springframework.data.repository.sample.Product; import org.springframework.data.repository.sample.ProductRepository; import org.springframework.data.repository.sample.SampleConfiguration; import org.springframework.data.repository.sample.User; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; /** * Integration tests for {@link Repositories}. @@ -34,15 +33,14 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * @author Oliver Gierke * @author Thomas Darimont */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = SampleConfiguration.class) -public class RepositoriesIntegrationTests { +@SpringJUnitConfig(classes = SampleConfiguration.class) +class RepositoriesIntegrationTests { @Autowired Repositories repositories; @Autowired ProductRepository productRepository; @Test - public void detectsRepositories() { + void detectsRepositories() { assertThat(repositories).isNotNull(); assertThat(repositories.hasRepositoryFor(User.class)).isTrue(); @@ -50,7 +48,7 @@ public class RepositoriesIntegrationTests { } @Test // DATACMNS-376 - public void returnsPersistentEntityForProxiedClass() { + void returnsPersistentEntityForProxiedClass() { User user = mock(User.class); assertThat(repositories.getPersistentEntity(user.getClass())).isNotNull(); diff --git a/src/test/java/org/springframework/data/repository/support/RepositoriesUnitTests.java b/src/test/java/org/springframework/data/repository/support/RepositoriesUnitTests.java index 6d6429769..b6371c69b 100755 --- a/src/test/java/org/springframework/data/repository/support/RepositoriesUnitTests.java +++ b/src/test/java/org/springframework/data/repository/support/RepositoriesUnitTests.java @@ -25,10 +25,13 @@ import java.util.List; import java.util.Optional; import java.util.Set; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +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.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; @@ -56,13 +59,14 @@ import org.springframework.util.ClassUtils; * @author Oliver Gierke * @author Thomas Darimont */ -@RunWith(MockitoJUnitRunner.Silent.class) -public class RepositoriesUnitTests { +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) +class RepositoriesUnitTests { GenericApplicationContext context; - @Before - public void setUp() { + @BeforeEach + void setUp() { DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory(); beanFactory.registerBeanDefinition("addressRepository", getRepositoryBeanDefinition(AddressRepository.class)); @@ -81,7 +85,7 @@ public class RepositoriesUnitTests { } @Test - public void doesNotConsiderCrudRepositoriesOnly() { + void doesNotConsiderCrudRepositoriesOnly() { Repositories repositories = new Repositories(context); @@ -90,19 +94,19 @@ public class RepositoriesUnitTests { } @Test - public void doesNotFindInformationForNonManagedDomainClass() { + void doesNotFindInformationForNonManagedDomainClass() { Repositories repositories = new Repositories(context); assertThat(repositories.hasRepositoryFor(String.class)).isFalse(); assertThat(repositories.getRepositoryFor(String.class)).isNotPresent(); } @Test - public void rejectsNullBeanFactory() { + void rejectsNullBeanFactory() { assertThatIllegalArgumentException().isThrownBy(() -> new Repositories(null)); } @Test // DATACMNS-256 - public void exposesPersistentEntityForDomainTypes() { + void exposesPersistentEntityForDomainTypes() { Repositories repositories = new Repositories(context); assertThat(repositories.getPersistentEntity(Person.class)).isNotNull(); @@ -110,12 +114,12 @@ public class RepositoriesUnitTests { } @Test // DATACMNS-634 - public void findsRepositoryForSubTypes() { + void findsRepositoryForSubTypes() { assertThat(new Repositories(context).getPersistentEntity(AdvancedAddress.class)).isNotNull(); } @Test // DATACMNS-673 - public void discoversRepositoryForAlternativeDomainType() { + void discoversRepositoryForAlternativeDomainType() { RepositoryMetadata metadata = new CustomRepositoryMetadata(SampleRepository.class); RepositoryFactoryInformation information = new SampleRepoFactoryInformation<>(metadata); @@ -133,7 +137,7 @@ public class RepositoriesUnitTests { } @Test // DATACMNS-794 - public void exposesRepositoryFactoryInformationForRepository() { + void exposesRepositoryFactoryInformationForRepository() { Optional information = new Repositories(context) .getRepositoryInformation(PersonRepository.class); @@ -143,7 +147,7 @@ public class RepositoriesUnitTests { } @Test // DATACMNS-1215 - public void exposesRepositoryForProxyType() { + void exposesRepositoryForProxyType() { ProxyFactory factory = new ProxyFactory(); factory.setTarget(new Person()); @@ -160,7 +164,7 @@ public class RepositoriesUnitTests { } @Test // DATACMNS-1448 - public void keepsPrimaryRepositoryInCaseOfMultipleOnes() { + void keepsPrimaryRepositoryInCaseOfMultipleOnes() { DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory(); beanFactory.registerBeanDefinition("first", getRepositoryBeanDefinition(FirstRepository.class)); @@ -196,11 +200,11 @@ public class RepositoriesUnitTests { private final RepositoryMetadata repositoryMetadata; private final SampleMappingContext mappingContext; - public SampleRepoFactoryInformation(Class repositoryInterface) { + SampleRepoFactoryInformation(Class repositoryInterface) { this(new DefaultRepositoryMetadata(repositoryInterface)); } - public SampleRepoFactoryInformation(RepositoryMetadata metadata) { + SampleRepoFactoryInformation(RepositoryMetadata metadata) { this.repositoryMetadata = metadata; this.mappingContext = new SampleMappingContext(); } @@ -230,7 +234,7 @@ public class RepositoriesUnitTests { /** * @param repositoryInterface */ - public CustomRepositoryMetadata(Class repositoryInterface) { + CustomRepositoryMetadata(Class repositoryInterface) { super(repositoryInterface); diff --git a/src/test/java/org/springframework/data/repository/support/RepositoryInvocationTestUtils.java b/src/test/java/org/springframework/data/repository/support/RepositoryInvocationTestUtils.java index 50761ba3c..0dc592725 100644 --- a/src/test/java/org/springframework/data/repository/support/RepositoryInvocationTestUtils.java +++ b/src/test/java/org/springframework/data/repository/support/RepositoryInvocationTestUtils.java @@ -34,7 +34,7 @@ import org.springframework.aop.framework.ProxyFactory; class RepositoryInvocationTestUtils { @SuppressWarnings("unchecked") - public static T getVerifyingRepositoryProxy(T target, VerifyingMethodInterceptor interceptor) { + static T getVerifyingRepositoryProxy(T target, VerifyingMethodInterceptor interceptor) { ProxyFactory factory = new ProxyFactory(); factory.setInterfaces(target.getClass().getInterfaces()); @@ -44,11 +44,11 @@ class RepositoryInvocationTestUtils { return (T) factory.getProxy(); } - public static VerifyingMethodInterceptor expectInvocationOnType(Class type) { + static VerifyingMethodInterceptor expectInvocationOnType(Class type) { return new VerifyingMethodInterceptor(type, new Method[0]); } - public static VerifyingMethodInterceptor expectInvocationOf(Method... methods) { + static VerifyingMethodInterceptor expectInvocationOf(Method... methods) { return new VerifyingMethodInterceptor(null, methods); } @@ -58,7 +58,7 @@ class RepositoryInvocationTestUtils { * @author Oliver Gierke */ @SuppressWarnings("rawtypes") - public static final class VerifyingMethodInterceptor implements MethodInterceptor { + static final class VerifyingMethodInterceptor implements MethodInterceptor { private final Class expectedInvocationTarget; private final List methods; diff --git a/src/test/java/org/springframework/data/repository/util/ClassUtilsUnitTests.java b/src/test/java/org/springframework/data/repository/util/ClassUtilsUnitTests.java index 174683f9a..82fb11c03 100755 --- a/src/test/java/org/springframework/data/repository/util/ClassUtilsUnitTests.java +++ b/src/test/java/org/springframework/data/repository/util/ClassUtilsUnitTests.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.Future; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.repository.Repository; @@ -34,16 +34,16 @@ import org.springframework.scheduling.annotation.Async; * * @author Oliver Gierke */ -public class ClassUtilsUnitTests { +class ClassUtilsUnitTests { @Test - public void rejectsInvalidReturnType() { + void rejectsInvalidReturnType() { assertThatIllegalStateException().isThrownBy(() -> assertReturnTypeAssignable( SomeDao.class.getMethod("findByFirstname", Pageable.class, String.class), User.class)); } @Test - public void determinesValidFieldsCorrectly() { + void determinesValidFieldsCorrectly() { assertThat(hasProperty(User.class, "firstname")).isTrue(); assertThat(hasProperty(User.class, "Firstname")).isTrue(); @@ -51,7 +51,7 @@ public class ClassUtilsUnitTests { } @Test // DATACMNS-769 - public void unwrapsWrapperTypesBeforeAssignmentCheck() throws Exception { + void unwrapsWrapperTypesBeforeAssignmentCheck() throws Exception { assertReturnTypeAssignable(UserRepository.class.getMethod("findAsync", Pageable.class), Page.class); } @@ -60,7 +60,7 @@ public class ClassUtilsUnitTests { private String firstname; - public String getAddress() { + String getAddress() { return null; } diff --git a/src/test/java/org/springframework/data/repository/util/QueryExecutionConvertersUnitTests.java b/src/test/java/org/springframework/data/repository/util/QueryExecutionConvertersUnitTests.java index 3729bc8da..10ab991eb 100755 --- a/src/test/java/org/springframework/data/repository/util/QueryExecutionConvertersUnitTests.java +++ b/src/test/java/org/springframework/data/repository/util/QueryExecutionConvertersUnitTests.java @@ -40,8 +40,8 @@ import java.util.Set; import java.util.concurrent.CompletableFuture; import java.util.concurrent.Future; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.reactivestreams.Publisher; import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.data.domain.Page; @@ -60,19 +60,19 @@ import com.google.common.base.Optional; * @author Mark Paluch * @author Maciek Opała */ -public class QueryExecutionConvertersUnitTests { +class QueryExecutionConvertersUnitTests { DefaultConversionService conversionService; - @Before - public void setUp() { + @BeforeEach + void setUp() { this.conversionService = new DefaultConversionService(); QueryExecutionConverters.registerConvertersIn(conversionService); } @Test // DATACMNS-714 - public void registersWrapperTypes() { + void registersWrapperTypes() { assertThat(QueryExecutionConverters.supports(Optional.class)).isTrue(); assertThat(QueryExecutionConverters.supports(java.util.Optional.class)).isTrue(); @@ -83,7 +83,7 @@ public class QueryExecutionConvertersUnitTests { } @Test // DATACMNS-836 - public void registersReactiveWrapperTypes() { + void registersReactiveWrapperTypes() { assertThat(QueryExecutionConverters.supports(Publisher.class)).isTrue(); assertThat(QueryExecutionConverters.supports(Mono.class)).isTrue(); @@ -99,7 +99,7 @@ public class QueryExecutionConvertersUnitTests { } @Test // DATACMNS-836 - public void registersUnwrapperTypes() { + void registersUnwrapperTypes() { assertThat(QueryExecutionConverters.supportsUnwrapping(Optional.class)).isTrue(); assertThat(QueryExecutionConverters.supportsUnwrapping(java.util.Optional.class)).isTrue(); @@ -109,7 +109,7 @@ public class QueryExecutionConvertersUnitTests { } @Test // DATACMNS-836 - public void doesNotRegisterReactiveUnwrapperTypes() { + void doesNotRegisterReactiveUnwrapperTypes() { assertThat(QueryExecutionConverters.supportsUnwrapping(Publisher.class)).isFalse(); assertThat(QueryExecutionConverters.supportsUnwrapping(Mono.class)).isFalse(); @@ -125,24 +125,24 @@ public class QueryExecutionConvertersUnitTests { } @Test // DATACMNS-714 - public void registersCompletableFutureAsWrapperTypeOnSpring42OrBetter() { + void registersCompletableFutureAsWrapperTypeOnSpring42OrBetter() { assertThat(QueryExecutionConverters.supports(CompletableFuture.class)).isTrue(); } @Test // DATACMNS-483 - public void turnsNullIntoGuavaOptional() { + void turnsNullIntoGuavaOptional() { assertThat(conversionService.convert(new NullableWrapper(null), Optional.class)).isEqualTo(Optional.absent()); } @Test // DATACMNS-483 @SuppressWarnings("unchecked") - public void turnsNullIntoJdk8Optional() { + void turnsNullIntoJdk8Optional() { assertThat(conversionService.convert(new NullableWrapper(null), java.util.Optional.class)).isEmpty(); } @Test // DATACMNS-714 @SuppressWarnings("unchecked") - public void turnsNullIntoCompletableFutureForNull() throws Exception { + void turnsNullIntoCompletableFutureForNull() throws Exception { CompletableFuture result = conversionService.convert(new NullableWrapper(null), CompletableFuture.class); @@ -152,59 +152,59 @@ public class QueryExecutionConvertersUnitTests { } @Test // DATACMNS-768 - public void unwrapsJdk8Optional() { + void unwrapsJdk8Optional() { assertThat(QueryExecutionConverters.unwrap(java.util.Optional.of("Foo"))).isEqualTo("Foo"); } @Test // DATACMNS-768 - public void unwrapsGuava8Optional() { + void unwrapsGuava8Optional() { assertThat(QueryExecutionConverters.unwrap(Optional.of("Foo"))).isEqualTo("Foo"); } @Test // DATACMNS-768 - public void unwrapsNullToNull() { + void unwrapsNullToNull() { assertThat(QueryExecutionConverters.unwrap(null)).isNull(); } @Test // DATACMNS-768 - public void unwrapsNonWrapperTypeToItself() { + void unwrapsNonWrapperTypeToItself() { assertThat(QueryExecutionConverters.unwrap("Foo")).isEqualTo("Foo"); } @Test // DATACMNS-795 - public void turnsNullIntoScalaOptionEmpty() { + void turnsNullIntoScalaOptionEmpty() { assertThat(conversionService.convert(new NullableWrapper(null), Option.class)).isEqualTo(Option.empty()); } @Test // DATACMNS-795 - public void unwrapsScalaOption() { + void unwrapsScalaOption() { assertThat(QueryExecutionConverters.unwrap(Option.apply("foo"))).isEqualTo("foo"); } @Test // DATACMNS-874 - public void unwrapsEmptyScalaOption() { + void unwrapsEmptyScalaOption() { assertThat(QueryExecutionConverters.unwrap(Option.empty())).isNull(); } @Test // DATACMNS-1005 - public void registersAllowedPageabletypes() { + void registersAllowedPageabletypes() { Set> allowedPageableTypes = QueryExecutionConverters.getAllowedPageableTypes(); assertThat(allowedPageableTypes).contains(Page.class, Slice.class, List.class, Seq.class); } @Test // DATACMNS-1065 - public void unwrapsEmptyVavrOption() { + void unwrapsEmptyVavrOption() { assertThat(QueryExecutionConverters.unwrap(io.vavr.control.Option.none())).isNull(); } @Test // DATACMNS-1065 - public void unwrapsVavrOption() { + void unwrapsVavrOption() { assertThat(QueryExecutionConverters.unwrap(io.vavr.control.Option.of("string"))).isEqualTo("string"); } @Test // DATACMNS-1065 - public void conversListToVavr() { + void conversListToVavr() { assertThat(conversionService.canConvert(List.class, io.vavr.collection.Traversable.class)).isTrue(); assertThat(conversionService.canConvert(List.class, io.vavr.collection.List.class)).isTrue(); @@ -220,7 +220,7 @@ public class QueryExecutionConvertersUnitTests { } @Test // DATACMNS-1065 - public void convertsSetToVavr() { + void convertsSetToVavr() { assertThat(conversionService.canConvert(Set.class, io.vavr.collection.Traversable.class)).isTrue(); assertThat(conversionService.canConvert(Set.class, io.vavr.collection.Set.class)).isTrue(); @@ -236,7 +236,7 @@ public class QueryExecutionConvertersUnitTests { } @Test // DATACMNS-1065 - public void convertsMapToVavr() { + void convertsMapToVavr() { assertThat(conversionService.canConvert(Map.class, io.vavr.collection.Traversable.class)).isTrue(); assertThat(conversionService.canConvert(Map.class, io.vavr.collection.Map.class)).isTrue(); @@ -251,7 +251,7 @@ public class QueryExecutionConvertersUnitTests { } @Test // DATACMNS-1065 - public void unwrapsVavrCollectionsToJavaOnes() { + void unwrapsVavrCollectionsToJavaOnes() { assertThat(unwrap(io.vavr.collection.List.of(1, 2, 3))).isInstanceOf(List.class); assertThat(unwrap(io.vavr.collection.LinkedHashSet.of(1, 2, 3))).isInstanceOf(Set.class); @@ -259,14 +259,14 @@ public class QueryExecutionConvertersUnitTests { } @Test // DATACMNS-1065 - public void vavrSeqIsASupportedPageableType() { + void vavrSeqIsASupportedPageableType() { Set> allowedPageableTypes = QueryExecutionConverters.getAllowedPageableTypes(); assertThat(allowedPageableTypes).contains(io.vavr.collection.Seq.class); } @Test // DATAJPA-1258 - public void convertsJavaListsToVavrSet() { + void convertsJavaListsToVavrSet() { List source = Collections.singletonList("foo"); @@ -275,7 +275,7 @@ public class QueryExecutionConvertersUnitTests { } @Test // DATACMNS-1299 - public void unwrapsPages() throws Exception { + void unwrapsPages() throws Exception { Method method = Sample.class.getMethod("pages"); TypeInformation returnType = ClassTypeInformation.fromReturnTypeOf(method); @@ -285,7 +285,7 @@ public class QueryExecutionConvertersUnitTests { } @Test // DATACMNS-983 - public void exposesExecutionAdapterForJavaslangTry() throws Throwable { + void exposesExecutionAdapterForJavaslangTry() throws Throwable { Object result = getExecutionAdapter(Try.class).apply(() -> { throw new IOException("Some message!"); @@ -295,7 +295,7 @@ public class QueryExecutionConvertersUnitTests { } @Test // DATACMNS-983 - public void unwrapsDomainTypeFromJavaslangTryWrapper() throws Exception { + void unwrapsDomainTypeFromJavaslangTryWrapper() throws Exception { for (String methodName : Arrays.asList("tryMethod", "tryForSeqMethod")) { @@ -309,7 +309,7 @@ public class QueryExecutionConvertersUnitTests { } @Test // DATACMNS-983 - public void exposesExecutionAdapterForVavrTry() throws Throwable { + void exposesExecutionAdapterForVavrTry() throws Throwable { Object result = getExecutionAdapter(io.vavr.control.Try.class).apply(() -> { throw new IOException("Some message!"); @@ -319,7 +319,7 @@ public class QueryExecutionConvertersUnitTests { } @Test // DATACMNS-983 - public void unwrapsDomainTypeFromVavrTryWrapper() throws Exception { + void unwrapsDomainTypeFromVavrTryWrapper() throws Exception { for (String methodName : Arrays.asList("tryMethod", "tryForSeqMethod")) { @@ -333,14 +333,14 @@ public class QueryExecutionConvertersUnitTests { } @Test // DATACMNS-1430 - public void returnsStreamableForIterable() throws Exception { + void returnsStreamableForIterable() throws Exception { assertThat(conversionService.canConvert(Iterable.class, Streamable.class)).isTrue(); assertThat(conversionService.convert(Arrays.asList("foo"), Streamable.class)).containsExactly("foo"); } @Test // DATACMNS-1430 - public void convertsToStreamableWrapper() throws Exception { + void convertsToStreamableWrapper() throws Exception { assertThat(conversionService.canConvert(Iterable.class, StreamableWrapper.class)).isTrue(); assertThat(conversionService.convert(Arrays.asList("foo"), StreamableWrapper.class).getStreamable()) // @@ -348,7 +348,7 @@ public class QueryExecutionConvertersUnitTests { } @Test // DATACMNS-1430 - public void convertsToStreamableWrapperImplementingStreamable() throws Exception { + void convertsToStreamableWrapperImplementingStreamable() throws Exception { assertThat(conversionService.canConvert(Iterable.class, CustomStreamableWrapper.class)).isTrue(); assertThat(conversionService.convert(Arrays.asList("foo"), CustomStreamableWrapper.class)) // @@ -356,7 +356,7 @@ public class QueryExecutionConvertersUnitTests { } @Test // DATACMNS-1484 - public void doesNotConvertCollectionToStreamableIfReturnTypeIsIterable() { + void doesNotConvertCollectionToStreamableIfReturnTypeIsIterable() { List source = Arrays.asList("1", "2"); diff --git a/src/test/java/org/springframework/data/repository/util/ReactiveWrapperConvertersUnitTests.java b/src/test/java/org/springframework/data/repository/util/ReactiveWrapperConvertersUnitTests.java index 1b8a7f99a..cc3f4191d 100644 --- a/src/test/java/org/springframework/data/repository/util/ReactiveWrapperConvertersUnitTests.java +++ b/src/test/java/org/springframework/data/repository/util/ReactiveWrapperConvertersUnitTests.java @@ -15,10 +15,7 @@ */ package org.springframework.data.repository.util; -import static org.assertj.core.api.AssertionsForClassTypes.assertThat; - -import org.junit.Test; -import org.reactivestreams.Publisher; +import static org.assertj.core.api.AssertionsForClassTypes.*; import io.reactivex.Maybe; import reactor.core.publisher.Flux; @@ -27,15 +24,18 @@ import rx.Completable; import rx.Observable; import rx.Single; +import org.junit.jupiter.api.Test; +import org.reactivestreams.Publisher; + /** * Unit tests for {@link ReactiveWrapperConverters}. * * @author Mark Paluch */ -public class ReactiveWrapperConvertersUnitTests { +class ReactiveWrapperConvertersUnitTests { @Test // DATACMNS-836 - public void shouldSupportReactorTypes() { + void shouldSupportReactorTypes() { assertThat(ReactiveWrapperConverters.supports(Mono.class)).isTrue(); assertThat(ReactiveWrapperConverters.supports(Flux.class)).isTrue(); @@ -44,7 +44,7 @@ public class ReactiveWrapperConvertersUnitTests { } @Test // DATACMNS-836 - public void shouldSupportRxJava1Types() { + void shouldSupportRxJava1Types() { assertThat(ReactiveWrapperConverters.supports(Single.class)).isTrue(); assertThat(ReactiveWrapperConverters.supports(Observable.class)).isTrue(); @@ -52,7 +52,7 @@ public class ReactiveWrapperConvertersUnitTests { } @Test // DATACMNS-836 - public void shouldSupportRxJava2Types() { + void shouldSupportRxJava2Types() { assertThat(ReactiveWrapperConverters.supports(io.reactivex.Single.class)).isTrue(); assertThat(ReactiveWrapperConverters.supports(io.reactivex.Maybe.class)).isTrue(); @@ -62,21 +62,21 @@ public class ReactiveWrapperConvertersUnitTests { } @Test // DATACMNS-836 - public void toWrapperShouldCastMonoToMono() { + void toWrapperShouldCastMonoToMono() { Mono foo = Mono.just("foo"); assertThat(ReactiveWrapperConverters.toWrapper(foo, Mono.class)).isSameAs(foo); } @Test // DATACMNS-836 - public void toWrapperShouldConvertMonoToRxJava1Single() { + void toWrapperShouldConvertMonoToRxJava1Single() { Mono foo = Mono.just("foo"); assertThat(ReactiveWrapperConverters.toWrapper(foo, Single.class)).isInstanceOf(Single.class); } @Test // DATACMNS-836 - public void toWrapperShouldConvertMonoToRxJava2Single() { + void toWrapperShouldConvertMonoToRxJava2Single() { Mono foo = Mono.just("foo"); assertThat(ReactiveWrapperConverters.toWrapper(foo, io.reactivex.Single.class)) @@ -84,77 +84,77 @@ public class ReactiveWrapperConvertersUnitTests { } @Test // DATACMNS-836 - public void toWrapperShouldConvertRxJava2SingleToMono() { + void toWrapperShouldConvertRxJava2SingleToMono() { io.reactivex.Single foo = io.reactivex.Single.just("foo"); assertThat(ReactiveWrapperConverters.toWrapper(foo, Mono.class)).isInstanceOf(Mono.class); } @Test // DATACMNS-836 - public void toWrapperShouldConvertRxJava2SingleToPublisher() { + void toWrapperShouldConvertRxJava2SingleToPublisher() { io.reactivex.Single foo = io.reactivex.Single.just("foo"); assertThat(ReactiveWrapperConverters.toWrapper(foo, Publisher.class)).isInstanceOf(Publisher.class); } @Test // DATACMNS-836 - public void toWrapperShouldConvertRxJava2MaybeToMono() { + void toWrapperShouldConvertRxJava2MaybeToMono() { io.reactivex.Maybe foo = io.reactivex.Maybe.just("foo"); assertThat(ReactiveWrapperConverters.toWrapper(foo, Mono.class)).isInstanceOf(Mono.class); } @Test // DATACMNS-836 - public void toWrapperShouldConvertRxJava2MaybeToFlux() { + void toWrapperShouldConvertRxJava2MaybeToFlux() { io.reactivex.Maybe foo = io.reactivex.Maybe.just("foo"); assertThat(ReactiveWrapperConverters.toWrapper(foo, Flux.class)).isInstanceOf(Flux.class); } @Test // DATACMNS-836 - public void toWrapperShouldConvertRxJava2MaybeToPublisher() { + void toWrapperShouldConvertRxJava2MaybeToPublisher() { io.reactivex.Maybe foo = io.reactivex.Maybe.just("foo"); assertThat(ReactiveWrapperConverters.toWrapper(foo, Publisher.class)).isInstanceOf(Publisher.class); } @Test // DATACMNS-836 - public void toWrapperShouldConvertRxJava2FlowableToMono() { + void toWrapperShouldConvertRxJava2FlowableToMono() { io.reactivex.Flowable foo = io.reactivex.Flowable.just("foo"); assertThat(ReactiveWrapperConverters.toWrapper(foo, Mono.class)).isInstanceOf(Mono.class); } @Test // DATACMNS-836 - public void toWrapperShouldConvertRxJava2FlowableToFlux() { + void toWrapperShouldConvertRxJava2FlowableToFlux() { io.reactivex.Flowable foo = io.reactivex.Flowable.just("foo"); assertThat(ReactiveWrapperConverters.toWrapper(foo, Flux.class)).isInstanceOf(Flux.class); } @Test // DATACMNS-836 - public void toWrapperShouldCastRxJava2FlowableToPublisher() { + void toWrapperShouldCastRxJava2FlowableToPublisher() { io.reactivex.Flowable foo = io.reactivex.Flowable.just("foo"); assertThat(ReactiveWrapperConverters.toWrapper(foo, Publisher.class)).isSameAs(foo); } @Test // DATACMNS-836 - public void toWrapperShouldConvertRxJava2ObservableToMono() { + void toWrapperShouldConvertRxJava2ObservableToMono() { io.reactivex.Observable foo = io.reactivex.Observable.just("foo"); assertThat(ReactiveWrapperConverters.toWrapper(foo, Mono.class)).isInstanceOf(Mono.class); } @Test // DATACMNS-836 - public void toWrapperShouldConvertRxJava2ObservableToFlux() { + void toWrapperShouldConvertRxJava2ObservableToFlux() { io.reactivex.Observable foo = io.reactivex.Observable.just("foo"); assertThat(ReactiveWrapperConverters.toWrapper(foo, Flux.class)).isInstanceOf(Flux.class); } @Test // DATACMNS-836 - public void toWrapperShouldConvertRxJava2ObservableToSingle() { + void toWrapperShouldConvertRxJava2ObservableToSingle() { io.reactivex.Observable foo = io.reactivex.Observable.just("foo"); assertThat(ReactiveWrapperConverters.toWrapper(foo, io.reactivex.Single.class)) @@ -162,21 +162,21 @@ public class ReactiveWrapperConvertersUnitTests { } @Test // DATACMNS-836 - public void toWrapperShouldConvertRxJava2ObservableToMaybe() { + void toWrapperShouldConvertRxJava2ObservableToMaybe() { io.reactivex.Observable foo = io.reactivex.Observable.empty(); assertThat(ReactiveWrapperConverters.toWrapper(foo, Maybe.class)).isInstanceOf(Maybe.class); } @Test // DATACMNS-836 - public void toWrapperShouldConvertRxJava2ObservableToPublisher() { + void toWrapperShouldConvertRxJava2ObservableToPublisher() { io.reactivex.Observable foo = io.reactivex.Observable.just("foo"); assertThat(ReactiveWrapperConverters.toWrapper(foo, Publisher.class)).isInstanceOf(Publisher.class); } @Test // DATACMNS-988 - public void toWrapperShouldConvertPublisherToRxJava2Observable() { + void toWrapperShouldConvertPublisherToRxJava2Observable() { Flux foo = Flux.just("foo"); assertThat(ReactiveWrapperConverters.toWrapper(foo, io.reactivex.Observable.class)) @@ -184,7 +184,7 @@ public class ReactiveWrapperConvertersUnitTests { } @Test // DATACMNS-988 - public void toWrapperShouldConvertPublisherToRxJava2Flowable() { + void toWrapperShouldConvertPublisherToRxJava2Flowable() { Flux foo = Flux.just("foo"); assertThat(ReactiveWrapperConverters.toWrapper(foo, io.reactivex.Flowable.class)) @@ -192,14 +192,14 @@ public class ReactiveWrapperConvertersUnitTests { } @Test // DATACMNS-836 - public void toWrapperShouldConvertMonoToFlux() { + void toWrapperShouldConvertMonoToFlux() { Mono foo = Mono.just("foo"); assertThat(ReactiveWrapperConverters.toWrapper(foo, Flux.class)).isInstanceOf(Flux.class); } @Test // DATACMNS-836 - public void shouldMapMono() { + void shouldMapMono() { Mono foo = Mono.just("foo"); Mono map = ReactiveWrapperConverters.map(foo, source -> 1L); @@ -207,7 +207,7 @@ public class ReactiveWrapperConvertersUnitTests { } @Test // DATACMNS-836 - public void shouldMapFlux() { + void shouldMapFlux() { Flux foo = Flux.just("foo"); Flux map = ReactiveWrapperConverters.map(foo, source -> 1L); @@ -215,7 +215,7 @@ public class ReactiveWrapperConvertersUnitTests { } @Test // DATACMNS-836 - public void shouldMapRxJava1Single() { + void shouldMapRxJava1Single() { Single foo = Single.just("foo"); Single map = ReactiveWrapperConverters.map(foo, source -> 1L); @@ -223,7 +223,7 @@ public class ReactiveWrapperConvertersUnitTests { } @Test // DATACMNS-836 - public void shouldMapRxJava1Observable() { + void shouldMapRxJava1Observable() { Observable foo = Observable.just("foo"); Observable map = ReactiveWrapperConverters.map(foo, source -> 1L); @@ -231,7 +231,7 @@ public class ReactiveWrapperConvertersUnitTests { } @Test // DATACMNS-836 - public void shouldMapRxJava2Single() { + void shouldMapRxJava2Single() { io.reactivex.Single foo = io.reactivex.Single.just("foo"); io.reactivex.Single map = ReactiveWrapperConverters.map(foo, source -> 1L); @@ -239,7 +239,7 @@ public class ReactiveWrapperConvertersUnitTests { } @Test // DATACMNS-836 - public void shouldMapRxJava2Maybe() { + void shouldMapRxJava2Maybe() { io.reactivex.Maybe foo = io.reactivex.Maybe.just("foo"); io.reactivex.Maybe map = ReactiveWrapperConverters.map(foo, source -> 1L); @@ -247,7 +247,7 @@ public class ReactiveWrapperConvertersUnitTests { } @Test // DATACMNS-836 - public void shouldMapRxJava2Observable() { + void shouldMapRxJava2Observable() { io.reactivex.Observable foo = io.reactivex.Observable.just("foo"); io.reactivex.Observable map = ReactiveWrapperConverters.map(foo, source -> 1L); @@ -255,7 +255,7 @@ public class ReactiveWrapperConvertersUnitTests { } @Test // DATACMNS-836 - public void shouldMapRxJava2Flowable() { + void shouldMapRxJava2Flowable() { io.reactivex.Flowable foo = io.reactivex.Flowable.just("foo"); io.reactivex.Flowable map = ReactiveWrapperConverters.map(foo, source -> 1L); diff --git a/src/test/java/org/springframework/data/repository/util/ReactiveWrappersUnitTests.java b/src/test/java/org/springframework/data/repository/util/ReactiveWrappersUnitTests.java index 76cd18ef7..25bdccebf 100644 --- a/src/test/java/org/springframework/data/repository/util/ReactiveWrappersUnitTests.java +++ b/src/test/java/org/springframework/data/repository/util/ReactiveWrappersUnitTests.java @@ -15,26 +15,27 @@ */ package org.springframework.data.repository.util; -import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.*; import io.reactivex.Completable; import io.reactivex.Flowable; -import org.junit.Test; -import org.reactivestreams.Publisher; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import rx.Observable; import rx.Single; +import org.junit.jupiter.api.Test; +import org.reactivestreams.Publisher; + /** * Unit tests for {@link ReactiveWrappers}. * * @author Mark Paluch */ -public class ReactiveWrappersUnitTests { +class ReactiveWrappersUnitTests { @Test // DATACMNS-836 - public void isSingleLikeShouldReportCorrectNoTypes() { + void isSingleLikeShouldReportCorrectNoTypes() { assertThat(ReactiveWrappers.isNoValueType(Mono.class)).isFalse(); assertThat(ReactiveWrappers.isNoValueType(Flux.class)).isFalse(); @@ -49,7 +50,7 @@ public class ReactiveWrappersUnitTests { } @Test // DATACMNS-836 - public void isSingleLikeShouldReportCorrectSingleTypes() { + void isSingleLikeShouldReportCorrectSingleTypes() { assertThat(ReactiveWrappers.isSingleValueType(Mono.class)).isTrue(); assertThat(ReactiveWrappers.isSingleValueType(Flux.class)).isFalse(); @@ -65,7 +66,7 @@ public class ReactiveWrappersUnitTests { } @Test // DATACMNS-836 - public void isCollectionLikeShouldReportCorrectCollectionTypes() { + void isCollectionLikeShouldReportCorrectCollectionTypes() { assertThat(ReactiveWrappers.isMultiValueType(Mono.class)).isFalse(); assertThat(ReactiveWrappers.isMultiValueType(Flux.class)).isTrue(); diff --git a/src/test/java/org/springframework/data/spel/EvaluationContextExtensionInformationUnitTests.java b/src/test/java/org/springframework/data/spel/EvaluationContextExtensionInformationUnitTests.java index 24b5fcdca..628f798c8 100644 --- a/src/test/java/org/springframework/data/spel/EvaluationContextExtensionInformationUnitTests.java +++ b/src/test/java/org/springframework/data/spel/EvaluationContextExtensionInformationUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.spel; import java.util.Optional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.spel.spi.EvaluationContextExtension; /** @@ -25,10 +25,10 @@ import org.springframework.data.spel.spi.EvaluationContextExtension; * * @author Oliver Gierke */ -public class EvaluationContextExtensionInformationUnitTests { +class EvaluationContextExtensionInformationUnitTests { @Test // DATACMNS-1024 - public void supportsMethodOverloadsOnRoot() { + void supportsMethodOverloadsOnRoot() { EvaluationContextExtensionInformation information = new EvaluationContextExtensionInformation( SampleExtension.class); diff --git a/src/test/java/org/springframework/data/spel/spi/FunctionUnitTests.java b/src/test/java/org/springframework/data/spel/spi/FunctionUnitTests.java index 896dda28f..8c1361f8b 100644 --- a/src/test/java/org/springframework/data/spel/spi/FunctionUnitTests.java +++ b/src/test/java/org/springframework/data/spel/spi/FunctionUnitTests.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.*; import java.lang.reflect.Method; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.core.convert.TypeDescriptor; import org.springframework.util.ReflectionUtils; @@ -29,10 +29,10 @@ import org.springframework.util.ReflectionUtils; * * @author Oliver Drotbohm */ -public class FunctionUnitTests { +class FunctionUnitTests { @Test // DATACMNS-1518 - public void detectsVarArgsOverload() { + void detectsVarArgsOverload() { Method method = ReflectionUtils.findMethod(Sample.class, "someMethod", String[].class); @@ -44,7 +44,7 @@ public class FunctionUnitTests { } @Test // DATACMNS-1518 - public void detectsObjectVarArgsOverload() { + void detectsObjectVarArgsOverload() { Method method = ReflectionUtils.findMethod(Sample.class, "onePlusObjectVarargs", String.class, Object[].class); diff --git a/src/test/java/org/springframework/data/support/PersistableIsNewStrategyUnitTests.java b/src/test/java/org/springframework/data/support/PersistableIsNewStrategyUnitTests.java index 1ae6d0be5..feb4c1124 100755 --- a/src/test/java/org/springframework/data/support/PersistableIsNewStrategyUnitTests.java +++ b/src/test/java/org/springframework/data/support/PersistableIsNewStrategyUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.support; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.domain.Persistable; /** @@ -25,12 +25,12 @@ import org.springframework.data.domain.Persistable; * * @author Oliver Gierke */ -public class PersistableIsNewStrategyUnitTests { +class PersistableIsNewStrategyUnitTests { IsNewStrategy strategy = PersistableIsNewStrategy.INSTANCE; @Test - public void invokesPersistableIsNewForTest() { + void invokesPersistableIsNewForTest() { PersistableEntity entity = new PersistableEntity(); assertThat(strategy.isNew(entity)).isTrue(); @@ -40,7 +40,7 @@ public class PersistableIsNewStrategyUnitTests { } @Test - public void rejectsNonPersistableEntity() { + void rejectsNonPersistableEntity() { assertThatIllegalArgumentException().isThrownBy(() -> strategy.isNew(new Object())); } diff --git a/src/test/java/org/springframework/data/transaction/ChainedTransactionManagerTests.java b/src/test/java/org/springframework/data/transaction/ChainedTransactionManagerTests.java index 191579b48..55ff9d342 100755 --- a/src/test/java/org/springframework/data/transaction/ChainedTransactionManagerTests.java +++ b/src/test/java/org/springframework/data/transaction/ChainedTransactionManagerTests.java @@ -18,7 +18,7 @@ package org.springframework.data.transaction; import static org.assertj.core.api.Assertions.*; import static org.springframework.data.transaction.ChainedTransactionManagerTests.TestPlatformTransactionManager.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.transaction.HeuristicCompletionException; import org.springframework.transaction.PlatformTransactionManager; @@ -36,12 +36,12 @@ import org.springframework.transaction.support.DefaultTransactionDefinition; * @author Oliver Gierke * @since 1.6 */ -public class ChainedTransactionManagerTests { +class ChainedTransactionManagerTests { ChainedTransactionManager tm; @Test - public void shouldCompleteSuccessfully() { + void shouldCompleteSuccessfully() { TestPlatformTransactionManager transactionManager = createNonFailingTransactionManager("single"); setupTransactionManagers(transactionManager); @@ -52,7 +52,7 @@ public class ChainedTransactionManagerTests { } @Test - public void shouldThrowRolledBackExceptionForSingleTMFailure() { + void shouldThrowRolledBackExceptionForSingleTMFailure() { setupTransactionManagers(createFailingTransactionManager("single")); @@ -62,7 +62,7 @@ public class ChainedTransactionManagerTests { } @Test - public void shouldCommitAllRegisteredTransactionManagers() { + void shouldCommitAllRegisteredTransactionManagers() { TestPlatformTransactionManager first = createNonFailingTransactionManager("first"); TestPlatformTransactionManager second = createNonFailingTransactionManager("second"); @@ -75,7 +75,7 @@ public class ChainedTransactionManagerTests { } @Test - public void shouldCommitInReverseOrder() { + void shouldCommitInReverseOrder() { TestPlatformTransactionManager first = createNonFailingTransactionManager("first"); TestPlatformTransactionManager second = createNonFailingTransactionManager("second"); @@ -87,7 +87,7 @@ public class ChainedTransactionManagerTests { } @Test - public void shouldThrowMixedRolledBackExceptionForNonFirstTMFailure() { + void shouldThrowMixedRolledBackExceptionForNonFirstTMFailure() { setupTransactionManagers(TestPlatformTransactionManager.createFailingTransactionManager("first"), createNonFailingTransactionManager("second")); @@ -98,7 +98,7 @@ public class ChainedTransactionManagerTests { } @Test - public void shouldRollbackAllTransactionManagers() { + void shouldRollbackAllTransactionManagers() { TestPlatformTransactionManager first = createNonFailingTransactionManager("first"); TestPlatformTransactionManager second = createNonFailingTransactionManager("second"); @@ -112,7 +112,7 @@ public class ChainedTransactionManagerTests { } @Test - public void shouldThrowExceptionOnFailingRollback() { + void shouldThrowExceptionOnFailingRollback() { PlatformTransactionManager first = createFailingTransactionManager("first"); setupTransactionManagers(first); @@ -157,7 +157,7 @@ public class ChainedTransactionManagerTests { private Long commitTime; private Long rollbackTime; - public TestPlatformTransactionManager(String name) { + TestPlatformTransactionManager(String name) { this.name = name; } @@ -196,15 +196,15 @@ public class ChainedTransactionManagerTests { rollbackTime = System.currentTimeMillis(); } - public boolean isCommitted() { + boolean isCommitted() { return commitTime != null; } - public boolean wasRolledBack() { + boolean wasRolledBack() { return rollbackTime != null; } - public Long getCommitTime() { + Long getCommitTime() { return commitTime; } @@ -212,7 +212,7 @@ public class ChainedTransactionManagerTests { static class TestTransactionStatus extends AbstractTransactionStatus { - public TestTransactionStatus(TransactionDefinition definition) {} + TestTransactionStatus(TransactionDefinition definition) {} public boolean isNewTransaction() { return false; diff --git a/src/test/java/org/springframework/data/type/classreading/DefaultMethodsMetadataReaderUnitTests.java b/src/test/java/org/springframework/data/type/classreading/DefaultMethodsMetadataReaderUnitTests.java index e341dd6ac..a59dab7aa 100644 --- a/src/test/java/org/springframework/data/type/classreading/DefaultMethodsMetadataReaderUnitTests.java +++ b/src/test/java/org/springframework/data/type/classreading/DefaultMethodsMetadataReaderUnitTests.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.*; import java.io.IOException; import java.util.Iterator; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.core.type.MethodMetadata; import org.springframework.data.type.MethodsMetadata; @@ -29,10 +29,10 @@ import org.springframework.data.type.MethodsMetadata; * * @author Mark Paluch */ -public class DefaultMethodsMetadataReaderUnitTests { +class DefaultMethodsMetadataReaderUnitTests { @Test // DATACMNS-1206 - public void shouldReadClassMethods() throws IOException { + void shouldReadClassMethods() throws IOException { MethodsMetadata metadata = getMethodsMetadata(Foo.class); @@ -46,7 +46,7 @@ public class DefaultMethodsMetadataReaderUnitTests { } @Test // DATACMNS-1206 - public void shouldReadInterfaceMethods() throws IOException { + void shouldReadInterfaceMethods() throws IOException { MethodsMetadata metadata = getMethodsMetadata(Baz.class); @@ -60,7 +60,7 @@ public class DefaultMethodsMetadataReaderUnitTests { } @Test // DATACMNS-1206 - public void shouldMetadata() throws IOException { + void shouldMetadata() throws IOException { MethodsMetadataReaderFactory factory = new MethodsMetadataReaderFactory(); MethodsMetadataReader metadataReader = factory.getMetadataReader(getClass().getName()); @@ -70,7 +70,7 @@ public class DefaultMethodsMetadataReaderUnitTests { } @Test // DATACMNS-1206 - public void shouldReturnMethodMetadataByName() throws IOException { + void shouldReturnMethodMetadataByName() throws IOException { MethodsMetadata metadata = getMethodsMetadata(Foo.class); diff --git a/src/test/java/org/springframework/data/type/classreading/MethodsMetadataReaderFactoryUnitTests.java b/src/test/java/org/springframework/data/type/classreading/MethodsMetadataReaderFactoryUnitTests.java index c91cf8880..3ef3bffd3 100644 --- a/src/test/java/org/springframework/data/type/classreading/MethodsMetadataReaderFactoryUnitTests.java +++ b/src/test/java/org/springframework/data/type/classreading/MethodsMetadataReaderFactoryUnitTests.java @@ -22,20 +22,19 @@ import java.io.IOException; import java.net.URL; import java.net.URLClassLoader; -import org.junit.Test; +import org.junit.jupiter.api.Test; + import org.springframework.core.io.DefaultResourceLoader; -import org.springframework.data.type.classreading.MethodsMetadataReader; -import org.springframework.data.type.classreading.MethodsMetadataReaderFactory; /** * Unit tests for {@link MethodsMetadataReaderFactory}. * * @author Mark Paluch */ -public class MethodsMetadataReaderFactoryUnitTests { +class MethodsMetadataReaderFactoryUnitTests { @Test // DATACMNS-1206 - public void shouldReadFromDefaultClassLoader() throws IOException { + void shouldReadFromDefaultClassLoader() throws IOException { MethodsMetadataReaderFactory factory = new MethodsMetadataReaderFactory(); MethodsMetadataReader reader = factory.getMetadataReader(getClass().getName()); @@ -44,7 +43,7 @@ public class MethodsMetadataReaderFactoryUnitTests { } @Test // DATACMNS-1206 - public void shouldReadFromClassLoader() throws IOException { + void shouldReadFromClassLoader() throws IOException { MethodsMetadataReaderFactory factory = new MethodsMetadataReaderFactory(getClass().getClassLoader()); MethodsMetadataReader reader = factory.getMetadataReader(getClass().getName()); @@ -53,7 +52,7 @@ public class MethodsMetadataReaderFactoryUnitTests { } @Test // DATACMNS-1206 - public void shouldNotFindClass() { + void shouldNotFindClass() { MethodsMetadataReaderFactory factory = new MethodsMetadataReaderFactory(new URLClassLoader(new URL[0], null)); @@ -61,7 +60,7 @@ public class MethodsMetadataReaderFactoryUnitTests { } @Test // DATACMNS-1206 - public void shouldReadFromResourceLoader() throws IOException { + void shouldReadFromResourceLoader() throws IOException { MethodsMetadataReaderFactory factory = new MethodsMetadataReaderFactory(new DefaultResourceLoader()); MethodsMetadataReader reader = factory.getMetadataReader(getClass().getName()); diff --git a/src/test/java/org/springframework/data/util/AnnotatedTypeScannerUnitTests.java b/src/test/java/org/springframework/data/util/AnnotatedTypeScannerUnitTests.java index 93b94e8d2..81bb8a964 100755 --- a/src/test/java/org/springframework/data/util/AnnotatedTypeScannerUnitTests.java +++ b/src/test/java/org/springframework/data/util/AnnotatedTypeScannerUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.util; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.annotation.Persistent; /** diff --git a/src/test/java/org/springframework/data/util/AnnotationDetectionFieldCallbackUnitTests.java b/src/test/java/org/springframework/data/util/AnnotationDetectionFieldCallbackUnitTests.java index 72a380aee..777d6f6cb 100755 --- a/src/test/java/org/springframework/data/util/AnnotationDetectionFieldCallbackUnitTests.java +++ b/src/test/java/org/springframework/data/util/AnnotationDetectionFieldCallbackUnitTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*; import lombok.Value; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.ReflectionUtils; diff --git a/src/test/java/org/springframework/data/util/AnnotationDetectionMethodCallbackUnitTests.java b/src/test/java/org/springframework/data/util/AnnotationDetectionMethodCallbackUnitTests.java index bbb6b442a..c84696483 100755 --- a/src/test/java/org/springframework/data/util/AnnotationDetectionMethodCallbackUnitTests.java +++ b/src/test/java/org/springframework/data/util/AnnotationDetectionMethodCallbackUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.util; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Value; import org.springframework.util.ReflectionUtils; diff --git a/src/test/java/org/springframework/data/util/BeanLookupUnitTests.java b/src/test/java/org/springframework/data/util/BeanLookupUnitTests.java index 303693c15..b61341d14 100644 --- a/src/test/java/org/springframework/data/util/BeanLookupUnitTests.java +++ b/src/test/java/org/springframework/data/util/BeanLookupUnitTests.java @@ -21,11 +21,12 @@ import static org.mockito.Mockito.*; import java.util.HashMap; import java.util.Map; -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.springframework.beans.factory.ListableBeanFactory; import org.springframework.beans.factory.NoUniqueBeanDefinitionException; import org.springframework.data.querydsl.EntityPathResolver; @@ -37,13 +38,13 @@ import org.springframework.data.querydsl.SimpleEntityPathResolver; * @author Oliver Gierke * @soundtrack Dave Matthews Band - Shotgun (DMB Live 25) */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class BeanLookupUnitTests { @Mock ListableBeanFactory beanFactory; Map beans; - @Before + @BeforeEach public void setUp() { this.beans = new HashMap<>(); diff --git a/src/test/java/org/springframework/data/util/ClassTypeInformationUnitTests.java b/src/test/java/org/springframework/data/util/ClassTypeInformationUnitTests.java index 649e2058f..53d7d7397 100755 --- a/src/test/java/org/springframework/data/util/ClassTypeInformationUnitTests.java +++ b/src/test/java/org/springframework/data/util/ClassTypeInformationUnitTests.java @@ -28,7 +28,7 @@ import java.util.Map; import java.util.Set; import java.util.SortedMap; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.mapping.Person; /** diff --git a/src/test/java/org/springframework/data/util/DataCmns511Tests.java b/src/test/java/org/springframework/data/util/DataCmns511Tests.java index 3df2982c2..03d217284 100755 --- a/src/test/java/org/springframework/data/util/DataCmns511Tests.java +++ b/src/test/java/org/springframework/data/util/DataCmns511Tests.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.*; import java.util.HashSet; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Unit tests to reproduce issues reported in DATACMNS-511. diff --git a/src/test/java/org/springframework/data/util/DirectFieldAccessFallbackBeanWrapperUnitTests.java b/src/test/java/org/springframework/data/util/DirectFieldAccessFallbackBeanWrapperUnitTests.java index 4f302e05a..9f4806e01 100755 --- a/src/test/java/org/springframework/data/util/DirectFieldAccessFallbackBeanWrapperUnitTests.java +++ b/src/test/java/org/springframework/data/util/DirectFieldAccessFallbackBeanWrapperUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.util; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.BeanWrapper; import org.springframework.beans.NotReadablePropertyException; import org.springframework.beans.NotWritablePropertyException; diff --git a/src/test/java/org/springframework/data/util/KotlinReflectionUtilsUnitTests.java b/src/test/java/org/springframework/data/util/KotlinReflectionUtilsUnitTests.java index a2db890cc..2e43b66bf 100644 --- a/src/test/java/org/springframework/data/util/KotlinReflectionUtilsUnitTests.java +++ b/src/test/java/org/springframework/data/util/KotlinReflectionUtilsUnitTests.java @@ -21,8 +21,8 @@ import static org.assertj.core.api.Assumptions.*; import java.net.URL; import java.net.URLClassLoader; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.core.KotlinDetector; import org.springframework.util.ClassUtils; @@ -35,19 +35,19 @@ import org.springframework.util.ReflectionUtils; */ public class KotlinReflectionUtilsUnitTests { - @Before - public void before() { + @BeforeEach + void before() { assumeThat(Version.javaVersion()).isLessThan(Version.parse("9.0")); } @Test // DATACMNS-1508 - public void classShouldLoadWithKotlin() { + void classShouldLoadWithKotlin() { assertThat(KotlinDetector.isKotlinPresent()).isTrue(); assertThat(KotlinReflectionUtils.isSupportedKotlinClass(TypeCreatingSyntheticClass.class)).isTrue(); } @Test // DATACMNS-1508 - public void classShouldLoadWithoutKotlin() throws Exception { + void classShouldLoadWithoutKotlin() throws Exception { runTest("loadClassWithoutKotlin"); } @@ -58,7 +58,7 @@ public class KotlinReflectionUtilsUnitTests { assertThat(KotlinReflectionUtils.isSupportedKotlinClass(TypeCreatingSyntheticClass.class)).isFalse(); } - protected void runTest(String testName) + void runTest(String testName) throws ClassNotFoundException, InstantiationException, IllegalAccessException, NoSuchMethodException { KotlinExcludingURLClassLoader classLoader = new KotlinExcludingURLClassLoader( @@ -69,7 +69,7 @@ public class KotlinReflectionUtilsUnitTests { } static class KotlinExcludingURLClassLoader extends URLClassLoader { - public KotlinExcludingURLClassLoader(URL[] urls) { + KotlinExcludingURLClassLoader(URL[] urls) { super(urls, null); } diff --git a/src/test/java/org/springframework/data/util/LazyUnitTests.java b/src/test/java/org/springframework/data/util/LazyUnitTests.java index dc2976392..fd36cb420 100755 --- a/src/test/java/org/springframework/data/util/LazyUnitTests.java +++ b/src/test/java/org/springframework/data/util/LazyUnitTests.java @@ -21,10 +21,10 @@ import static org.mockito.Mockito.*; import java.util.Optional; import java.util.function.Supplier; -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; /** * Unit tests for {@link Lazy}. @@ -32,14 +32,14 @@ import org.mockito.junit.MockitoJUnitRunner; * @author Oliver Gierke * @author Mark Paluch */ -@RunWith(MockitoJUnitRunner.class) -public class LazyUnitTests { +@ExtendWith(MockitoExtension.class) +class LazyUnitTests { @Mock Supplier supplier; @Mock Supplier> optionalSupplier; @Test - public void createsLazyOptional() { + void createsLazyOptional() { doReturn(Optional.empty()).when(optionalSupplier).get(); @@ -47,7 +47,7 @@ public class LazyUnitTests { } @Test - public void createsLazyFromValue() { + void createsLazyFromValue() { Object value = new Object(); @@ -55,7 +55,7 @@ public class LazyUnitTests { } @Test - public void returnsLastValueInChain() { + void returnsLastValueInChain() { Object reference = new Object(); @@ -68,7 +68,7 @@ public class LazyUnitTests { } @Test - public void returnsCachedInstanceOnMultipleAccesses() { + void returnsCachedInstanceOnMultipleAccesses() { Lazy lazy = Lazy.of(() -> new Object()); @@ -76,24 +76,24 @@ public class LazyUnitTests { } @Test - public void rejectsNullValueLookup() { + void rejectsNullValueLookup() { assertThatExceptionOfType(IllegalStateException.class) // .isThrownBy(() -> Lazy.of(() -> null).get()); } @Test - public void allowsNullableValueLookupViaOptional() { + void allowsNullableValueLookupViaOptional() { assertThat(Lazy.of(() -> null).getOptional()).isEmpty(); } @Test // DATACMNS-1556 - public void allowsNullableValue() { + void allowsNullableValue() { assertThat(Lazy.of(() -> null).getNullable()).isNull(); } @Test - public void ignoresElseIfValuePresent() { + void ignoresElseIfValuePresent() { Object first = new Object(); Object second = new Object(); @@ -106,7 +106,7 @@ public class LazyUnitTests { } @Test - public void returnsElseValue() { + void returnsElseValue() { Object reference = new Object(); diff --git a/src/test/java/org/springframework/data/util/MethodInvocationRecorderUnitTests.java b/src/test/java/org/springframework/data/util/MethodInvocationRecorderUnitTests.java index 5126a3eb2..ba08d9438 100644 --- a/src/test/java/org/springframework/data/util/MethodInvocationRecorderUnitTests.java +++ b/src/test/java/org/springframework/data/util/MethodInvocationRecorderUnitTests.java @@ -21,7 +21,7 @@ import lombok.Getter; import java.util.Collection; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.util.MethodInvocationRecorder.Recorded; /** @@ -30,19 +30,19 @@ import org.springframework.data.util.MethodInvocationRecorder.Recorded; * @author Oliver Gierke * @soundtrack The Intersphere - Don't Think Twice (The Grand Delusion) */ -public class MethodInvocationRecorderUnitTests { +class MethodInvocationRecorderUnitTests { - Recorded recorder = MethodInvocationRecorder.forProxyOf(Foo.class); + private Recorded recorder = MethodInvocationRecorder.forProxyOf(Foo.class); @Test // DATACMNS-1449 - public void rejectsFinalTypes() { + void rejectsFinalTypes() { assertThatExceptionOfType(IllegalArgumentException.class) // .isThrownBy(() -> MethodInvocationRecorder.forProxyOf(FinalType.class)); } @Test // DATACMNS-1449 - public void createsPropertyPathForSimpleMethodReference() { + void createsPropertyPathForSimpleMethodReference() { Recorded wrapper = recorder.record(Foo::getBar); @@ -50,7 +50,7 @@ public class MethodInvocationRecorderUnitTests { } @Test // DATACMNS-1449 - public void createsPropertyPathForNestedMethodReference() { + void createsPropertyPathForNestedMethodReference() { Recorded wrapper = recorder.record(Foo::getBar).record(Bar::getFooBar); @@ -58,7 +58,7 @@ public class MethodInvocationRecorderUnitTests { } @Test // DATACMNS-1449 - public void createsPropertyPathForNestedCall() { + void createsPropertyPathForNestedCall() { Recorded wrapper = recorder.record((Foo source) -> source.getBar().getFooBar()); @@ -66,7 +66,7 @@ public class MethodInvocationRecorderUnitTests { } @Test // DATACMNS-1449 - public void usesCustomPropertyNamingStrategy() { + void usesCustomPropertyNamingStrategy() { Recorded recorded = MethodInvocationRecorder.forProxyOf(Foo.class).record(Foo::getBar); @@ -74,12 +74,12 @@ public class MethodInvocationRecorderUnitTests { } @Test // DATACMNS-1449 - public void registersLookupToFinalType() { + void registersLookupToFinalType() { assertThat(recorder.record(Foo::getName).getPropertyPath()).hasValue("name"); } @Test // DATACMNS-1449 - public void recordsInvocationOnInterface() { + void recordsInvocationOnInterface() { Recorded recorder = MethodInvocationRecorder.forProxyOf(Sample.class); diff --git a/src/test/java/org/springframework/data/util/NullableUtilsUnitTests.java b/src/test/java/org/springframework/data/util/NullableUtilsUnitTests.java index 8962dbeed..4487a02f3 100644 --- a/src/test/java/org/springframework/data/util/NullableUtilsUnitTests.java +++ b/src/test/java/org/springframework/data/util/NullableUtilsUnitTests.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.*; import java.lang.annotation.ElementType; import java.lang.reflect.Method; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.core.MethodParameter; import org.springframework.data.util.nonnull.NullableAnnotatedType; import org.springframework.data.util.nonnull.packagelevel.NonNullOnPackage; @@ -34,10 +34,10 @@ import org.springframework.util.ReflectionUtils; * * @author Mark Paluch */ -public class NullableUtilsUnitTests { +class NullableUtilsUnitTests { @Test // DATACMNS-1154 - public void packageAnnotatedShouldConsiderNonNullAnnotation() { + void packageAnnotatedShouldConsiderNonNullAnnotation() { Method method = ReflectionUtils.findMethod(NonNullOnPackage.class, "nonNullReturnValue"); @@ -47,42 +47,42 @@ public class NullableUtilsUnitTests { } @Test // DATACMNS-1154 - public void packageAnnotatedShouldConsiderNonNullAnnotationForClass() { + void packageAnnotatedShouldConsiderNonNullAnnotationForClass() { assertThat(NullableUtils.isNonNull(NonNullOnPackage.class, ElementType.PARAMETER)).isTrue(); assertThat(NullableUtils.isNonNull(NonNullOnPackage.class, ElementType.PACKAGE)).isFalse(); } @Test // DATACMNS-1154 - public void packageAnnotatedShouldConsiderNonNullAnnotationForMethod() { + void packageAnnotatedShouldConsiderNonNullAnnotationForMethod() { assertThat(NullableUtils.isNonNull(NonNullOnPackage.class, ElementType.PARAMETER)).isTrue(); assertThat(NullableUtils.isNonNull(NonNullOnPackage.class, ElementType.PACKAGE)).isFalse(); } @Test // DATACMNS-1154 - public void shouldConsiderJsr305NonNullParameters() { + void shouldConsiderJsr305NonNullParameters() { assertThat(NullableUtils.isNonNull(NonNullableParameters.class, ElementType.PARAMETER)).isTrue(); assertThat(NullableUtils.isNonNull(NonNullableParameters.class, ElementType.FIELD)).isFalse(); } @Test // DATACMNS-1154 - public void shouldConsiderJsr305NonNullAnnotation() { + void shouldConsiderJsr305NonNullAnnotation() { assertThat(NullableUtils.isNonNull(Jsr305NonnullAnnotatedType.class, ElementType.PARAMETER)).isTrue(); assertThat(NullableUtils.isNonNull(Jsr305NonnullAnnotatedType.class, ElementType.FIELD)).isTrue(); } @Test // DATACMNS-1154 - public void shouldConsiderNonAnnotatedTypeNullable() { + void shouldConsiderNonAnnotatedTypeNullable() { assertThat(NullableUtils.isNonNull(NonAnnotatedType.class, ElementType.PARAMETER)).isFalse(); assertThat(NullableUtils.isNonNull(NonAnnotatedType.class, ElementType.FIELD)).isFalse(); } @Test // DATACMNS-1154 - public void shouldConsiderParametersWithoutNullableAnnotation() { + void shouldConsiderParametersWithoutNullableAnnotation() { Method method = ReflectionUtils.findMethod(NullableAnnotatedType.class, "nonNullMethod", String.class); @@ -94,7 +94,7 @@ public class NullableUtilsUnitTests { } @Test // DATACMNS-1154 - public void shouldConsiderParametersNullableAnnotation() { + void shouldConsiderParametersNullableAnnotation() { Method method = ReflectionUtils.findMethod(NullableAnnotatedType.class, "nullableReturn"); @@ -102,7 +102,7 @@ public class NullableUtilsUnitTests { } @Test // DATACMNS-1154 - public void shouldConsiderParametersJsr305NullableMetaAnnotation() { + void shouldConsiderParametersJsr305NullableMetaAnnotation() { Method method = ReflectionUtils.findMethod(NullableAnnotatedType.class, "jsr305NullableReturn"); @@ -110,7 +110,7 @@ public class NullableUtilsUnitTests { } @Test // DATACMNS-1154 - public void shouldConsiderParametersJsr305NonnullAnnotation() { + void shouldConsiderParametersJsr305NonnullAnnotation() { Method method = ReflectionUtils.findMethod(NullableAnnotatedType.class, "jsr305NullableReturnWhen"); diff --git a/src/test/java/org/springframework/data/util/PairUnitTests.java b/src/test/java/org/springframework/data/util/PairUnitTests.java index 418a1e2d2..82a015368 100755 --- a/src/test/java/org/springframework/data/util/PairUnitTests.java +++ b/src/test/java/org/springframework/data/util/PairUnitTests.java @@ -17,17 +17,17 @@ package org.springframework.data.util; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Unit tests for {@link Pair}. * * @author Oliver Gierke */ -public class PairUnitTests { +class PairUnitTests { @Test // DATACMNS-790 - public void setsUpSimpleInstance() { + void setsUpSimpleInstance() { Pair pair = Pair.of(1, 2); @@ -36,17 +36,17 @@ public class PairUnitTests { } @Test // DATACMNS-790 - public void rejectsNullFirstElement() { + void rejectsNullFirstElement() { assertThatIllegalArgumentException().isThrownBy(() -> Pair.of(null, 1)); } @Test // DATACMNS-790 - public void rejectsNullSecondElement() { + void rejectsNullSecondElement() { assertThatIllegalArgumentException().isThrownBy(() -> Pair.of(1, null)); } @Test // DATACMNS-790 - public void hasCorrectEquals() { + void hasCorrectEquals() { Pair first = Pair.of(1, 2); Pair second = Pair.of(1, 2); @@ -57,7 +57,7 @@ public class PairUnitTests { } @Test // DATACMNS-790 - public void hasCorrectHashCode() { + void hasCorrectHashCode() { Pair first = Pair.of(1, 2); Pair second = Pair.of(1, 2); diff --git a/src/test/java/org/springframework/data/util/ParameterTypesUnitTests.java b/src/test/java/org/springframework/data/util/ParameterTypesUnitTests.java index 713ced0fc..50c4da437 100644 --- a/src/test/java/org/springframework/data/util/ParameterTypesUnitTests.java +++ b/src/test/java/org/springframework/data/util/ParameterTypesUnitTests.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.*; import java.lang.reflect.Method; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.util.ReflectionUtils; /** diff --git a/src/test/java/org/springframework/data/util/ParameterizedTypeInformationUnitTests.java b/src/test/java/org/springframework/data/util/ParameterizedTypeInformationUnitTests.java index 37151039d..06a226d99 100755 --- a/src/test/java/org/springframework/data/util/ParameterizedTypeInformationUnitTests.java +++ b/src/test/java/org/springframework/data/util/ParameterizedTypeInformationUnitTests.java @@ -27,11 +27,13 @@ import java.util.HashMap; import java.util.List; import java.util.Locale; -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 ParameterizedTypeInformation}. @@ -39,18 +41,19 @@ import org.mockito.junit.MockitoJUnitRunner; * @author Oliver Gierke * @author Mark Paluch */ -@RunWith(MockitoJUnitRunner.class) -public class ParameterizedTypeInformationUnitTests { +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) +class ParameterizedTypeInformationUnitTests { @Mock ParameterizedType one; - @Before - public void setUp() { + @BeforeEach + void setUp() { when(one.getActualTypeArguments()).thenReturn(new Type[0]); } @Test - public void considersTypeInformationsWithDifferingParentsNotEqual() { + void considersTypeInformationsWithDifferingParentsNotEqual() { TypeDiscoverer stringParent = new TypeDiscoverer<>(String.class, emptyMap()); TypeDiscoverer objectParent = new TypeDiscoverer<>(Object.class, emptyMap()); @@ -62,7 +65,7 @@ public class ParameterizedTypeInformationUnitTests { } @Test - public void considersTypeInformationsWithSameParentsNotEqual() { + void considersTypeInformationsWithSameParentsNotEqual() { TypeDiscoverer stringParent = new TypeDiscoverer<>(String.class, emptyMap()); @@ -73,7 +76,7 @@ public class ParameterizedTypeInformationUnitTests { } @Test // DATACMNS-88 - public void resolvesMapValueTypeCorrectly() { + void resolvesMapValueTypeCorrectly() { TypeInformation type = ClassTypeInformation.from(Foo.class); TypeInformation propertyType = type.getProperty("param"); @@ -90,14 +93,14 @@ public class ParameterizedTypeInformationUnitTests { } @Test // DATACMNS-446 - public void createsToStringRepresentation() { + void createsToStringRepresentation() { assertThat(from(Foo.class).getProperty("param").toString()) .isEqualTo("org.springframework.data.util.ParameterizedTypeInformationUnitTests$Localized"); } @Test // DATACMNS-485 - public void hashCodeShouldBeConsistentWithEqualsForResolvedTypes() { + void hashCodeShouldBeConsistentWithEqualsForResolvedTypes() { TypeInformation first = from(First.class).getProperty("property"); TypeInformation second = from(Second.class).getProperty("property"); @@ -109,7 +112,7 @@ public class ParameterizedTypeInformationUnitTests { } @Test // DATACMNS-485 - public void getActualTypeShouldNotUnwrapParameterizedTypes() { + void getActualTypeShouldNotUnwrapParameterizedTypes() { TypeInformation type = from(First.class).getProperty("property"); @@ -117,7 +120,7 @@ public class ParameterizedTypeInformationUnitTests { } @Test // DATACMNS-697 - public void usesLocalGenericInformationOfFields() { + void usesLocalGenericInformationOfFields() { TypeInformation information = ClassTypeInformation.from(NormalizedProfile.class); @@ -126,7 +129,7 @@ public class ParameterizedTypeInformationUnitTests { } @Test // DATACMNS-899 - public void returnsEmptyOptionalMapValueTypeForNonMapProperties() { + void returnsEmptyOptionalMapValueTypeForNonMapProperties() { TypeInformation typeInformation = ClassTypeInformation.from(Bar.class).getProperty("param"); assertThat(typeInformation).isInstanceOf(ParameterizedTypeInformation.class); @@ -134,7 +137,7 @@ public class ParameterizedTypeInformationUnitTests { } @Test // DATACMNS-1135 - public void prefersLocalGenericsDeclarationOverParentBound() { + void prefersLocalGenericsDeclarationOverParentBound() { ClassTypeInformation candidate = ClassTypeInformation.from(Candidate.class); @@ -145,7 +148,7 @@ public class ParameterizedTypeInformationUnitTests { } @Test // DATACMNS-1196 - public void detectsNestedGenerics() { + void detectsNestedGenerics() { TypeInformation myList = ClassTypeInformation.from(EnumGeneric.class).getRequiredProperty("inner.myList"); @@ -198,13 +201,13 @@ public class ParameterizedTypeInformationUnitTests { T value; } - class Education {} + private class Education {} // DATACMNS-1135 abstract class CandidateInfo {} - class Responsibility extends CandidateInfo {} + private class Responsibility extends CandidateInfo {} class Experience extends CandidateInfo { CandidateInfoContainer responsibilities; @@ -229,7 +232,7 @@ public class ParameterizedTypeInformationUnitTests { } } - static class EnumGeneric extends Generic {} + private static class EnumGeneric extends Generic {} public enum MyEnum { E1, E2 diff --git a/src/test/java/org/springframework/data/util/ParsingUtilsUnitTests.java b/src/test/java/org/springframework/data/util/ParsingUtilsUnitTests.java index e720e2d93..a3358cc71 100755 --- a/src/test/java/org/springframework/data/util/ParsingUtilsUnitTests.java +++ b/src/test/java/org/springframework/data/util/ParsingUtilsUnitTests.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.*; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Unit tests for {@link ParsingUtils}. diff --git a/src/test/java/org/springframework/data/util/ProxyUtilsUnitTests.java b/src/test/java/org/springframework/data/util/ProxyUtilsUnitTests.java index 8c7b2b0ca..4b0e1f486 100644 --- a/src/test/java/org/springframework/data/util/ProxyUtilsUnitTests.java +++ b/src/test/java/org/springframework/data/util/ProxyUtilsUnitTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*; import java.io.Serializable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.aop.framework.ProxyFactory; import org.springframework.data.util.ProxyUtils.ProxyDetector; diff --git a/src/test/java/org/springframework/data/util/ReflectionUtilsUnitTests.java b/src/test/java/org/springframework/data/util/ReflectionUtilsUnitTests.java index 33bafa1f2..f0b0497ff 100755 --- a/src/test/java/org/springframework/data/util/ReflectionUtilsUnitTests.java +++ b/src/test/java/org/springframework/data/util/ReflectionUtilsUnitTests.java @@ -20,8 +20,8 @@ import static org.assertj.core.api.Assertions.*; import java.lang.reflect.Constructor; import java.lang.reflect.Field; -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.annotation.Autowired; import org.springframework.core.MethodParameter; import org.springframework.data.mapping.model.TypeCreatingSyntheticClassKt; @@ -40,7 +40,7 @@ public class ReflectionUtilsUnitTests { @SuppressWarnings("rawtypes") Constructor constructor; Field reference; - @Before + @BeforeEach public void setUp() throws Exception { this.reference = Sample.class.getField("field"); this.constructor = ConstructorDetection.class.getConstructor(int.class, String.class); diff --git a/src/test/java/org/springframework/data/util/StreamUtilsTests.java b/src/test/java/org/springframework/data/util/StreamUtilsTests.java index 753856e7f..7497a0dbb 100755 --- a/src/test/java/org/springframework/data/util/StreamUtilsTests.java +++ b/src/test/java/org/springframework/data/util/StreamUtilsTests.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Spring Data specific Java {@link Stream} utility methods and classes. diff --git a/src/test/java/org/springframework/data/util/StreamableUnitTests.java b/src/test/java/org/springframework/data/util/StreamableUnitTests.java index 12f220cf9..20f01bc15 100644 --- a/src/test/java/org/springframework/data/util/StreamableUnitTests.java +++ b/src/test/java/org/springframework/data/util/StreamableUnitTests.java @@ -21,7 +21,7 @@ import java.util.Arrays; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Unit tests for {@link Streamable} diff --git a/src/test/java/org/springframework/data/util/TypeDiscovererUnitTests.java b/src/test/java/org/springframework/data/util/TypeDiscovererUnitTests.java index fa43cb907..b3fc4cb78 100755 --- a/src/test/java/org/springframework/data/util/TypeDiscovererUnitTests.java +++ b/src/test/java/org/springframework/data/util/TypeDiscovererUnitTests.java @@ -29,31 +29,31 @@ import java.util.Locale; import java.util.Map; import java.util.Set; -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; /** * Unit tests for {@link TypeDiscoverer}. * * @author Oliver Gierke */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class TypeDiscovererUnitTests { - static final Map, Type> EMPTY_MAP = Collections.emptyMap(); + private static final Map, Type> EMPTY_MAP = Collections.emptyMap(); @Mock Map, Type> firstMap; @Mock Map, Type> secondMap; @Test - public void rejectsNullType() { + void rejectsNullType() { assertThatIllegalArgumentException().isThrownBy(() -> new TypeDiscoverer<>(null, null)); } @Test - public void isNotEqualIfTypesDiffer() { + void isNotEqualIfTypesDiffer() { TypeDiscoverer objectTypeInfo = new TypeDiscoverer<>(Object.class, EMPTY_MAP); TypeDiscoverer stringTypeInfo = new TypeDiscoverer<>(String.class, EMPTY_MAP); @@ -62,7 +62,7 @@ public class TypeDiscovererUnitTests { } @Test - public void isNotEqualIfTypeVariableMapsDiffer() { + void isNotEqualIfTypeVariableMapsDiffer() { assertThat(firstMap.equals(secondMap)).isFalse(); @@ -73,7 +73,7 @@ public class TypeDiscovererUnitTests { } @Test - public void dealsWithTypesReferencingThemselves() { + void dealsWithTypesReferencingThemselves() { TypeInformation information = from(SelfReferencing.class); TypeInformation first = information.getProperty("parent").getMapValueType(); @@ -83,7 +83,7 @@ public class TypeDiscovererUnitTests { } @Test - public void dealsWithTypesReferencingThemselvesInAMap() { + void dealsWithTypesReferencingThemselvesInAMap() { TypeInformation information = from(SelfReferencingMap.class); TypeInformation property = information.getProperty("map"); @@ -92,7 +92,7 @@ public class TypeDiscovererUnitTests { } @Test - public void returnsComponentAndValueTypesForMapExtensions() { + void returnsComponentAndValueTypesForMapExtensions() { TypeInformation discoverer = new TypeDiscoverer<>(CustomMap.class, EMPTY_MAP); @@ -101,7 +101,7 @@ public class TypeDiscovererUnitTests { } @Test - public void returnsComponentTypeForCollectionExtension() { + void returnsComponentTypeForCollectionExtension() { TypeDiscoverer discoverer = new TypeDiscoverer<>(CustomCollection.class, firstMap); @@ -109,7 +109,7 @@ public class TypeDiscovererUnitTests { } @Test - public void returnsComponentTypeForArrays() { + void returnsComponentTypeForArrays() { TypeDiscoverer discoverer = new TypeDiscoverer<>(String[].class, EMPTY_MAP); @@ -117,7 +117,7 @@ public class TypeDiscovererUnitTests { } @Test // DATACMNS-57 - public void discoveresConstructorParameterTypesCorrectly() throws NoSuchMethodException, SecurityException { + void discoveresConstructorParameterTypesCorrectly() throws NoSuchMethodException, SecurityException { TypeDiscoverer discoverer = new TypeDiscoverer<>(GenericConstructors.class, firstMap); Constructor constructor = GenericConstructors.class.getConstructor(List.class, Locale.class); @@ -130,7 +130,7 @@ public class TypeDiscovererUnitTests { @Test @SuppressWarnings("rawtypes") - public void returnsNullForComponentAndValueTypesForRawMaps() { + void returnsNullForComponentAndValueTypesForRawMaps() { TypeDiscoverer discoverer = new TypeDiscoverer<>(Map.class, EMPTY_MAP); @@ -140,7 +140,7 @@ public class TypeDiscovererUnitTests { @Test // DATACMNS-167 @SuppressWarnings("rawtypes") - public void doesNotConsiderTypeImplementingIterableACollection() { + void doesNotConsiderTypeImplementingIterableACollection() { TypeDiscoverer discoverer = new TypeDiscoverer<>(Person.class, EMPTY_MAP); TypeInformation reference = from(Address.class); @@ -161,7 +161,7 @@ public class TypeDiscovererUnitTests { } @Test // DATACMNS-1342, DATACMNS-1430 - public void considersStreamableToBeCollectionLike() { + void considersStreamableToBeCollectionLike() { TypeInformation type = from(SomeStreamable.class); @@ -170,7 +170,7 @@ public class TypeDiscovererUnitTests { } @Test // DATACMNS-1419 - public void detectsSubTypes() { + void detectsSubTypes() { ClassTypeInformation type = from(Set.class); diff --git a/src/test/java/org/springframework/data/util/VersionUnitTests.java b/src/test/java/org/springframework/data/util/VersionUnitTests.java index fe2cd92bf..2b2cddea9 100755 --- a/src/test/java/org/springframework/data/util/VersionUnitTests.java +++ b/src/test/java/org/springframework/data/util/VersionUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.util; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Unit tests for {@link Version}. @@ -25,10 +25,10 @@ import org.junit.Test; * @author Oliver Gierke * @author Mark Paluch */ -public class VersionUnitTests { +class VersionUnitTests { @Test // DATCMNS-384 - public void sameVersionsEqualOneDigits() { + void sameVersionsEqualOneDigits() { Version first = new Version(6); Version second = new Version(6); @@ -38,7 +38,7 @@ public class VersionUnitTests { } @Test // DATCMNS-384 - public void sameVersionsEqualTwoDigits() { + void sameVersionsEqualTwoDigits() { Version first = new Version(5, 2); Version second = new Version(5, 2); @@ -48,7 +48,7 @@ public class VersionUnitTests { } @Test // DATCMNS-384 - public void sameVersionsEqualThreeDigits() { + void sameVersionsEqualThreeDigits() { Version first = new Version(1, 2, 3); Version second = new Version(1, 2, 3); @@ -58,7 +58,7 @@ public class VersionUnitTests { } @Test // DATCMNS-384 - public void sameVersionsEqualFourDigits() { + void sameVersionsEqualFourDigits() { Version first = new Version(1, 2, 3, 1000); Version second = new Version(1, 2, 3, 1000); @@ -68,35 +68,35 @@ public class VersionUnitTests { } @Test // DATCMNS-384 - public void parsesVersionCorrectlyOneDigits() { + void parsesVersionCorrectlyOneDigits() { Version version = Version.parse("5"); assertThat(version).isEqualTo(new Version(5)); } @Test // DATCMNS-384 - public void parsesVersionCorrectlyTwoDigits() { + void parsesVersionCorrectlyTwoDigits() { Version version = Version.parse("5.2"); assertThat(version).isEqualTo(new Version(5, 2)); } @Test // DATCMNS-384 - public void parsesVersionCorrectlyThreeDigits() { + void parsesVersionCorrectlyThreeDigits() { Version version = Version.parse("12.1.3"); assertThat(version).isEqualTo(new Version(12, 1, 3)); } @Test // DATCMNS-384 - public void parsesVersionCorrectlyFourDigits() { + void parsesVersionCorrectlyFourDigits() { Version version = Version.parse("12.1.3.1000"); assertThat(version).isEqualTo(new Version(12, 1, 3, 1000)); } @Test // DATCMNS-384 - public void comparesToCorrectly() { + void comparesToCorrectly() { Version version = new Version(1, 2, 3, 1000); Version nextBuild = new Version(1, 2, 3, 1001); @@ -127,7 +127,7 @@ public class VersionUnitTests { } @Test // DATCMNS-384 - public void removesTrailingZerosAfterSecondValueForToString() { + void removesTrailingZerosAfterSecondValueForToString() { assertThat(new Version(2)).hasToString("2.0"); assertThat(new Version(2, 0)).hasToString("2.0"); @@ -139,17 +139,17 @@ public class VersionUnitTests { } @Test // DATACMNS-496 - public void parseShouldRemoveNonNumericVersionParts() { + void parseShouldRemoveNonNumericVersionParts() { assertThat(Version.parse("2.0.0-rc1")).isEqualTo(new Version(2, 0, 0)); } @Test // DATACMNS-719, DATACMNS-496 - public void removesNonNumericSuffix() { + void removesNonNumericSuffix() { assertThat(Version.parse("4.2.0.RELEASE")).isEqualTo(new Version(4, 2, 0)); } @Test // DATACMNS-719, DATACMNS-496 - public void rejectsNonNumericPartOnNonLastPosition() { + void rejectsNonNumericPartOnNonLastPosition() { assertThatIllegalArgumentException().isThrownBy(() -> Version.parse("1.RELEASE.2")) .withMessageContaining("1.RELEASE.2"); diff --git a/src/test/java/org/springframework/data/web/HateoasPageableHandlerMethodArgumentResolverUnitTests.java b/src/test/java/org/springframework/data/web/HateoasPageableHandlerMethodArgumentResolverUnitTests.java index 33bd6afb6..4d30eca9d 100755 --- a/src/test/java/org/springframework/data/web/HateoasPageableHandlerMethodArgumentResolverUnitTests.java +++ b/src/test/java/org/springframework/data/web/HateoasPageableHandlerMethodArgumentResolverUnitTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.core.MethodParameter; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; @@ -33,11 +33,11 @@ import org.springframework.web.util.UriComponentsBuilder; * * @author Oliver Gierke */ -public class HateoasPageableHandlerMethodArgumentResolverUnitTests +class HateoasPageableHandlerMethodArgumentResolverUnitTests extends PageableHandlerMethodArgumentResolverUnitTests { @Test - public void buildsUpRequestParameters() { + void buildsUpRequestParameters() { String basicString = String.format("page=%d&size=%d", PAGE_NUMBER, PAGE_SIZE); @@ -47,7 +47,7 @@ public class HateoasPageableHandlerMethodArgumentResolverUnitTests } @Test // DATACMNS-343 - public void replacesExistingPaginationInformation() throws Exception { + void replacesExistingPaginationInformation() throws Exception { MethodParameter parameter = new MethodParameter(Sample.class.getMethod("supportedMethod", Pageable.class), 0); UriComponentsContributor resolver = new HateoasPageableHandlerMethodArgumentResolver(); @@ -66,12 +66,12 @@ public class HateoasPageableHandlerMethodArgumentResolverUnitTests } @Test // DATACMNS-335 - public void preventsPageSizeFromExceedingMayValueIfConfiguredOnWrite() throws Exception { + void preventsPageSizeFromExceedingMayValueIfConfiguredOnWrite() throws Exception { assertUriStringFor(PageRequest.of(0, 200), "page=0&size=100"); } @Test // DATACMNS-418 - public void appendsTemplateVariablesCorrectly() { + void appendsTemplateVariablesCorrectly() { assertTemplateEnrichment("/foo", "{?page,size,sort}"); assertTemplateEnrichment("/foo?bar=1", "{&page,size,sort}"); @@ -82,7 +82,7 @@ public class HateoasPageableHandlerMethodArgumentResolverUnitTests } @Test // DATACMNS-418 - public void returnsCustomizedTemplateVariables() { + void returnsCustomizedTemplateVariables() { UriComponents uriComponents = UriComponentsBuilder.fromPath("/foo").build(); @@ -94,7 +94,7 @@ public class HateoasPageableHandlerMethodArgumentResolverUnitTests } @Test // DATACMNS-563 - public void enablingOneIndexedParameterReturnsOneForFirstPage() { + void enablingOneIndexedParameterReturnsOneForFirstPage() { HateoasPageableHandlerMethodArgumentResolver resolver = getResolver(); resolver.setOneIndexedParameters(true); @@ -110,7 +110,7 @@ public class HateoasPageableHandlerMethodArgumentResolverUnitTests } @Test // DATACMNS-1455 - public void enhancesUnpaged() { + void enhancesUnpaged() { UriComponentsBuilder builder = UriComponentsBuilder.fromPath("/"); diff --git a/src/test/java/org/springframework/data/web/HateoasSortHandlerMethodArgumentResolverUnitTests.java b/src/test/java/org/springframework/data/web/HateoasSortHandlerMethodArgumentResolverUnitTests.java index 4885e076d..8e74f8584 100755 --- a/src/test/java/org/springframework/data/web/HateoasSortHandlerMethodArgumentResolverUnitTests.java +++ b/src/test/java/org/springframework/data/web/HateoasSortHandlerMethodArgumentResolverUnitTests.java @@ -20,7 +20,7 @@ import static org.springframework.data.domain.Sort.Direction.*; import java.net.URI; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.core.MethodParameter; import org.springframework.data.domain.Sort; import org.springframework.web.util.UriComponents; @@ -31,10 +31,10 @@ import org.springframework.web.util.UriComponentsBuilder; * * @author Oliver Gierke */ -public class HateoasSortHandlerMethodArgumentResolverUnitTests extends SortHandlerMethodArgumentResolverUnitTests { +class HateoasSortHandlerMethodArgumentResolverUnitTests extends SortHandlerMethodArgumentResolverUnitTests { @Test - public void buildsUpRequestParameters() throws Exception { + void buildsUpRequestParameters() throws Exception { assertUriStringFor(SORT, "sort=firstname,lastname,desc"); assertUriStringFor(Sort.by(ASC, "foo").and(Sort.by(DESC, "bar").and(Sort.by(ASC, "foobar"))), @@ -44,12 +44,12 @@ public class HateoasSortHandlerMethodArgumentResolverUnitTests extends SortHandl } @Test // DATACMNS-407 - public void replacesExistingRequestParameters() throws Exception { + void replacesExistingRequestParameters() throws Exception { assertUriStringFor(SORT, "/?sort=firstname,lastname,desc", "/?sort=foo,asc"); } @Test // DATACMNS-418 - public void returnCorrectTemplateVariables() { + void returnCorrectTemplateVariables() { UriComponents uriComponents = UriComponentsBuilder.fromPath("/").build(); diff --git a/src/test/java/org/springframework/data/web/JsonProjectingMethodInterceptorFactoryUnitTests.java b/src/test/java/org/springframework/data/web/JsonProjectingMethodInterceptorFactoryUnitTests.java index 5811a92b7..2475733ee 100755 --- a/src/test/java/org/springframework/data/web/JsonProjectingMethodInterceptorFactoryUnitTests.java +++ b/src/test/java/org/springframework/data/web/JsonProjectingMethodInterceptorFactoryUnitTests.java @@ -25,8 +25,8 @@ import java.io.ByteArrayInputStream; import java.util.List; import java.util.Set; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.data.projection.ProjectionFactory; import org.springframework.data.projection.SpelAwareProxyProjectionFactory; @@ -41,13 +41,13 @@ import com.jayway.jsonpath.spi.mapper.MappingProvider; * @since 1.13 * @soundtrack Richard Spaven - Assemble (Whole Other*) */ -public class JsonProjectingMethodInterceptorFactoryUnitTests { +class JsonProjectingMethodInterceptorFactoryUnitTests { ProjectionFactory projectionFactory; Customer customer; - @Before - public void setUp() { + @BeforeEach + void setUp() { String json = "{\"firstname\" : \"Dave\", "// + "\"address\" : { \"zipCode\" : \"01097\", \"city\" : \"Dresden\" }," // @@ -63,47 +63,47 @@ public class JsonProjectingMethodInterceptorFactoryUnitTests { } @Test // DATCMNS-885 - public void accessSimpleProperty() { + void accessSimpleProperty() { assertThat(customer.getFirstname()).isEqualTo("Dave"); } @Test // DATCMNS-885 - public void accessPropertyWithExplicitAnnotation() { + void accessPropertyWithExplicitAnnotation() { assertThat(customer.getBar()).isEqualTo("Dave"); } @Test // DATCMNS-885 - public void accessPropertyWithComplexReturnType() { + void accessPropertyWithComplexReturnType() { assertThat(customer.getAddress()).isEqualTo(new Address("01097", "Dresden")); } @Test // DATCMNS-885 - public void accessComplexPropertyWithProjection() { + void accessComplexPropertyWithProjection() { assertThat(customer.getAddressProjection().getCity()).isEqualTo("Dresden"); } @Test // DATCMNS-885 - public void accessPropertyWithNestedJsonPath() { + void accessPropertyWithNestedJsonPath() { assertThat(customer.getNestedZipCode()).isEqualTo("01097"); } @Test // DATCMNS-885 - public void accessCollectionProperty() { + void accessCollectionProperty() { assertThat(customer.getAddresses().get(0)).isEqualTo(new Address("01097", "Dresden")); } @Test // DATCMNS-885 - public void accessPropertyOnNestedProjection() { + void accessPropertyOnNestedProjection() { assertThat(customer.getAddressProjections().get(0).getZipCode()).isEqualTo("01097"); } @Test // DATCMNS-885 - public void accessPropertyThatUsesJsonPathProjectionInTurn() { + void accessPropertyThatUsesJsonPathProjectionInTurn() { assertThat(customer.getAnotherAddressProjection().getZipCodeButNotCity()).isEqualTo("01097"); } @Test // DATCMNS-885 - public void accessCollectionPropertyThatUsesJsonPathProjectionInTurn() { + void accessCollectionPropertyThatUsesJsonPathProjectionInTurn() { List projections = customer.getAnotherAddressProjections(); @@ -112,7 +112,7 @@ public class JsonProjectingMethodInterceptorFactoryUnitTests { } @Test // DATCMNS-885 - public void accessAsCollectionPropertyThatUsesJsonPathProjectionInTurn() { + void accessAsCollectionPropertyThatUsesJsonPathProjectionInTurn() { Set projections = customer.getAnotherAddressProjectionAsCollection(); @@ -121,7 +121,7 @@ public class JsonProjectingMethodInterceptorFactoryUnitTests { } @Test // DATCMNS-885 - public void accessNestedPropertyButStayOnRootLevel() { + void accessNestedPropertyButStayOnRootLevel() { Name name = customer.getName(); @@ -130,19 +130,19 @@ public class JsonProjectingMethodInterceptorFactoryUnitTests { } @Test // DATACMNS-885 - public void accessNestedFields() { + void accessNestedFields() { assertThat(customer.getNestedCity()).isEqualTo("Dresden"); assertThat(customer.getNestedCities()).hasSize(2); } @Test // DATACMNS-1144 - public void returnsNullForNonExistantValue() { + void returnsNullForNonExistantValue() { assertThat(customer.getName().getLastname()).isNull(); } @Test // DATACMNS-1144 - public void triesMultipleDeclaredPathsIfNotAvailable() { + void triesMultipleDeclaredPathsIfNotAvailable() { assertThat(customer.getName().getSomeName()).isEqualTo(customer.getName().getFirstname()); } diff --git a/src/test/java/org/springframework/data/web/MapDataBinderUnitTests.java b/src/test/java/org/springframework/data/web/MapDataBinderUnitTests.java index d4eebed90..6a39ccb5d 100755 --- a/src/test/java/org/springframework/data/web/MapDataBinderUnitTests.java +++ b/src/test/java/org/springframework/data/web/MapDataBinderUnitTests.java @@ -27,7 +27,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.ConfigurablePropertyAccessor; import org.springframework.beans.MutablePropertyValues; import org.springframework.beans.NotWritablePropertyException; @@ -42,10 +42,10 @@ import org.springframework.format.support.DefaultFormattingConversionService; * * @author Oliver Gierke */ -public class MapDataBinderUnitTests { +class MapDataBinderUnitTests { @Test // DATACMNS-630 - public void honorsFormattingAnnotationOnAccessor() { + void honorsFormattingAnnotationOnAccessor() { Date reference = new Date(); @@ -59,7 +59,7 @@ public class MapDataBinderUnitTests { } @Test // DATACMNS-630 - public void bindsNestedCollectionElement() { + void bindsNestedCollectionElement() { MutablePropertyValues values = new MutablePropertyValues(); values.add("foo.bar.fooBar[0]", "String"); @@ -73,7 +73,7 @@ public class MapDataBinderUnitTests { } @Test // DATACMNS-630 - public void bindsNestedPrimitive() { + void bindsNestedPrimitive() { MutablePropertyValues values = new MutablePropertyValues(); values.add("foo.firstname", "Dave"); @@ -89,7 +89,7 @@ public class MapDataBinderUnitTests { } @Test // DATACMNS-630 - public void skipsPropertyNotExposedByTheTypeHierarchy() { + void skipsPropertyNotExposedByTheTypeHierarchy() { MutablePropertyValues values = new MutablePropertyValues(); values.add("somethingWeird", "Value"); @@ -98,7 +98,7 @@ public class MapDataBinderUnitTests { } @Test // DATACMNS-1264 - public void dropsMapExpressionsForCollectionReferences() { + void dropsMapExpressionsForCollectionReferences() { ConfigurablePropertyAccessor accessor = new MapDataBinder(Bar.class, new DefaultFormattingConversionService()) .getPropertyAccessor(); @@ -109,7 +109,7 @@ public class MapDataBinderUnitTests { } @Test // DATACMNS-1264 - public void rejectsExpressionContainingTypeExpression() { + void rejectsExpressionContainingTypeExpression() { ConfigurablePropertyAccessor accessor = new MapDataBinder(Bar.class, new DefaultFormattingConversionService()) .getPropertyAccessor(); diff --git a/src/test/java/org/springframework/data/web/PageableDefaultUnitTests.java b/src/test/java/org/springframework/data/web/PageableDefaultUnitTests.java index 6e1328925..9abb557bc 100755 --- a/src/test/java/org/springframework/data/web/PageableDefaultUnitTests.java +++ b/src/test/java/org/springframework/data/web/PageableDefaultUnitTests.java @@ -20,7 +20,7 @@ import static org.springframework.data.web.SortDefaultUnitTests.*; import javax.servlet.http.HttpServletRequest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.core.MethodParameter; import org.springframework.data.domain.AbstractPageRequest; @@ -42,7 +42,7 @@ import org.springframework.web.method.support.HandlerMethodArgumentResolver; * @author Oliver Gierke * @author Nick Williams */ -public abstract class PageableDefaultUnitTests { +abstract class PageableDefaultUnitTests { static final int PAGE_SIZE = 47; static final int PAGE_NUMBER = 23; @@ -53,50 +53,50 @@ public abstract class PageableDefaultUnitTests { Sort.by(SORT_FIELDS)); @Test - public void supportsPageable() { + void supportsPageable() { assertThat(getResolver().supportsParameter(getParameterOfMethod("supportedMethod"))).isTrue(); } @Test - public void doesNotSupportNonPageable() { + void doesNotSupportNonPageable() { MethodParameter parameter = TestUtils.getParameterOfMethod(getControllerClass(), "unsupportedMethod", String.class); assertThat(getResolver().supportsParameter(parameter)).isFalse(); } @Test - public void returnsDefaultIfNoRequestParametersAndNoDefault() throws Exception { + void returnsDefaultIfNoRequestParametersAndNoDefault() throws Exception { assertSupportedAndResult(getParameterOfMethod("supportedMethod"), (Pageable) ReflectionTestUtils.getField(getResolver(), "fallbackPageable")); } @Test - public void simpleDefault() throws Exception { + void simpleDefault() throws Exception { assertSupportedAndResult(getParameterOfMethod("simpleDefault"), REFERENCE_WITHOUT_SORT); } @Test - public void simpleDefaultWithSort() throws Exception { + void simpleDefaultWithSort() throws Exception { assertSupportedAndResult(getParameterOfMethod("simpleDefaultWithSort"), REFERENCE_WITH_SORT_FIELDS); } @Test - public void simpleDefaultWithSortAndDirection() throws Exception { + void simpleDefaultWithSortAndDirection() throws Exception { assertSupportedAndResult(getParameterOfMethod("simpleDefaultWithSortAndDirection"), REFERENCE_WITH_SORT); } @Test - public void simpleDefaultWithExternalSort() throws Exception { + void simpleDefaultWithExternalSort() throws Exception { assertSupportedAndResult(getParameterOfMethod("simpleDefaultWithExternalSort"), REFERENCE_WITH_SORT); } @Test - public void simpleDefaultWithContaineredExternalSort() throws Exception { + void simpleDefaultWithContaineredExternalSort() throws Exception { assertSupportedAndResult(getParameterOfMethod("simpleDefaultWithContaineredExternalSort"), REFERENCE_WITH_SORT); } @Test - public void rejectsInvalidQulifiers() throws Exception { + void rejectsInvalidQulifiers() throws Exception { MethodParameter parameter = TestUtils.getParameterOfMethod(getControllerClass(), "invalidQualifiers", Pageable.class, Pageable.class); @@ -110,7 +110,7 @@ public abstract class PageableDefaultUnitTests { } @Test - public void rejectsNoQualifiers() throws Exception { + void rejectsNoQualifiers() throws Exception { MethodParameter parameter = TestUtils.getParameterOfMethod(getControllerClass(), "noQualifiers", Pageable.class, Pageable.class); diff --git a/src/test/java/org/springframework/data/web/PageableHandlerMethodArgumentResolverUnitTests.java b/src/test/java/org/springframework/data/web/PageableHandlerMethodArgumentResolverUnitTests.java index 830f07940..fa9050f46 100755 --- a/src/test/java/org/springframework/data/web/PageableHandlerMethodArgumentResolverUnitTests.java +++ b/src/test/java/org/springframework/data/web/PageableHandlerMethodArgumentResolverUnitTests.java @@ -18,8 +18,8 @@ package org.springframework.data.web; import static org.assertj.core.api.Assertions.*; import static org.springframework.data.web.PageableHandlerMethodArgumentResolver.*; -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.annotation.Qualifier; import org.springframework.core.MethodParameter; import org.springframework.data.domain.PageRequest; @@ -36,17 +36,17 @@ import org.springframework.web.context.request.ServletWebRequest; * @author Oliver Gierke * @author Nick Williams */ -public class PageableHandlerMethodArgumentResolverUnitTests extends PageableDefaultUnitTests { +class PageableHandlerMethodArgumentResolverUnitTests extends PageableDefaultUnitTests { MethodParameter supportedMethodParameter; - @Before - public void setUp() throws Exception { + @BeforeEach + void setUp() throws Exception { this.supportedMethodParameter = new MethodParameter(Sample.class.getMethod("supportedMethod", Pageable.class), 0); } @Test // DATACMNS-335 - public void preventsPageSizeFromExceedingMayValueIfConfigured() throws Exception { + void preventsPageSizeFromExceedingMayValueIfConfigured() throws Exception { // Read side MockHttpServletRequest request = new MockHttpServletRequest(); @@ -57,31 +57,31 @@ public class PageableHandlerMethodArgumentResolverUnitTests extends PageableDefa } @Test - public void rejectsEmptyPageParameterName() { + void rejectsEmptyPageParameterName() { assertThatIllegalArgumentException() .isThrownBy(() -> new PageableHandlerMethodArgumentResolver().setPageParameterName("")); } @Test - public void rejectsNullPageParameterName() { + void rejectsNullPageParameterName() { assertThatIllegalArgumentException() .isThrownBy(() -> new PageableHandlerMethodArgumentResolver().setPageParameterName(null)); } @Test - public void rejectsEmptySizeParameterName() { + void rejectsEmptySizeParameterName() { assertThatIllegalArgumentException() .isThrownBy(() -> new PageableHandlerMethodArgumentResolver().setSizeParameterName("")); } @Test - public void rejectsNullSizeParameterName() { + void rejectsNullSizeParameterName() { assertThatIllegalArgumentException() .isThrownBy(() -> new PageableHandlerMethodArgumentResolver().setSizeParameterName(null)); } @Test - public void qualifierIsUsedInParameterLookup() throws Exception { + void qualifierIsUsedInParameterLookup() throws Exception { MethodParameter parameter = new MethodParameter(Sample.class.getMethod("validQualifier", Pageable.class), 0); @@ -93,7 +93,7 @@ public class PageableHandlerMethodArgumentResolverUnitTests extends PageableDefa } @Test // DATACMNS-377 - public void usesDefaultPageSizeIfRequestPageSizeIsLessThanOne() throws Exception { + void usesDefaultPageSizeIfRequestPageSizeIsLessThanOne() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest(); request.addParameter("page", "0"); @@ -103,7 +103,7 @@ public class PageableHandlerMethodArgumentResolverUnitTests extends PageableDefa } @Test // DATACMNS-377 - public void rejectsInvalidCustomDefaultForPageSize() throws Exception { + void rejectsInvalidCustomDefaultForPageSize() throws Exception { MethodParameter parameter = new MethodParameter(Sample.class.getMethod("invalidDefaultPageSize", Pageable.class), 0); @@ -113,7 +113,7 @@ public class PageableHandlerMethodArgumentResolverUnitTests extends PageableDefa } @Test // DATACMNS-408 - public void fallsBackToFirstPageIfNegativePageNumberIsGiven() throws Exception { + void fallsBackToFirstPageIfNegativePageNumberIsGiven() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest(); request.addParameter("page", "-1"); @@ -122,7 +122,7 @@ public class PageableHandlerMethodArgumentResolverUnitTests extends PageableDefa } @Test // DATACMNS-408 - public void pageParamIsNotNumeric() throws Exception { + void pageParamIsNotNumeric() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest(); request.addParameter("page", "a"); @@ -131,7 +131,7 @@ public class PageableHandlerMethodArgumentResolverUnitTests extends PageableDefa } @Test // DATACMNS-408 - public void sizeParamIsNotNumeric() throws Exception { + void sizeParamIsNotNumeric() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest(); request.addParameter("size", "a"); @@ -140,7 +140,7 @@ public class PageableHandlerMethodArgumentResolverUnitTests extends PageableDefa } @Test // DATACMNS-477 - public void returnsNullIfFallbackIsUnpagedAndNoParametersGiven() throws Exception { + void returnsNullIfFallbackIsUnpagedAndNoParametersGiven() throws Exception { PageableHandlerMethodArgumentResolver resolver = getResolver(); resolver.setFallbackPageable(Pageable.unpaged()); @@ -150,7 +150,7 @@ public class PageableHandlerMethodArgumentResolverUnitTests extends PageableDefa } @Test // DATACMNS-477 - public void returnsFallbackIfOnlyPageIsGiven() throws Exception { + void returnsFallbackIfOnlyPageIsGiven() throws Exception { PageableHandlerMethodArgumentResolver resolver = getResolver(); resolver.setFallbackPageable(Pageable.unpaged()); @@ -163,7 +163,7 @@ public class PageableHandlerMethodArgumentResolverUnitTests extends PageableDefa } @Test // DATACMNS-477 - public void returnsFallbackIfFallbackIsUnpagedAndOnlySizeIsGiven() throws Exception { + void returnsFallbackIfFallbackIsUnpagedAndOnlySizeIsGiven() throws Exception { PageableHandlerMethodArgumentResolver resolver = getResolver(); resolver.setFallbackPageable(Pageable.unpaged()); @@ -176,7 +176,7 @@ public class PageableHandlerMethodArgumentResolverUnitTests extends PageableDefa } @Test // DATACMNS-563 - public void considersOneIndexedParametersSetting() { + void considersOneIndexedParametersSetting() { PageableHandlerMethodArgumentResolver resolver = getResolver(); resolver.setOneIndexedParameters(true); @@ -190,7 +190,7 @@ public class PageableHandlerMethodArgumentResolverUnitTests extends PageableDefa } @Test // DATACMNS-640 - public void usesNullSortIfNoDefaultIsConfiguredAndPageAndSizeAreGiven() { + void usesNullSortIfNoDefaultIsConfiguredAndPageAndSizeAreGiven() { PageableHandlerMethodArgumentResolver resolver = getResolver(); resolver.setFallbackPageable(Pageable.unpaged()); @@ -207,7 +207,7 @@ public class PageableHandlerMethodArgumentResolverUnitTests extends PageableDefa } @Test // DATACMNS-692 - public void oneIndexedParametersDefaultsIndexOutOfRange() { + void oneIndexedParametersDefaultsIndexOutOfRange() { PageableHandlerMethodArgumentResolver resolver = getResolver(); resolver.setOneIndexedParameters(true); @@ -221,7 +221,7 @@ public class PageableHandlerMethodArgumentResolverUnitTests extends PageableDefa } @Test // DATACMNS-761 - public void returnsCorrectPageSizeForOneIndexParameters() { + void returnsCorrectPageSizeForOneIndexParameters() { PageableHandlerMethodArgumentResolver resolver = getResolver(); resolver.setOneIndexedParameters(true); @@ -235,7 +235,7 @@ public class PageableHandlerMethodArgumentResolverUnitTests extends PageableDefa } @Test // DATACMNS-929 - public void detectsFallbackPageableIfNullOneIsConfigured() { + void detectsFallbackPageableIfNullOneIsConfigured() { PageableHandlerMethodArgumentResolver resolver = getResolver(); resolver.setFallbackPageable(Pageable.unpaged()); diff --git a/src/test/java/org/springframework/data/web/PagedResourcesAssemblerArgumentResolverUnitTests.java b/src/test/java/org/springframework/data/web/PagedResourcesAssemblerArgumentResolverUnitTests.java index 3779dad2b..e6cd73d3e 100755 --- a/src/test/java/org/springframework/data/web/PagedResourcesAssemblerArgumentResolverUnitTests.java +++ b/src/test/java/org/springframework/data/web/PagedResourcesAssemblerArgumentResolverUnitTests.java @@ -20,8 +20,8 @@ import static org.assertj.core.api.Assertions.*; import java.lang.reflect.Method; import java.util.Optional; -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.annotation.Qualifier; import org.springframework.core.MethodParameter; @@ -36,12 +36,12 @@ import org.springframework.web.util.UriComponents; * @author Oliver Gierke * @since 1.7 */ -public class PagedResourcesAssemblerArgumentResolverUnitTests { +class PagedResourcesAssemblerArgumentResolverUnitTests { PagedResourcesAssemblerArgumentResolver resolver; - @Before - public void setUp() { + @BeforeEach + void setUp() { WebTestUtils.initWebTest(); @@ -50,7 +50,7 @@ public class PagedResourcesAssemblerArgumentResolverUnitTests { } @Test // DATACMNS-418 - public void createsPlainAssemblerWithoutContext() throws Exception { + void createsPlainAssemblerWithoutContext() throws Exception { Method method = Controller.class.getMethod("noContext", PagedResourcesAssembler.class); Object result = resolver.resolveArgument(new MethodParameter(method, 0), null, null, null); @@ -60,28 +60,28 @@ public class PagedResourcesAssemblerArgumentResolverUnitTests { } @Test // DATACMNS-418 - public void selectsUniquePageableParameter() throws Exception { + void selectsUniquePageableParameter() throws Exception { Method method = Controller.class.getMethod("unique", PagedResourcesAssembler.class, Pageable.class); assertSelectsParameter(method, 1); } @Test // DATACMNS-418 - public void selectsUniquePageableParameterForQualifiedAssembler() throws Exception { + void selectsUniquePageableParameterForQualifiedAssembler() throws Exception { Method method = Controller.class.getMethod("unnecessarilyQualified", PagedResourcesAssembler.class, Pageable.class); assertSelectsParameter(method, 1); } @Test // DATACMNS-418 - public void selectsUniqueQualifiedPageableParameter() throws Exception { + void selectsUniqueQualifiedPageableParameter() throws Exception { Method method = Controller.class.getMethod("qualifiedUnique", PagedResourcesAssembler.class, Pageable.class); assertSelectsParameter(method, 1); } @Test // DATACMNS-418 - public void selectsQualifiedPageableParameter() throws Exception { + void selectsQualifiedPageableParameter() throws Exception { Method method = Controller.class.getMethod("qualified", PagedResourcesAssembler.class, Pageable.class, Pageable.class); @@ -89,22 +89,22 @@ public class PagedResourcesAssemblerArgumentResolverUnitTests { } @Test // DATACMNS-418 - public void rejectsAmbiguousPageableParameters() throws Exception { + void rejectsAmbiguousPageableParameters() throws Exception { assertRejectsAmbiguity("unqualifiedAmbiguity"); } @Test // DATACMNS-418 - public void rejectsAmbiguousPageableParametersForQualifiedAssembler() throws Exception { + void rejectsAmbiguousPageableParametersForQualifiedAssembler() throws Exception { assertRejectsAmbiguity("assemblerQualifiedAmbiguity"); } @Test // DATACMNS-418 - public void rejectsAmbiguityWithoutMatchingQualifiers() throws Exception { + void rejectsAmbiguityWithoutMatchingQualifiers() throws Exception { assertRejectsAmbiguity("noMatchingQualifiers"); } @Test // DATACMNS-419 - public void doesNotFailForTemplatedMethodMapping() throws Exception { + void doesNotFailForTemplatedMethodMapping() throws Exception { Method method = Controller.class.getMethod("methodWithPathVariable", PagedResourcesAssembler.class); Object result = resolver.resolveArgument(new MethodParameter(method, 0), null, null, null); @@ -113,7 +113,7 @@ public class PagedResourcesAssemblerArgumentResolverUnitTests { } @Test // DATACMNS-513 - public void detectsMappingOfInvokedSubType() throws Exception { + void detectsMappingOfInvokedSubType() throws Exception { Method method = Controller.class.getMethod("methodWithMapping", PagedResourcesAssembler.class); @@ -136,7 +136,7 @@ public class PagedResourcesAssemblerArgumentResolverUnitTests { }); } - private void assertSelectsParameter(Method method, int expectedIndex) throws Exception { + private void assertSelectsParameter(Method method, int expectedIndex) { MethodParameter parameter = new MethodParameter(method, 0); @@ -162,7 +162,7 @@ public class PagedResourcesAssemblerArgumentResolverUnitTests { } @RequestMapping("/") - static interface Controller { + interface Controller { void noContext(PagedResourcesAssembler resolver); diff --git a/src/test/java/org/springframework/data/web/PagedResourcesAssemblerUnitTests.java b/src/test/java/org/springframework/data/web/PagedResourcesAssemblerUnitTests.java index b79f3c3e0..1842f11d2 100755 --- a/src/test/java/org/springframework/data/web/PagedResourcesAssemblerUnitTests.java +++ b/src/test/java/org/springframework/data/web/PagedResourcesAssemblerUnitTests.java @@ -23,8 +23,8 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.data.domain.AbstractPageRequest; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; @@ -48,7 +48,7 @@ import org.springframework.web.util.UriComponentsBuilder; * @author Nick Williams * @author Marcel Overdijk */ -public class PagedResourcesAssemblerUnitTests { +class PagedResourcesAssemblerUnitTests { static final Pageable PAGEABLE = PageRequest.of(0, 20); static final Page EMPTY_PAGE = new PageImpl<>(Collections.emptyList(), PAGEABLE, 0); @@ -56,13 +56,13 @@ public class PagedResourcesAssemblerUnitTests { HateoasPageableHandlerMethodArgumentResolver resolver = new HateoasPageableHandlerMethodArgumentResolver(); PagedResourcesAssembler assembler = new PagedResourcesAssembler<>(resolver, null); - @Before - public void setUp() { + @BeforeEach + void setUp() { WebTestUtils.initWebTest(); } @Test - public void addsNextLinkForFirstPage() { + void addsNextLinkForFirstPage() { PagedModel> resources = assembler.toModel(createPage(0)); @@ -72,7 +72,7 @@ public class PagedResourcesAssemblerUnitTests { } @Test - public void addsPreviousAndNextLinksForMiddlePage() { + void addsPreviousAndNextLinksForMiddlePage() { PagedModel> resources = assembler.toModel(createPage(1)); @@ -82,7 +82,7 @@ public class PagedResourcesAssemblerUnitTests { } @Test - public void addsPreviousLinkForLastPage() { + void addsPreviousLinkForLastPage() { PagedModel> resources = assembler.toModel(createPage(2)); @@ -92,7 +92,7 @@ public class PagedResourcesAssemblerUnitTests { } @Test - public void usesBaseUriIfConfigured() { + void usesBaseUriIfConfigured() { UriComponents baseUri = UriComponentsBuilder.fromUriString("https://foo:9090").build(); @@ -105,7 +105,7 @@ public class PagedResourcesAssemblerUnitTests { } @Test - public void usesCustomLinkProvided() { + void usesCustomLinkProvided() { Link link = Link.of("https://foo:9090", "rel"); @@ -117,7 +117,7 @@ public class PagedResourcesAssemblerUnitTests { } @Test // DATACMNS-358 - public void createsPagedResourcesForOneIndexedArgumentResolver() { + void createsPagedResourcesForOneIndexedArgumentResolver() { resolver.setOneIndexedParameters(true); @@ -128,7 +128,7 @@ public class PagedResourcesAssemblerUnitTests { } @Test // DATACMNS-418, DATACMNS-515 - public void createsACanonicalLinkWithoutTemplateParameters() { + void createsACanonicalLinkWithoutTemplateParameters() { PagedModel> resources = assembler.toModel(createPage(1)); @@ -136,7 +136,7 @@ public class PagedResourcesAssemblerUnitTests { } @Test // DATACMNS-418 - public void invokesCustomElementResourceAssembler() { + void invokesCustomElementResourceAssembler() { PersonResourceAssembler personAssembler = new PersonResourceAssembler(); @@ -150,7 +150,7 @@ public class PagedResourcesAssemblerUnitTests { } @Test // DATAMCNS-563 - public void createsPaginationLinksForOneIndexedArgumentResolverCorrectly() { + void createsPaginationLinksForOneIndexedArgumentResolverCorrectly() { HateoasPageableHandlerMethodArgumentResolver argumentResolver = new HateoasPageableHandlerMethodArgumentResolver(); argumentResolver.setOneIndexedParameters(true); @@ -169,7 +169,7 @@ public class PagedResourcesAssemblerUnitTests { } @Test // DATACMNS-515 - public void generatedLinksShouldNotBeTemplated() { + void generatedLinksShouldNotBeTemplated() { PagedModel> resources = assembler.toModel(createPage(1)); @@ -179,7 +179,7 @@ public class PagedResourcesAssemblerUnitTests { } @Test // DATACMNS-699 - public void generatesEmptyPagedResourceWithEmbeddedWrapper() { + void generatesEmptyPagedResourceWithEmbeddedWrapper() { PagedModel result = assembler.toEmptyModel(EMPTY_PAGE, Person.class); @@ -192,17 +192,17 @@ public class PagedResourcesAssemblerUnitTests { } @Test // DATACMNS-699 - public void emptyPageCreatorRejectsPageWithContent() { + void emptyPageCreatorRejectsPageWithContent() { assertThatIllegalArgumentException().isThrownBy(() -> assembler.toEmptyModel(createPage(1), Person.class)); } @Test // DATACMNS-699 - public void emptyPageCreatorRejectsNullType() { + void emptyPageCreatorRejectsNullType() { assertThatIllegalArgumentException().isThrownBy(() -> assembler.toEmptyModel(EMPTY_PAGE, null)); } @Test // DATACMNS-701 - public void addsFirstAndLastLinksForMultiplePages() { + void addsFirstAndLastLinksForMultiplePages() { PagedModel> resources = assembler.toModel(createPage(1)); @@ -211,7 +211,7 @@ public class PagedResourcesAssemblerUnitTests { } @Test // DATACMNS-701 - public void addsFirstAndLastLinksForFirstPage() { + void addsFirstAndLastLinksForFirstPage() { PagedModel> resources = assembler.toModel(createPage(0)); @@ -220,7 +220,7 @@ public class PagedResourcesAssemblerUnitTests { } @Test // DATACMNS-701 - public void addsFirstAndLastLinksForLastPage() { + void addsFirstAndLastLinksForLastPage() { PagedModel> resources = assembler.toModel(createPage(2)); @@ -229,7 +229,7 @@ public class PagedResourcesAssemblerUnitTests { } @Test // DATACMNS-701 - public void alwaysAddsFirstAndLastLinkIfConfiguredTo() { + void alwaysAddsFirstAndLastLinkIfConfiguredTo() { PagedResourcesAssembler assembler = new PagedResourcesAssembler<>(resolver, null); assembler.setForceFirstAndLastRels(true); @@ -241,7 +241,7 @@ public class PagedResourcesAssemblerUnitTests { } @Test // DATACMNS-802 - public void usesCustomPagedResources() { + void usesCustomPagedResources() { RepresentationModelAssembler, PagedModel>> assembler = new CustomPagedResourcesAssembler<>( resolver, null); @@ -250,7 +250,7 @@ public class PagedResourcesAssemblerUnitTests { } @Test // DATACMNS-1042 - public void selfLinkContainsCoordinatesForCurrentPage() { + void selfLinkContainsCoordinatesForCurrentPage() { PagedModel> resource = assembler.toModel(createPage(0)); @@ -297,7 +297,7 @@ public class PagedResourcesAssemblerUnitTests { static class CustomPagedResourcesAssembler extends PagedResourcesAssembler { - public CustomPagedResourcesAssembler(HateoasPageableHandlerMethodArgumentResolver resolver, UriComponents baseUri) { + CustomPagedResourcesAssembler(HateoasPageableHandlerMethodArgumentResolver resolver, UriComponents baseUri) { super(resolver, baseUri); } @@ -314,7 +314,7 @@ public class PagedResourcesAssemblerUnitTests { static class CustomPagedResources extends PagedModel { - public CustomPagedResources(Collection content, PageMetadata metadata) { + CustomPagedResources(Collection content, PageMetadata metadata) { super(content, metadata); } } diff --git a/src/test/java/org/springframework/data/web/ProjectingJackson2HttpMessageConverterUnitTests.java b/src/test/java/org/springframework/data/web/ProjectingJackson2HttpMessageConverterUnitTests.java index 0f758a39a..60b54d270 100755 --- a/src/test/java/org/springframework/data/web/ProjectingJackson2HttpMessageConverterUnitTests.java +++ b/src/test/java/org/springframework/data/web/ProjectingJackson2HttpMessageConverterUnitTests.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.*; import java.lang.reflect.Method; import java.lang.reflect.Type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.http.MediaType; /** @@ -31,28 +31,28 @@ import org.springframework.http.MediaType; * @soundtrack Richard Spaven - Tribute (Whole Other*) * @since 1.13 */ -public class ProjectingJackson2HttpMessageConverterUnitTests { +class ProjectingJackson2HttpMessageConverterUnitTests { ProjectingJackson2HttpMessageConverter converter = new ProjectingJackson2HttpMessageConverter(); MediaType ANYTHING_JSON = MediaType.parseMediaType("application/*+json"); @Test // DATCMNS-885 - public void canReadJsonIntoAnnotatedInterface() { + void canReadJsonIntoAnnotatedInterface() { assertThat(converter.canRead(SampleInterface.class, ANYTHING_JSON)).isTrue(); } @Test // DATCMNS-885 - public void cannotReadUnannotatedInterface() { + void cannotReadUnannotatedInterface() { assertThat(converter.canRead(UnannotatedInterface.class, ANYTHING_JSON)).isFalse(); } @Test // DATCMNS-885 - public void cannotReadClass() { + void cannotReadClass() { assertThat(converter.canRead(SampleClass.class, ANYTHING_JSON)).isFalse(); } @Test // DATACMNS-972 - public void doesNotConsiderTypeVariableBoundTo() throws Throwable { + void doesNotConsiderTypeVariableBoundTo() throws Throwable { Method method = BaseController.class.getDeclaredMethod("createEntity", AbstractDto.class); Type type = method.getGenericParameterTypes()[0]; @@ -61,7 +61,7 @@ public class ProjectingJackson2HttpMessageConverterUnitTests { } @Test // DATACMNS-972 - public void genericTypeOnConcreteOne() throws Throwable { + void genericTypeOnConcreteOne() throws Throwable { Method method = ConcreteController.class.getMethod("createEntity", AbstractDto.class); Type type = method.getGenericParameterTypes()[0]; diff --git a/src/test/java/org/springframework/data/web/ProxyingHandlerMethodArgumentResolverUnitTests.java b/src/test/java/org/springframework/data/web/ProxyingHandlerMethodArgumentResolverUnitTests.java index 0a00919d2..020830826 100755 --- a/src/test/java/org/springframework/data/web/ProxyingHandlerMethodArgumentResolverUnitTests.java +++ b/src/test/java/org/springframework/data/web/ProxyingHandlerMethodArgumentResolverUnitTests.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.*; import java.lang.reflect.Method; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.core.MethodParameter; import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.data.web.ProjectingJackson2HttpMessageConverterUnitTests.SampleInterface; @@ -38,7 +38,7 @@ public class ProxyingHandlerMethodArgumentResolverUnitTests { () -> new DefaultConversionService(), true); @Test // DATACMNS-776 - public void supportAnnotatedInterface() throws Exception { + void supportAnnotatedInterface() throws Exception { Method method = Controller.class.getMethod("with", AnnotatedInterface.class); MethodParameter parameter = new MethodParameter(method, 0); @@ -47,7 +47,7 @@ public class ProxyingHandlerMethodArgumentResolverUnitTests { } @Test // DATACMNS-776 - public void supportsUnannotatedInterfaceFromUserPackage() throws Exception { + void supportsUnannotatedInterfaceFromUserPackage() throws Exception { Method method = Controller.class.getMethod("with", SampleInterface.class); MethodParameter parameter = new MethodParameter(method, 0); @@ -56,7 +56,7 @@ public class ProxyingHandlerMethodArgumentResolverUnitTests { } @Test // DATACMNS-776 - public void doesNotSupportUnannotatedInterfaceFromSpringNamespace() throws Exception { + void doesNotSupportUnannotatedInterfaceFromSpringNamespace() throws Exception { Method method = Controller.class.getMethod("with", UnannotatedInterface.class); MethodParameter parameter = new MethodParameter(method, 0); @@ -65,7 +65,7 @@ public class ProxyingHandlerMethodArgumentResolverUnitTests { } @Test // DATACMNS-776 - public void doesNotSupportCoreJavaType() throws Exception { + void doesNotSupportCoreJavaType() throws Exception { Method method = Controller.class.getMethod("with", List.class); MethodParameter parameter = new MethodParameter(method, 0); diff --git a/src/test/java/org/springframework/data/web/ReactivePageableHandlerMethodArgumentResolverUnitTests.java b/src/test/java/org/springframework/data/web/ReactivePageableHandlerMethodArgumentResolverUnitTests.java index 71aa1c259..401d328b0 100755 --- a/src/test/java/org/springframework/data/web/ReactivePageableHandlerMethodArgumentResolverUnitTests.java +++ b/src/test/java/org/springframework/data/web/ReactivePageableHandlerMethodArgumentResolverUnitTests.java @@ -19,10 +19,9 @@ import static org.assertj.core.api.Assertions.*; import static org.springframework.data.web.PageableDefaultUnitTests.*; import static org.springframework.data.web.PageableHandlerMethodArgumentResolver.*; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.core.MethodParameter; import org.springframework.data.domain.PageRequest; @@ -38,19 +37,17 @@ import org.springframework.web.reactive.result.method.SyncHandlerMethodArgumentR * * @author Mark Paluch */ -public class ReactivePageableHandlerMethodArgumentResolverUnitTests { - - @Rule public final ExpectedException exception = ExpectedException.none(); +class ReactivePageableHandlerMethodArgumentResolverUnitTests { MethodParameter supportedMethodParameter; - @Before - public void setUp() throws Exception { + @BeforeEach + void setUp() throws Exception { this.supportedMethodParameter = new MethodParameter(Sample.class.getMethod("supportedMethod", Pageable.class), 0); } @Test // DATACMNS-1211 - public void preventsPageSizeFromExceedingMayValueIfConfigured() { + void preventsPageSizeFromExceedingMayValueIfConfigured() { // Read side MockServerHttpRequest request = MockServerHttpRequest.get("foo?page=0&size=200").build(); @@ -58,28 +55,32 @@ public class ReactivePageableHandlerMethodArgumentResolverUnitTests { assertSupportedAndResult(supportedMethodParameter, PageRequest.of(0, 100), request); } - @Test(expected = IllegalArgumentException.class) // DATACMNS-1211 - public void rejectsEmptyPageParameterName() { - new ReactivePageableHandlerMethodArgumentResolver().setPageParameterName(""); - } - - @Test(expected = IllegalArgumentException.class) // DATACMNS-1211 - public void rejectsNullPageParameterName() { - new ReactivePageableHandlerMethodArgumentResolver().setPageParameterName(null); - } - - @Test(expected = IllegalArgumentException.class) // DATACMNS-1211 - public void rejectsEmptySizeParameterName() { - new ReactivePageableHandlerMethodArgumentResolver().setSizeParameterName(""); - } - - @Test(expected = IllegalArgumentException.class) // DATACMNS-1211 - public void rejectsNullSizeParameterName() { - new ReactivePageableHandlerMethodArgumentResolver().setSizeParameterName(null); + @Test // DATACMNS-1211 + void rejectsEmptyPageParameterName() { + assertThatIllegalArgumentException() + .isThrownBy(() -> new ReactivePageableHandlerMethodArgumentResolver().setPageParameterName("")); } @Test // DATACMNS-1211 - public void qualifierIsUsedInParameterLookup() throws Exception { + void rejectsNullPageParameterName() { + assertThatIllegalArgumentException() + .isThrownBy(() -> new ReactivePageableHandlerMethodArgumentResolver().setPageParameterName(null)); + } + + @Test // DATACMNS-1211 + void rejectsEmptySizeParameterName() { + assertThatIllegalArgumentException() + .isThrownBy(() -> new ReactivePageableHandlerMethodArgumentResolver().setSizeParameterName("")); + } + + @Test // DATACMNS-1211 + void rejectsNullSizeParameterName() { + assertThatIllegalArgumentException() + .isThrownBy(() -> new ReactivePageableHandlerMethodArgumentResolver().setSizeParameterName(null)); + } + + @Test // DATACMNS-1211 + void qualifierIsUsedInParameterLookup() throws Exception { MethodParameter parameter = new MethodParameter(Sample.class.getMethod("validQualifier", Pageable.class), 0); @@ -89,7 +90,7 @@ public class ReactivePageableHandlerMethodArgumentResolverUnitTests { } @Test // DATACMNS-1211 - public void usesDefaultPageSizeIfRequestPageSizeIsLessThanOne() { + void usesDefaultPageSizeIfRequestPageSizeIsLessThanOne() { MockServerHttpRequest request = MockServerHttpRequest.get("foo?page=0&size=0").build(); @@ -97,19 +98,17 @@ public class ReactivePageableHandlerMethodArgumentResolverUnitTests { } @Test // DATACMNS-1211 - public void rejectsInvalidCustomDefaultForPageSize() throws Exception { + void rejectsInvalidCustomDefaultForPageSize() throws Exception { MethodParameter parameter = new MethodParameter(Sample.class.getMethod("invalidDefaultPageSize", Pageable.class), 0); - exception.expect(IllegalStateException.class); - exception.expectMessage("invalidDefaultPageSize"); - - assertSupportedAndResult(parameter, DEFAULT_PAGE_REQUEST); + assertThatIllegalStateException().isThrownBy(() -> assertSupportedAndResult(parameter, DEFAULT_PAGE_REQUEST)) + .withMessageContaining("invalidDefaultPageSize"); } @Test // DATACMNS-1211 - public void fallsBackToFirstPageIfNegativePageNumberIsGiven() { + void fallsBackToFirstPageIfNegativePageNumberIsGiven() { MockServerHttpRequest request = MockServerHttpRequest.get("foo?page=-1").build(); @@ -117,7 +116,7 @@ public class ReactivePageableHandlerMethodArgumentResolverUnitTests { } @Test // DATACMNS-1211 - public void pageParamIsNotNumeric() { + void pageParamIsNotNumeric() { MockServerHttpRequest request = MockServerHttpRequest.get("foo?page=a").build(); @@ -125,7 +124,7 @@ public class ReactivePageableHandlerMethodArgumentResolverUnitTests { } @Test // DATACMNS-1211 - public void sizeParamIsNotNumeric() { + void sizeParamIsNotNumeric() { MockServerHttpRequest request = MockServerHttpRequest.get("foo?size=a").build(); @@ -133,7 +132,7 @@ public class ReactivePageableHandlerMethodArgumentResolverUnitTests { } @Test // DATACMNS-1211 - public void returnsNullIfFallbackIsUnpagedAndNoParametersGiven() { + void returnsNullIfFallbackIsUnpagedAndNoParametersGiven() { ReactivePageableHandlerMethodArgumentResolver resolver = getReactiveResolver(); resolver.setFallbackPageable(Pageable.unpaged()); @@ -142,7 +141,7 @@ public class ReactivePageableHandlerMethodArgumentResolverUnitTests { } @Test // DATACMNS-1211 - public void returnsFallbackIfOnlyPageIsGiven() { + void returnsFallbackIfOnlyPageIsGiven() { ReactivePageableHandlerMethodArgumentResolver resolver = getReactiveResolver(); resolver.setFallbackPageable(Pageable.unpaged()); @@ -153,7 +152,7 @@ public class ReactivePageableHandlerMethodArgumentResolverUnitTests { } @Test // DATACMNS-1211 - public void returnsFallbackIfFallbackIsUnpagedAndOnlySizeIsGiven() { + void returnsFallbackIfFallbackIsUnpagedAndOnlySizeIsGiven() { ReactivePageableHandlerMethodArgumentResolver resolver = getReactiveResolver(); resolver.setFallbackPageable(Pageable.unpaged()); @@ -164,7 +163,7 @@ public class ReactivePageableHandlerMethodArgumentResolverUnitTests { } @Test // DATACMNS-1211 - public void considersOneIndexedParametersSetting() { + void considersOneIndexedParametersSetting() { ReactivePageableHandlerMethodArgumentResolver resolver = getReactiveResolver(); resolver.setOneIndexedParameters(true); @@ -175,7 +174,7 @@ public class ReactivePageableHandlerMethodArgumentResolverUnitTests { } @Test // DATACMNS-1211 - public void usesNullSortIfNoDefaultIsConfiguredAndPageAndSizeAreGiven() { + void usesNullSortIfNoDefaultIsConfiguredAndPageAndSizeAreGiven() { ReactivePageableHandlerMethodArgumentResolver resolver = getReactiveResolver(); resolver.setFallbackPageable(Pageable.unpaged()); @@ -190,7 +189,7 @@ public class ReactivePageableHandlerMethodArgumentResolverUnitTests { } @Test // DATACMNS-1211 - public void oneIndexedParametersDefaultsIndexOutOfRange() { + void oneIndexedParametersDefaultsIndexOutOfRange() { ReactivePageableHandlerMethodArgumentResolver resolver = getReactiveResolver(); resolver.setOneIndexedParameters(true); @@ -201,7 +200,7 @@ public class ReactivePageableHandlerMethodArgumentResolverUnitTests { } @Test // DATACMNS-1211 - public void returnsCorrectPageSizeForOneIndexParameters() { + void returnsCorrectPageSizeForOneIndexParameters() { ReactivePageableHandlerMethodArgumentResolver resolver = getReactiveResolver(); resolver.setOneIndexedParameters(true); @@ -212,7 +211,7 @@ public class ReactivePageableHandlerMethodArgumentResolverUnitTests { } @Test // DATACMNS-1211 - public void detectsFallbackPageableIfNullOneIsConfigured() { + void detectsFallbackPageableIfNullOneIsConfigured() { ReactivePageableHandlerMethodArgumentResolver resolver = getReactiveResolver(); resolver.setFallbackPageable(Pageable.unpaged()); diff --git a/src/test/java/org/springframework/data/web/ReactiveSortHandlerMethodArgumentResolverUnitTests.java b/src/test/java/org/springframework/data/web/ReactiveSortHandlerMethodArgumentResolverUnitTests.java index 313a1eab6..243146f06 100755 --- a/src/test/java/org/springframework/data/web/ReactiveSortHandlerMethodArgumentResolverUnitTests.java +++ b/src/test/java/org/springframework/data/web/ReactiveSortHandlerMethodArgumentResolverUnitTests.java @@ -19,10 +19,9 @@ import static org.assertj.core.api.Assertions.*; import static org.springframework.data.domain.Sort.Direction.*; import static org.springframework.data.web.SortDefaultUnitTests.*; -import org.junit.BeforeClass; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.core.MethodParameter; import org.springframework.data.domain.Sort; @@ -39,19 +38,17 @@ import org.springframework.util.StringUtils; * * @author Mark Paluch */ -public class ReactiveSortHandlerMethodArgumentResolverUnitTests { +class ReactiveSortHandlerMethodArgumentResolverUnitTests { static MethodParameter PARAMETER; - @Rule public final ExpectedException exception = ExpectedException.none(); - - @BeforeClass - public static void setUp() throws Exception { + @BeforeAll + static void setUp() throws Exception { PARAMETER = new MethodParameter(Controller.class.getMethod("supportedMethod", Sort.class), 0); } @Test // DATACMNS-1211 - public void supportsSortParameter() { + void supportsSortParameter() { ReactiveSortHandlerMethodArgumentResolver resolver = new ReactiveSortHandlerMethodArgumentResolver(); @@ -59,22 +56,22 @@ public class ReactiveSortHandlerMethodArgumentResolverUnitTests { } @Test // DATACMNS-1211 - public void returnsNullForNoDefault() { + void returnsNullForNoDefault() { assertSupportedAndResolvedTo(getParameterOfMethod("supportedMethod"), Sort.unsorted()); } @Test // DATACMNS-1211 - public void discoversSimpleDefault() { + void discoversSimpleDefault() { assertSupportedAndResolvedTo(getParameterOfMethod("simpleDefault"), Sort.by(SORT_FIELDS).ascending()); } @Test // DATACMNS-1211 - public void discoversSimpleDefaultWithDirection() { + void discoversSimpleDefaultWithDirection() { assertSupportedAndResolvedTo(getParameterOfMethod("simpleDefaultWithDirection"), SORT); } @Test // DATACMNS-1211 - public void fallbackToGivenDefaultSort() { + void fallbackToGivenDefaultSort() { MethodParameter parameter = TestUtils.getParameterOfMethod(Controller.class, "unsupportedMethod", String.class); ReactiveSortHandlerMethodArgumentResolver resolver = new ReactiveSortHandlerMethodArgumentResolver(); @@ -85,7 +82,7 @@ public class ReactiveSortHandlerMethodArgumentResolverUnitTests { } @Test // DATACMNS-1211 - public void fallbackToDefaultDefaultSort() { + void fallbackToDefaultDefaultSort() { MethodParameter parameter = TestUtils.getParameterOfMethod(Controller.class, "unsupportedMethod", String.class); ReactiveSortHandlerMethodArgumentResolver resolver = new ReactiveSortHandlerMethodArgumentResolver(); @@ -94,7 +91,7 @@ public class ReactiveSortHandlerMethodArgumentResolverUnitTests { } @Test // DATACMNS-1211 - public void discoversSimpleSortFromRequest() { + void discoversSimpleSortFromRequest() { MethodParameter parameter = getParameterOfMethod("simpleDefault"); Sort reference = Sort.by("bar", "foo"); @@ -104,7 +101,7 @@ public class ReactiveSortHandlerMethodArgumentResolverUnitTests { } @Test // DATACMNS-1211 - public void discoversComplexSortFromRequest() { + void discoversComplexSortFromRequest() { MethodParameter parameter = getParameterOfMethod("simpleDefault"); Sort reference = Sort.by("bar", "foo").and(Sort.by("fizz", "buzz")); @@ -113,7 +110,7 @@ public class ReactiveSortHandlerMethodArgumentResolverUnitTests { } @Test // DATACMNS-1211 - public void discoversQualifiedSortFromRequest() { + void discoversQualifiedSortFromRequest() { MethodParameter parameter = getParameterOfMethod("qualifiedSort"); Sort reference = Sort.by("bar", "foo"); @@ -122,7 +119,7 @@ public class ReactiveSortHandlerMethodArgumentResolverUnitTests { } @Test // DATACMNS-1211 - public void requestForMultipleSortPropertiesIsUnmarshalledCorrectly() { + void requestForMultipleSortPropertiesIsUnmarshalledCorrectly() { MockServerHttpRequest request = MockServerHttpRequest.get(String.format("foo?sort=%s", SortDefaultUnitTests.SORT_3)) .build(); @@ -134,7 +131,7 @@ public class ReactiveSortHandlerMethodArgumentResolverUnitTests { } @Test // DATACMNS-1211 - public void parsesEmptySortToNull() { + void parsesEmptySortToNull() { MockServerHttpRequest request = MockServerHttpRequest.get("foo?sort=").build(); @@ -142,7 +139,7 @@ public class ReactiveSortHandlerMethodArgumentResolverUnitTests { } @Test // DATACMNS-1211 - public void sortParamIsInvalidProperty() { + void sortParamIsInvalidProperty() { MockServerHttpRequest request = MockServerHttpRequest.get("foo?sort=,DESC").build(); @@ -150,7 +147,7 @@ public class ReactiveSortHandlerMethodArgumentResolverUnitTests { } @Test // DATACMNS-1211 - public void sortParamIsInvalidPropertyWhenMultiProperty() { + void sortParamIsInvalidPropertyWhenMultiProperty() { MockServerHttpRequest request = MockServerHttpRequest.get("foo?sort=property1,,DESC").build(); @@ -158,24 +155,23 @@ public class ReactiveSortHandlerMethodArgumentResolverUnitTests { } @Test // DATACMNS-1211 - public void rejectsDoubleAnnotatedMethod() { + void rejectsDoubleAnnotatedMethod() { MethodParameter parameter = getParameterOfMethod("invalid"); ReactiveSortHandlerMethodArgumentResolver resolver = new ReactiveSortHandlerMethodArgumentResolver(); assertThat(resolver.supportsParameter(parameter)).isTrue(); - exception.expect(IllegalArgumentException.class); - exception.expectMessage(SortDefault.class.getSimpleName()); - exception.expectMessage(SortDefaults.class.getSimpleName()); - exception.expectMessage(parameter.toString()); - + assertThatIllegalArgumentException() + .isThrownBy(() -> resolver.resolveArgumentValue(parameter, null, - MockServerWebExchange.from(TestUtils.getWebfluxRequest())); + MockServerWebExchange.from(TestUtils.getWebfluxRequest()))) + .withMessageContaining(SortDefault.class.getSimpleName()) + .withMessageContaining(SortDefaults.class.getSimpleName()).withMessageContaining(parameter.toString()); } @Test // DATACMNS-1211 - public void sortParamIsEmptyWhenMultiParams() { + void sortParamIsEmptyWhenMultiParams() { MockServerHttpRequest request = MockServerHttpRequest.get("foo?sort=property,DESC&sort=").build(); @@ -183,7 +179,7 @@ public class ReactiveSortHandlerMethodArgumentResolverUnitTests { } @Test // DATACMNS-1211 - public void parsesCommaParameterForSort() { + void parsesCommaParameterForSort() { MockServerHttpRequest request = MockServerHttpRequest.get("foo?sort=,").build(); @@ -191,7 +187,7 @@ public class ReactiveSortHandlerMethodArgumentResolverUnitTests { } @Test // DATACMNS-1211 - public void doesNotReturnNullWhenAnnotatedWithSortDefault() { + void doesNotReturnNullWhenAnnotatedWithSortDefault() { MockServerHttpRequest request = MockServerHttpRequest.get("foo?sort=").build(); diff --git a/src/test/java/org/springframework/data/web/SortDefaultUnitTests.java b/src/test/java/org/springframework/data/web/SortDefaultUnitTests.java index 6504bd8ec..6b4d245e0 100755 --- a/src/test/java/org/springframework/data/web/SortDefaultUnitTests.java +++ b/src/test/java/org/springframework/data/web/SortDefaultUnitTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.core.MethodParameter; import org.springframework.data.domain.Sort; @@ -35,7 +35,7 @@ import org.springframework.web.method.support.HandlerMethodArgumentResolver; * @author Oliver Gierke * @author Mark Paluch */ -public abstract class SortDefaultUnitTests { +abstract class SortDefaultUnitTests { static final String SORT_0 = "username"; static final String SORT_1 = "username,asc"; @@ -48,7 +48,7 @@ public abstract class SortDefaultUnitTests { static final Sort SORT = Sort.by(SORT_DIRECTION, SORT_FIELDS); @Test - public void parsesSimpleSortStringCorrectly() { + void parsesSimpleSortStringCorrectly() { assertSortStringParsedInto(Sort.by(Order.asc("username")), SORT_1); assertSortStringParsedInto(Sort.by(Order.asc("username"), // @@ -65,34 +65,34 @@ public abstract class SortDefaultUnitTests { } @Test - public void supportsSortParameter() { + void supportsSortParameter() { assertThat(getResolver().supportsParameter(getParameterOfMethod("supportedMethod"))).isTrue(); } @Test - public void returnsNullForNoDefault() throws Exception { + void returnsNullForNoDefault() throws Exception { assertSupportedAndResolvedTo(getParameterOfMethod("supportedMethod"), Sort.unsorted()); } @Test - public void discoversSimpleDefault() throws Exception { + void discoversSimpleDefault() throws Exception { assertSupportedAndResolvedTo(getParameterOfMethod("simpleDefault"), Sort.by(SORT_FIELDS).ascending()); } @Test - public void discoversSimpleDefaultWithDirection() throws Exception { + void discoversSimpleDefaultWithDirection() throws Exception { assertSupportedAndResolvedTo(getParameterOfMethod("simpleDefaultWithDirection"), SORT); } @Test - public void rejectsNonSortParameter() { + void rejectsNonSortParameter() { MethodParameter parameter = TestUtils.getParameterOfMethod(getControllerClass(), "unsupportedMethod", String.class); assertThat(getResolver().supportsParameter(parameter)).isFalse(); } @Test - public void rejectsDoubleAnnotatedMethod() { + void rejectsDoubleAnnotatedMethod() { MethodParameter parameter = getParameterOfMethod("invalid"); @@ -107,7 +107,7 @@ public abstract class SortDefaultUnitTests { } @Test - public void discoversContaineredDefault() throws Exception { + void discoversContaineredDefault() throws Exception { MethodParameter parameter = getParameterOfMethod("containeredDefault"); Sort reference = Sort.by("foo", "bar"); diff --git a/src/test/java/org/springframework/data/web/SortHandlerMethodArgumentResolverUnitTests.java b/src/test/java/org/springframework/data/web/SortHandlerMethodArgumentResolverUnitTests.java index 2a1bca2fd..972fe4558 100755 --- a/src/test/java/org/springframework/data/web/SortHandlerMethodArgumentResolverUnitTests.java +++ b/src/test/java/org/springframework/data/web/SortHandlerMethodArgumentResolverUnitTests.java @@ -22,8 +22,8 @@ import java.util.stream.Stream; import javax.servlet.http.HttpServletRequest; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.core.MethodParameter; @@ -46,17 +46,17 @@ import org.springframework.web.context.request.ServletWebRequest; * @author Nick Williams * @author Mark Paluch */ -public class SortHandlerMethodArgumentResolverUnitTests extends SortDefaultUnitTests { +class SortHandlerMethodArgumentResolverUnitTests extends SortDefaultUnitTests { static MethodParameter PARAMETER; - @BeforeClass - public static void setUp() throws Exception { + @BeforeAll + static void setUp() throws Exception { PARAMETER = new MethodParameter(Controller.class.getMethod("supportedMethod", Sort.class), 0); } @Test // DATACMNS-351 - public void fallbackToGivenDefaultSort() { + void fallbackToGivenDefaultSort() { MethodParameter parameter = TestUtils.getParameterOfMethod(getControllerClass(), "unsupportedMethod", String.class); SortHandlerMethodArgumentResolver resolver = new SortHandlerMethodArgumentResolver(); @@ -68,7 +68,7 @@ public class SortHandlerMethodArgumentResolverUnitTests extends SortDefaultUnitT } @Test // DATACMNS-351 - public void fallbackToDefaultDefaultSort() { + void fallbackToDefaultDefaultSort() { MethodParameter parameter = TestUtils.getParameterOfMethod(getControllerClass(), "unsupportedMethod", String.class); SortHandlerMethodArgumentResolver resolver = new SortHandlerMethodArgumentResolver(); @@ -78,7 +78,7 @@ public class SortHandlerMethodArgumentResolverUnitTests extends SortDefaultUnitT } @Test - public void discoversSimpleSortFromRequest() { + void discoversSimpleSortFromRequest() { MethodParameter parameter = getParameterOfMethod("simpleDefault"); Sort reference = Sort.by("bar", "foo"); @@ -88,7 +88,7 @@ public class SortHandlerMethodArgumentResolverUnitTests extends SortDefaultUnitT } @Test - public void discoversComplexSortFromRequest() { + void discoversComplexSortFromRequest() { MethodParameter parameter = getParameterOfMethod("simpleDefault"); Sort reference = Sort.by("bar", "foo").and(Sort.by("fizz", "buzz")); @@ -97,7 +97,7 @@ public class SortHandlerMethodArgumentResolverUnitTests extends SortDefaultUnitT } @Test - public void discoversQualifiedSortFromRequest() { + void discoversQualifiedSortFromRequest() { MethodParameter parameter = getParameterOfMethod("qualifiedSort"); Sort reference = Sort.by("bar", "foo"); @@ -106,7 +106,7 @@ public class SortHandlerMethodArgumentResolverUnitTests extends SortDefaultUnitT } @Test - public void returnsNullForSortParameterSetToNothing() { + void returnsNullForSortParameterSetToNothing() { MethodParameter parameter = getParameterOfMethod("supportedMethod"); @@ -119,7 +119,7 @@ public class SortHandlerMethodArgumentResolverUnitTests extends SortDefaultUnitT } @Test // DATACMNS-366 - public void requestForMultipleSortPropertiesIsUnmarshalledCorrectly() { + void requestForMultipleSortPropertiesIsUnmarshalledCorrectly() { MethodParameter parameter = getParameterOfMethod("supportedMethod"); @@ -132,7 +132,7 @@ public class SortHandlerMethodArgumentResolverUnitTests extends SortDefaultUnitT } @Test // DATACMNS-408 - public void parsesEmptySortToNull() throws Exception { + void parsesEmptySortToNull() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest(); request.addParameter("sort", ""); @@ -141,7 +141,7 @@ public class SortHandlerMethodArgumentResolverUnitTests extends SortDefaultUnitT } @Test // DATACMNS-408 - public void sortParamIsInvalidProperty() throws Exception { + void sortParamIsInvalidProperty() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest(); request.addParameter("sort", ",DESC"); @@ -150,7 +150,7 @@ public class SortHandlerMethodArgumentResolverUnitTests extends SortDefaultUnitT } @Test // DATACMNS-408 - public void sortParamIsInvalidPropertyWhenMultiProperty() throws Exception { + void sortParamIsInvalidPropertyWhenMultiProperty() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest(); request.addParameter("sort", "property1,,DESC"); @@ -159,7 +159,7 @@ public class SortHandlerMethodArgumentResolverUnitTests extends SortDefaultUnitT } @Test // DATACMNS-408 - public void sortParamIsEmptyWhenMultiParams() throws Exception { + void sortParamIsEmptyWhenMultiParams() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest(); request.addParameter("sort", "property,DESC"); @@ -169,7 +169,7 @@ public class SortHandlerMethodArgumentResolverUnitTests extends SortDefaultUnitT } @Test // DATACMNS-658 - public void sortParamHandlesSortOrderAndIgnoreCase() throws Exception { + void sortParamHandlesSortOrderAndIgnoreCase() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest(); request.addParameter("sort", "property,DESC,IgnoreCase"); @@ -179,7 +179,7 @@ public class SortHandlerMethodArgumentResolverUnitTests extends SortDefaultUnitT } @Test // DATACMNS-658 - public void sortParamHandlesMultiplePropertiesWithSortOrderAndIgnoreCase() throws Exception { + void sortParamHandlesMultiplePropertiesWithSortOrderAndIgnoreCase() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest(); request.addParameter("sort", "property1,property2,DESC,IgnoreCase"); @@ -189,7 +189,7 @@ public class SortHandlerMethodArgumentResolverUnitTests extends SortDefaultUnitT } @Test // DATACMNS-658 - public void sortParamHandlesIgnoreCase() throws Exception { + void sortParamHandlesIgnoreCase() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest(); request.addParameter("sort", "property,IgnoreCase"); @@ -199,7 +199,7 @@ public class SortHandlerMethodArgumentResolverUnitTests extends SortDefaultUnitT } @Test // DATACMNS-658 - public void returnsDefaultCaseInsensitive() throws Exception { + void returnsDefaultCaseInsensitive() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest(); request.addParameter("sort", ""); @@ -209,7 +209,7 @@ public class SortHandlerMethodArgumentResolverUnitTests extends SortDefaultUnitT } @Test // DATACMNS-379 - public void parsesCommaParameterForSort() throws Exception { + void parsesCommaParameterForSort() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest(); request.addParameter("sort", ","); @@ -218,7 +218,7 @@ public class SortHandlerMethodArgumentResolverUnitTests extends SortDefaultUnitT } @Test // DATACMNS-753, DATACMNS-408 - public void doesNotReturnNullWhenAnnotatedWithSortDefault() throws Exception { + void doesNotReturnNullWhenAnnotatedWithSortDefault() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest(); request.addParameter("sort", ""); @@ -228,7 +228,7 @@ public class SortHandlerMethodArgumentResolverUnitTests extends SortDefaultUnitT } @Test // DATACMNS-1551 - public void resolvesDotOnlyInputToDefault() { + void resolvesDotOnlyInputToDefault() { Stream.of(".", ".,ASC").forEach(it -> { diff --git a/src/test/java/org/springframework/data/web/TestUtils.java b/src/test/java/org/springframework/data/web/TestUtils.java index c5cc73729..163321de5 100644 --- a/src/test/java/org/springframework/data/web/TestUtils.java +++ b/src/test/java/org/springframework/data/web/TestUtils.java @@ -32,21 +32,21 @@ import org.springframework.web.context.request.ServletWebRequest; */ class TestUtils { - public static NativeWebRequest getWebRequest() { + static NativeWebRequest getWebRequest() { return new ServletWebRequest(new MockHttpServletRequest()); } - public static MockServerHttpRequest getWebfluxRequest() { + static MockServerHttpRequest getWebfluxRequest() { return MockServerHttpRequest.get("foo").build(); } - public static MethodParameter getParameterOfMethod(Class controller, String name, Class... argumentTypes) { + static MethodParameter getParameterOfMethod(Class controller, String name, Class... argumentTypes) { Method method = getMethod(controller, name, argumentTypes); return new MethodParameter(method, 0); } - public static Method getMethod(Class controller, String name, Class... argumentTypes) { + static Method getMethod(Class controller, String name, Class... argumentTypes) { try { return controller.getMethod(name, argumentTypes); diff --git a/src/test/java/org/springframework/data/web/XmlBeamHttpMessageConverterUnitTests.java b/src/test/java/org/springframework/data/web/XmlBeamHttpMessageConverterUnitTests.java index 298b93b4f..35d8b5423 100755 --- a/src/test/java/org/springframework/data/web/XmlBeamHttpMessageConverterUnitTests.java +++ b/src/test/java/org/springframework/data/web/XmlBeamHttpMessageConverterUnitTests.java @@ -21,14 +21,16 @@ import static org.mockito.Mockito.*; import java.io.ByteArrayInputStream; import java.io.IOException; -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.springframework.data.web.ProjectingJackson2HttpMessageConverterUnitTests.UnannotatedInterface; import org.springframework.http.HttpInputMessage; import org.springframework.http.MediaType; import org.springframework.http.converter.HttpMessageNotReadableException; + import org.xml.sax.SAXParseException; import org.xmlbeam.annotation.XBRead; @@ -38,15 +40,15 @@ import org.xmlbeam.annotation.XBRead; * @author Oliver Gierke * @soundtrack Dr. Kobayashi Maru & The Mothership Connection - Anthem (EPisode One) */ -@RunWith(MockitoJUnitRunner.class) -public class XmlBeamHttpMessageConverterUnitTests { +@ExtendWith(MockitoExtension.class) +class XmlBeamHttpMessageConverterUnitTests { XmlBeamHttpMessageConverter converter = new XmlBeamHttpMessageConverter(); @Mock HttpInputMessage message; @Test // DATACMNS-885 - public void findsTopLevelElements() throws Exception { + void findsTopLevelElements() throws Exception { preparePayload("DaveMatthews"); @@ -57,7 +59,7 @@ public class XmlBeamHttpMessageConverterUnitTests { } @Test // DATACMNS-885 - public void findsNestedElements() throws Exception { + void findsNestedElements() throws Exception { preparePayload("DaveMatthews"); @@ -68,29 +70,29 @@ public class XmlBeamHttpMessageConverterUnitTests { } @Test // DATACMNS-885 - public void supportsAnnotatedInterface() { + void supportsAnnotatedInterface() { assertThat(converter.canRead(Customer.class, MediaType.APPLICATION_XML)).isTrue(); } @Test // DATACMNS-885 - public void supportsXmlBasedMediaType() { + void supportsXmlBasedMediaType() { assertThat(converter.canRead(Customer.class, MediaType.APPLICATION_ATOM_XML)).isTrue(); } @Test // DATACMNS-885 - public void doesNotSupportUnannotatedInterface() { + void doesNotSupportUnannotatedInterface() { assertThat(converter.canRead(UnannotatedInterface.class, MediaType.APPLICATION_XML)).isFalse(); } @Test // DATACMNS-885 - public void supportsInterfaceAfterLookupForDifferrentMediaType() { + void supportsInterfaceAfterLookupForDifferrentMediaType() { assertThat(converter.canRead(Customer.class, MediaType.APPLICATION_JSON)).isFalse(); assertThat(converter.canRead(Customer.class, MediaType.APPLICATION_XML)).isTrue(); } @Test // DATACMNS-1292 - public void doesNotSupportEntityExpansion() throws Exception { + void doesNotSupportEntityExpansion() throws Exception { preparePayload("\n" // + " pageableResolver.setMaxPageSize(100); } } @@ -86,7 +87,7 @@ public class EnableSpringDataWebSupportIntegrationTests { static class SortResolverCustomizerConfig extends SampleConfig { @Bean - public SortHandlerMethodArgumentResolverCustomizer testSortResolverCustomizer() { + SortHandlerMethodArgumentResolverCustomizer testSortResolverCustomizer() { return sortResolver -> sortResolver.setSortParameter("foo"); } } @@ -104,7 +105,7 @@ public class EnableSpringDataWebSupportIntegrationTests { } @Test // DATACMNS-330 - public void registersBasicBeanDefinitions() throws Exception { + void registersBasicBeanDefinitions() throws Exception { ApplicationContext context = WebTestUtils.createApplicationContext(SampleConfig.class); List names = Arrays.asList(context.getBeanDefinitionNames()); @@ -116,7 +117,7 @@ public class EnableSpringDataWebSupportIntegrationTests { } @Test // DATACMNS-330 - public void registersHateoasSpecificBeanDefinitions() throws Exception { + void registersHateoasSpecificBeanDefinitions() throws Exception { ApplicationContext context = WebTestUtils.createApplicationContext(SampleConfig.class); List names = Arrays.asList(context.getBeanDefinitionNames()); @@ -126,7 +127,7 @@ public class EnableSpringDataWebSupportIntegrationTests { } @Test // DATACMNS-330 - public void doesNotRegisterHateoasSpecificComponentsIfHateoasNotPresent() throws Exception { + void doesNotRegisterHateoasSpecificComponentsIfHateoasNotPresent() throws Exception { HidingClassLoader classLoader = HidingClassLoader.hide(Link.class); @@ -139,7 +140,7 @@ public class EnableSpringDataWebSupportIntegrationTests { } @Test // DATACMNS-475 - public void registersJacksonSpecificBeanDefinitions() throws Exception { + void registersJacksonSpecificBeanDefinitions() throws Exception { ApplicationContext context = WebTestUtils.createApplicationContext(SampleConfig.class); List names = Arrays.asList(context.getBeanDefinitionNames()); @@ -148,7 +149,7 @@ public class EnableSpringDataWebSupportIntegrationTests { } @Test // DATACMNS-475 - public void doesNotRegisterJacksonSpecificComponentsIfJacksonNotPresent() throws Exception { + void doesNotRegisterJacksonSpecificComponentsIfJacksonNotPresent() throws Exception { ApplicationContext context = WebTestUtils.createApplicationContext(HidingClassLoader.hide(ObjectMapper.class), SampleConfig.class); @@ -159,7 +160,7 @@ public class EnableSpringDataWebSupportIntegrationTests { } @Test // DATACMNS-626 - public void registersFormatters() { + void registersFormatters() { ApplicationContext context = WebTestUtils.createApplicationContext(SampleConfig.class); @@ -172,7 +173,7 @@ public class EnableSpringDataWebSupportIntegrationTests { } @Test // DATACMNS-630 - public void createsProxyForInterfaceBasedControllerMethodParameter() throws Exception { + void createsProxyForInterfaceBasedControllerMethodParameter() throws Exception { WebApplicationContext applicationContext = WebTestUtils.createApplicationContext(SampleConfig.class); MockMvc mvc = MockMvcBuilders.webAppContextSetup(applicationContext).build(); @@ -190,7 +191,7 @@ public class EnableSpringDataWebSupportIntegrationTests { } @Test // DATACMNS-660 - public void picksUpWebConfigurationMixins() { + void picksUpWebConfigurationMixins() { ApplicationContext context = WebTestUtils.createApplicationContext(SampleConfig.class); List names = Arrays.asList(context.getBeanDefinitionNames()); @@ -199,7 +200,7 @@ public class EnableSpringDataWebSupportIntegrationTests { } @Test // DATACMNS-822 - public void picksUpPageableResolverCustomizer() { + void picksUpPageableResolverCustomizer() { ApplicationContext context = WebTestUtils.createApplicationContext(PageableResolverCustomizerConfig.class); List names = Arrays.asList(context.getBeanDefinitionNames()); @@ -210,7 +211,7 @@ public class EnableSpringDataWebSupportIntegrationTests { } @Test // DATACMNS-822 - public void picksUpSortResolverCustomizer() { + void picksUpSortResolverCustomizer() { ApplicationContext context = WebTestUtils.createApplicationContext(SortResolverCustomizerConfig.class); List names = Arrays.asList(context.getBeanDefinitionNames()); @@ -221,7 +222,7 @@ public class EnableSpringDataWebSupportIntegrationTests { } @Test // DATACMNS-1237 - public void configuresProxyingHandlerMethodArgumentResolver() { + void configuresProxyingHandlerMethodArgumentResolver() { ApplicationContext context = WebTestUtils.createApplicationContext(SampleConfig.class); @@ -231,7 +232,7 @@ public class EnableSpringDataWebSupportIntegrationTests { } @Test // DATACMNS-1235 - public void picksUpEntityPathResolverIfRegistered() { + void picksUpEntityPathResolverIfRegistered() { WebApplicationContext context = WebTestUtils.createApplicationContext(CustomEntityPathResolver.class); diff --git a/src/test/java/org/springframework/data/web/config/PageableResourcesAssemblerIntegrationTests.java b/src/test/java/org/springframework/data/web/config/PageableResourcesAssemblerIntegrationTests.java index 70ba6fe6e..013a9c550 100755 --- a/src/test/java/org/springframework/data/web/config/PageableResourcesAssemblerIntegrationTests.java +++ b/src/test/java/org/springframework/data/web/config/PageableResourcesAssemblerIntegrationTests.java @@ -19,8 +19,9 @@ import static org.assertj.core.api.Assertions.*; import java.util.Collections; -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.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -31,9 +32,9 @@ import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.data.web.PagedResourcesAssembler; import org.springframework.data.web.WebTestUtils; +import org.springframework.hateoas.EntityModel; import org.springframework.hateoas.IanaLinkRelations; import org.springframework.hateoas.PagedModel; -import org.springframework.hateoas.EntityModel; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.context.WebApplicationContext; @@ -43,25 +44,25 @@ import org.springframework.web.context.WebApplicationContext; * * @author Oliver Gierke */ -public class PageableResourcesAssemblerIntegrationTests { +class PageableResourcesAssemblerIntegrationTests { @Configuration @EnableSpringDataWebSupport static class Config { @Bean - public SampleController controller() { + SampleController controller() { return new SampleController(); } } - @Before - public void setUp() { + @BeforeEach + void setUp() { WebTestUtils.initWebTest(); } @Test - public void injectsPagedResourcesAssembler() { + void injectsPagedResourcesAssembler() { WebApplicationContext context = WebTestUtils.createApplicationContext(Config.class); SampleController controller = context.getBean(SampleController.class); @@ -76,7 +77,7 @@ public class PageableResourcesAssemblerIntegrationTests { } @Test // DATACMNS-471 - public void setsUpPagedResourcesAssemblerFromManualXmlConfig() { + void setsUpPagedResourcesAssemblerFromManualXmlConfig() { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("manual.xml", getClass()); assertThat(context.getBean(PagedResourcesAssembler.class)).isNotNull(); @@ -84,7 +85,7 @@ public class PageableResourcesAssemblerIntegrationTests { } @Test // DATACMNS-471 - public void setsUpPagedResourcesAssemblerFromJavaConfigXmlConfig() { + void setsUpPagedResourcesAssemblerFromJavaConfigXmlConfig() { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("via-config-class.xml", getClass()); assertThat(context.getBean(PagedResourcesAssembler.class)).isNotNull(); diff --git a/src/test/java/org/springframework/data/web/config/SampleController.java b/src/test/java/org/springframework/data/web/config/SampleController.java index 833bde5a1..8225b133c 100755 --- a/src/test/java/org/springframework/data/web/config/SampleController.java +++ b/src/test/java/org/springframework/data/web/config/SampleController.java @@ -31,10 +31,10 @@ import org.springframework.web.bind.annotation.RequestMapping; * @author Oliver Gierke */ @Controller -public class SampleController { +class SampleController { @RequestMapping("/proxy") - public String someMethod(SampleDto sampleDto) { + String someMethod(SampleDto sampleDto) { assertThat(sampleDto).isNotNull(); assertThat(sampleDto.getName()).isEqualTo("Foo"); diff --git a/src/test/java/org/springframework/data/web/config/SampleMixin.java b/src/test/java/org/springframework/data/web/config/SampleMixin.java index 580792d9a..efeb3bd4e 100644 --- a/src/test/java/org/springframework/data/web/config/SampleMixin.java +++ b/src/test/java/org/springframework/data/web/config/SampleMixin.java @@ -20,7 +20,7 @@ import org.springframework.context.annotation.Bean; /** * @author Oliver Gierke */ -public class SampleMixin implements SpringDataJacksonModules { +class SampleMixin implements SpringDataJacksonModules { @Bean String sampleBean() { diff --git a/src/test/java/org/springframework/data/web/config/SpringDataWebConfigurationIntegrationTests.java b/src/test/java/org/springframework/data/web/config/SpringDataWebConfigurationIntegrationTests.java index 226f3cc3c..f272429e2 100644 --- a/src/test/java/org/springframework/data/web/config/SpringDataWebConfigurationIntegrationTests.java +++ b/src/test/java/org/springframework/data/web/config/SpringDataWebConfigurationIntegrationTests.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.function.Consumer; import org.assertj.core.api.Condition; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -46,10 +46,10 @@ import com.jayway.jsonpath.DocumentContext; * @author Jens Schauder * @author Oliver Gierke */ -public class SpringDataWebConfigurationIntegrationTests { +class SpringDataWebConfigurationIntegrationTests { @Test // DATACMNS-987 - public void shouldNotLoadJacksonConverterWhenJacksonNotPresent() { + void shouldNotLoadJacksonConverterWhenJacksonNotPresent() { List> converters = new ArrayList>(); @@ -60,7 +60,7 @@ public class SpringDataWebConfigurationIntegrationTests { } @Test // DATACMNS-987 - public void shouldNotLoadJacksonConverterWhenJaywayNotPresent() { + void shouldNotLoadJacksonConverterWhenJaywayNotPresent() { List> converters = new ArrayList>(); @@ -71,7 +71,7 @@ public class SpringDataWebConfigurationIntegrationTests { } @Test // DATACMNS-987 - public void shouldNotLoadXBeamConverterWhenXBeamNotPresent() throws Exception { + void shouldNotLoadXBeamConverterWhenXBeamNotPresent() throws Exception { List> converters = new ArrayList>(); @@ -82,7 +82,7 @@ public class SpringDataWebConfigurationIntegrationTests { } @Test // DATACMNS-987 - public void shouldLoadAllConvertersWhenDependenciesArePresent() throws Exception { + void shouldLoadAllConvertersWhenDependenciesArePresent() throws Exception { List> converters = new ArrayList>(); @@ -93,7 +93,7 @@ public class SpringDataWebConfigurationIntegrationTests { } @Test // DATACMNS-1152 - public void usesCustomObjectMapper() { + void usesCustomObjectMapper() { createConfigWithClassLoader(getClass().getClassLoader(), it -> { @@ -111,7 +111,7 @@ public class SpringDataWebConfigurationIntegrationTests { } @Test // DATACMNS-1386 - public void doesNotFailWithJacksonMissing() throws Exception { + void doesNotFailWithJacksonMissing() throws Exception { ReflectionUtils.getUniqueDeclaredMethods(loadWithout(SpringDataWebConfiguration.class, ObjectMapper.class)); } diff --git a/src/test/java/org/springframework/data/web/querydsl/QuerydslPredicateArgumentResolverUnitTests.java b/src/test/java/org/springframework/data/web/querydsl/QuerydslPredicateArgumentResolverUnitTests.java index c0263bdfb..95a7d0ed0 100755 --- a/src/test/java/org/springframework/data/web/querydsl/QuerydslPredicateArgumentResolverUnitTests.java +++ b/src/test/java/org/springframework/data/web/querydsl/QuerydslPredicateArgumentResolverUnitTests.java @@ -20,8 +20,8 @@ import static org.springframework.data.web.querydsl.QuerydslPredicateArgumentRes import java.util.Optional; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.core.MethodParameter; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -53,13 +53,13 @@ import com.querydsl.core.types.dsl.BooleanExpression; * @author Oliver Gierke * @author Mark Paluch */ -public class QuerydslPredicateArgumentResolverUnitTests { +class QuerydslPredicateArgumentResolverUnitTests { QuerydslPredicateArgumentResolver resolver; MockHttpServletRequest request; - @Before - public void setUp() { + @BeforeEach + void setUp() { resolver = new QuerydslPredicateArgumentResolver(new QuerydslBindingsFactory(SimpleEntityPathResolver.INSTANCE), Optional.empty()); @@ -67,30 +67,30 @@ public class QuerydslPredicateArgumentResolverUnitTests { } @Test // DATACMNS-669 - public void supportsParameterReturnsTrueWhenMethodParameterIsPredicateAndAnnotatedCorrectly() { + void supportsParameterReturnsTrueWhenMethodParameterIsPredicateAndAnnotatedCorrectly() { assertThat(resolver.supportsParameter(getMethodParameterFor("simpleFind", Predicate.class))).isTrue(); } @Test // DATACMNS-669 - public void supportsParameterReturnsTrueWhenMethodParameterIsPredicateButNotAnnotatedAsSuch() { + void supportsParameterReturnsTrueWhenMethodParameterIsPredicateButNotAnnotatedAsSuch() { assertThat(resolver.supportsParameter(getMethodParameterFor("predicateWithoutAnnotation", Predicate.class))) .isTrue(); } @Test // DATACMNS-669 - public void supportsParameterShouldThrowExceptionWhenMethodParameterIsNoPredicateButAnnotatedAsSuch() { + void supportsParameterShouldThrowExceptionWhenMethodParameterIsNoPredicateButAnnotatedAsSuch() { assertThatIllegalArgumentException().isThrownBy( () -> resolver.supportsParameter(getMethodParameterFor("nonPredicateWithAnnotation", String.class))); } @Test // DATACMNS-669 - public void supportsParameterReturnsFalseWhenMethodParameterIsNoPredicate() { + void supportsParameterReturnsFalseWhenMethodParameterIsNoPredicate() { assertThat(resolver.supportsParameter(getMethodParameterFor("nonPredicateWithoutAnnotation", String.class))) .isFalse(); } @Test // DATACMNS-669 - public void resolveArgumentShouldCreateSingleStringParameterPredicateCorrectly() throws Exception { + void resolveArgumentShouldCreateSingleStringParameterPredicateCorrectly() throws Exception { request.addParameter("firstname", "rand"); @@ -101,7 +101,7 @@ public class QuerydslPredicateArgumentResolverUnitTests { } @Test // DATACMNS-669 - public void resolveArgumentShouldCreateMultipleParametersPredicateCorrectly() throws Exception { + void resolveArgumentShouldCreateMultipleParametersPredicateCorrectly() throws Exception { request.addParameter("firstname", "rand"); request.addParameter("lastname", "al'thor"); @@ -113,7 +113,7 @@ public class QuerydslPredicateArgumentResolverUnitTests { } @Test // DATACMNS-669 - public void resolveArgumentShouldCreateNestedObjectPredicateCorrectly() throws Exception { + void resolveArgumentShouldCreateNestedObjectPredicateCorrectly() throws Exception { request.addParameter("address.city", "two rivers"); @@ -126,7 +126,7 @@ public class QuerydslPredicateArgumentResolverUnitTests { } @Test // DATACMNS-669 - public void resolveArgumentShouldResolveTypePropertyFromPageCorrectly() throws Exception { + void resolveArgumentShouldResolveTypePropertyFromPageCorrectly() throws Exception { request.addParameter("address.city", "tar valon"); @@ -137,7 +137,7 @@ public class QuerydslPredicateArgumentResolverUnitTests { } @Test // DATACMNS-669 - public void resolveArgumentShouldHonorCustomSpecification() throws Exception { + void resolveArgumentShouldHonorCustomSpecification() throws Exception { request.addParameter("firstname", "egwene"); request.addParameter("lastname", "al'vere"); @@ -150,7 +150,7 @@ public class QuerydslPredicateArgumentResolverUnitTests { } @Test // DATACMNS-669 - public void shouldCreatePredicateForNonStringPropertyCorrectly() throws Exception { + void shouldCreatePredicateForNonStringPropertyCorrectly() throws Exception { request.addParameter("inceptionYear", "978"); @@ -161,7 +161,7 @@ public class QuerydslPredicateArgumentResolverUnitTests { } @Test // DATACMNS-669 - public void shouldCreatePredicateForNonStringListPropertyCorrectly() throws Exception { + void shouldCreatePredicateForNonStringListPropertyCorrectly() throws Exception { request.addParameter("inceptionYear", new String[] { "978", "998" }); @@ -172,7 +172,7 @@ public class QuerydslPredicateArgumentResolverUnitTests { } @Test // DATACMNS-669 - public void shouldExcludePropertiesCorrectly() throws Exception { + void shouldExcludePropertiesCorrectly() throws Exception { request.addParameter("address.street", "downhill"); request.addParameter("inceptionYear", "973"); @@ -185,7 +185,7 @@ public class QuerydslPredicateArgumentResolverUnitTests { @Test // DATACMNS-669 @SuppressWarnings("rawtypes") - public void extractTypeInformationShouldUseTypeExtractedFromMethodReturnTypeIfPredicateNotAnnotated() { + void extractTypeInformationShouldUseTypeExtractedFromMethodReturnTypeIfPredicateNotAnnotated() { TypeInformation type = ReflectionTestUtils.invokeMethod(resolver, "extractTypeInfo", getMethodParameterFor("predicateWithoutAnnotation", Predicate.class)); @@ -195,7 +195,7 @@ public class QuerydslPredicateArgumentResolverUnitTests { @Test // DATACMNS-669 @SuppressWarnings("rawtypes") - public void detectsDomainTypesCorrectly() { + void detectsDomainTypesCorrectly() { TypeInformation USER_TYPE = ClassTypeInformation.from(User.class); TypeInformation MODELA_AND_VIEW_TYPE = ClassTypeInformation.from(ModelAndView.class); @@ -206,7 +206,7 @@ public class QuerydslPredicateArgumentResolverUnitTests { } @Test // DATACMNS-1593 - public void returnsEmptyPredicateForEmptyInput() throws Exception { + void returnsEmptyPredicateForEmptyInput() throws Exception { MethodParameter parameter = getMethodParameterFor("predicateWithoutAnnotation", Predicate.class); @@ -217,7 +217,7 @@ public class QuerydslPredicateArgumentResolverUnitTests { } @Test // DATACMNS-1635 - public void forwardsNullValueForNullablePredicate() throws Exception { + void forwardsNullValueForNullablePredicate() throws Exception { MethodParameter parameter = getMethodParameterFor("nullablePredicateWithoutAnnotation", Predicate.class); @@ -227,7 +227,7 @@ public class QuerydslPredicateArgumentResolverUnitTests { } @Test // DATACMNS-1635 - public void returnsOptionalIfDeclared() throws Exception { + void returnsOptionalIfDeclared() throws Exception { MethodParameter parameter = getMethodParameterFor("optionalPredicateWithoutAnnotation", Optional.class); @@ -289,7 +289,7 @@ public class QuerydslPredicateArgumentResolverUnitTests { User optionalPredicateWithoutAnnotation(Optional predicate); } - public static class SampleRepo implements QuerydslBinderCustomizer { + static class SampleRepo implements QuerydslBinderCustomizer { @Override public void customize(QuerydslBindings bindings, QUser user) { diff --git a/src/test/kotlin/org/springframework/data/convert/KotlinClassGeneratingEntityInstantiatorUnitTests.kt b/src/test/kotlin/org/springframework/data/convert/KotlinClassGeneratingEntityInstantiatorUnitTests.kt index ee430e064..9f32c315d 100644 --- a/src/test/kotlin/org/springframework/data/convert/KotlinClassGeneratingEntityInstantiatorUnitTests.kt +++ b/src/test/kotlin/org/springframework/data/convert/KotlinClassGeneratingEntityInstantiatorUnitTests.kt @@ -19,7 +19,7 @@ import io.mockk.every import io.mockk.mockk import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.assertThatThrownBy -import org.junit.Test +import org.junit.jupiter.api.Test import org.springframework.data.annotation.PersistenceConstructor import org.springframework.data.mapping.PersistentEntity import org.springframework.data.mapping.context.SamplePersistentProperty diff --git a/src/test/kotlin/org/springframework/data/convert/ReflectionEntityInstantiatorDataClassUnitTests.kt b/src/test/kotlin/org/springframework/data/convert/ReflectionEntityInstantiatorDataClassUnitTests.kt index bf18b1d18..b619525eb 100644 --- a/src/test/kotlin/org/springframework/data/convert/ReflectionEntityInstantiatorDataClassUnitTests.kt +++ b/src/test/kotlin/org/springframework/data/convert/ReflectionEntityInstantiatorDataClassUnitTests.kt @@ -18,7 +18,7 @@ package org.springframework.data.convert import io.mockk.every import io.mockk.mockk import org.assertj.core.api.Assertions.assertThat -import org.junit.Test +import org.junit.jupiter.api.Test import org.springframework.data.mapping.PersistentEntity import org.springframework.data.mapping.context.SamplePersistentProperty import org.springframework.data.mapping.model.ParameterValueProvider diff --git a/src/test/kotlin/org/springframework/data/mapping/model/PreferredConstructorDiscovererUnitTests.kt b/src/test/kotlin/org/springframework/data/mapping/model/PreferredConstructorDiscovererUnitTests.kt index 1ca1bb7ee..a25e7ec8e 100644 --- a/src/test/kotlin/org/springframework/data/mapping/model/PreferredConstructorDiscovererUnitTests.kt +++ b/src/test/kotlin/org/springframework/data/mapping/model/PreferredConstructorDiscovererUnitTests.kt @@ -16,7 +16,7 @@ package org.springframework.data.mapping.model import org.assertj.core.api.Assertions.assertThat -import org.junit.Test +import org.junit.jupiter.api.Test import org.springframework.data.annotation.PersistenceConstructor import org.springframework.data.mapping.model.AbstractPersistentPropertyUnitTests.SamplePersistentProperty diff --git a/src/test/kotlin/org/springframework/data/repository/CrudRepositoryExtensionsTests.kt b/src/test/kotlin/org/springframework/data/repository/CrudRepositoryExtensionsTests.kt index bcba5028f..ac66e825a 100644 --- a/src/test/kotlin/org/springframework/data/repository/CrudRepositoryExtensionsTests.kt +++ b/src/test/kotlin/org/springframework/data/repository/CrudRepositoryExtensionsTests.kt @@ -19,7 +19,7 @@ import io.mockk.every import io.mockk.mockk import io.mockk.verify import org.assertj.core.api.Assertions.assertThat -import org.junit.Test +import org.junit.jupiter.api.Test import org.springframework.data.repository.sample.User import java.util.* diff --git a/src/test/kotlin/org/springframework/data/repository/kotlin/CoroutineCrudRepositoryCustomImplementationUnitTests.kt b/src/test/kotlin/org/springframework/data/repository/kotlin/CoroutineCrudRepositoryCustomImplementationUnitTests.kt index d5589617a..0a3cd1eea 100644 --- a/src/test/kotlin/org/springframework/data/repository/kotlin/CoroutineCrudRepositoryCustomImplementationUnitTests.kt +++ b/src/test/kotlin/org/springframework/data/repository/kotlin/CoroutineCrudRepositoryCustomImplementationUnitTests.kt @@ -18,8 +18,8 @@ package org.springframework.data.repository.kotlin import io.mockk.mockk import kotlinx.coroutines.runBlocking import org.assertj.core.api.Assertions.assertThat -import org.junit.Before -import org.junit.Test +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test import org.springframework.data.repository.core.RepositoryMetadata import org.springframework.data.repository.core.support.DummyReactiveRepositoryFactory import org.springframework.data.repository.core.support.RepositoryComposition @@ -38,7 +38,7 @@ class CoroutineCrudRepositoryCustomImplementationUnitTests { lateinit var factory: DummyReactiveRepositoryFactory lateinit var coRepository: MyCoRepository - @Before + @BeforeEach fun before() { factory = CustomDummyReactiveRepositoryFactory(backingRepository) coRepository = factory.getRepository(MyCoRepository::class.java) diff --git a/src/test/kotlin/org/springframework/data/repository/kotlin/CoroutineCrudRepositoryUnitTests.kt b/src/test/kotlin/org/springframework/data/repository/kotlin/CoroutineCrudRepositoryUnitTests.kt index 01ff1d982..6f4756a13 100644 --- a/src/test/kotlin/org/springframework/data/repository/kotlin/CoroutineCrudRepositoryUnitTests.kt +++ b/src/test/kotlin/org/springframework/data/repository/kotlin/CoroutineCrudRepositoryUnitTests.kt @@ -23,8 +23,8 @@ import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.toList import kotlinx.coroutines.runBlocking import org.assertj.core.api.Assertions.assertThat -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.reactivestreams.Publisher import org.springframework.data.repository.core.support.DummyReactiveRepositoryFactory @@ -46,7 +46,7 @@ class CoroutineCrudRepositoryUnitTests { lateinit var factory: DummyReactiveRepositoryFactory lateinit var coRepository: MyCoRepository - @Before + @BeforeEach fun before() { factory = DummyReactiveRepositoryFactory(backingRepository) coRepository = factory.getRepository(MyCoRepository::class.java) diff --git a/src/test/kotlin/org/springframework/data/repository/kotlin/CoroutineRepositoryMetadataUnitTests.kt b/src/test/kotlin/org/springframework/data/repository/kotlin/CoroutineRepositoryMetadataUnitTests.kt index adaa77a8e..ec5d3d11e 100644 --- a/src/test/kotlin/org/springframework/data/repository/kotlin/CoroutineRepositoryMetadataUnitTests.kt +++ b/src/test/kotlin/org/springframework/data/repository/kotlin/CoroutineRepositoryMetadataUnitTests.kt @@ -17,7 +17,7 @@ package org.springframework.data.repository.kotlin import kotlinx.coroutines.flow.Flow import org.assertj.core.api.Assertions.assertThat -import org.junit.Test +import org.junit.jupiter.api.Test import org.springframework.data.repository.core.support.DefaultRepositoryMetadata import org.springframework.data.repository.sample.User import org.springframework.data.util.ReflectionUtils diff --git a/src/test/kotlin/org/springframework/data/repository/query/ParameterUnitTests.kt b/src/test/kotlin/org/springframework/data/repository/query/ParameterUnitTests.kt index 27ebeb95b..f93fb0ce8 100644 --- a/src/test/kotlin/org/springframework/data/repository/query/ParameterUnitTests.kt +++ b/src/test/kotlin/org/springframework/data/repository/query/ParameterUnitTests.kt @@ -16,7 +16,7 @@ package org.springframework.data.repository.query import org.assertj.core.api.Assertions.assertThat -import org.junit.Test +import org.junit.jupiter.api.Test import org.springframework.core.DefaultParameterNameDiscoverer import org.springframework.core.MethodParameter import kotlin.reflect.jvm.javaMethod