DATACMNS-1554 - Polishing.

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

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

@@ -86,13 +86,14 @@ public class ClassGeneratingEntityInstantiatorUnitTests<P extends PersistentProp
 				.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 class ConfigurableTypeInformationMapperUnitTests<T extends PersistentProp
 		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 class MappingContextTypeInformationMapperUnitTests {
 		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 class ReflectionEntityInstantiatorUnitTests<P extends PersistentProperty<
 				.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