Merge branch 'main' into feat/same-team-competing

src/test/java/edu/ntnu/idatt1002/k1g4/CupDAOTest.java

@@ -2,6 +2,8 @@ package edu.ntnu.idatt1002.k1g4;
 
 import edu.ntnu.idatt1002.k1g4.dao.CupDAO;
 
+import edu.ntnu.idatt1002.k1g4.dao.DivisionDAO;
+import edu.ntnu.idatt1002.k1g4.dao.MatchDAO;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -44,4 +46,19 @@ public class CupDAOTest {
         ArrayList<Cup> cups = cupDAO.getCups();
         assertTrue(cups.size() == 4 && cupsBefore.size() == 3);
     }
+
+    @Test
+    public void testDeleteCup() {
+        MatchDAO matchDAO = new MatchDAO();
+        DivisionDAO divisionDAO = new DivisionDAO();
+        ArrayList<Cup> cupsBefore = cupDAO.getCups();
+        ArrayList<Match> matchesBefore = matchDAO.getMatchesByCup(1);
+        ArrayList<Division> divisionsBefore = divisionDAO.getDivisionsByCup(1);
+        cupDAO.deleteCup(cupsBefore.get(0).getCupId());
+        assertTrue(cupDAO.getCups().size() == cupsBefore.size() - 1);
+        assertEquals(0, matchDAO.getMatchesByCup(1).size());
+        assertEquals(0, divisionDAO.getDivisionsByCup(1).size());
+        assertNotEquals(divisionsBefore.size(), divisionDAO.getDivisionsByCup(1).size());
+        assertNotEquals(matchesBefore.size(), matchDAO.getMatchesByCup(1).size());
+    }
 }
\ No newline at end of file

src/test/java/edu/ntnu/idatt1002/k1g4/DivisionDAOTest.java

 package edu.ntnu.idatt1002.k1g4;
 
 import edu.ntnu.idatt1002.k1g4.dao.DivisionDAO;
+import edu.ntnu.idatt1002.k1g4.dao.MatchDAO;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -42,4 +43,14 @@ public class DivisionDAOTest {
         ArrayList<Division> divisions = divisionDAO.getDivisionsByCup(1);
         assertTrue(divisions.size() == 4 && divisionsBefore.size() == 3);
     }
+
+    @Test
+    public void testDeleteDivision() {
+        MatchDAO matchDAO = new MatchDAO();
+        ArrayList<Division> divisionsBefore = divisionDAO.getDivisionsByCup(1);
+        ArrayList<Match> matchesBefore = matchDAO.getMatchesByDivision(1);
+        divisionDAO.deleteDivision(divisionsBefore.get(0).getDivisionId());
+        assertTrue(divisionDAO.getDivisionsByCup(1).size() == divisionsBefore.size() - 1);
+        assertNotEquals(matchesBefore.size(), matchDAO.getMatchesByDivision(1).size());
+    }
 }
\ No newline at end of file

src/test/java/edu/ntnu/idatt1002/k1g4/MatchDAOTest.java

@@ -79,4 +79,10 @@ public class MatchDAOTest {
         ArrayList matches = matchDAO.getMatchesByDivision(1);
         assertTrue(matches.size() == 4);
     }
+
+    @Test
+    public void testGetMatchById() {
+        String field = matchDAO.getMatchById(1).getField();
+        assertEquals(field, "A1");
+    }
 }
\ No newline at end of file