[+] Completed the unit tests, completely restructured the test

CSC207-2022F-UofT · Nov 15, 2022 · 67376de · 67376de
1 parent 0c1784f
commit 67376de
Show file tree

Hide file tree

Showing 4 changed files with 556 additions and 338 deletions.
diff --git a/src/main/java/billgates/database/MySQLDatabaseGateway.java b/src/main/java/billgates/database/MySQLDatabaseGateway.java
@@ -174,11 +174,12 @@ public void insertEntry(int billId, QueryEntryData entry) {
             Statement statement = connection.createStatement();
 
             String query = String.format("""
-                            INSERT INTO bill%d (value, date, currency, description, `from`, `to`, location, split_bill_id) VALUE (
-                            %f, "%s", "%s", "%s", "%s", "%s", "%s", %d
+                            INSERT INTO bill%d (entry_id, value, date, currency, description, `from`, `to`, location, split_bill_id) VALUE (
+                            %d, %f, "%s", "%s", "%s", "%s", "%s", "%s", %d
                             )
                             """,
                     billId,
+                    entry.getId(),
                     entry.getValue(),
                     entry.getDate().format(formatter),
                     entry.getCurrency(),
@@ -291,6 +292,7 @@ public void createUsersTable() {
                 return;
             }
 
+
             String query = """
                     CREATE TABLE users
                     (
@@ -309,5 +311,9 @@ password VARCHAR(16) NOT NULL,
         }
     }
 
+    public static void main(String[] args) {
+
+
+    }
 
 }
diff --git a/src/main/java/billgates/database/QueryEntryData.java b/src/main/java/billgates/database/QueryEntryData.java
@@ -3,6 +3,7 @@
 import billgates.entities.EntryBuilder;
 
 import java.time.ZonedDateTime;
+import java.time.temporal.ChronoUnit;
 
 public class QueryEntryData {
     private final int id;
@@ -25,7 +26,7 @@ public QueryEntryData(int id,
                           String location,
                           int splitBillId) {
         this.id = id;
-        this.date = date;
+        this.date = date.truncatedTo(ChronoUnit.SECONDS);
         this.value = value;
         this.currency = currency;
         this.description = description;
@@ -40,7 +41,7 @@ public QueryEntryData(int id,
                           double value) {
         // Constructor for not all values provided
         this.id = id;
-        this.date = date;
+        this.date = date.truncatedTo(ChronoUnit.SECONDS);
         this.value = value;
     }
 

diff --git a/src/test/java/TestMySQLDatabaseGateway.java b/src/test/java/TestMySQLDatabaseGateway.java