vergnet/clavardator
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use another DB for testing

Browse source
This commit is contained in:
Yohan Simard 2020-12-20 00:56:02 +01:00
parent 34255a98e8
commit d24550fd63
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/fr/insa/clavardator/db/DatabaseController.java
View file

@ -17,9 +17,17 @@ public class DatabaseController {
} }
public void connect() { public void connect() {
connectToDatabase("clavardator");
}
public void connectToTestDb() {
connectToDatabase("clavardator_test");
}
private void connectToDatabase(String dbName) {
try { try {
Class.forName("org.sqlite.JDBC"); Class.forName("org.sqlite.JDBC");
connection = DriverManager.getConnection("jdbc:sqlite:clavardator.db"); connection = DriverManager.getConnection("jdbc:sqlite:" + dbName + ".db");
Log.v(getClass().getSimpleName(), "Opened database successfully"); Log.v(getClass().getSimpleName(), "Opened database successfully");
} catch (ClassNotFoundException | SQLException e) { } catch (ClassNotFoundException | SQLException e) {
e.printStackTrace(); e.printStackTrace();
@ -70,7 +78,7 @@ public class DatabaseController {
public void resetTables() { public void resetTables() {
try { try {
Statement dropMessage = connection.createStatement(); Statement dropMessage = connection.createStatement();
String dropMessageSql = "DROP TABLE message"; String dropMessageSql = "DROP TABLE IF EXISTS message";
Log.v(getClass().getSimpleName(), "Dropping table message..."); Log.v(getClass().getSimpleName(), "Dropping table message...");
int rowsModified = dropMessage.executeUpdate(dropMessageSql); int rowsModified = dropMessage.executeUpdate(dropMessageSql);
@ -79,7 +87,7 @@ public class DatabaseController {
dropMessage.close(); dropMessage.close();
Statement dropUser = connection.createStatement(); Statement dropUser = connection.createStatement();
String dropUserSql = "DROP TABLE user"; String dropUserSql = "DROP TABLE IF EXISTS user";
Log.v(getClass().getSimpleName(), "Dropping table user..."); Log.v(getClass().getSimpleName(), "Dropping table user...");
rowsModified = dropUser.executeUpdate(dropUserSql); rowsModified = dropUser.executeUpdate(dropUserSql);

2
src/test/java/fr/insa/clavardator/DatabaseTest.java
View file

@ -14,7 +14,7 @@ public class DatabaseTest {
@Test @Test
void testDB() { void testDB() {
db.connect(); db.connectToTestDb();
db.resetTables(); db.resetTables();
db.getAllUsers(users -> { db.getAllUsers(users -> {
assertEquals(0, users.size()); assertEquals(0, users.size());