diff options
Diffstat (limited to 'src/test/java/com/juick')
| -rw-r--r-- | src/test/java/com/juick/tests/ApiTests.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/java/com/juick/tests/ApiTests.java b/src/test/java/com/juick/tests/ApiTests.java index 51641c1de..d97f84d2d 100644 --- a/src/test/java/com/juick/tests/ApiTests.java +++ b/src/test/java/com/juick/tests/ApiTests.java @@ -32,7 +32,6 @@ import com.juick.service.TagService; import com.juick.service.UserService; import com.juick.service.search.SearchService; import com.juick.www.WebApp; -import org.apache.commons.dbcp2.BasicDataSource; import org.apache.commons.lang3.StringUtils; import org.junit.Before; import org.junit.Test; @@ -53,6 +52,7 @@ import org.springframework.transaction.annotation.TransactionManagementConfigure import ru.sape.Sape; import javax.inject.Inject; +import javax.sql.DataSource; import java.lang.reflect.InvocationTargetException; import java.text.ParseException; import java.util.ArrayList; @@ -73,13 +73,13 @@ public class ApiTests { @ComponentScan(basePackages = {"com.juick.service", "com.juick.server.protocol"}) static class Config implements TransactionManagementConfigurer { @Bean - public BasicDataSource dataSource() { + public DataSource dataSource() { try { DB db = DB.newEmbeddedDB(33306); db.start(); db.createDB("juick"); db.source("schema.sql"); - BasicDataSource dataSource = new BasicDataSource(); + org.apache.tomcat.jdbc.pool.DataSource dataSource = new org.apache.tomcat.jdbc.pool.DataSource(); dataSource.setDriverClassName("com.mysql.jdbc.Driver"); dataSource.setUrl("jdbc:mysql://localhost:33306/juick?autoReconnect=true&user=root"); |