Use AssertJ in AnnotationAttributesTests

spring-core/src/test/java/org/springframework/core/annotation/AnnotationAttributesTests.java

@@ -74,17 +74,19 @@ public class AnnotationAttributesTests {
 	@Test
 	public void unresolvableClassWithClassNotFoundException() throws Exception {
 		attributes.put("unresolvableClass", new ClassNotFoundException("myclass"));
-		assertThatIllegalArgumentException().isThrownBy(() ->
+		assertThatIllegalArgumentException()
-				attributes.getClass("unresolvableClass"))
+			.isThrownBy(() -> attributes.getClass("unresolvableClass"))
-			.withMessageContaining("myclass");
+			.withMessageContaining("myclass")
+			.withCauseInstanceOf(ClassNotFoundException.class);
 	}
 
 	@Test
 	public void unresolvableClassWithLinkageError() throws Exception {
 		attributes.put("unresolvableClass", new LinkageError("myclass"));
-		exception.expect(IllegalArgumentException.class);
+		assertThatIllegalArgumentException()
-		exception.expectMessage(containsString("myclass"));
+			.isThrownBy(() -> attributes.getClass("unresolvableClass"))
-		attributes.getClass("unresolvableClass");
+			.withMessageContaining("myclass")
+			.withCauseInstanceOf(LinkageError.class);
 	}
 
 	@Test
@@ -134,30 +136,30 @@ public class AnnotationAttributesTests {
 
 	@Test
 	public void getEnumWithNullAttributeName() {
-		assertThatIllegalArgumentException().isThrownBy(() ->
+		assertThatIllegalArgumentException()
-				attributes.getEnum(null))
+			.isThrownBy(() -> attributes.getEnum(null))
 			.withMessageContaining("must not be null or empty");
 	}
 
 	@Test
 	public void getEnumWithEmptyAttributeName() {
-		assertThatIllegalArgumentException().isThrownBy(() ->
+		assertThatIllegalArgumentException()
-				attributes.getEnum(""))
+			.isThrownBy(() -> attributes.getEnum(""))
 			.withMessageContaining("must not be null or empty");
 	}
 
 	@Test
 	public void getEnumWithUnknownAttributeName() {
-		assertThatIllegalArgumentException().isThrownBy(() ->
+		assertThatIllegalArgumentException()
-				attributes.getEnum("bogus"))
+			.isThrownBy(() -> attributes.getEnum("bogus"))
 			.withMessageContaining("Attribute 'bogus' not found");
 	}
 
 	@Test
 	public void getEnumWithTypeMismatch() {
 		attributes.put("color", "RED");
-		assertThatIllegalArgumentException().isThrownBy(() ->
+		assertThatIllegalArgumentException()
-				attributes.getEnum("color"))
+			.isThrownBy(() -> attributes.getEnum("color"))
 			.withMessageContaining("Attribute 'color' is of type String, but Enum was expected");
 	}