diff --git a/src/test/java/org/springframework/data/auditing/DefaultAuditableBeanWrapperFactoryUnitTests.java b/src/test/java/org/springframework/data/auditing/DefaultAuditableBeanWrapperFactoryUnitTests.java index d86057724..07b0b7f40 100755 --- a/src/test/java/org/springframework/data/auditing/DefaultAuditableBeanWrapperFactoryUnitTests.java +++ b/src/test/java/org/springframework/data/auditing/DefaultAuditableBeanWrapperFactoryUnitTests.java @@ -96,7 +96,7 @@ class DefaultAuditableBeanWrapperFactoryUnitTests { assertThat(wrapper).isNotEmpty(); - assertThatExceptionOfType(IllegalArgumentException.class) + assertThatIllegalArgumentException() .isThrownBy(() -> wrapper.ifPresent(it -> it.setLastModifiedDate(zonedDateTime))); } 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 81ac06871..66d196925 100755 --- a/src/test/java/org/springframework/data/auditing/config/AuditingBeanDefinitionRegistrarSupportUnitTests.java +++ b/src/test/java/org/springframework/data/auditing/config/AuditingBeanDefinitionRegistrarSupportUnitTests.java @@ -59,7 +59,7 @@ class AuditingBeanDefinitionRegistrarSupportUnitTests { AuditingBeanDefinitionRegistrarSupport registrar = new DummyAuditingBeanDefinitionRegistrarSupport(); - assertThatExceptionOfType(IllegalArgumentException.class) // + assertThatIllegalArgumentException() // .isThrownBy(() -> registrar.registerBeanDefinitions(null, registry)); } @@ -69,7 +69,7 @@ class AuditingBeanDefinitionRegistrarSupportUnitTests { AuditingBeanDefinitionRegistrarSupport registrar = new DummyAuditingBeanDefinitionRegistrarSupport(); AnnotationMetadata metadata = new StandardAnnotationMetadata(SampleConfig.class); - assertThatExceptionOfType(IllegalArgumentException.class) // + assertThatIllegalArgumentException() // .isThrownBy(() -> registrar.registerBeanDefinitions(metadata, null)); } diff --git a/src/test/java/org/springframework/data/domain/AbstractAggregateRootUnitTests.java b/src/test/java/org/springframework/data/domain/AbstractAggregateRootUnitTests.java index de5d648b3..e2b967cd6 100644 --- a/src/test/java/org/springframework/data/domain/AbstractAggregateRootUnitTests.java +++ b/src/test/java/org/springframework/data/domain/AbstractAggregateRootUnitTests.java @@ -82,7 +82,7 @@ class AbstractAggregateRootUnitTests { @SuppressWarnings("null") void rejectsNullEvent() { - assertThatExceptionOfType(IllegalArgumentException.class) // + assertThatIllegalArgumentException() // .isThrownBy(() -> new SampleAggregate().andEvent(null)); } @@ -90,7 +90,7 @@ class AbstractAggregateRootUnitTests { @SuppressWarnings("null") void rejectsNullEventForRegistration() { - assertThatExceptionOfType(IllegalArgumentException.class) // + assertThatIllegalArgumentException() // .isThrownBy(() -> new SampleAggregate().registerEvent(null)); } @@ -98,7 +98,7 @@ class AbstractAggregateRootUnitTests { @SuppressWarnings("null") void rejectsNullAggregate() { - assertThatExceptionOfType(IllegalArgumentException.class) // + assertThatIllegalArgumentException() // .isThrownBy(() -> new SampleAggregate().andEventsFrom(null)); } diff --git a/src/test/java/org/springframework/data/domain/PageRequestUnitTests.java b/src/test/java/org/springframework/data/domain/PageRequestUnitTests.java index 2e4562a48..bf48160f5 100755 --- a/src/test/java/org/springframework/data/domain/PageRequestUnitTests.java +++ b/src/test/java/org/springframework/data/domain/PageRequestUnitTests.java @@ -66,7 +66,7 @@ class PageRequestUnitTests extends AbstractPageRequestUnitTests { @Test // DATACMNS-1581 void rejectsNullSort() { - assertThatExceptionOfType(IllegalArgumentException.class) // + assertThatIllegalArgumentException() // .isThrownBy(() -> PageRequest.of(0, 10, null)); } } diff --git a/src/test/java/org/springframework/data/domain/SortUnitTests.java b/src/test/java/org/springframework/data/domain/SortUnitTests.java index cf4989c09..263687bec 100755 --- a/src/test/java/org/springframework/data/domain/SortUnitTests.java +++ b/src/test/java/org/springframework/data/domain/SortUnitTests.java @@ -168,7 +168,7 @@ class SortUnitTests { @SuppressWarnings("null") void preventsNullDirection() { - assertThatExceptionOfType(IllegalArgumentException.class)// + assertThatIllegalArgumentException()// .isThrownBy(() -> Sort.by((Direction) null, "foo"))// .withMessageContaining("Direction"); } diff --git a/src/test/java/org/springframework/data/history/AnnotationRevisionMetadataUnitTests.java b/src/test/java/org/springframework/data/history/AnnotationRevisionMetadataUnitTests.java index faba15cc8..5c28e7c0c 100644 --- a/src/test/java/org/springframework/data/history/AnnotationRevisionMetadataUnitTests.java +++ b/src/test/java/org/springframework/data/history/AnnotationRevisionMetadataUnitTests.java @@ -46,10 +46,10 @@ class AnnotationRevisionMetadataUnitTests { assertThat(metadata.getRevisionNumber()).isEmpty(); - assertThatExceptionOfType(IllegalStateException.class) // + assertThatIllegalStateException() // .isThrownBy(metadata::getRequiredRevisionNumber); - assertThatExceptionOfType(IllegalStateException.class) // + assertThatIllegalStateException() // .isThrownBy(metadata::getRequiredRevisionInstant); } diff --git a/src/test/java/org/springframework/data/mapping/PersistentPropertyAccessorUnitTests.java b/src/test/java/org/springframework/data/mapping/PersistentPropertyAccessorUnitTests.java index 893de68f4..b0e6a9cdc 100644 --- a/src/test/java/org/springframework/data/mapping/PersistentPropertyAccessorUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/PersistentPropertyAccessorUnitTests.java @@ -86,7 +86,7 @@ public class PersistentPropertyAccessorUnitTests { setUp(new Order(null), ""); - assertThatExceptionOfType(IllegalArgumentException.class) // + assertThatIllegalArgumentException() // .isThrownBy(() -> accessor.setProperty(path, "Oliver August")); } @@ -189,7 +189,7 @@ public class PersistentPropertyAccessorUnitTests { TraversalContext traversal = new TraversalContext(); - assertThatExceptionOfType(IllegalArgumentException.class) // + assertThatIllegalArgumentException() // .isThrownBy(() -> traversal.registerHandler(property, Map.class, Function.identity())); } diff --git a/src/test/java/org/springframework/data/mapping/PropertyPathUnitTests.java b/src/test/java/org/springframework/data/mapping/PropertyPathUnitTests.java index e7eb7b4f9..9ab52411a 100755 --- a/src/test/java/org/springframework/data/mapping/PropertyPathUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/PropertyPathUnitTests.java @@ -374,7 +374,7 @@ public class PropertyPathUnitTests { final String path = source; - assertThatExceptionOfType(IllegalArgumentException.class) // + assertThatIllegalArgumentException() // .isThrownBy(() -> PropertyPath.from(path, Left.class)); } diff --git a/src/test/java/org/springframework/data/mapping/TargetAwareIdentifierAccessorUnitTests.java b/src/test/java/org/springframework/data/mapping/TargetAwareIdentifierAccessorUnitTests.java index f1959ec96..7674622d4 100644 --- a/src/test/java/org/springframework/data/mapping/TargetAwareIdentifierAccessorUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/TargetAwareIdentifierAccessorUnitTests.java @@ -41,7 +41,7 @@ public class TargetAwareIdentifierAccessorUnitTests { } }; - assertThatExceptionOfType(IllegalStateException.class)// + assertThatIllegalStateException()// .isThrownBy(accessor::getRequiredIdentifier)// .withMessageContaining(sample.toString()); } 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 248fc8ad6..2961bd470 100644 --- a/src/test/java/org/springframework/data/mapping/callback/DefaultEntityCallbacksUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/callback/DefaultEntityCallbacksUnitTests.java @@ -95,7 +95,7 @@ class DefaultEntityCallbacksUnitTests { DefaultEntityCallbacks callbacks = new DefaultEntityCallbacks(); callbacks.addEntityCallback(new InvalidEntityCallback() {}); - assertThatExceptionOfType(IllegalStateException.class) + assertThatIllegalStateException() .isThrownBy(() -> callbacks.callback(InvalidEntityCallback.class, new PersonDocument(null, "Walter", null), "agr0", Float.POSITIVE_INFINITY)); } @@ -126,7 +126,7 @@ class DefaultEntityCallbacksUnitTests { DefaultEntityCallbacks callbacks = new DefaultEntityCallbacks(); callbacks.addEntityCallback(new CapturingEntityCallback()); - assertThatExceptionOfType(IllegalArgumentException.class) + assertThatIllegalArgumentException() .isThrownBy(() -> callbacks.callback(CapturingEntityCallback.class, null)); } @@ -144,7 +144,7 @@ class DefaultEntityCallbacksUnitTests { PersonDocument initial = new PersonDocument(null, "Walter", null); - assertThatExceptionOfType(IllegalArgumentException.class) + assertThatIllegalArgumentException() .isThrownBy(() -> callbacks.callback(CapturingEntityCallback.class, initial)); assertThat(first.capturedValue()).isSameAs(initial); 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 02fe0760d..c3305d1d7 100644 --- a/src/test/java/org/springframework/data/mapping/callback/DefaultReactiveEntityCallbacksUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/callback/DefaultReactiveEntityCallbacksUnitTests.java @@ -96,7 +96,7 @@ class DefaultReactiveEntityCallbacksUnitTests { DefaultReactiveEntityCallbacks callbacks = new DefaultReactiveEntityCallbacks(); callbacks.addEntityCallback(new CapturingEntityCallback()); - assertThatExceptionOfType(IllegalArgumentException.class) + assertThatIllegalArgumentException() .isThrownBy(() -> callbacks.callback(CapturingEntityCallback.class, null)); } 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 0e4cf0bde..83e5b587a 100755 --- a/src/test/java/org/springframework/data/mapping/context/PersistentEntitiesUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/context/PersistentEntitiesUnitTests.java @@ -104,7 +104,7 @@ class PersistentEntitiesUnitTests { PersistentEntities entities = PersistentEntities.of(context); - assertThatExceptionOfType(IllegalStateException.class)// + assertThatIllegalStateException()// .isThrownBy(() -> entities.getEntityUltimatelyReferredToBy(property)) // .withMessageContaining(FirstWithLongId.class.getName()) // .withMessageContaining(SecondWithLongId.class.getName()) // 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 240ce8e96..a1205d024 100755 --- a/src/test/java/org/springframework/data/mapping/model/AnnotationBasedPersistentPropertyUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/model/AnnotationBasedPersistentPropertyUnitTests.java @@ -254,7 +254,7 @@ public class AnnotationBasedPersistentPropertyUnitTests

property.getRequiredGetter()) // .withMessageContaining("field") // .withMessageContaining(Sample.class.getName()); @@ -265,7 +265,7 @@ public class AnnotationBasedPersistentPropertyUnitTests

property.getRequiredSetter()) // .withMessageContaining("field") // .withMessageContaining(Sample.class.getName()); @@ -276,7 +276,7 @@ public class AnnotationBasedPersistentPropertyUnitTests

property.getRequiredWither()) // .withMessageContaining("field") // .withMessageContaining(Sample.class.getName()); @@ -287,7 +287,7 @@ public class AnnotationBasedPersistentPropertyUnitTests

property.getRequiredField()) // .withMessageContaining("firstname") // .withMessageContaining(NoField.class.getName()); 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 2c46355d5..22114f45f 100755 --- a/src/test/java/org/springframework/data/mapping/model/BasicPersistentEntityUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/model/BasicPersistentEntityUnitTests.java @@ -255,7 +255,7 @@ class BasicPersistentEntityUnitTests> { MutablePersistentEntity entity = createEntity(Entity.class); - assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> entity.addAssociation(null)); + assertThatIllegalArgumentException().isThrownBy(() -> entity.addAssociation(null)); } @Test // DATACMNS-1141 diff --git a/src/test/java/org/springframework/data/querydsl/QPageRequestUnitTests.java b/src/test/java/org/springframework/data/querydsl/QPageRequestUnitTests.java index 21ebd1d85..c3394b46d 100755 --- a/src/test/java/org/springframework/data/querydsl/QPageRequestUnitTests.java +++ b/src/test/java/org/springframework/data/querydsl/QPageRequestUnitTests.java @@ -57,7 +57,7 @@ public class QPageRequestUnitTests extends AbstractPageRequestUnitTests { @Test // DATACMNS-1581 void rejectsNullSort() { - assertThatExceptionOfType(IllegalArgumentException.class) // + assertThatIllegalArgumentException() // .isThrownBy(() -> QPageRequest.of(0, 10, (QSort) null)); } } 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 448236fad..cc7f23eef 100755 --- a/src/test/java/org/springframework/data/querydsl/binding/QuerydslBindingsFactoryUnitTests.java +++ b/src/test/java/org/springframework/data/querydsl/binding/QuerydslBindingsFactoryUnitTests.java @@ -98,7 +98,7 @@ class QuerydslBindingsFactoryUnitTests { @Test // DATACMNS-669 void rejectsPredicateResolutionIfDomainTypeCantBeAutoDetected() { - assertThatExceptionOfType(IllegalStateException.class)// + assertThatIllegalStateException()// .isThrownBy(() -> factory.createBindingsFor(ClassTypeInformation.from(ModelAndView.class)))// .withMessageContaining(QuerydslPredicate.class.getSimpleName())// .withMessageContaining("root"); 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 f304b741e..cf28029a4 100755 --- a/src/test/java/org/springframework/data/repository/config/AnnotationRepositoryConfigurationSourceUnitTests.java +++ b/src/test/java/org/springframework/data/repository/config/AnnotationRepositoryConfigurationSourceUnitTests.java @@ -154,7 +154,7 @@ class AnnotationRepositoryConfigurationSourceUnitTests { RepositoryConfigurationSource source = getConfigSource(DefaultConfiguration.class); - assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> source.getAttribute("fooBar")); + assertThatIllegalArgumentException().isThrownBy(() -> source.getAttribute("fooBar")); } @Test // DATACMNS-1498 @@ -163,7 +163,7 @@ class AnnotationRepositoryConfigurationSourceUnitTests { RepositoryConfigurationSource source = getConfigSource(DefaultConfiguration.class); assertThat(source.getAttribute("namedQueriesLocation", String.class)).isEmpty(); - assertThatExceptionOfType(IllegalArgumentException.class) + assertThatIllegalArgumentException() .isThrownBy(() -> source.getRequiredAttribute("namedQueriesLocation", String.class)); } 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 3f025ab71..585a71c0c 100644 --- a/src/test/java/org/springframework/data/repository/config/CustomRepositoryImplementationDetectorUnitTests.java +++ b/src/test/java/org/springframework/data/repository/config/CustomRepositoryImplementationDetectorUnitTests.java @@ -104,7 +104,7 @@ class CustomRepositoryImplementationDetectorUnitTests { @Test // DATACMNS-764, DATACMNS-1371 void throwsExceptionWhenMultipleImplementationAreFound() { - assertThatExceptionOfType(IllegalStateException.class).isThrownBy(() -> { + assertThatIllegalStateException().isThrownBy(() -> { ImplementationLookupConfiguration lookup = mock(ImplementationLookupConfiguration.class); 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 b339e57bd..420a17f33 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 @@ -81,7 +81,7 @@ class AbstractEntityInformationUnitTests { CustomEntityInformation information = new CustomEntityInformation( UnsupportedPrimitiveIdEntity.class); - assertThatExceptionOfType(IllegalArgumentException.class)// + assertThatIllegalArgumentException()// .isThrownBy(() -> information.isNew(new UnsupportedPrimitiveIdEntity()))// .withMessageContaining(boolean.class.getName()); } 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 113011b51..c64b15390 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 @@ -40,7 +40,7 @@ class AnnotationRepositoryMetadataUnitTests { @Test // DATACMNS-37, DATACMNS-1375 void preventsUnannotatedInterface() { - assertThatExceptionOfType(IllegalArgumentException.class) // + assertThatIllegalArgumentException() // .isThrownBy(() -> new AnnotationRepositoryMetadata(UnannotatedRepository.class)) // .withMessageContaining(UnannotatedRepository.class.getName()); } 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 279f0fcce..5740dab9a 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 @@ -142,7 +142,7 @@ class RepositoryCompositionUnitTests { RepositoryComposition mixed = RepositoryComposition.of(RepositoryFragment.structural(QueryByExampleExecutor.class), RepositoryFragment.implemented(backingRepo)); - assertThatExceptionOfType(IllegalStateException.class) // + assertThatIllegalStateException() // .isThrownBy(mixed::validateImplementation) // .withMessageContaining( "Fragment org.springframework.data.repository.query.QueryByExampleExecutor has no implementation."); 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 f9577500c..d74f14cd7 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 @@ -52,7 +52,7 @@ class RepositoryFactoryBeanSupportUnitTests { @SuppressWarnings({ "rawtypes", "unchecked" }) void initializationFailsWithMissingRepositoryInterface() { - assertThatExceptionOfType(IllegalArgumentException.class)// + assertThatIllegalArgumentException()// .isThrownBy(() -> new DummyRepositoryFactoryBean(null))// .withMessageContaining("Repository interface"); } @@ -83,7 +83,7 @@ class RepositoryFactoryBeanSupportUnitTests { bean.afterPropertiesSet(); - assertThatExceptionOfType(IllegalStateException.class) // + assertThatIllegalStateException() // .isThrownBy(() -> bean.getPersistentEntity()); } 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 1f87b454d..af4f47ae0 100755 --- a/src/test/java/org/springframework/data/repository/query/ExtensionAwareEvaluationContextProviderUnitTests.java +++ b/src/test/java/org/springframework/data/repository/query/ExtensionAwareEvaluationContextProviderUnitTests.java @@ -271,7 +271,7 @@ class ExtensionAwareEvaluationContextProviderUnitTests { provider = createContextProviderWithOverloads(); - assertThatExceptionOfType(IllegalStateException.class) // + assertThatIllegalStateException() // .isThrownBy(() -> evaluateExpression("ambiguousOverloaded(23)")) // .withMessageContaining("ambiguousOverloaded") // .withMessageContaining("(java.lang.Integer)"); 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 c9323871c..7ce912994 100644 --- a/src/test/java/org/springframework/data/repository/query/QuotationMapUnitTests.java +++ b/src/test/java/org/springframework/data/repository/query/QuotationMapUnitTests.java @@ -103,7 +103,7 @@ class QuotationMapUnitTests { @Test // DATAJPA-1235 void openEndedQuoteThrowsException() { - assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> new QuotationMap("a'b")); + assertThatIllegalArgumentException().isThrownBy(() -> new QuotationMap("a'b")); } private static void isNotQuoted(String query, Object label, int... indexes) { 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 b8813b4c7..8ff112efc 100644 --- a/src/test/java/org/springframework/data/repository/query/SpelExtractorUnitTests.java +++ b/src/test/java/org/springframework/data/repository/query/SpelExtractorUnitTests.java @@ -45,7 +45,7 @@ class SpelExtractorUnitTests { SpelQueryContext context = SpelQueryContext.of(PARAMETER_NAME_SOURCE, REPLACEMENT_SOURCE); - assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> context.parse(null)); + assertThatIllegalArgumentException().isThrownBy(() -> context.parse(null)); } @Test // DATACMNS-1258 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 45160eeee..4ed01fc62 100644 --- a/src/test/java/org/springframework/data/repository/query/SpelQueryContextUnitTests.java +++ b/src/test/java/org/springframework/data/repository/query/SpelQueryContextUnitTests.java @@ -37,14 +37,14 @@ class SpelQueryContextUnitTests { @Test // DATACMNS-1258 void nullParameterNameSourceThrowsException() { - assertThatExceptionOfType(IllegalArgumentException.class) // + assertThatIllegalArgumentException() // .isThrownBy(() -> SpelQueryContext.of(null, REPLACEMENT_SOURCE)); } @Test // DATACMNS-1258 void nullReplacementSourceThrowsException() { - assertThatExceptionOfType(IllegalArgumentException.class) // + assertThatIllegalArgumentException() // .isThrownBy(() -> SpelQueryContext.of(PARAMETER_NAME_SOURCE, null)); } @@ -53,7 +53,7 @@ class SpelQueryContextUnitTests { SpelQueryContext context = SpelQueryContext.of(PARAMETER_NAME_SOURCE, REPLACEMENT_SOURCE); - assertThatExceptionOfType(IllegalArgumentException.class) // + assertThatIllegalArgumentException() // .isThrownBy(() -> context.withEvaluationContextProvider(null)); } diff --git a/src/test/java/org/springframework/data/util/LazyUnitTests.java b/src/test/java/org/springframework/data/util/LazyUnitTests.java index fd36cb420..ec2fe5a38 100755 --- a/src/test/java/org/springframework/data/util/LazyUnitTests.java +++ b/src/test/java/org/springframework/data/util/LazyUnitTests.java @@ -78,7 +78,7 @@ class LazyUnitTests { @Test void rejectsNullValueLookup() { - assertThatExceptionOfType(IllegalStateException.class) // + assertThatIllegalStateException() // .isThrownBy(() -> Lazy.of(() -> null).get()); } diff --git a/src/test/java/org/springframework/data/util/MethodInvocationRecorderUnitTests.java b/src/test/java/org/springframework/data/util/MethodInvocationRecorderUnitTests.java index ba08d9438..caee97c13 100644 --- a/src/test/java/org/springframework/data/util/MethodInvocationRecorderUnitTests.java +++ b/src/test/java/org/springframework/data/util/MethodInvocationRecorderUnitTests.java @@ -37,7 +37,7 @@ class MethodInvocationRecorderUnitTests { @Test // DATACMNS-1449 void rejectsFinalTypes() { - assertThatExceptionOfType(IllegalArgumentException.class) // + assertThatIllegalArgumentException() // .isThrownBy(() -> MethodInvocationRecorder.forProxyOf(FinalType.class)); }