From ef290ff95c4d879e0c1c176388436ee8cfa39386 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Thu, 8 May 2014 16:22:24 +0200
Subject: [PATCH] Additional tests for configuration class importing via ASM

Issue: SPR-11647
(cherry picked from commit 8c9116f)
---
 ...anAndImportAnnotationInteractionTests.java | 50 ++++++++++++++++++-
 .../importing/ImportingConfig.java            | 26 ++++++++++
 2 files changed, 74 insertions(+), 2 deletions(-)
 create mode 100644 spring-context/src/test/java/org/springframework/context/annotation/componentscan/importing/ImportingConfig.java

diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAndImportAnnotationInteractionTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAndImportAnnotationInteractionTests.java
index d8c5125eb5d..d70b26a59d3 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAndImportAnnotationInteractionTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAndImportAnnotationInteractionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -17,6 +17,8 @@
 package org.springframework.context.annotation;
 
 import org.junit.Test;
+
+import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.context.annotation.componentscan.simple.SimpleComponent;
 
 /**
@@ -36,17 +38,61 @@ public class ComponentScanAndImportAnnotationInteractionTests {
 		ctx.getBean(SimpleComponent.class); // succeeds -> there is only one bean of type SimpleComponent
 	}
 
+	@Test
+	public void componentScanOverlapsWithImportUsingAsm() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.registerBeanDefinition("config1", new RootBeanDefinition(Config1.class.getName()));
+		ctx.registerBeanDefinition("config2", new RootBeanDefinition(Config2.class.getName()));
+		ctx.refresh(); // no conflicts found trying to register SimpleComponent
+		ctx.getBean(SimpleComponent.class); // succeeds -> there is only one bean of type SimpleComponent
+	}
+
+	@Test
+	public void componentScanViaImport() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.register(Config3.class);
+		ctx.refresh();
+		ctx.getBean(SimpleComponent.class);
+	}
+
+	@Test
+	public void componentScanViaImportUsingAsm() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.registerBeanDefinition("config4", new RootBeanDefinition(Config3.class.getName()));
+		ctx.refresh();
+		ctx.getBean(SimpleComponent.class);
+	}
+
+	@Test
+	public void componentScanViaImportUsingScan() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.scan("org.springframework.context.annotation.componentscan.importing");
+		ctx.refresh();
+		ctx.getBean(SimpleComponent.class);
+	}
+
 
 	@Configuration
 	@ComponentScan("org.springframework.context.annotation.componentscan.simple")
 	static class Config1 {
-
 	}
 
 
 	@Configuration
 	@Import(org.springframework.context.annotation.componentscan.simple.SimpleComponent.class)
 	static class Config2 {
+	}
+
 
+	@Configuration
+	@Import(ImportedConfig.class)
+	static class Config3 {
 	}
+
+
+	@Configuration
+	@ComponentScan("org.springframework.context.annotation.componentscan.simple")
+	public static class ImportedConfig {
+	}
+
 }
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/componentscan/importing/ImportingConfig.java b/spring-context/src/test/java/org/springframework/context/annotation/componentscan/importing/ImportingConfig.java
new file mode 100644
index 00000000000..708b2ca2cd3
--- /dev/null
+++ b/spring-context/src/test/java/org/springframework/context/annotation/componentscan/importing/ImportingConfig.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2002-2014 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.context.annotation.componentscan.importing;
+
+import org.springframework.context.annotation.ComponentScanAndImportAnnotationInteractionTests;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+@Configuration
+@Import(ComponentScanAndImportAnnotationInteractionTests.ImportedConfig.class)
+public class ImportingConfig {
+}