Browse Source

Use another DB for testing

Yohan Simard 3 years ago
parent
commit
d24550fd63

+ 11
- 3
src/main/java/fr/insa/clavardator/db/DatabaseController.java View File

@@ -17,9 +17,17 @@ public class DatabaseController {
17 17
 	}
18 18
 
19 19
 	public void connect() {
20
+		connectToDatabase("clavardator");
21
+	}
22
+
23
+	public void connectToTestDb() {
24
+		connectToDatabase("clavardator_test");
25
+	}
26
+
27
+	private void connectToDatabase(String dbName) {
20 28
 		try {
21 29
 			Class.forName("org.sqlite.JDBC");
22
-			connection = DriverManager.getConnection("jdbc:sqlite:clavardator.db");
30
+			connection = DriverManager.getConnection("jdbc:sqlite:" + dbName + ".db");
23 31
 			Log.v(getClass().getSimpleName(), "Opened database successfully");
24 32
 		} catch (ClassNotFoundException | SQLException e) {
25 33
 			e.printStackTrace();
@@ -70,7 +78,7 @@ public class DatabaseController {
70 78
 	public void resetTables() {
71 79
 		try {
72 80
 			Statement dropMessage = connection.createStatement();
73
-			String dropMessageSql = "DROP TABLE message";
81
+			String dropMessageSql = "DROP TABLE IF EXISTS message";
74 82
 
75 83
 			Log.v(getClass().getSimpleName(), "Dropping table message...");
76 84
 			int rowsModified = dropMessage.executeUpdate(dropMessageSql);
@@ -79,7 +87,7 @@ public class DatabaseController {
79 87
 			dropMessage.close();
80 88
 
81 89
 			Statement dropUser = connection.createStatement();
82
-			String dropUserSql = "DROP TABLE user";
90
+			String dropUserSql = "DROP TABLE IF EXISTS user";
83 91
 
84 92
 			Log.v(getClass().getSimpleName(), "Dropping table user...");
85 93
 			rowsModified = dropUser.executeUpdate(dropUserSql);

+ 1
- 1
src/test/java/fr/insa/clavardator/DatabaseTest.java View File

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

Loading…
Cancel
Save