From 02dfe943964672de91bf99dd5c590f6e263353cf Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Mon, 26 Oct 2009 13:00:04 +0000
Subject: [PATCH] [SPR-6128] Verified that claims raised in this issue no
 longer apply.

---
 .../AutowiredQualifierTests-context.xml       | 13 +++++
 .../spr6128/AutowiredQualifierTests.java      | 56 +++++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests-context.xml
 create mode 100644 org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests.java

diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests-context.xml b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests-context.xml
new file mode 100644
index 0000000000..6b39409bc9
--- /dev/null
+++ b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests-context.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+	<bean id="foo" class="java.lang.String">
+		<constructor-arg value="normal" />
+	</bean>
+
+	<bean id="customFoo" class="java.lang.String">
+		<constructor-arg value="custom" />
+	</bean>
+
+</beans>
\ No newline at end of file
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests.java
new file mode 100644
index 0000000000..5dca0e29d9
--- /dev/null
+++ b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2009 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.test.context.junit4.spr6128;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertThat;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * Unit tests to verify claims made in <a
+ * href="http://jira.springframework.org/browse/SPR-6128"
+ * target="_blank">SPR-6128</a>.
+ * 
+ * @author Sam Brannen
+ * @author Chris Beams
+ * @since 3.0
+ */
+@ContextConfiguration
+@RunWith(SpringJUnit4ClassRunner.class)
+public class AutowiredQualifierTests {
+
+	@Autowired
+	private String foo;
+
+	@Autowired
+	@Qualifier("customFoo")
+	private String customFoo;
+
+
+	@Test
+	public void test() {
+		assertThat(foo, equalTo("normal"));
+		assertThat(customFoo, equalTo("custom"));
+	}
+
+}