spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-20 14:39:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '1.3.x'

Browse Source
This commit is contained in:
Phillip Webb
2016-06-10 17:24:02 -07:00
parent 6dc0ecb182 f27bdcb737
commit e27bc9ddea
7 changed files with 82 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/AbstractDevToolsDataSourceAutoConfigurationTests.java
-1
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());