1.1 --- a/minesweeper/src/test/java/org/apidesign/demo/minesweeper/MinesModelTest.java	Fri Feb 07 14:47:07 2014 +0100
     1.2 +++ b/minesweeper/src/test/java/org/apidesign/demo/minesweeper/MinesModelTest.java	Fri Feb 07 15:21:54 2014 +0100
     1.3 @@ -23,6 +23,7 @@
     1.4   */
     1.5  package org.apidesign.demo.minesweeper;
     1.6  
     1.7 +import org.apidesign.demo.minesweeper.MinesModel.SquareType;
     1.8  import static org.testng.Assert.*;
     1.9  import org.testng.annotations.Test;
    1.10  
    1.11 @@ -43,4 +44,38 @@
    1.12          }
    1.13          assertEquals(cnt, 10, "Ten mines");
    1.14      }
    1.15 +    
    1.16 +    @Test public void bombsSet() {
    1.17 +        Mines m = new Mines();
    1.18 +        m.init(10, 10, 0);
    1.19 +        
    1.20 +        set(m, 1, 1, SquareType.UNKNOWN, true);
    1.21 +        set(m, 0, 0, SquareType.N_0, false);
    1.22 +        set(m, 0, 1, SquareType.N_2, false);
    1.23 +        set(m, 0, 2, SquareType.N_3, false);
    1.24 +        set(m, 1, 0, SquareType.N_5, false);
    1.25 +        set(m, 2, 0, SquareType.N_8, false);
    1.26 +        set(m, 3, 0, SquareType.N_2, false);
    1.27 +        
    1.28 +        m.computeMines();
    1.29 +        
    1.30 +        assertSquare(m, 0, 0, SquareType.N_1);
    1.31 +        assertSquare(m, 1, 0, SquareType.N_1);
    1.32 +        assertSquare(m, 2, 0, SquareType.N_1);
    1.33 +        assertSquare(m, 3, 0, SquareType.N_0);
    1.34 +        assertSquare(m, 0, 1, SquareType.N_1);
    1.35 +        assertSquare(m, 0, 2, SquareType.N_1);
    1.36 +        assertSquare(m, 2, 2, SquareType.UNKNOWN);
    1.37 +    }
    1.38 +
    1.39 +    private static void set(Mines m, int x, int y, SquareType squareType, boolean mine) {
    1.40 +        Square sq = m.getRows().get(y).getColumns().get(x);
    1.41 +        sq.setState(squareType);
    1.42 +        sq.setMine(mine);
    1.43 +    }
    1.44 +    
    1.45 +    private static void assertSquare(Mines m, int x, int y, SquareType t) {
    1.46 +        Square sq = m.getRows().get(y).getColumns().get(x);
    1.47 +        assertEquals(sq.getState(), t, "Expecting at " + x + ":" + y);
    1.48 +    }
    1.49  }