all tests pass

Author: julianalg

Client/pom.xml

@@ -5,7 +5,6 @@
     <modelVersion>4.0.0</modelVersion>
     <properties>
         <javafx.version>23.0.2</javafx.version>
-        <junit.version>5.12.0</junit.version>
         <maven.compiler.source>24</maven.compiler.source>
         <maven.compiler.target>24</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

Client/src/test/java/edu/sdccd/cisc191/Client/ClientTest.java

@@ -86,7 +86,7 @@ void clearStaticCollections() {
      *  getOdds
      * -------------------------------------------------- */
     @Test
-    void getOdds_returnsCorrectHomeAndAway() throws Exception {
+    void getOdds() throws Exception {
 
         /* ---------- mock the static constructor ---------- */
         try (var mockedStatic = mockStatic(HttpClient.class)) {
@@ -119,7 +119,7 @@ void getOdds_returnsCorrectHomeAndAway() throws Exception {
      *  getGames
      * -------------------------------------------------- */
     @Test
-    void getGames_parsesListIntoDomainObjects() throws Exception {
+    void getGamesParseToObjects() throws Exception {
 
         try (var mockedStatic = mockStatic(HttpClient.class)) {
             HttpClient mockClient   = mock(HttpClient.class);
@@ -148,7 +148,7 @@ void getGames_parsesListIntoDomainObjects() throws Exception {
      *  createBotArray → getBots
      * -------------------------------------------------- */
     @Test
-    void createBotArray_convertsUsersToBots_skippingMainUser() throws Exception {
+    void createBotArray() throws Exception {
             Client.createBotArray();
             List<BotBase> bots = Client.getBots();
             assertEquals(4, bots.size(), "should skip first (human) user and make 2 bots");

Common/pom.xml

@@ -31,11 +31,6 @@
             <artifactId>joda-time</artifactId>
             <version>2.12.5</version>
         </dependency>
-        <dependency>
-            <groupId>com.googlecode.json-simple</groupId>
-            <artifactId>json-simple</artifactId>
-            <version>1.1.1</version>
-        </dependency>
         <!-- Spring stuff -->
         <dependency>
             <groupId>org.springframework.boot</groupId>

Common/src/main/java/edu/sdccd/cisc191/Common/Models/Bet.java

@@ -31,6 +31,7 @@ public class Bet implements Serializable {
 
     @ManyToOne
     @JoinColumn(name = "game_db_id", unique = true)
+    @Getter @Setter
     private Game game;
     private String betTeam;
     private int betAmt;

Common/src/main/java/edu/sdccd/cisc191/Common/Models/User.java

@@ -40,6 +40,54 @@ public JodaModule jodaModule() {
 @Setter
 @ToString
 public class User implements Serializable {
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public long getMoney() {
+        return money;
+    }
+
+    public void setMoney(long money) {
+        this.money = money;
+    }
+
+    public int getMoneyLine() {
+        return moneyLine;
+    }
+
+    public void setMoneyLine(int moneyLine) {
+        this.moneyLine = moneyLine;
+    }
+
+    public List<Bet> getBets() {
+        return bets;
+    }
+
+    public void setBets(List<Bet> bets) {
+        this.bets = bets;
+    }
+
+    public int getMoneyBet() {
+        return moneyBet;
+    }
+
+    public void setMoneyBet(int moneyBet) {
+        this.moneyBet = moneyBet;
+    }
+
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;

Common/src/test/java/edu/sdccd/cisc191/Common/GameBSTTest.java

@@ -0,0 +1,100 @@
+package edu.sdccd.cisc191.Common;
+
+import edu.sdccd.cisc191.Common.GameBST.BinarySearchTree;
+import edu.sdccd.cisc191.Common.Models.Game;
+import org.joda.time.DateTime;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class GameBSTTest {
+
+    @Test
+    @DisplayName("Generic BST inorderTraversal should sort Integers")
+    void testGenericBinarySearchTreeInorderTraversal() {
+        BinarySearchTree<Integer> tree = new BinarySearchTree<>(Integer::compareTo);
+        tree.insert(5);
+        tree.insert(3);
+        tree.insert(7);
+        tree.insert(1);
+        tree.insert(4);
+
+        List<Integer> expected = Arrays.asList(1, 3, 4, 5, 7);
+        assertEquals(expected, tree.inorderTraversal(),
+                "Inorder traversal of [5,3,7,1,4] should be [1,3,4,5,7]");
+    }
+
+    @Test
+    @DisplayName("buildGameIdTree orders by Game.getId()")
+    void testBuildGameIdTree() {
+        Game g1 = new Game();
+        g1.setId(2L);
+        Game g2 = new Game();
+        g2.setId(1L);
+
+        List<Game> games = Arrays.asList(g1, g2);
+        BinarySearchTree<Game> tree = GameBST.buildGameIdTree(games);
+
+        List<Game> inorder = tree.inorderTraversal();
+        assertEquals(1L, inorder.get(0).getId(), "First element should have ID 1");
+        assertEquals(2L, inorder.get(1).getId(), "Second element should have ID 2");
+    }
+
+    @Test
+    @DisplayName("buildOddsTree orders by Game.getTeam1Odd()")
+    void testBuildOddsTree() {
+        Game g1 = new Game();
+        g1.setTeam1Odd(2.0);
+        Game g2 = new Game();
+        g2.setTeam1Odd(1.5);
+
+        List<Game> games = Arrays.asList(g1, g2);
+        BinarySearchTree<Game> tree = GameBST.buildOddsTree(games);
+
+        List<Game> inorder = tree.inorderTraversal();
+        assertEquals(1.5, inorder.get(0).getTeam1Odd(), 1e-9,
+                "Lowest team1Odd should come first");
+        assertEquals(2.0, inorder.get(1).getTeam1Odd(), 1e-9,
+                "Highest team1Odd should come last");
+    }
+
+    @Test
+    @DisplayName("buildTeam2OddsTree orders by Game.getTeam2Odd()")
+    void testBuildTeam2OddsTree() {
+        Game g1 = new Game();
+        g1.setTeam2Odd(3.0);
+        Game g2 = new Game();
+        g2.setTeam2Odd(2.5);
+
+        List<Game> games = Arrays.asList(g1, g2);
+        BinarySearchTree<Game> tree = GameBST.buildTeam2OddsTree(games);
+
+        List<Game> inorder = tree.inorderTraversal();
+        assertEquals(2.5, inorder.get(0).getTeam2Odd(), 1e-9,
+                "Lowest team2Odd should come first");
+        assertEquals(3.0, inorder.get(1).getTeam2Odd(), 1e-9,
+                "Highest team2Odd should come last");
+    }
+
+    @Test
+    @DisplayName("buildDateTree orders by Game.getGameDate()")
+    void testBuildDateTree() {
+        Game g1 = new Game();
+        g1.setGameDate(new DateTime(2021, 1, 2, 0, 0));
+        Game g2 = new Game();
+        g2.setGameDate(new DateTime(2021, 1, 1, 0, 0));
+
+        List<Game> games = Arrays.asList(g1, g2);
+        BinarySearchTree<Game> tree = GameBST.buildDateTree(games);
+
+        List<Game> inorder = tree.inorderTraversal();
+        assertEquals(new DateTime(2021, 1, 1, 0, 0), inorder.get(0).getGameDate(),
+                "Earliest date should come first");
+        assertEquals(new DateTime(2021, 1, 2, 0, 0), inorder.get(1).getGameDate(),
+                "Latest date should come last");
+    }
+}

DatabaseServer.mv.db

@@ -1,9 +1,11 @@
 package edu.sdccd.cisc191.Server.exceptions;
 
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(HttpStatus.NOT_FOUND)
 public class UserNotFoundException extends RuntimeException {
     public UserNotFoundException(Long id) {
         super("Could not find user " + id);
-
     }
 }
-

Server/src/main/java/edu/sdccd/cisc191/Server/exceptions/UserNotFoundException.java

@@ -29,7 +29,7 @@
 
 @SpringBootTest
 @AutoConfigureMockMvc
-class ZGameControllerTest {
+class GameControllerTest {
     @Autowired
     private MockMvc mockMvc;