From 228a77552db58fdacd662f64455a96d7edbf1f09 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Mon, 10 Sep 2012 15:44:12 +0200
Subject: [PATCH] @Import'ed configuration classes get properly registered in
 case of same class name

Issue: SPR-9243
---
 .../AnnotationBeanNameGeneratorTests.java     | 38 +++++--------------
 1 file changed, 9 insertions(+), 29 deletions(-)

diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationBeanNameGeneratorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationBeanNameGeneratorTests.java
index f3c2437b74..e225839893 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationBeanNameGeneratorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationBeanNameGeneratorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,17 +16,17 @@
 
 package org.springframework.context.annotation;
 
-import static org.easymock.EasyMock.*;
-import static org.junit.Assert.*;
-
+import example.scannable.DefaultNamedComponent;
 import org.junit.Test;
+
 import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
 import org.springframework.beans.factory.annotation.AnnotatedGenericBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.beans.factory.support.SimpleBeanDefinitionRegistry;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 
-import example.scannable.DefaultNamedComponent;
+import static org.junit.Assert.*;
 
 /**
  * @author Rick Evans
@@ -41,64 +41,44 @@ public class AnnotationBeanNameGeneratorTests {
 
 	@Test
 	public void testGenerateBeanNameWithNamedComponent() {
-		BeanDefinitionRegistry registry = createMock(BeanDefinitionRegistry.class);
-		replay(registry);
-
+		BeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();
 		AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition(ComponentWithName.class);
 		String beanName = this.beanNameGenerator.generateBeanName(bd, registry);
 		assertNotNull("The generated beanName must *never* be null.", beanName);
 		assertTrue("The generated beanName must *never* be blank.", StringUtils.hasText(beanName));
 		assertEquals("walden", beanName);
-
-		verify(registry);
 	}
 
 	@Test
 	public void testGenerateBeanNameWithDefaultNamedComponent() {
-		BeanDefinitionRegistry registry = createMock(BeanDefinitionRegistry.class);
-		replay(registry);
-
+		BeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();
 		AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition(DefaultNamedComponent.class);
 		String beanName = this.beanNameGenerator.generateBeanName(bd, registry);
 		assertNotNull("The generated beanName must *never* be null.", beanName);
 		assertTrue("The generated beanName must *never* be blank.", StringUtils.hasText(beanName));
 		assertEquals("thoreau", beanName);
-
-		verify(registry);
 	}
 
 	@Test
 	public void testGenerateBeanNameWithNamedComponentWhereTheNameIsBlank() {
-		BeanDefinitionRegistry registry = createMock(BeanDefinitionRegistry.class);
-		replay(registry);
-
+		BeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();
 		AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition(ComponentWithBlankName.class);
 		String beanName = this.beanNameGenerator.generateBeanName(bd, registry);
 		assertNotNull("The generated beanName must *never* be null.", beanName);
 		assertTrue("The generated beanName must *never* be blank.", StringUtils.hasText(beanName));
-
 		String expectedGeneratedBeanName = this.beanNameGenerator.buildDefaultBeanName(bd);
-
 		assertEquals(expectedGeneratedBeanName, beanName);
-
-		verify(registry);
 	}
 
 	@Test
 	public void testGenerateBeanNameWithAnonymousComponentYieldsGeneratedBeanName() {
-		BeanDefinitionRegistry registry = createMock(BeanDefinitionRegistry.class);
-		replay(registry);
-
+		BeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();
 		AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition(AnonymousComponent.class);
 		String beanName = this.beanNameGenerator.generateBeanName(bd, registry);
 		assertNotNull("The generated beanName must *never* be null.", beanName);
 		assertTrue("The generated beanName must *never* be blank.", StringUtils.hasText(beanName));
-
 		String expectedGeneratedBeanName = this.beanNameGenerator.buildDefaultBeanName(bd);
-
 		assertEquals(expectedGeneratedBeanName, beanName);
-
-		verify(registry);
 	}