update

Author: yennanliu

dev_projects/TddPlayGround/src/main/java/com/yen/TddPlayGround/Connect4/Connect4.java

@@ -20,6 +20,12 @@ public class Connect4 {
 
     private String[][] board = new String[ROWS][COLUMNS];
 
+    private static final String RED = "R";
+
+    private static final String GREEN = "G";
+
+    private String currentPlayer = RED;
+
 //    private final int maxDiscsInColumn = 6;
 //    private int discNum;
 
@@ -30,6 +36,21 @@ public class Connect4 {
         }
     }
 
+
+    public String getCurrentPlayer(){
+
+        return this.currentPlayer;
+    }
+
+    public void SwitchPlayer(){
+
+        if (RED.equals(this.currentPlayer)){
+            this.currentPlayer = GREEN;
+        }else{
+            this.currentPlayer = RED;
+        }
+    }
+
     public int getNumberOfDiscs() {
 
         //return this.discNum; //0;
@@ -53,7 +74,11 @@ public int putDiscInColumn(int column) {
         this.checkPositionToInsert(row, column);
         board[row][column] = "X";
         System.out.println(">>> putDiscInColumn");
-        return column; //row;
+
+        // switch player
+        SwitchPlayer();
+        
+        return column; //row; // TODO : verify should return column or row
     }
 
     private void checkPositionToInsert(int row, int column) {

dev_projects/TddPlayGround/src/test/java/com/yen/TddPlayGround/Connect4/Connect4TDDSpec.java

@@ -110,4 +110,21 @@ public void whenNoMoreRoomInColumnThenRuntimeException(){
         System.out.println(exception);
     }
 
+    // book p.96
+    @Test
+    public void whenFirstPlayerPlaysThenDiscColorIsRed(){
+
+        Connect4 tested = new Connect4();
+        assertEquals(tested.getCurrentPlayer(), "R");
+    }
+
+    @Test
+    public void whenSecondPlayerPlaysThenDiscColorIsRed(){
+
+        Connect4 tested = new Connect4();
+        int column = 1;
+        tested.putDiscInColumn(column);
+        assertEquals(tested.getCurrentPlayer(), "G");
+    }
+
 }