SPR-8336 - Fixed broken test case.
Converted the test to JUnit 4. git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4309 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
parent
6f41d8c68d
commit
11383f27fb
|
|
@ -16,8 +16,11 @@
|
||||||
|
|
||||||
package org.springframework.core.type;
|
package org.springframework.core.type;
|
||||||
|
|
||||||
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
import java.lang.annotation.Inherited;
|
import java.lang.annotation.Inherited;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
import org.springframework.core.type.classreading.MetadataReader;
|
import org.springframework.core.type.classreading.MetadataReader;
|
||||||
import org.springframework.core.type.classreading.MetadataReaderFactory;
|
import org.springframework.core.type.classreading.MetadataReaderFactory;
|
||||||
import org.springframework.core.type.classreading.SimpleMetadataReaderFactory;
|
import org.springframework.core.type.classreading.SimpleMetadataReaderFactory;
|
||||||
|
|
@ -27,9 +30,11 @@ import org.springframework.stereotype.Component;
|
||||||
/**
|
/**
|
||||||
* @author Ramnivas Laddad
|
* @author Ramnivas Laddad
|
||||||
* @author Juergen Hoeller
|
* @author Juergen Hoeller
|
||||||
|
* @author Oliver Gierke
|
||||||
*/
|
*/
|
||||||
public class AnnotationTypeFilterTests extends TestCase {
|
public class AnnotationTypeFilterTests {
|
||||||
|
|
||||||
|
@Test
|
||||||
public void testDirectAnnotationMatch() throws Exception {
|
public void testDirectAnnotationMatch() throws Exception {
|
||||||
MetadataReaderFactory metadataReaderFactory = new SimpleMetadataReaderFactory();
|
MetadataReaderFactory metadataReaderFactory = new SimpleMetadataReaderFactory();
|
||||||
String classUnderTest = "org.springframework.core.type.AnnotationTypeFilterTests$SomeComponent";
|
String classUnderTest = "org.springframework.core.type.AnnotationTypeFilterTests$SomeComponent";
|
||||||
|
|
@ -40,6 +45,7 @@ public class AnnotationTypeFilterTests extends TestCase {
|
||||||
ClassloadingAssertions.assertClassNotLoaded(classUnderTest);
|
ClassloadingAssertions.assertClassNotLoaded(classUnderTest);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
public void testInheritedAnnotationFromInterfaceDoesNotMatch() throws Exception {
|
public void testInheritedAnnotationFromInterfaceDoesNotMatch() throws Exception {
|
||||||
MetadataReaderFactory metadataReaderFactory = new SimpleMetadataReaderFactory();
|
MetadataReaderFactory metadataReaderFactory = new SimpleMetadataReaderFactory();
|
||||||
String classUnderTest = "org.springframework.core.type.AnnotationTypeFilterTests$SomeSubClassOfSomeComponentInterface";
|
String classUnderTest = "org.springframework.core.type.AnnotationTypeFilterTests$SomeSubClassOfSomeComponentInterface";
|
||||||
|
|
@ -51,6 +57,7 @@ public class AnnotationTypeFilterTests extends TestCase {
|
||||||
ClassloadingAssertions.assertClassNotLoaded(classUnderTest);
|
ClassloadingAssertions.assertClassNotLoaded(classUnderTest);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
public void testInheritedAnnotationFromBaseClassDoesMatch() throws Exception {
|
public void testInheritedAnnotationFromBaseClassDoesMatch() throws Exception {
|
||||||
MetadataReaderFactory metadataReaderFactory = new SimpleMetadataReaderFactory();
|
MetadataReaderFactory metadataReaderFactory = new SimpleMetadataReaderFactory();
|
||||||
String classUnderTest = "org.springframework.core.type.AnnotationTypeFilterTests$SomeSubClassOfSomeComponent";
|
String classUnderTest = "org.springframework.core.type.AnnotationTypeFilterTests$SomeSubClassOfSomeComponent";
|
||||||
|
|
@ -61,6 +68,7 @@ public class AnnotationTypeFilterTests extends TestCase {
|
||||||
ClassloadingAssertions.assertClassNotLoaded(classUnderTest);
|
ClassloadingAssertions.assertClassNotLoaded(classUnderTest);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
public void testNonInheritedAnnotationDoesNotMatch() throws Exception {
|
public void testNonInheritedAnnotationDoesNotMatch() throws Exception {
|
||||||
MetadataReaderFactory metadataReaderFactory = new SimpleMetadataReaderFactory();
|
MetadataReaderFactory metadataReaderFactory = new SimpleMetadataReaderFactory();
|
||||||
String classUnderTest = "org.springframework.core.type.AnnotationTypeFilterTests$SomeSubclassOfSomeClassMarkedWithNonInheritedAnnotation";
|
String classUnderTest = "org.springframework.core.type.AnnotationTypeFilterTests$SomeSubclassOfSomeClassMarkedWithNonInheritedAnnotation";
|
||||||
|
|
@ -72,6 +80,7 @@ public class AnnotationTypeFilterTests extends TestCase {
|
||||||
ClassloadingAssertions.assertClassNotLoaded(classUnderTest);
|
ClassloadingAssertions.assertClassNotLoaded(classUnderTest);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
public void testNonAnnotatedClassDoesntMatch() throws Exception {
|
public void testNonAnnotatedClassDoesntMatch() throws Exception {
|
||||||
MetadataReaderFactory metadataReaderFactory = new SimpleMetadataReaderFactory();
|
MetadataReaderFactory metadataReaderFactory = new SimpleMetadataReaderFactory();
|
||||||
String classUnderTest = "org.springframework.core.type.AnnotationTypeFilterTests$SomeNonCandidateClass";
|
String classUnderTest = "org.springframework.core.type.AnnotationTypeFilterTests$SomeNonCandidateClass";
|
||||||
|
|
@ -82,6 +91,7 @@ public class AnnotationTypeFilterTests extends TestCase {
|
||||||
ClassloadingAssertions.assertClassNotLoaded(classUnderTest);
|
ClassloadingAssertions.assertClassNotLoaded(classUnderTest);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
public void testMatchesInterfacesIfConfigured() throws Exception {
|
public void testMatchesInterfacesIfConfigured() throws Exception {
|
||||||
|
|
||||||
MetadataReaderFactory metadataReaderFactory = new SimpleMetadataReaderFactory();
|
MetadataReaderFactory metadataReaderFactory = new SimpleMetadataReaderFactory();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue