From 859185d086ac4936c49820cc2018a38664ff14d6 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Tue, 10 May 2011 11:54:37 +0000
Subject: [PATCH] Test interaction of @ComponentScan and @Import

---
 ...anAndImportAnnotationInteractionTests.java | 52 +++++++++++++++++++
 .../componentscan/simple/SimpleComponent.java | 24 +++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 org.springframework.context/src/test/java/org/springframework/context/annotation/ComponentScanAndImportAnnotationInteractionTests.java
 create mode 100644 org.springframework.context/src/test/java/org/springframework/context/annotation/componentscan/simple/SimpleComponent.java

diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/ComponentScanAndImportAnnotationInteractionTests.java b/org.springframework.context/src/test/java/org/springframework/context/annotation/ComponentScanAndImportAnnotationInteractionTests.java
new file mode 100644
index 00000000000..d8c5125eb5d
--- /dev/null
+++ b/org.springframework.context/src/test/java/org/springframework/context/annotation/ComponentScanAndImportAnnotationInteractionTests.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2002-2011 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;
+
+import org.junit.Test;
+import org.springframework.context.annotation.componentscan.simple.SimpleComponent;
+
+/**
+ * Tests covering overlapping use of @ComponentScan and @Import annotations.
+ *
+ * @author Chris Beams
+ * @since 3.1
+ */
+public class ComponentScanAndImportAnnotationInteractionTests {
+
+	@Test
+	public void componentScanOverlapsWithImport() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.register(Config1.class);
+		ctx.register(Config2.class);
+		ctx.refresh(); // no conflicts found trying to register SimpleComponent
+		ctx.getBean(SimpleComponent.class); // succeeds -> there is only one bean of type SimpleComponent
+	}
+
+
+	@Configuration
+	@ComponentScan("org.springframework.context.annotation.componentscan.simple")
+	static class Config1 {
+
+	}
+
+
+	@Configuration
+	@Import(org.springframework.context.annotation.componentscan.simple.SimpleComponent.class)
+	static class Config2 {
+
+	}
+}
diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/componentscan/simple/SimpleComponent.java b/org.springframework.context/src/test/java/org/springframework/context/annotation/componentscan/simple/SimpleComponent.java
new file mode 100644
index 00000000000..956b90d157e
--- /dev/null
+++ b/org.springframework.context/src/test/java/org/springframework/context/annotation/componentscan/simple/SimpleComponent.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2002-2011 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.simple;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class SimpleComponent {
+
+}