Skip to content

Commit b980232

Browse files
committed
DATAJPA-1448 - Polishing.
AssertJ polishing in unit tests. Formatting.
1 parent da025f0 commit b980232

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

src/main/java/org/springframework/data/jpa/repository/config/JpaAuditingRegistrar.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,9 @@ public void registerBeanDefinitions(AnnotationMetadata annotationMetadata, BeanD
8787

8888
registerBeanConfigurerAspectIfNecessary(registry);
8989
super.registerBeanDefinitions(annotationMetadata, registry);
90-
registerInfrastructureBeanWithId(BeanDefinitionBuilder.rootBeanDefinition(AuditingBeanFactoryPostProcessor.class)
91-
.getRawBeanDefinition(), AuditingBeanFactoryPostProcessor.class.getName(), registry);
90+
registerInfrastructureBeanWithId(
91+
BeanDefinitionBuilder.rootBeanDefinition(AuditingBeanFactoryPostProcessor.class).getRawBeanDefinition(),
92+
AuditingBeanFactoryPostProcessor.class.getName(), registry);
9293
}
9394

9495
/*
@@ -132,7 +133,7 @@ private void registerBeanConfigurerAspectIfNecessary(BeanDefinitionRegistry regi
132133
def.setFactoryMethodName("aspectOf");
133134
def.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
134135

135-
registry.registerBeanDefinition(BEAN_CONFIGURER_ASPECT_BEAN_NAME, new BeanComponentDefinition(def,
136-
BEAN_CONFIGURER_ASPECT_BEAN_NAME).getBeanDefinition());
136+
registry.registerBeanDefinition(BEAN_CONFIGURER_ASPECT_BEAN_NAME,
137+
new BeanComponentDefinition(def, BEAN_CONFIGURER_ASPECT_BEAN_NAME).getBeanDefinition());
137138
}
138139
}

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package org.springframework.data.jpa.repository.config;
1717

18+
import static org.assertj.core.api.Assertions.*;
1819
import static org.mockito.ArgumentMatchers.*;
1920
import static org.mockito.Mockito.*;
2021

@@ -41,14 +42,18 @@ public class JpaAuditingRegistrarUnitTests {
4142
@Mock AnnotationMetadata metadata;
4243
@Mock BeanDefinitionRegistry registry;
4344

44-
@Test(expected = IllegalArgumentException.class) // DATAJPA-265
45+
@Test // DATAJPA-265
4546
public void rejectsNullAnnotationMetadata() {
46-
registrar.registerBeanDefinitions(null, registry);
47+
48+
assertThatExceptionOfType(IllegalArgumentException.class) //
49+
.isThrownBy(() -> registrar.registerBeanDefinitions(null, registry));
4750
}
4851

49-
@Test(expected = IllegalArgumentException.class) // DATAJPA-265
52+
@Test // DATAJPA-265
5053
public void rejectsNullBeanDefinitionRegistry() {
51-
registrar.registerBeanDefinitions(metadata, null);
54+
55+
assertThatExceptionOfType(IllegalArgumentException.class) //
56+
.isThrownBy(() -> registrar.registerBeanDefinitions(metadata, null));
5257
}
5358

5459
@Test // DATAJPA-1448

0 commit comments

Comments
 (0)