Skip to content

Commit 228a775

Browse files
committed
@import'ed configuration classes get properly registered in case of same class name
Issue: SPR-9243
1 parent 430db26 commit 228a775

File tree

1 file changed

+9
-29
lines changed

1 file changed

+9
-29
lines changed

spring-context/src/test/java/org/springframework/context/annotation/AnnotationBeanNameGeneratorTests.java

Lines changed: 9 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2008 the original author or authors.
2+
* Copyright 2002-2012 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,17 +16,17 @@
1616

1717
package org.springframework.context.annotation;
1818

19-
import static org.easymock.EasyMock.*;
20-
import static org.junit.Assert.*;
21-
19+
import example.scannable.DefaultNamedComponent;
2220
import org.junit.Test;
21+
2322
import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
2423
import org.springframework.beans.factory.annotation.AnnotatedGenericBeanDefinition;
2524
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
25+
import org.springframework.beans.factory.support.SimpleBeanDefinitionRegistry;
2626
import org.springframework.stereotype.Component;
2727
import org.springframework.util.StringUtils;
2828

29-
import example.scannable.DefaultNamedComponent;
29+
import static org.junit.Assert.*;
3030

3131
/**
3232
* @author Rick Evans
@@ -41,64 +41,44 @@ public class AnnotationBeanNameGeneratorTests {
4141

4242
@Test
4343
public void testGenerateBeanNameWithNamedComponent() {
44-
BeanDefinitionRegistry registry = createMock(BeanDefinitionRegistry.class);
45-
replay(registry);
46-
44+
BeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();
4745
AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition(ComponentWithName.class);
4846
String beanName = this.beanNameGenerator.generateBeanName(bd, registry);
4947
assertNotNull("The generated beanName must *never* be null.", beanName);
5048
assertTrue("The generated beanName must *never* be blank.", StringUtils.hasText(beanName));
5149
assertEquals("walden", beanName);
52-
53-
verify(registry);
5450
}
5551

5652
@Test
5753
public void testGenerateBeanNameWithDefaultNamedComponent() {
58-
BeanDefinitionRegistry registry = createMock(BeanDefinitionRegistry.class);
59-
replay(registry);
60-
54+
BeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();
6155
AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition(DefaultNamedComponent.class);
6256
String beanName = this.beanNameGenerator.generateBeanName(bd, registry);
6357
assertNotNull("The generated beanName must *never* be null.", beanName);
6458
assertTrue("The generated beanName must *never* be blank.", StringUtils.hasText(beanName));
6559
assertEquals("thoreau", beanName);
66-
67-
verify(registry);
6860
}
6961

7062
@Test
7163
public void testGenerateBeanNameWithNamedComponentWhereTheNameIsBlank() {
72-
BeanDefinitionRegistry registry = createMock(BeanDefinitionRegistry.class);
73-
replay(registry);
74-
64+
BeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();
7565
AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition(ComponentWithBlankName.class);
7666
String beanName = this.beanNameGenerator.generateBeanName(bd, registry);
7767
assertNotNull("The generated beanName must *never* be null.", beanName);
7868
assertTrue("The generated beanName must *never* be blank.", StringUtils.hasText(beanName));
79-
8069
String expectedGeneratedBeanName = this.beanNameGenerator.buildDefaultBeanName(bd);
81-
8270
assertEquals(expectedGeneratedBeanName, beanName);
83-
84-
verify(registry);
8571
}
8672

8773
@Test
8874
public void testGenerateBeanNameWithAnonymousComponentYieldsGeneratedBeanName() {
89-
BeanDefinitionRegistry registry = createMock(BeanDefinitionRegistry.class);
90-
replay(registry);
91-
75+
BeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();
9276
AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition(AnonymousComponent.class);
9377
String beanName = this.beanNameGenerator.generateBeanName(bd, registry);
9478
assertNotNull("The generated beanName must *never* be null.", beanName);
9579
assertTrue("The generated beanName must *never* be blank.", StringUtils.hasText(beanName));
96-
9780
String expectedGeneratedBeanName = this.beanNameGenerator.buildDefaultBeanName(bd);
98-
9981
assertEquals(expectedGeneratedBeanName, beanName);
100-
101-
verify(registry);
10282
}
10383

10484

0 commit comments

Comments
 (0)