root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

moving unit tests from .testsuite -> .context

This commit is contained in:
Chris Beams 2008-12-14 03:59:10 +00:00
parent 72b306fe0a
commit 57eaf42424
3 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
org.springframework.testsuite/src/test/java/org/springframework/context/annotation/AnnotationBeanNameGeneratorTests.java → org.springframework.context/src/test/java/org/springframework/context/annotation/AnnotationBeanNameGeneratorTests.java
View File

@ -16,9 +16,10 @@
package org.springframework.context.annotation; package org.springframework.context.annotation;
import junit.framework.TestCase; import static org.easymock.EasyMock.*;
import org.easymock.MockControl; import static org.junit.Assert.*;
import org.junit.Test;
import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition; import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
import org.springframework.beans.factory.annotation.AnnotatedGenericBeanDefinition; import org.springframework.beans.factory.annotation.AnnotatedGenericBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.BeanDefinitionRegistry;
@ -29,16 +30,17 @@ import org.springframework.util.StringUtils;
* @author Rick Evans * @author Rick Evans
* @author Juergen Hoeller * @author Juergen Hoeller
* @author Mark Fisher * @author Mark Fisher
* @author Chris Beams
*/ */
public class AnnotationBeanNameGeneratorTests extends TestCase { public class AnnotationBeanNameGeneratorTests {
private AnnotationBeanNameGenerator beanNameGenerator = new AnnotationBeanNameGenerator(); private AnnotationBeanNameGenerator beanNameGenerator = new AnnotationBeanNameGenerator();
@Test
public void testGenerateBeanNameWithNamedComponent() { public void testGenerateBeanNameWithNamedComponent() {
MockControl control = MockControl.createControl(BeanDefinitionRegistry.class); BeanDefinitionRegistry registry = createMock(BeanDefinitionRegistry.class);
BeanDefinitionRegistry registry = (BeanDefinitionRegistry) control.getMock(); replay(registry);
control.replay();
AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition(ComponentWithName.class); AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition(ComponentWithName.class);
String beanName = this.beanNameGenerator.generateBeanName(bd, registry); String beanName = this.beanNameGenerator.generateBeanName(bd, registry);
@ -46,13 +48,13 @@ public class AnnotationBeanNameGeneratorTests extends TestCase {
assertTrue("The generated beanName must *never* be blank.", StringUtils.hasText(beanName)); assertTrue("The generated beanName must *never* be blank.", StringUtils.hasText(beanName));
assertEquals("walden", beanName); assertEquals("walden", beanName);
control.verify(); verify(registry);
} }
@Test
public void testGenerateBeanNameWithDefaultNamedComponent() { public void testGenerateBeanNameWithDefaultNamedComponent() {
MockControl control = MockControl.createControl(BeanDefinitionRegistry.class); BeanDefinitionRegistry registry = createMock(BeanDefinitionRegistry.class);
BeanDefinitionRegistry registry = (BeanDefinitionRegistry) control.getMock(); replay(registry);
control.replay();
AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition(DefaultNamedComponent.class); AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition(DefaultNamedComponent.class);
String beanName = this.beanNameGenerator.generateBeanName(bd, registry); String beanName = this.beanNameGenerator.generateBeanName(bd, registry);
@ -60,13 +62,13 @@ public class AnnotationBeanNameGeneratorTests extends TestCase {
assertTrue("The generated beanName must *never* be blank.", StringUtils.hasText(beanName)); assertTrue("The generated beanName must *never* be blank.", StringUtils.hasText(beanName));
assertEquals("thoreau", beanName); assertEquals("thoreau", beanName);
control.verify(); verify(registry);
} }
@Test
public void testGenerateBeanNameWithNamedComponentWhereTheNameIsBlank() { public void testGenerateBeanNameWithNamedComponentWhereTheNameIsBlank() {
MockControl control = MockControl.createControl(BeanDefinitionRegistry.class); BeanDefinitionRegistry registry = createMock(BeanDefinitionRegistry.class);
BeanDefinitionRegistry registry = (BeanDefinitionRegistry) control.getMock(); replay(registry);
control.replay();
AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition(ComponentWithBlankName.class); AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition(ComponentWithBlankName.class);
String beanName = this.beanNameGenerator.generateBeanName(bd, registry); String beanName = this.beanNameGenerator.generateBeanName(bd, registry);
@ -77,13 +79,13 @@ public class AnnotationBeanNameGeneratorTests extends TestCase {
assertEquals(expectedGeneratedBeanName, beanName); assertEquals(expectedGeneratedBeanName, beanName);
control.verify(); verify(registry);
} }
@Test
public void testGenerateBeanNameWithAnonymousComponentYieldsGeneratedBeanName() { public void testGenerateBeanNameWithAnonymousComponentYieldsGeneratedBeanName() {
MockControl control = MockControl.createControl(BeanDefinitionRegistry.class); BeanDefinitionRegistry registry = createMock(BeanDefinitionRegistry.class);
BeanDefinitionRegistry registry = (BeanDefinitionRegistry) control.getMock(); replay(registry);
control.replay();
AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition(AnonymousComponent.class); AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition(AnonymousComponent.class);
String beanName = this.beanNameGenerator.generateBeanName(bd, registry); String beanName = this.beanNameGenerator.generateBeanName(bd, registry);
@ -94,7 +96,7 @@ public class AnnotationBeanNameGeneratorTests extends TestCase {
assertEquals(expectedGeneratedBeanName, beanName); assertEquals(expectedGeneratedBeanName, beanName);
control.verify(); verify(registry);
} }

0
org.springframework.testsuite/src/test/java/org/springframework/context/annotation/CustomStereotype.java → org.springframework.context/src/test/java/org/springframework/context/annotation/CustomStereotype.java
View File

0
org.springframework.testsuite/src/test/java/org/springframework/context/annotation/DefaultNamedComponent.java → org.springframework.context/src/test/java/org/springframework/context/annotation/DefaultNamedComponent.java
View File