Merge pull request #64 from Project516/copilot/fix-game-logic-issues

Fix game logic issues: spelling, critical quit bug, resource management, and error handling

Author: Project516

app/src/main/java/io/github/project516/NumberGuessingGame/CheckGuess.java

@@ -20,7 +20,7 @@ void check(int guess) {
     void quit(int input) {
         // 0 is quit
         // 1 is continue
-        if (input != 0 || input != 1) {
+        if (input != 0 && input != 1) {
             throw new IllegalArgumentException("Invalid number!");
         }
     }

app/src/main/java/io/github/project516/NumberGuessingGame/GUI.java

@@ -33,7 +33,7 @@ void createWindow() {
      * @param args command line arguments (not used)
      */
     public static void main(String[] args) { // Test GUI
-        GUI GUI = new GUI();
-        GUI.createWindow();
+        GUI gui = new GUI();
+        gui.createWindow();
     }
 }

app/src/main/java/io/github/project516/NumberGuessingGame/GameLogic.java

@@ -5,17 +5,17 @@
  * input, and guess validation.
  */
 public class GameLogic {
-    // TODO port game logic from Main to GameLogic
     /**
      * Runs the main game loop. Generates a random number and prompts the user to guess it. Provides
      * feedback on each guess and tracks the number of attempts.
+     *
+     * @param scan the ScannerHelper instance to use for user input
      */
-    void game() {
+    void game(ScannerHelper scan) {
 
         RandomNumber ranNumber = new RandomNumber();
         int number = ranNumber.number(100);
         int numOfGuesses = 0;
-        ScannerHelper scan = new ScannerHelper();
         CheckGuess check = new CheckGuess();
 
         while (true) {
@@ -24,13 +24,12 @@ void game() {
             int guess = scan.userGuess();
             check.check(guess);
             if (guess > number) {
-                System.out.println("You guessed to much!");
+                System.out.println("You guessed too much!");
             } else if (guess < number) {
-                System.out.println("You guessed to little!");
+                System.out.println("You guessed too little!");
             } else {
                 numOfGuesses++;
                 System.out.println("Took you " + numOfGuesses + " guesses!");
-                scan.close();
                 break;
             }
             numOfGuesses++;

app/src/main/java/io/github/project516/NumberGuessingGame/NumberGuessingGame.java

@@ -8,31 +8,38 @@ void run() {
         GameLogic logic = new GameLogic();
         CheckGuess check = new CheckGuess();
 
-        debugInfo.launchDebug();
-        gameInfo.about();
-        int play = 1;
-        while (play != 0) {
+        try {
+            debugInfo.launchDebug();
+            gameInfo.about();
+            int play = 1;
+            while (play != 0) {
 
-            try {
-
-                logic.game();
-
-            } catch (Exception e) {
+                try {
 
-                debugInfo.gameCrash();
-                e.printStackTrace();
+                    logic.game(scan);
 
-            } finally {
-                System.out.print("\nPlay again? (1 -> Y / 0 -> N) ");
-                try {
-                    play = scan.userGuess();
-                    check.quit(play);
                 } catch (Exception e) {
-                    debugInfo.gameCrash();
+
+                    System.err.println("\n===Program Crashed!===");
+                    System.err.println("Error: " + e.getMessage());
                     e.printStackTrace();
-                    break;
+
+                } finally {
+                    System.out.print("\nPlay again? (1 -> Y / 0 -> N) ");
+                    try {
+                        play = scan.userGuess();
+                        check.quit(play);
+                    } catch (Exception e) {
+                        System.err.println("\n===Program Crashed!===");
+                        System.err.println("Error: " + e.getMessage());
+                        e.printStackTrace();
+                        break;
+                    }
                 }
             }
+            System.out.println("\nThank you for playing!");
+        } finally {
+            scan.close();
         }
     }
 }

app/src/main/java/io/github/project516/NumberGuessingGame/ReadVersionFile.java

@@ -1,27 +1,33 @@
 package io.github.project516.NumberGuessingGame;
 
+import java.io.BufferedReader;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 
 /**
  * Reads version information for the Number Guessing Game. Currently returns a placeholder version
  * string.
  */
 public class ReadVersionFile {
-    // TODO - make this read the file in the resources directory
     /**
-     * Retrieves the current version of the game. Currently returns "rolling" as a placeholder.
+     * Retrieves the current version of the game by reading from the version.txt resource file.
      *
-     * @return the version string
+     * @return the version string, or "rolling" if the file cannot be read
      */
     public String readVersion() {
-        String filePath = "version.txt";
         String content = "rolling"; // Placeholder version
-        try {
-            content = new String(Files.readAllBytes(Paths.get(filePath)));
+        try (InputStream inputStream =
+                        getClass().getClassLoader().getResourceAsStream("version.txt");
+                BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream))) {
+            if (inputStream != null) {
+                content = reader.readLine();
+                if (content != null) {
+                    content = content.trim();
+                }
+            }
         } catch (IOException e) {
-            System.err.println("Error reading file: " + e.getMessage());
+            System.err.println("Error reading version file: " + e.getMessage());
         }
         return content;
     }

app/src/test/java/io/github/project516/NumberGuessingGame/CheckGuessTest.java

@@ -0,0 +1,50 @@
+package io.github.project516.NumberGuessingGame;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+
+class CheckGuessTest {
+    @Test
+    void quitAcceptsZero() {
+        CheckGuess check = new CheckGuess();
+        assertDoesNotThrow(() -> check.quit(0), "quit should accept 0");
+    }
+
+    @Test
+    void quitAcceptsOne() {
+        CheckGuess check = new CheckGuess();
+        assertDoesNotThrow(() -> check.quit(1), "quit should accept 1");
+    }
+
+    @Test
+    void quitRejectsOtherNumbers() {
+        CheckGuess check = new CheckGuess();
+        assertThrows(
+                IllegalArgumentException.class,
+                () -> check.quit(2),
+                "quit should reject numbers other than 0 or 1");
+        assertThrows(
+                IllegalArgumentException.class,
+                () -> check.quit(-1),
+                "quit should reject numbers other than 0 or 1");
+    }
+
+    @Test
+    void checkAcceptsValidGuess() {
+        CheckGuess check = new CheckGuess();
+        assertDoesNotThrow(() -> check.check(50), "check should accept valid guess");
+        assertDoesNotThrow(() -> check.check(1), "check should accept 1");
+        assertDoesNotThrow(() -> check.check(100), "check should accept 100");
+    }
+
+    @Test
+    void checkRejectsInvalidGuess() {
+        CheckGuess check = new CheckGuess();
+        assertThrows(IllegalArgumentException.class, () -> check.check(0), "check should reject 0");
+        assertThrows(
+                IllegalArgumentException.class,
+                () -> check.check(102),
+                "check should reject numbers > 101");
+    }
+}

app/src/test/java/io/github/project516/NumberGuessingGame/ReadVersionFileTest.java

@@ -0,0 +1,22 @@
+package io.github.project516.NumberGuessingGame;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+
+class ReadVersionFileTest {
+    @Test
+    void readVersionReturnsNonEmptyString() {
+        ReadVersionFile versionFile = new ReadVersionFile();
+        String version = versionFile.readVersion();
+        assertNotNull(version, "Version should not be null");
+        assertFalse(version.isEmpty(), "Version should not be empty");
+    }
+
+    @Test
+    void readVersionReturnsRolling() {
+        ReadVersionFile versionFile = new ReadVersionFile();
+        String version = versionFile.readVersion();
+        assertEquals("rolling", version, "Version should be 'rolling'");
+    }
+}