Merge branch '1.3.x'

This commit is contained in:
Phillip Webb
2016-06-10 17:24:02 -07:00
7 changed files with 82 additions and 15 deletions

View File

@@ -76,7 +76,6 @@ public abstract class AbstractDevToolsDataSourceAutoConfigurationTests {
@Test
public void emptyFactoryMethodMetadataIgnored() {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
DataSource dataSource = mock(DataSource.class);
AnnotatedGenericBeanDefinition beanDefinition = new AnnotatedGenericBeanDefinition(
dataSource.getClass());