Projects >> tdd-tetris-tutorial >>b31317d91ee50eed4d485dae57bc89f91b655a10

Chunk
Conflicting content 
<<<<<<< HEAD
=======
// Copyright (c) 2008-2010  Esko Luontola 
// You may use and modify this source code freely for personal non-commercial use.
// This source code may NOT be used as course material without prior written agreement.

>>>>>>> ef116f6a340c60ea3fba908170a9a5cddbb8eeb7
package tetris;

public class Board {
Solution content 
package tetris;

public class Board {
File
Board.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
            assertTrue(board.hasFalling());
        }

<<<<<<< HEAD
//        @Test
//        public void it_stops_when_it_hits_the_bottom() {
//            board.tick();
//            assertFalse(board.hasFalling());
//            assertEquals("" +
//                    "...\n" +
//                    "...\n" +
//                    ".X.\n", board.toString());
//        }
=======
        @Test
        public void it_stops_when_it_hits_the_bottom() {
            board.tick();
            assertEquals("" +
                    "...\n" +
                    "...\n" +
                    ".X.\n", board.toString());
            assertFalse(board.hasFalling());
        }
>>>>>>> ef116f6a340c60ea3fba908170a9a5cddbb8eeb7
    }
*/
Solution content 
            assertTrue(board.hasFalling());
        }

//        @Test
//        public void it_stops_when_it_hits_the_bottom() {
//            board.tick();
//            assertEquals("" +
//                    "...\n" +
//                    "...\n" +
//                    ".X.\n", board.toString());
//            assertFalse(board.hasFalling());
//        }
    }
*/
File
FallingBlocksTest.java
Developer's decision
Combination
Kind of conflict
Annotation
Comment
Method declaration
Chunk
Conflicting content 
            assertTrue(board.hasFalling());
        }

<<<<<<< HEAD
//        @Test
//        public void it_stops_when_it_hits_the_other_block() {
//            board.tick();
//            assertFalse(board.hasFalling());
//            assertEquals("" +
//                    "...\n" +
//                    ".Y.\n" +
//                    ".X.\n", board.toString());
//        }
=======
        @Test
        public void it_stops_when_it_hits_the_other_block() {
            board.tick();
            assertEquals("" +
                    "...\n" +
                    ".Y.\n" +
                    ".X.\n", board.toString());
            assertFalse(board.hasFalling());
        }
>>>>>>> ef116f6a340c60ea3fba908170a9a5cddbb8eeb7
    }
*/
}
Solution content 
}
//            assertFalse(board.hasFalling());
//        }
    }
*/
            assertTrue(board.hasFalling());
        }

//        @Test
//        public void it_stops_when_it_hits_the_other_block() {
//            board.tick();
//            assertEquals("" +
//                    "...\n" +
//                    ".Y.\n" +
//                    ".X.\n", board.toString());
File
FallingBlocksTest.java
Developer's decision
Combination
Kind of conflict
Annotation
Comment
Method declaration
Chunk
Conflicting content 
            assertTrue(board.hasFalling());
        }

<<<<<<< HEAD
//        @Test
//        public void it_stops_when_it_hits_the_bottom() {
//            board.tick();
//            assertFalse(board.hasFalling());
//            assertEquals("" +
//                    "........\n" +
//                    "........\n" +
//                    "........\n" +
//                    "........\n" +
//                    "....T...\n" +
//                    "...TTT..\n", board.toString());
//        }
=======
        @Test
        public void it_stops_when_it_hits_the_bottom() {
            board.tick();
            assertEquals("" +
                    "........\n" +
                    "........\n" +
                    "........\n" +
        }
>>>>>>> ef116f6a340c60ea3fba908170a9a5cddbb8eeb7
                    "........\n" +
                    "....T...\n" +
                    "...TTT..\n", board.toString());
            assertFalse(board.hasFalling());
    }
*/
Solution content 
            assertTrue(board.hasFalling());
        }

//        @Test
//        public void it_stops_when_it_hits_the_bottom() {
//            board.tick();
//            assertEquals("" +
//                    "........\n" +
//                    "........\n" +
//                    "........\n" +
//                    "........\n" +
//                    "....T...\n" +
//                    "...TTT..\n", board.toString());
//            assertFalse(board.hasFalling());
//        }
    }
*/
File
FallingPiecesTest.java
Developer's decision
Combination
Kind of conflict
Annotation
Comment
Method declaration
Chunk
Conflicting content 
            assertTrue(board.hasFalling());
        }

<<<<<<< HEAD
//        @Test
//        public void it_stops_when_it_hits_the_other_piece() {
//            board.tick();
//            assertFalse(board.hasFalling());
//            assertEquals("" +
//                    "........\n" +
//                    "........\n" +
//                    "....T...\n" +
//                    "...TTT..\n" +
//                    "....T...\n" +
//                    "...TTT..\n", board.toString());
//        }
=======
        @Test
        public void it_stops_when_it_hits_the_other_piece() {
            board.tick();
            assertEquals("" +
                    "........\n" +
                    "........\n" +
                    "....T...\n" +
                    "...TTT..\n" +
                    "....T...\n" +
                    "...TTT..\n", board.toString());
            assertFalse(board.hasFalling());
        }
>>>>>>> ef116f6a340c60ea3fba908170a9a5cddbb8eeb7
    }
*/
}
Solution content 
            assertTrue(board.hasFalling());
        }

//        @Test
//        public void it_stops_when_it_hits_the_other_piece() {
//            board.tick();
//            assertEquals("" +
//                    "........\n" +
//                    "........\n" +
//                    "....T...\n" +
//                    "...TTT..\n" +
//                    "....T...\n" +
//                    "...TTT..\n", board.toString());
//            assertFalse(board.hasFalling());
//        }
    }
*/
}
File
FallingPiecesTest.java
Developer's decision
Combination
Kind of conflict
Annotation
Comment
Method declaration