From 5807d0d11b6694bfaac0d83c6bd3960c2a4f7827 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Wed, 27 Sep 2017 09:04:41 +0000 Subject: Revert "tomcat-jdbc -> Hikari" This reverts commit 7b0d1a92aa13931333213dc4d2971eabb41303e5. --- src/test/java/com/juick/tests/ApiTests.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/test/java/com/juick/tests') diff --git a/src/test/java/com/juick/tests/ApiTests.java b/src/test/java/com/juick/tests/ApiTests.java index 403adfa6..d97f84d2 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 com.zaxxer.hikari.HikariDataSource; import org.apache.commons.lang3.StringUtils; import org.junit.Before; import org.junit.Test; @@ -80,11 +79,11 @@ public class ApiTests { db.start(); db.createDB("juick"); db.source("schema.sql"); - HikariDataSource dataSource = new HikariDataSource(); + org.apache.tomcat.jdbc.pool.DataSource dataSource = new org.apache.tomcat.jdbc.pool.DataSource(); dataSource.setDriverClassName("com.mysql.jdbc.Driver"); - dataSource.setJdbcUrl("jdbc:mysql://localhost:33306/juick?autoReconnect=true&user=root"); + dataSource.setUrl("jdbc:mysql://localhost:33306/juick?autoReconnect=true&user=root"); - // dataSource.setValidationQuery("select 1"); + dataSource.setValidationQuery("select 1"); return dataSource; } catch (ManagedProcessException e) { -- cgit v1.2.3