aboutsummaryrefslogtreecommitdiff
path: root/src/test/java/com
diff options
context:
space:
mode:
Diffstat (limited to 'src/test/java/com')
-rw-r--r--src/test/java/com/juick/tests/JsonTests.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/java/com/juick/tests/JsonTests.java b/src/test/java/com/juick/tests/JsonTests.java
index 496dea24..795b3429 100644
--- a/src/test/java/com/juick/tests/JsonTests.java
+++ b/src/test/java/com/juick/tests/JsonTests.java
@@ -5,6 +5,8 @@ import com.juick.server.MessagesQueries;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.DriverManagerDataSource;
import java.io.FileInputStream;
import java.io.IOException;
@@ -12,8 +14,6 @@ import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.List;
import java.util.Properties;
-import org.apache.commons.dbcp2.BasicDataSource;
-import org.springframework.jdbc.core.JdbcTemplate;
public class JsonTests {
@@ -23,7 +23,7 @@ public class JsonTests {
Properties conf = new Properties();
try {
conf.load(new FileInputStream("/etc/juick/api.conf"));
- BasicDataSource dataSource = new BasicDataSource();
+ DriverManagerDataSource dataSource = new DriverManagerDataSource();
dataSource.setDriverClassName("com.mysql.jdbc.Driver");
dataSource.setUrl("jdbc:mysql://localhost/juick?autoReconnect=true&user="
+ conf.getProperty("mysql_username", "")