From 78c10cd242f44680d9536721d34fedd80359a218 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@gopivotal.com>
Date: Mon, 28 Oct 2013 16:51:20 -0700
Subject: [PATCH] Polish BeanMethodPolymorphismTests

Polish BeanMethodPolymorphismTests and add @Ignored failing test
for SPR-10988.

Issue: SPR-10988
---
 .../BeanMethodPolymorphismTests.java          | 98 +++++++++++++++----
 1 file changed, 77 insertions(+), 21 deletions(-)

diff --git a/spring-context/src/test/java/org/springframework/context/annotation/BeanMethodPolymorphismTests.java b/spring-context/src/test/java/org/springframework/context/annotation/BeanMethodPolymorphismTests.java
index 1d573540f8a..9a9d8260fdb 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/BeanMethodPolymorphismTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/BeanMethodPolymorphismTests.java
@@ -16,18 +16,20 @@
 
 package org.springframework.context.annotation;
 
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 import java.lang.annotation.Inherited;
+import java.util.List;
 
+import org.junit.Ignore;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
 /**
  * Tests regarding overloading and overriding of bean methods.
  * Related to SPR-6618.
@@ -42,22 +44,27 @@ import org.springframework.beans.factory.support.RootBeanDefinition;
  * the most specific subclass bean method will always be the one that is invoked.
  *
  * @author Chris Beams
+ * @author Phillip Webb
  */
+@SuppressWarnings("resource")
 public class BeanMethodPolymorphismTests {
 
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
+
+
 	@Test
 	public void beanMethodOverloadingWithoutInheritance() {
+
 		@SuppressWarnings({ "hiding" })
 		@Configuration class Config {
 			@Bean String aString() { return "na"; }
 			@Bean String aString(Integer dependency) { return "na"; }
 		}
-		try {
-			new AnnotationConfigApplicationContext(Config.class);
-			fail("expected bean method overloading exception");
-		} catch (BeanDefinitionParsingException ex) {
-			assertTrue(ex.getMessage(), ex.getMessage().contains("2 overloaded @Bean methods named 'aString'"));
-		}
+
+		this.thrown.expect(BeanDefinitionParsingException.class);
+		this.thrown.expectMessage("overloaded @Bean methods named 'aString'");
+		new AnnotationConfigApplicationContext(Config.class);
 	}
 
 	@Test
@@ -65,12 +72,13 @@ public class BeanMethodPolymorphismTests {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(SubConfig.class);
 		assertThat(ctx.getBean(String.class), equalTo("overloaded5"));
 	}
-	static @Configuration class SuperConfig {
-		@Bean String aString() { return "super"; }
-	}
-	static @Configuration class SubConfig {
-		@Bean Integer anInt() { return 5; }
-		@Bean String aString(Integer dependency) { return "overloaded"+dependency; }
+
+	@Test
+	@Ignore
+	public void beanMethodOverloadingWithInheritanceAndList() {
+		// SPR-11025
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(SubConfigWithList.class);
+		assertThat(ctx.getBean(String.class), equalTo("overloaded5"));
 	}
 
 	/**
@@ -83,10 +91,6 @@ public class BeanMethodPolymorphismTests {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(ShadowConfig.class);
 		assertThat(ctx.getBean(String.class), equalTo("shadow"));
 	}
-	@Import(SubConfig.class)
-	static @Configuration class ShadowConfig {
-		@Bean String aString() { return "shadow"; }
-	}
 
 	/**
 	 * Tests that polymorphic Configuration classes need not explicitly redeclare the
@@ -110,6 +114,7 @@ public class BeanMethodPolymorphismTests {
 		public TestBean testBean() {
 			return new TestBean();
 		}
+
 	}
 
 
@@ -117,4 +122,55 @@ public class BeanMethodPolymorphismTests {
 	static class Config extends BaseConfig {
 	}
 
+
+	@Configuration
+	static class SuperConfig {
+
+		@Bean
+		String aString() {
+			return "super";
+		}
+	}
+
+
+	@Configuration
+	static class SubConfig extends SuperConfig {
+
+		@Bean
+		Integer anInt() {
+			return 5;
+		}
+
+		@Bean
+		String aString(Integer dependency) {
+			return "overloaded" + dependency;
+		}
+	}
+
+
+	@Configuration
+	static class SubConfigWithList extends SuperConfig {
+
+		@Bean
+		Integer anInt() {
+			return 5;
+		}
+
+		@Bean
+		String aString(List<Integer> dependency) {
+			return "overloaded" + dependency.get(0);
+		}
+	}
+
+
+	@Configuration
+	@Import(SubConfig.class)
+	static class ShadowConfig {
+
+		@Bean
+		String aString() {
+			return "shadow";
+		}
+	}
+
 }