feat: refactor LoadGame and Xbox classes to improve game loading and insert disk logic; add unit tests for DiskDriveFullException and LoadGame functionality

Author: Dlafferty251

lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/dylans_xbox/LoadGame.java

@@ -21,8 +21,7 @@ public void loadGamesFromFile(Xbox xbox) throws Exception {
 
           int id = Integer.parseInt(gameDetails[0].trim());
           String name = gameDetails[1].trim();
-          xbox.inputGame(id, name);
-          xbox.setDiskDriveFull(false); // Set diskDriveFull to true after adding a game
+          xbox.getGames().put(id, name);
         }
       }
     } catch (IOException e) {

lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/dylans_xbox/Xbox.java

@@ -1,17 +1,17 @@
 package com.codedifferently.lesson16.dylans_xbox;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 
 public class Xbox {
+  private ArrayList<String> insertedGames = new ArrayList<>();
   private HashMap<Integer, String> games;
   // Declares the model of the Xbox by using the enum XboxModel
   private XboxModel model;
   private String color;
   private int price;
   // Declares if there is a disk drive on the Xbox
-  private boolean diskDrive;
-  // If there is a disk drive, this will be t/f based on if there is a disk inside of the xbox
-  private boolean diskDriveFull = true;
+  private boolean diskDrive = false;
 
   // Defines a fixed set of constants for GameGenre
   public enum XboxModel {
@@ -29,10 +29,14 @@ public Xbox(String model, int price, String color, boolean diskDrive, boolean di
     this.price = price;
     this.color = color;
     this.diskDrive = diskDrive;
-    this.diskDriveFull = diskDriveFull;
+    this.insertedGames = new ArrayList<>();
     this.games = new HashMap<>();
   }
 
+  public int getInsertedGamesSize() {
+    return insertedGames.size();
+  }
+
   // Getters for the Xbox class
   public XboxModel getModel() {
     return model;
@@ -54,36 +58,37 @@ public boolean DiskDrive() {
     return diskDrive;
   }
 
-  public boolean DiskDriveFull() {
-    return diskDriveFull;
-  }
-
   // Method that will add a game to the disk drive
   // it will check if the disk drive is empty and if it is, it will add the game to the disk drive
-  // by turnign it to true.
-  public void inputGame(int id, String name) throws Exception {
-
-    // These are my custom exceptions that will be thrown if the disk drive is empty or if the disk
-    // drive is full.
+  // by turning it to true.
+  public void inputGame(int id) throws Exception {
     if (!diskDrive) {
       throw new Exception("This Xbox does not have a disk drive. Cannot insert game.");
     }
-    if (diskDriveFull) {
+    if (insertedGames.size() >= 2) {
       throw new DiskDriveFullException("Disk drive is full. Cannot insert game.");
     }
 
-    games.put(id, name);
-    diskDriveFull = true;
-    System.out.println("Game with ID: " + id + " was added to the disk drive.");
+    String gameName = games.get(id);
+    if (gameName == null) {
+      throw new Exception("Game with ID: " + id + " does not exist in the library.");
+    }
+    if (insertedGames.contains(gameName)) {
+      throw new Exception("Game \"" + gameName + "\" is already inserted.");
+    }
+
+    insertedGames.add(gameName);
+    games.remove(id);
+
+    System.out.println("Game \"" + gameName + "\" (ID: " + id + ") was added to the disk drive.");
   }
 
   // Method that will eject a game from the disk drive
   // it will check if the game is in the drive and if it is, it will turn the drive to false.
   public void ejectGame(int id) {
-    if (games.containsKey(id)) {
-      games.remove(id);
-      diskDrive = false;
-      System.out.println("Game with ID: " + id + " was removed from the disk drive.");
+    if (insertedGames.size() >= 1) {
+      insertedGames.removeAll(insertedGames);
+      System.out.println("Game with ID: " + id + " was ejected from the disk drive.");
     } else {
       System.out.println("Game with ID: " + id + " not found in the disk drive.");
     }
@@ -96,9 +101,4 @@ public void printAllGames() {
       System.out.println("Game ID: " + id + ", Game Name: " + games.get(id));
     }
   }
-
-  // This method will remove a game from the HashMap
-  public void setDiskDriveFull(boolean b) {
-    this.diskDriveFull = b;
-  }
 }

lesson_16/objects/objects_app/src/test/xboxtest/DiskdrivefullTest.java renamed to lesson_16/objects/objects_app/src/test/java/xboxtest/DiskdrivefullTest.java

@@ -1,20 +1,29 @@
-package XboxTest;
+package xboxtest;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 
 import com.codedifferently.lesson16.dylans_xbox.DiskDriveFullException;
+import com.codedifferently.lesson16.dylans_xbox.LoadGame;
 import com.codedifferently.lesson16.dylans_xbox.Xbox;
 import org.junit.jupiter.api.Test;
 
 public class DiskdrivefullTest {
   @Test
   public void testDiskDriveFullException() throws Exception {
-    // Create an instance of Xbox with diskDriveFull set to true
-    Xbox xbox = new Xbox("XBOXSERIESX", 600, "Black", true, true);
+    // Create Xbox with a working disk drive
+    Xbox xbox = new Xbox("XBOXSERIESX", 600, "Black", true, false);
+    LoadGame loader =
+        new LoadGame("src/main/java/com/codedifferently/lesson16/dylans_xbox/data/games.csv");
+
+    loader.loadGamesFromFile(xbox); // Load game library
+
+    // Insert two games to fill the disk drive
+    xbox.inputGame(1);
+    xbox.inputGame(2);
 
     try {
-      xbox.inputGame(1, "Call of Duty");
+      xbox.inputGame(3); // This should trigger the exception
       fail("Expected DiskDriveFullException to be thrown.");
     } catch (DiskDriveFullException e) {
       assertEquals("Disk drive is full. Cannot insert game.", e.getMessage());

lesson_16/objects/objects_app/src/test/xboxtest/LoadgameTest.java renamed to lesson_16/objects/objects_app/src/test/java/xboxtest/LoadgameTest.java

@@ -1,4 +1,4 @@
-package XboxTest;
+package xboxtest;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;

lesson_16/objects/objects_app/src/test/xboxtest/XboxTest.java renamed to lesson_16/objects/objects_app/src/test/java/xboxtest/XboxTest.java

@@ -1,16 +1,16 @@
-package XboxTest;
+package xboxtest;
 
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-import java.util.HashMap; // Ensure LoadGame is imported
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals; // Ensure LoadGame is imported
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
-import org.junit.jupiter.api.Test;
 
+import com.codedifferently.lesson16.dylans_xbox.DiskDriveFullException;
 import com.codedifferently.lesson16.dylans_xbox.LoadGame;
 import com.codedifferently.lesson16.dylans_xbox.Xbox;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.util.HashMap;
+import org.junit.jupiter.api.Test;
 
 public class XboxTest {
 
@@ -36,34 +36,36 @@ public void testAddGame() {
 
   @Test
   public void testAddGameIfFull() {
-    Xbox xbox = new Xbox("XBOXSERIESX", 600, "Black", true, true); // Set diskDriveFull to true
+    Xbox xbox = new Xbox("XBOXSERIESX", 600, "Black", true, false); // false means not full yet
+    LoadGame loader =
+        new LoadGame("src/main/java/com/codedifferently/lesson16/dylans_xbox/data/games.csv");
+
     try {
-      xbox.inputGame(1, "Call of Duty");
-      fail("Expected an exception to be thrown when adding a game to a full disk drive.");
-    } catch (Exception e) {
+      loader.loadGamesFromFile(xbox);
+
+      // Insert two games (disk limit)
+      xbox.inputGame(1);
+      xbox.inputGame(2);
+
+      // This third insert should throw an exception
+      xbox.inputGame(3);
+      fail("Expected DiskDriveFullException to be thrown.");
+    } catch (DiskDriveFullException e) {
       assertEquals("Disk drive is full. Cannot insert game.", e.getMessage());
+    } catch (Exception e) {
+      e.printStackTrace();
+      fail("Unexpected exception: " + e.getMessage());
     }
   }
 
   @Test
   public void testXboxModelEnumValues() {
     Xbox.XboxModel[] models = Xbox.XboxModel.values();
     assertEquals(6, models.length);
-    assertEquals(
-        Xbox.XboxModel.XBOX360, models[0]); 
+    assertEquals(Xbox.XboxModel.XBOX360, models[0]);
     assertEquals(Xbox.XboxModel.XBOXSERIESX, models[5]);
   }
 
-  @Test
-  public void testDiskDrive() {
-    Xbox xbox =
-        new Xbox(
-            "XBOXONE", 400, "White", true,
-            false);
-    assertTrue(
-        xbox.DiskDrive(), "Disk drive should be empty"); 
-  }
-
   @Test
   public void testPrintAllGames() {
     Xbox xbox = new Xbox("XBOXSERIESX", 600, "Black", true, false);
@@ -105,17 +107,18 @@ public void testEjectGame() {
     Xbox xbox = new Xbox("XBOXSERIESX", 600, "Black", true, false);
     LoadGame loader =
         new LoadGame("src/main/java/com/codedifferently/lesson16/dylans_xbox/data/games.csv");
+
     try {
-      loader.loadGamesFromFile(xbox);
+      loader.loadGamesFromFile(xbox); // Load games into library
+      xbox.inputGame(1); // Insert game with ID 1
+      assertEquals(1, xbox.getInsertedGamesSize(), "Game should be inserted.");
+
+      xbox.ejectGame(1); // Eject by name (you may use ID instead if implemented that way)
+      assertEquals(0, xbox.getInsertedGamesSize(), "The game should be ejected.");
     } catch (Exception e) {
       e.printStackTrace();
-      fail("Exception occurred while loading games: " + e.getMessage());
+      fail("Exception occurred: " + e.getMessage());
     }
-
-    xbox.ejectGame(1);
-
-    assertTrue(
-        !xbox.getGames().containsKey(1), "Game with ID 1 should be removed from the games list.");
   }
 
   @Test