From b629d18ebe4c255b6d94dd9a922c9a989f80611f Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Tue, 30 Oct 2018 09:39:25 +0100 Subject: [PATCH] DATAJPA-1448 - Polishing. AssertJ polishing in unit tests. Formatting. --- .../jpa/repository/config/JpaAuditingRegistrar.java | 9 +++++---- .../config/JpaAuditingRegistrarUnitTests.java | 13 +++++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/springframework/data/jpa/repository/config/JpaAuditingRegistrar.java b/src/main/java/org/springframework/data/jpa/repository/config/JpaAuditingRegistrar.java index 5f6a2d3cc..480563738 100644 --- a/src/main/java/org/springframework/data/jpa/repository/config/JpaAuditingRegistrar.java +++ b/src/main/java/org/springframework/data/jpa/repository/config/JpaAuditingRegistrar.java @@ -87,8 +87,9 @@ class JpaAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport { registerBeanConfigurerAspectIfNecessary(registry); super.registerBeanDefinitions(annotationMetadata, registry); - registerInfrastructureBeanWithId(BeanDefinitionBuilder.rootBeanDefinition(AuditingBeanFactoryPostProcessor.class) - .getRawBeanDefinition(), AuditingBeanFactoryPostProcessor.class.getName(), registry); + registerInfrastructureBeanWithId( + BeanDefinitionBuilder.rootBeanDefinition(AuditingBeanFactoryPostProcessor.class).getRawBeanDefinition(), + AuditingBeanFactoryPostProcessor.class.getName(), registry); } /* @@ -132,7 +133,7 @@ class JpaAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport { def.setFactoryMethodName("aspectOf"); def.setRole(BeanDefinition.ROLE_INFRASTRUCTURE); - registry.registerBeanDefinition(BEAN_CONFIGURER_ASPECT_BEAN_NAME, new BeanComponentDefinition(def, - BEAN_CONFIGURER_ASPECT_BEAN_NAME).getBeanDefinition()); + registry.registerBeanDefinition(BEAN_CONFIGURER_ASPECT_BEAN_NAME, + new BeanComponentDefinition(def, BEAN_CONFIGURER_ASPECT_BEAN_NAME).getBeanDefinition()); } } diff --git a/src/test/java/org/springframework/data/jpa/repository/config/JpaAuditingRegistrarUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/config/JpaAuditingRegistrarUnitTests.java index 055c3f744..cbf567189 100644 --- a/src/test/java/org/springframework/data/jpa/repository/config/JpaAuditingRegistrarUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/config/JpaAuditingRegistrarUnitTests.java @@ -15,6 +15,7 @@ */ package org.springframework.data.jpa.repository.config; +import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -41,14 +42,18 @@ public class JpaAuditingRegistrarUnitTests { @Mock AnnotationMetadata metadata; @Mock BeanDefinitionRegistry registry; - @Test(expected = IllegalArgumentException.class) // DATAJPA-265 + @Test // DATAJPA-265 public void rejectsNullAnnotationMetadata() { - registrar.registerBeanDefinitions(null, registry); + + assertThatExceptionOfType(IllegalArgumentException.class) // + .isThrownBy(() -> registrar.registerBeanDefinitions(null, registry)); } - @Test(expected = IllegalArgumentException.class) // DATAJPA-265 + @Test // DATAJPA-265 public void rejectsNullBeanDefinitionRegistry() { - registrar.registerBeanDefinitions(metadata, null); + + assertThatExceptionOfType(IllegalArgumentException.class) // + .isThrownBy(() -> registrar.registerBeanDefinitions(metadata, null)); } @Test // DATAJPA-1448