Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • main
1 result

Target

Select target project
No results found
Select Git revision
  • main
1 result
Show changes

Commits on Source 1

6 files
+ 28
− 12
Compare changes
  • Side-by-side
  • Inline

Files

app/src/test/java/model/ArrayGridTest.java

+4 −1
Original line number Diff line number Diff line
@@ -11,7 +11,9 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; 


class ArrayGridTest {





    // TODO

    //  uncomment

/*

    private  ArrayGrid arrayGridThreeFour;

    private final ArrayGrid arrayGridTwoTwo = new ArrayGrid(2,2);
@@ -87,4 +89,5 @@ class ArrayGridTest { 
        assertThat(iterator.hasNext()).isFalse();



    }

 */

}
 
 No newline at end of file

app/src/test/java/model/ColoredCellIteratorTest.java

+4 −3
Original line number Diff line number Diff line
@@ -11,7 +11,8 @@ import static org.assertj.core.api.Assertions.assertThat; 


class ColoredCellIteratorTest {





    // TODO

    //  uncomment

    /*

     * +---+---+---+

     * | R | B | R |
@@ -22,7 +23,7 @@ class ColoredCellIteratorTest { 
     * +---+---+---+

     */



    private static ArrayGrid gridThreeThree = new ArrayGrid(3,3);

  /*  private static ArrayGrid gridThreeThree = new ArrayGrid(3,3);



    @BeforeAll

    private static void initializeColorsGrid(){
@@ -55,5 +56,5 @@ class ColoredCellIteratorTest { 
        assertThat(fromIteratorCells).hasSameElementsAs(expectedBlackCells).hasSameSizeAs(expectedBlackCells);



    }



   */

}
 
 No newline at end of file

app/src/test/java/model/ComputerPlayerTest.java

+6 −6
Original line number Diff line number Diff line
@@ -7,19 +7,19 @@ import static org.assertj.core.api.Assertions.assertThat; 


class ComputerPlayerTest {







    // TODO

    //  uncomment and adapt

/*

    @Test

    void testSetStrategyAndPlay() {

        ComputerPlayer player = new ComputerPlayer("computer",null);

        ComputerPlayer player = new ComputerPlayer(new SquareCell(),null);

        player.setStrategy(startCell -> Color.INDIGO);

        player.setStartCell(new SquareCell());

        assertThat(player.play()).isEqualTo(Color.INDIGO);

    }





    @Test

    void testIsHuman() {

        assertThat(new ComputerPlayer("computer", null).isHuman()).isFalse();

    }

        assertThat(new ComputerPlayer(new SquareCell(), null).isHuman()).isFalse();

    }*/

}
 
 No newline at end of file

app/src/test/java/model/DistinctColorGeneratorTest.java

+5 −0
Original line number Diff line number Diff line
@@ -9,6 +9,10 @@ import java.util.List; 
import static org.assertj.core.api.Assertions.assertThat;



class DistinctColorGeneratorTest {



    // TODO

    //  uncomment

   /*

    private final static Color initialColor = Color.GRAY;

    private final Grid grid = new ArrayGrid(2,3);

    @BeforeEach
@@ -36,4 +40,5 @@ class DistinctColorGeneratorTest { 
            assertThat(cell.getColor()).isNotEqualTo(defaultColor).isNotEqualTo(initialColor);

        }

    }

    */

}
 
 No newline at end of file

app/src/test/java/model/FloodGameTest.java

+4 −1
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ import static org.assertj.core.api.Assertions.assertThat; 


class FloodGameTest {



    // TODO

    //  uncomment

    /*

    private final int totalNumberOfCells = 6;

    private final Grid gridTwoThree = new ArrayGrid(2,3);

    private final Color colorONE = RED;
@@ -89,5 +92,5 @@ class FloodGameTest { 
        fillGridYellow(gridTwoThree);

        assertThat(game.hasEnded()).isTrue();

    }



*/

}
 
 No newline at end of file

app/src/test/java/model/SquareCellTest.java

+5 −1
Original line number Diff line number Diff line
@@ -11,7 +11,9 @@ import static org.assertj.core.api.Assertions.assertThat; 


class SquareCellTest {





    // TODO

    //  uncomment

    /*

    private final Cell northCell = new SquareCell(Color.NAVY);

    private final Cell southCell = new SquareCell(Color.SALMON);

    private final Cell westCell = new SquareCell(Color.WHEAT);
@@ -48,4 +50,6 @@ class SquareCellTest { 
        centralCell.setNeighbours(List.of(northCell,southCell));

        assertThat(centralCell.getNeighbours()).containsExactlyInAnyOrder(northCell,southCell);

    }



     */

}
 
 No newline at end of file