Merge pull request #54 from utastudents/w_lobby

added more test cases
utastudents · May 1, 2024 · 445ee68 · 445ee68
2 parents c9153e6 + 7be665e
commit 445ee68
Show file tree

Hide file tree

Showing 31 changed files with 56 additions and 243 deletions.
diff --git a/src/main/java/com/cse3310/Game.java b/src/main/java/com/cse3310/Game.java
@@ -14,6 +14,9 @@ public class Game {
     public ArrayList<Integer> ActiveButtons;
     public ArrayList<Integer> CompletedButtons;
     public ArrayList<Integer> AllCompletedButtons;
+    public double gridDensity;
+    public double gridTime;
+
 
     public Game() {
         this.wordBank = new ArrayList<String>();
@@ -204,12 +207,13 @@ public char[][] generateGrid(ArrayList<String> words, ArrayList<String> wordbank
 
         }
 
-        System.out.println("Actual Density: " + (double) validWordsLetters / (length * width));
-        System.out.println("Upward Diagonals: " + (diagUp / index));
-        System.out.println("Downward Diagonals: " + (diagDown / index));
-        System.out.println("Horizontals: " + (horizontals / index));
-        System.out.println("Downward verticals: " + (vertDown / index));
-        System.out.println("Upward verticals:" + (vertUp / index));
+        System.out.println("Actual Density: " + (double)validWordsLetters / (length * width));
+        this.gridDensity = (double)validWordsLetters / (length * width);
+        System.out.println("Upward Diagonals: " + (diagUp/index));
+        System.out.println("Downward Diagonals: " + (diagDown/index));
+        System.out.println("Horizontals: " +  (horizontals/index));
+        System.out.println("Downward verticals: " + (vertDown/index));
+        System.out.println("Upward verticals:" + (vertUp/index));
 
         // Fill in rest of the grid with random letters
         // Print grid to console for debugging
@@ -227,6 +231,7 @@ public char[][] generateGrid(ArrayList<String> words, ArrayList<String> wordbank
         }
         double endTime = System.currentTimeMillis();
         System.out.println("Time to generate grid: " + (endTime - startTime) + " ms");
+        this.gridTime = endTime - startTime;
         System.out.println("Word Bank: " + wordBank);
         System.out.println();
 

diff --git a/src/test/java/com/cse3310/GameTest.java b/src/test/java/com/cse3310/GameTest.java
@@ -3,6 +3,9 @@
 
 import static org.junit.Assert.assertArrayEquals;
 
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Random;
 
@@ -102,4 +105,46 @@ public void testGenerateGrid() {
         GenerateGrid(B);
     }
 
+
+    public void densityIsWithinRange(){
+
+        String filename = "words.txt";
+        ArrayList<String> wordList = new ArrayList<>();
+
+        try (BufferedReader br = new BufferedReader(new FileReader(filename))) {
+            String line;
+            while ((line = br.readLine()) != null) {
+                wordList.add(line.trim());
+            }
+        } catch (IOException e) {
+            System.err.println("Error reading file:" + e.getMessage());
+        }
+
+        Game g = new Game(wordList, 0);
+
+        System.out.println("DENSITY IS " + g.gridDensity);
+        assertTrue(g.gridDensity >= 0.67);
+    }
+
+
+    public void timeIsWithinRange(){
+
+        String filename = "words.txt";
+        ArrayList<String> wordList = new ArrayList<>();
+
+        try (BufferedReader br = new BufferedReader(new FileReader(filename))) {
+            String line;
+            while ((line = br.readLine()) != null) {
+                wordList.add(line.trim());
+            }
+        } catch (IOException e) {
+            System.err.println("Error reading file:" + e.getMessage());
+        }
+
+        Game g = new Game(wordList, 0);
+
+        System.out.println("TIME IS " + g.gridTime);
+        assertTrue(g.gridTime <= 1000);
+    }
+
 }
diff --git a/target/classes/com/cse3310/App$LetterTimer.class b/target/classes/com/cse3310/App$LetterTimer.class
diff --git a/target/classes/com/cse3310/App.class b/target/classes/com/cse3310/App.class
diff --git a/target/classes/com/cse3310/Error.class b/target/classes/com/cse3310/Error.class
diff --git a/target/classes/com/cse3310/Game.class b/target/classes/com/cse3310/Game.class
diff --git a/target/classes/com/cse3310/HttpServer$1.class b/target/classes/com/cse3310/HttpServer$1.class
diff --git a/target/classes/com/cse3310/HttpServer.class b/target/classes/com/cse3310/HttpServer.class
diff --git a/target/classes/com/cse3310/Lobby.class b/target/classes/com/cse3310/Lobby.class
diff --git a/target/classes/com/cse3310/PlayerList.class b/target/classes/com/cse3310/PlayerList.class
diff --git a/target/classes/com/cse3310/ServerEvent.class b/target/classes/com/cse3310/ServerEvent.class
diff --git a/target/classes/com/cse3310/User.class b/target/classes/com/cse3310/User.class
diff --git a/target/classes/com/cse3310/UserEvent.class b/target/classes/com/cse3310/UserEvent.class
diff --git a/target/classes/com/cse3310/Version.class b/target/classes/com/cse3310/Version.class
diff --git a/target/classes/com/cse3310/Winner.class b/target/classes/com/cse3310/Winner.class
diff --git a/target/classes/com/cse3310/timerEvent.class b/target/classes/com/cse3310/timerEvent.class
diff --git a/target/cse3310-wordsearch.jar b/target/cse3310-wordsearch.jar
diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
diff --git a/target/surefire-reports/TEST-com.cse3310.AppTest.xml b/target/surefire-reports/TEST-com.cse3310.AppTest.xml
diff --git a/target/surefire-reports/TEST-com.cse3310.GameTest.xml b/target/surefire-reports/TEST-com.cse3310.GameTest.xml