Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish AnnotationAttributes[Tests]

Browse Source
This commit is contained in:
Sam Brannen
2015-07-06 14:41:52 +02:00
parent 23124d106b
commit 67ac675e9a
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-core/src/main/java/org/springframework/core/annotation/AnnotationAttributes.java
View File

@@ -40,6 +40,7 @@ import org.springframework.util.StringUtils;
*
* @author Chris Beams
* @author Sam Brannen
* @author Juergen Hoeller
* @since 3.1.1
* @see AnnotationUtils#getAnnotationAttributes
* @see AnnotatedElementUtils

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

@@ -31,6 +31,7 @@ import static org.junit.Assert.*;
*
* @author Chris Beams
* @author Sam Brannen
* @author Juergen Hoeller
* @since 3.1.1
*/
public class AnnotationAttributesTests {
@@ -57,7 +58,6 @@ public class AnnotationAttributesTests {
attributes.put("number", 42);
attributes.put("anno", nestedAttributes);
attributes.put("annoArray", new AnnotationAttributes[] { nestedAttributes });
attributes.put("unresolvableClass", new ClassNotFoundException("myclass"));
assertThat(attributes.getString("name"), equalTo("dave"));
assertThat(attributes.getStringArray("names"), equalTo(new String[] { "dave", "frank", "hal" }));
@@ -70,14 +70,14 @@ public class AnnotationAttributesTests {
assertThat(attributes.getAnnotation("anno").<Integer>getNumber("value"), equalTo(10));
assertThat(attributes.getAnnotationArray("annoArray")[0].getString("name"), equalTo("algernon"));
try {
attributes.getClass("unresolvableClass");
fail("Should have thrown IllegalArgumentException");
}
catch (IllegalArgumentException ex) {
assertTrue(ex.getCause() instanceof ClassNotFoundException);
assertTrue(ex.getMessage().contains("myclass"));
}
}
@Test
public void unresolvableClass() throws Exception {
attributes.put("unresolvableClass", new ClassNotFoundException("myclass"));
exception.expect(IllegalArgumentException.class);
exception.expectMessage(containsString("myclass"));
attributes.getClass("unresolvableClass");
}
@Test