root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 17 Packages Projects Releases Wiki Activity

Polish

This commit is contained in:
Stephane Nicoll 2017-10-03 13:36:36 +02:00
parent 1fd184f7db
commit bccf9464aa
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JdbcTemplateAutoConfigurationTests.java
View File

@ -192,7 +192,7 @@ public class JdbcTemplateAutoConfigurationTests {
@Bean
public DataSource customDataSource() {
return new TestDataSource("overridedb");
return new TestDataSource();
}
}

18
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/TestDataSource.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2016 the original author or authors.
* Copyright 2012-2017 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.
@ -16,6 +16,8 @@
package org.springframework.boot.autoconfigure.jdbc;
import java.util.UUID;
import org.apache.commons.dbcp2.BasicDataSource;
/**
@ -23,13 +25,25 @@ import org.apache.commons.dbcp2.BasicDataSource;
*
* @author Phillip Webb
* @author Kazuki Shimizu
* @author Stephane Nicoll
*/
public class TestDataSource extends BasicDataSource {
/**
* Create an in-memory database with the specified name.
* @param name the name of the database
*/
public TestDataSource(String name) {
setDriverClassName("org.hsqldb.jdbcDriver");
setUrl("jdbc:hsqldb:target/" + name);
setUrl("jdbc:hsqldb:mem:" + name);
setUsername("sa");
}
/**
* Create an in-memory database with a random name.
*/
public TestDataSource() {
this(UUID.randomUUID().toString());
}
}