DATACMNS-1554 - Polishing.

Replace AtTest(expected = …) and ExpectedException with the corresponding AssertJ assertThatExceptionOfType(…) and assertThatIllegalArgumentException().isThrownBy(…).

Author: mp911de

src/test/java/org/springframework/data/auditing/AnnotationAuditingMetadataUnitTests.java

@@ -19,9 +19,8 @@
 
 import java.lang.reflect.Field;
 
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
+
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.util.ReflectionUtils;
 
@@ -39,8 +38,6 @@ public class AnnotationAuditingMetadataUnitTests {
 	static final Field lastModifiedByField = ReflectionUtils.findField(AnnotatedUser.class, "lastModifiedBy");
 	static final Field lastModifiedDateField = ReflectionUtils.findField(AnnotatedUser.class, "lastModifiedDate");
 
-	@Rule public ExpectedException exception = ExpectedException.none();
-
 	@Test
 	public void checkAnnotationDiscovery() {
 
@@ -82,11 +79,8 @@ class Sample {
 			@CreatedDate String field;
 		}
 
-		exception.expect(IllegalStateException.class);
-		exception.expectMessage(String.class.getName());
-		exception.expectMessage("field");
-
-		AnnotationAuditingMetadata.getMetadata(Sample.class);
+		assertThatIllegalStateException().isThrownBy(() -> AnnotationAuditingMetadata.getMetadata(Sample.class))
+				.withMessageContaining("field").withMessageContaining("String");
 	}
 
 	@SuppressWarnings("unused")

src/test/java/org/springframework/data/auditing/DefaultAuditableBeanWrapperFactoryUnitTests.java

@@ -26,6 +26,7 @@
 import java.util.Optional;
 
 import org.junit.Test;
+
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.auditing.DefaultAuditableBeanWrapperFactory.AuditableInterfaceBeanWrapper;
@@ -43,9 +44,9 @@ public class DefaultAuditableBeanWrapperFactoryUnitTests {
 
 	DefaultAuditableBeanWrapperFactory factory = new DefaultAuditableBeanWrapperFactory();
 
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void rejectsNullSource() {
-		factory.getBeanWrapperFor(null);
+		assertThatIllegalArgumentException().isThrownBy(() -> factory.getBeanWrapperFor(null));
 	}
 
 	@Test
@@ -85,15 +86,18 @@ public void setsJsr310AndThreeTenBpTypes() {
 		});
 	}
 
-	@Test(expected = IllegalArgumentException.class) // DATACMNS-867
+	@Test // DATACMNS-867
 	public void errorsWhenUnableToConvertDateViaIntermediateJavaUtilDateConversion() {
 
 		Jsr310ThreeTenBpAuditedUser user = new Jsr310ThreeTenBpAuditedUser();
 		ZonedDateTime zonedDateTime = ZonedDateTime.now();
 
 		Optional<AuditableBeanWrapper<Jsr310ThreeTenBpAuditedUser>> wrapper = factory.getBeanWrapperFor(user);
 
-		assertThat(wrapper).hasValueSatisfying(it -> it.setLastModifiedDate(zonedDateTime));
+		assertThat(wrapper).isNotEmpty();
+
+		assertThatExceptionOfType(IllegalArgumentException.class)
+				.isThrownBy(() -> wrapper.ifPresent(it -> it.setLastModifiedDate(zonedDateTime)));
 	}
 
 	@Test // DATACMNS-1259

src/test/java/org/springframework/data/auditing/IsNewAwareAuditingHandlerUnitTests.java

@@ -23,6 +23,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.junit.MockitoJUnitRunner;
+
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mapping.context.PersistentEntities;
 import org.springframework.data.mapping.context.SampleMappingContext;
@@ -74,9 +75,9 @@ public void delegatesToMarkModifiedForNonNewEntity() {
 		assertThat(user.modifiedDate).isNotNull();
 	}
 
-	@Test(expected = IllegalArgumentException.class) // DATACMNS-365
+	@Test // DATACMNS-365
 	public void rejectsNullMappingContext() {
-		new IsNewAwareAuditingHandler((PersistentEntities) null);
+		assertThatIllegalArgumentException().isThrownBy(() -> new IsNewAwareAuditingHandler((PersistentEntities) null));
 	}
 
 	@Test // DATACMNS-365

src/test/java/org/springframework/data/convert/ClassGeneratingEntityInstantiatorUnitTests.java

@@ -86,13 +86,14 @@ public void instantiatesTypeWithPreferredConstructorUsingParameterValueProvider(
 				.satisfies(it -> verify(provider, times(1)).getParameterValue(it.getParameters().iterator().next()));
 	}
 
-	@Test(expected = MappingInstantiationException.class) // DATACMNS-300, DATACMNS-578
+	@Test // DATACMNS-300, DATACMNS-578
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public void throwsExceptionOnBeanInstantiationException() {
 
 		doReturn(PersistentEntity.class).when(entity).getType();
 
-		this.instance.createInstance(entity, provider);
+		assertThatExceptionOfType(MappingInstantiationException.class)
+				.isThrownBy(() -> this.instance.createInstance(entity, provider));
 	}
 
 	@Test // DATACMNS-134, DATACMNS-578

src/test/java/org/springframework/data/convert/ConfigurableTypeInformationMapperUnitTests.java

@@ -45,19 +45,19 @@ public void setUp() {
 		mapper = new ConfigurableTypeInformationMapper(Collections.singletonMap(String.class, "1"));
 	}
 
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void rejectsNullTypeMap() {
-		new ConfigurableTypeInformationMapper(null);
+		assertThatIllegalArgumentException().isThrownBy(() -> new ConfigurableTypeInformationMapper(null));
 	}
 
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void rejectsNonBijectionalMap() {
 
 		Map<Class<?>, String> map = new HashMap<>();
 		map.put(String.class, "1");
 		map.put(Object.class, "1");
 
-		new ConfigurableTypeInformationMapper(map);
+		assertThatIllegalArgumentException().isThrownBy(() -> new ConfigurableTypeInformationMapper(map));
 	}
 
 	@Test

src/test/java/org/springframework/data/convert/EntityInstantiatorsUnitTests.java

@@ -38,9 +38,9 @@ public class EntityInstantiatorsUnitTests {
 	@Mock PersistentEntity<?, ?> entity;
 	@Mock EntityInstantiator customInstantiator;
 
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void rejectsNullFallbackInstantiator() {
-		new EntityInstantiators((EntityInstantiator) null);
+		assertThatIllegalArgumentException().isThrownBy(() -> new EntityInstantiators((EntityInstantiator) null));
 	}
 
 	@Test

src/test/java/org/springframework/data/convert/MappingContextTypeInformationMapperUnitTests.java

@@ -45,9 +45,9 @@ public void setUp() {
 		mappingContext = new SampleMappingContext();
 	}
 
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void rejectsNullMappingContext() {
-		new MappingContextTypeInformationMapper(null);
+		assertThatIllegalArgumentException().isThrownBy(() -> new MappingContextTypeInformationMapper(null));
 	}
 
 	@Test

src/test/java/org/springframework/data/convert/ReflectionEntityInstantiatorUnitTests.java

@@ -80,13 +80,14 @@ public void instantiatesTypeWithPreferredConstructorUsingParameterValueProvider(
 				.satisfies(it -> verify(provider, times(1)).getParameterValue(it.getParameters().iterator().next()));
 	}
 
-	@Test(expected = MappingInstantiationException.class) // DATACMNS-300
+	@Test // DATACMNS-300
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public void throwsExceptionOnBeanInstantiationException() {
 
 		doReturn(PersistentEntity.class).when(entity).getType();
 
-		INSTANCE.createInstance(entity, provider);
+		assertThatExceptionOfType(MappingInstantiationException.class)
+				.isThrownBy(() -> INSTANCE.createInstance(entity, provider));
 	}
 
 	@Test // DATACMNS-134

src/test/java/org/springframework/data/domain/AbstractPageRequestUnitTests.java

@@ -28,14 +28,14 @@ public abstract class AbstractPageRequestUnitTests {
 
 	public abstract AbstractPageRequest newPageRequest(int page, int size);
 
-	@Test(expected = IllegalArgumentException.class) // DATACMNS-402
+	@Test // DATACMNS-402
 	public void preventsNegativePage() {
-		newPageRequest(-1, 10);
+		assertThatIllegalArgumentException().isThrownBy(() -> newPageRequest(-1, 10));
 	}
 
-	@Test(expected = IllegalArgumentException.class) // DATACMNS-402
+	@Test // DATACMNS-402
 	public void preventsNegativeSize() {
-		newPageRequest(0, -1);
+		assertThatIllegalArgumentException().isThrownBy(() -> newPageRequest(0, -1));
 	}
 
 	@Test // DATACMNS-402
@@ -72,9 +72,9 @@ public void equalsHonoursPageAndSize() {
 		assertNotEqualsAndHashcode(request, newPageRequest(0, 11));
 	}
 
-	@Test(expected = IllegalArgumentException.class) // DATACMNS-377
+	@Test // DATACMNS-377
 	public void preventsPageSizeLessThanOne() {
-		newPageRequest(0, 0);
+		assertThatIllegalArgumentException().isThrownBy(() -> newPageRequest(0, 0));
 	}
 
 	@Test // DATACMNS-1327

src/test/java/org/springframework/data/domain/DirectionUnitTests.java

@@ -7,7 +7,7 @@
 
 /**
  * Unit test for {@link Direction}.
- * 
+ *
  * @author Oliver Gierke
  */
 public class DirectionUnitTests {
@@ -19,8 +19,8 @@ public void jpaValueMapping() throws Exception {
 		assertThat(Direction.fromString("desc")).isEqualTo(Direction.DESC);
 	}
 
-	@Test(expected = IllegalArgumentException.class)
-	public void rejectsInvalidString() throws Exception {
-		Direction.fromString("foo");
+	@Test
+	public void rejectsInvalidString() {
+		assertThatIllegalArgumentException().isThrownBy(() -> Direction.fromString("foo"));
 	}
 }

src/test/java/org/springframework/data/domain/ExampleMatcherUnitTests.java

@@ -57,9 +57,10 @@ public void nullHandlerShouldReturnIgnoreByDefault() {
 		assertThat(matcher.getNullHandler()).isEqualTo(NullHandler.IGNORE);
 	}
 
-	@Test(expected = UnsupportedOperationException.class) // DATACMNS-810
+	@Test // DATACMNS-810
 	public void ignoredPathsIsNotModifiable() {
-		matcher.getIgnoredPaths().add("¯\\_(ツ)_/¯");
+		assertThatExceptionOfType(UnsupportedOperationException.class)
+				.isThrownBy(() -> matcher.getIgnoredPaths().add("¯\\_(ツ)_/¯"));
 	}
 
 	@Test // DATACMNS-810

src/test/java/org/springframework/data/domain/ExampleUnitTests.java

@@ -42,9 +42,9 @@ public void setUp() {
 		example = Example.of(person);
 	}
 
-	@Test(expected = IllegalArgumentException.class) // DATACMNS-810
+	@Test // DATACMNS-810
 	public void rejectsNullProbe() {
-		Example.of(null);
+		assertThatIllegalArgumentException().isThrownBy(() -> Example.of(null));
 	}
 
 	@Test // DATACMNS-810

src/test/java/org/springframework/data/domain/PageImplUnitTests.java

@@ -55,14 +55,14 @@ public void assertEqualsForComplexSetup() throws Exception {
 		assertNotEqualsAndHashcode(page, new PageImpl<>(content, PageRequest.of(0, 15), 100));
 	}
 
-	@Test(expected = IllegalArgumentException.class)
-	public void preventsNullContentForSimpleSetup() throws Exception {
-		new PageImpl<>(null);
+	@Test
+	public void preventsNullContentForSimpleSetup() {
+		assertThatIllegalArgumentException().isThrownBy(() -> new PageImpl<>(null));
 	}
 
-	@Test(expected = IllegalArgumentException.class)
-	public void preventsNullContentForAdvancedSetup() throws Exception {
-		new PageImpl<>(null, null, 0);
+	@Test
+	public void preventsNullContentForAdvancedSetup() {
+		assertThatIllegalArgumentException().isThrownBy(() -> new PageImpl<>(null, null, 0));
 	}
 
 	@Test

src/test/java/org/springframework/data/domain/RangeUnitTests.java

@@ -18,6 +18,7 @@
 import static org.assertj.core.api.Assertions.*;
 
 import org.junit.Test;
+
 import org.springframework.data.domain.Range.Bound;
 
 /**
@@ -29,9 +30,10 @@
  */
 public class RangeUnitTests {
 
-	@Test(expected = IllegalArgumentException.class) // DATACMNS-651
+	@Test // DATACMNS-651
 	public void rejectsNullReferenceValuesForContains() {
-		Range.from(Bound.inclusive(10L)).to(Bound.inclusive(20L)).contains(null);
+		assertThatIllegalArgumentException()
+				.isThrownBy(() -> Range.from(Bound.inclusive(10L)).to(Bound.inclusive(20L)).contains(null));
 	}
 
 	@Test // DATACMNS-651

src/test/java/org/springframework/data/domain/SortUnitTests.java

@@ -42,7 +42,7 @@ public class SortUnitTests {
 	 * @throws Exception
 	 */
 	@Test
-	public void appliesDefaultForOrder() throws Exception {
+	public void appliesDefaultForOrder() {
 		assertThat(Sort.by("foo").iterator().next().getDirection()).isEqualTo(Sort.DEFAULT_DIRECTION);
 	}
 
@@ -51,44 +51,40 @@ public void appliesDefaultForOrder() throws Exception {
 	 *
 	 * @throws Exception
 	 */
+	@Test
 	@SuppressWarnings("null")
-	@Test(expected = IllegalArgumentException.class)
-	public void preventsNullProperties() throws Exception {
-
-		Sort.by(Direction.ASC, (String[]) null);
+	public void preventsNullProperties() {
+		assertThatIllegalArgumentException().isThrownBy(() -> Sort.by(Direction.ASC, (String[]) null));
 	}
 
 	/**
 	 * Asserts that the class rejects {@code null} values in the properties array.
 	 *
 	 * @throws Exception
 	 */
-	@Test(expected = IllegalArgumentException.class)
-	public void preventsNullProperty() throws Exception {
-
-		Sort.by(Direction.ASC, (String) null);
+	@Test
+	public void preventsNullProperty() {
+		assertThatIllegalArgumentException().isThrownBy(() -> Sort.by(Direction.ASC, (String) null));
 	}
 
 	/**
 	 * Asserts that the class rejects empty strings in the properties array.
 	 *
 	 * @throws Exception
 	 */
-	@Test(expected = IllegalArgumentException.class)
-	public void preventsEmptyProperty() throws Exception {
-
-		Sort.by(Direction.ASC, "");
+	@Test
+	public void preventsEmptyProperty() {
+		assertThatIllegalArgumentException().isThrownBy(() -> Sort.by(Direction.ASC, ""));
 	}
 
 	/**
 	 * Asserts that the class rejects no properties given at all.
 	 *
 	 * @throws Exception
 	 */
-	@Test(expected = IllegalArgumentException.class)
-	public void preventsNoProperties() throws Exception {
-
-		Sort.by(Direction.ASC);
+	@Test
+	public void preventsNoProperties() {
+		assertThatIllegalArgumentException().isThrownBy(() -> Sort.by(Direction.ASC));
 	}
 
 	@Test

src/test/java/org/springframework/data/geo/CircleUnitTests.java

@@ -28,14 +28,14 @@
  */
 public class CircleUnitTests {
 
-	@Test(expected = IllegalArgumentException.class) // DATACMNS-437
+	@Test // DATACMNS-437
 	public void rejectsNullOrigin() {
-		new Circle(null, new Distance(0));
+		assertThatIllegalArgumentException().isThrownBy(() -> new Circle(null, new Distance(0)));
 	}
 
-	@Test(expected = IllegalArgumentException.class) // DATACMNS-437
+	@Test // DATACMNS-437
 	public void rejectsNegativeRadius() {
-		new Circle(1, 1, -1);
+		assertThatIllegalArgumentException().isThrownBy(() -> new Circle(1, 1, -1));
 	}
 
 	@Test // DATACMNS-437

src/test/java/org/springframework/data/geo/GeoResultUnitTests.java

@@ -50,10 +50,11 @@ public void considersSameValuesAsEqual() {
 		assertThat(fourth.equals(first)).isFalse();
 	}
 
+	@Test
 	@SuppressWarnings({ "rawtypes", "unchecked" })
-	@Test(expected = IllegalArgumentException.class) // DATACMNS-437
+	// DATACMNS-437
 	public void rejectsNullContent() {
-		new GeoResult(null, new Distance(2.5));
+		assertThatIllegalArgumentException().isThrownBy(() -> new GeoResult(null, new Distance(2.5)));
 	}
 
 	@Test // DATACMNS-482