Removed unnecessary imports

sfbahr · May 1, 2014 · 6e3e607 · 6e3e607
2 parents d3b9121 + 2c2bfe0
commit 6e3e607
Show file tree

Hide file tree

Showing 19 changed files with 100 additions and 5 deletions.
diff --git a/Project Files/bin/UltimateTic.apk b/Project Files/bin/UltimateTic.apk
diff --git a/Project Files/bin/classes.dex b/Project Files/bin/classes.dex
diff --git a/Project Files/bin/classes/cs2114/ultimatetic/AIGrid.class b/Project Files/bin/classes/cs2114/ultimatetic/AIGrid.class
diff --git a/Project Files/bin/classes/cs2114/ultimatetic/AIGridTest.class b/Project Files/bin/classes/cs2114/ultimatetic/AIGridTest.class
diff --git a/Project Files/bin/classes/cs2114/ultimatetic/Grid.class b/Project Files/bin/classes/cs2114/ultimatetic/Grid.class
diff --git a/Project Files/bin/classes/cs2114/ultimatetic/GridTest.class b/Project Files/bin/classes/cs2114/ultimatetic/GridTest.class
diff --git a/Project Files/bin/classes/cs2114/ultimatetic/RandomAIGridTest.class b/Project Files/bin/classes/cs2114/ultimatetic/RandomAIGridTest.class
diff --git a/Project Files/bin/classes/cs2114/ultimatetic/TacGameScreenTests.class b/Project Files/bin/classes/cs2114/ultimatetic/TacGameScreenTests.class
diff --git a/Project Files/bin/dexedLibs/android-support-v4-b0fbdab169eedb14d42ff9e398a9b633.jar b/Project Files/bin/dexedLibs/android-support-v4-b0fbdab169eedb14d42ff9e398a9b633.jar
diff --git a/Project Files/bin/dexedLibs/sofia-support-4e7f63491de44a23182261ce299f7af0.jar b/Project Files/bin/dexedLibs/sofia-support-4e7f63491de44a23182261ce299f7af0.jar
diff --git a/Project Files/bin/dexedLibs/sofia-with-dependencies-f5747cfc684d144263763a3b6b5ae919.jar b/Project Files/bin/dexedLibs/sofia-with-dependencies-f5747cfc684d144263763a3b6b5ae919.jar
diff --git a/Project Files/bin/dexedLibs/student-fdd98325402a2b196d1cd57e40cc7934.jar b/Project Files/bin/dexedLibs/student-fdd98325402a2b196d1cd57e40cc7934.jar
diff --git a/Project Files/bin/resources.ap_ b/Project Files/bin/resources.ap_
diff --git a/Project Files/src/cs2114/ultimatetic/AIGrid.java b/Project Files/src/cs2114/ultimatetic/AIGrid.java
@@ -1333,4 +1333,30 @@ public boolean playOppositeCorner()
     }
 
 
+    public boolean playEmptyCorner()
+    {
+        if (this.getCell(board[0], board[1]) == Cell.EMPTY)
+        {
+            super.setCell(board[0], board[1]);
+            return true;
+        }
+        if (this.getCell(board[0] + 2, board[1]) == Cell.EMPTY)
+        {
+            super.setCell(board[0] + 2, board[1]);
+            return true;
+        }
+        if (this.getCell(board[0], board[1] + 2) == Cell.EMPTY)
+        {
+            super.setCell(board[0], board[1] + 2);
+            return true;
+        }
+        if (this.getCell(board[0] + 2, board[1] + 2) == Cell.EMPTY)
+        {
+            super.setCell(board[0] + 2, board[1] + 2);
+            return true;
+        }
+        return false;
+
+    }
+
 }
diff --git a/Project Files/src/cs2114/ultimatetic/AIGridTest.java b/Project Files/src/cs2114/ultimatetic/AIGridTest.java
@@ -824,4 +824,27 @@ public void testPlayOppositeCorner()
         assertTrue(AI.playOppositeCorner());
     }
 
+    public void testEmptyCorner()
+    {
+        String grid = "BEBEEEBEE";
+        AI.getBoard(2, 2).fromString(grid);
+        AI.whichIsPlayable();
+        assertTrue(AI.playEmptyCorner());
+
+        String grid1 = "BEBEEEEEB";
+        AI.getBoard(2, 2).fromString(grid1);
+        AI.whichIsPlayable();
+        assertTrue(AI.playEmptyCorner());
+
+        String grid2 = "BEEEEEBEB";
+        AI.getBoard(2, 2).fromString(grid2);
+        AI.whichIsPlayable();
+        assertTrue(AI.playEmptyCorner());
+
+        String grid3 = "EEBEEEBEB";
+        AI.getBoard(2, 2).fromString(grid3);
+        AI.whichIsPlayable();
+        assertTrue(AI.playEmptyCorner());
+    }
+
 }
diff --git a/Project Files/src/cs2114/ultimatetic/Grid.java b/Project Files/src/cs2114/ultimatetic/Grid.java
@@ -1,6 +1,6 @@
 package cs2114.ultimatetic;
 
-import java.util.Random;
+import sofia.util.Random;
 import java.util.Stack;
 
 // -------------------------------------------------------------------------
@@ -19,6 +19,7 @@ public class Grid
 
     private Cell         turn;
     private Stack<int[]> moves;
+    private static Random random = sofia.util.Random.generator();
 
 
     /**
@@ -483,8 +484,8 @@ public int[] playRandom()
             || !this.getBoard(x / 3, y / 3).getIsPlayable())
             && this.getWhoHasWon() == Cell.EMPTY)
         {
-            x = new Random().nextInt(9);
-            y = new Random().nextInt(9);
+            x = random.nextInt(9);
+            y = random.nextInt(9);
         }
         int[] coords = { x, y };
         return coords;

diff --git a/Project Files/src/cs2114/ultimatetic/GridTest.java b/Project Files/src/cs2114/ultimatetic/GridTest.java
@@ -1,5 +1,6 @@
 package cs2114.ultimatetic;
 
+import sofia.util.Random;
 import junit.framework.TestCase;
 
 // -------------------------------------------------------------------------
@@ -552,4 +553,17 @@ public void testUndoMove()
 
 
     }
+
+    // ----------------------------------------------------------
+    /**
+     * Tests playRandom()
+     */
+    public void testPlayRandom()
+    {
+        int[] ints = new int[] {0, 0};
+        Random.setNextInts(0, 0);
+        int[] ints2 = g1.playRandom();
+        assertEquals(ints[0], ints2[0]);
+        assertEquals(ints[1], ints2[1]);
+    }
 }
diff --git a/Project Files/src/cs2114/ultimatetic/RandomAIGridTest.java b/Project Files/src/cs2114/ultimatetic/RandomAIGridTest.java
@@ -0,0 +1,33 @@
+package cs2114.ultimatetic;
+
+import student.TestCase;
+
+public class RandomAIGridTest extends TestCase
+{
+
+    RandomAIGrid random;
+
+    /*public RandomAIGridTest()
+    {
+        // TODO Auto-generated constructor stub
+    }
+    */
+
+    public void setUp()
+    {
+        random = new RandomAIGrid();
+    }
+
+    public void testSetCell()
+    {
+        assertTrue(random.setCell(0, 0));
+    }
+
+    public void testUndoMove()
+    {
+        assertFalse(random.undoMove());
+        random.setCell(0, 0);
+        assertTrue(random.undoMove());
+    }
+
+}
diff --git a/Project Files/src/cs2114/ultimatetic/TacGameScreenTests.java b/Project Files/src/cs2114/ultimatetic/TacGameScreenTests.java
@@ -1,7 +1,5 @@
 package cs2114.ultimatetic;
 
-import android.widget.Button;
-import sofia.app.Screen;
 import sofia.graphics.ShapeView;
 
 /**