Projects >> tdd-tetris-tutorial >>e2a2e8981c7221cc208fa7de557d7c3d8bafa29a

Chunk
Conflicting content 
        }

<<<<<<< HEAD
    }
                    "...\n", board.toString());
//        public void testHasNoFallingBlocks() {
//            assertFalse(board.hasFalling());
//        }

/*
    public static class WhenABlockIsDropped extends TestCase {
=======
        public void test_Has_no_falling_blocks() {
            assertFalse(board.hasFalling());
        }
    }

    public static class When_a_block_is_dropped extends TestCase {
>>>>>>> 8dcba9521ac8e475566619da0883abafcd8f8b14

        private Board board;
Solution content 
                    "...\n", board.toString());
        }

//        public void test_Has_no_falling_blocks() {
//            assertFalse(board.hasFalling());
//        }
    }

/*
    public static class When_a_block_is_dropped extends TestCase {

        private Board board;
File
FallingBlocksTest.java
Developer's decision
Manual
Kind of conflict
Class signature
Comment
Method declaration
Chunk
Conflicting content 
            assertTrue(board.hasFalling());
        }

<<<<<<< HEAD
//        public void testItStartsFromTheTopMiddle() {
//            assertEquals("" +
//                    ".X.\n" +
//                    "...\n" +
//                    "...\n", board.toString());
//        }

//        public void testItMovesDownOneRowPerTick() {
//            board.tick();
//            assertEquals("" +
//                    "...\n" +
//                    ".X.\n" +
//                    "...\n", board.toString());
//        }

//        public void testAtMostOneBlockMayBeFallingAtATime() {
//            try {
//                board.drop(new Block('Y'));
//                fail();
//            } catch (IllegalStateException e) {
//                assertTrue(e.getMessage().contains("already falling"));
//            }
//            assertEquals("" +
//                    ".X.\n" +
//                    "...\n" +
//                    "...\n", board.toString());
//        }
=======
        public void test_It_starts_from_the_top_middle() {
            assertEquals("" +
                    ".X.\n" +
                    "...\n" +
                    "...\n", board.toString());
        }

        public void test_It_moves_down_one_row_per_tick() {
            board.tick();
            assertEquals("" +
                    "...\n" +
                    ".X.\n" +
                    "...\n", board.toString());
        }

        public void test_At_most_one_block_may_be_falling_at_a_time() {
            try {
                board.drop(new Block('Y'));
                fail();
            } catch (IllegalStateException e) {
                assertTrue(e.getMessage().contains("already falling"));
            }
            assertEquals("" +
                    ".X.\n" +
                    "...\n" +
                    "...\n", board.toString());
        }
>>>>>>> 8dcba9521ac8e475566619da0883abafcd8f8b14
    }
*/
Solution content 
            assertTrue(board.hasFalling());
        }
//        public void test_It_starts_from_the_top_middle() {
//            assertEquals("" +
//                    ".X.\n" +
//                    "...\n" +
//                    "...\n", board.toString());
//        }

//        public void test_It_moves_down_one_row_per_tick() {
//            board.tick();
//            assertEquals("" +
//                    "...\n" +
//                    ".X.\n" +
//                    "...\n", board.toString());
//        }

//        public void test_At_most_one_block_may_be_falling_at_a_time() {
//            try {
//                board.drop(new Block('Y'));
//                fail();
//            } catch (IllegalStateException e) {
//                assertTrue(e.getMessage().contains("already falling"));
//            }
//            assertEquals("" +
//                    ".X.\n" +
//                    "...\n" +
//                    "...\n", board.toString());
//        }
    }
*/
File
FallingBlocksTest.java
Developer's decision
Manual
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
    }
*/

<<<<<<< HEAD
/*
    public static class WhenABlockReachesTheBottom extends TestCase {
=======
    public static class When_a_block_reaches_the_bottom extends TestCase {
>>>>>>> 8dcba9521ac8e475566619da0883abafcd8f8b14

        private Board board;
Solution content 
    }
*/

/*
    public static class When_a_block_reaches_the_bottom extends TestCase {

        private Board board;
File
FallingBlocksTest.java
Developer's decision
Combination
Kind of conflict
Class signature
Comment
Chunk
Conflicting content 
                    ".X.\n", board.toString());
        }

<<<<<<< HEAD
//        public void testItStopsWhenItHitsTheBottom() {
//            board.tick();
//            assertFalse(board.hasFalling());
//            assertEquals("" +
//                    "...\n" +
//                    "...\n" +
//                    ".X.\n", board.toString());
//        }
=======
        public void test_It_stops_when_it_hits_the_bottom() {
            board.tick();
            assertFalse(board.hasFalling());
            assertEquals("" +
                    "...\n" +
                    "...\n" +
                    ".X.\n", board.toString());
        }
>>>>>>> 8dcba9521ac8e475566619da0883abafcd8f8b14
    }
*/
Solution content 
//                    "...\n" +
                    ".X.\n", board.toString());
        }

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

<<<<<<< HEAD
/*
    public static class WhenABlockLandsOnAnotherBlock extends TestCase {
=======
    public static class When_a_block_lands_on_another_block extends TestCase {
>>>>>>> 8dcba9521ac8e475566619da0883abafcd8f8b14

        private Board board;
Solution content 
    }
*/

/*
    public static class When_a_block_lands_on_another_block extends TestCase {

        private Board board;
File
FallingBlocksTest.java
Developer's decision
Combination
Kind of conflict
Class signature
Comment
Chunk
Conflicting content 
                    ".X.\n", board.toString());
        }

<<<<<<< HEAD
//        public void testItStopsWhenItHitsTheOtherBlock() {
//            board.tick();
//            assertFalse(board.hasFalling());
//            assertEquals("" +
//                    "...\n" +
//                    ".Y.\n" +
//                    ".X.\n", board.toString());
//        }
=======
        public void test_It_stops_when_it_hits_the_other_block() {
            board.tick();
            assertFalse(board.hasFalling());
            assertEquals("" +
                    "...\n" +
                    ".Y.\n" +
                    ".X.\n", board.toString());
        }
>>>>>>> 8dcba9521ac8e475566619da0883abafcd8f8b14
    }
*/
}
Solution content 
                    ".X.\n", board.toString());
        }

//        public void test_It_stops_when_it_hits_the_other_block() {
//            board.tick();
//            assertFalse(board.hasFalling());
//            assertEquals("" +
//                    "...\n" +
//                    ".Y.\n" +
//                    ".X.\n", board.toString());
//        }
    }
*/
}
File
FallingBlocksTest.java
Developer's decision
Manual
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
        return new TestSuite(FallingPiecesTest.class.getDeclaredClasses());
    }

<<<<<<< HEAD
/*
    public static class WhenAPieceIsDropped extends TestCase {
=======
    public static class When_a_piece_is_dropped extends TestCase {
>>>>>>> 8dcba9521ac8e475566619da0883abafcd8f8b14

        private Board board;
Solution content 
        return new TestSuite(FallingPiecesTest.class.getDeclaredClasses());
    }

/*
    public static class When_a_piece_is_dropped extends TestCase {

        private Board board;
File
FallingPiecesTest.java
Developer's decision
Combination
Kind of conflict
Class signature
Comment
Chunk
Conflicting content 
    }
*/

<<<<<<< HEAD
/*
    public static class WhenAPieceReachesTheBottom extends TestCase {
=======
    public static class When_a_piece_reaches_the_bottom extends TestCase {
>>>>>>> 8dcba9521ac8e475566619da0883abafcd8f8b14

        private Board board;
Solution content 
    }
*/

/*
    public static class When_a_piece_reaches_the_bottom extends TestCase {

        private Board board;
File
FallingPiecesTest.java
Developer's decision
Combination
Kind of conflict
Class signature
Comment
Chunk
Conflicting content 
                    "...TTT..\n", board.toString());
        }

<<<<<<< HEAD
//        public void testItStopsWhenItHitsTheBottom() {
//            board.tick();
//            assertFalse(board.hasFalling());
//            assertEquals("" +
//                    "........\n" +
//                    "........\n" +
//                    "........\n" +
//                    "........\n" +
//                    "....T...\n" +
//                    "...TTT..\n", board.toString());
//        }
=======
        public void test_It_stops_when_it_hits_the_bottom() {
            board.tick();
            assertFalse(board.hasFalling());
            assertEquals("" +
                    "........\n" +
                    "........\n" +
                    "........\n" +
                    "........\n" +
                    "....T...\n" +
                    "...TTT..\n", board.toString());
        }
>>>>>>> 8dcba9521ac8e475566619da0883abafcd8f8b14
    }
*/
Solution content 
                    "...TTT..\n", board.toString());
        }

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

<<<<<<< HEAD
/*
    public static class WhenAPieceLandsOnAnotherPiece extends TestCase {
=======
    public static class When_a_piece_lands_on_another_piece extends TestCase {
>>>>>>> 8dcba9521ac8e475566619da0883abafcd8f8b14

        private Board board;
Solution content 
    }
*/

/*
    public static class When_a_piece_lands_on_another_piece extends TestCase {
        private Board board;
File
FallingPiecesTest.java
Developer's decision
Combination
Kind of conflict
Class signature
Comment
Chunk
Conflicting content 
                    "...TTT..\n", board.toString());
        }

<<<<<<< HEAD
//        public void testItStopsWhenItHitsTheOtherPiece() {
//            board.tick();
//            assertFalse(board.hasFalling());
//            assertEquals("" +
//                    "........\n" +
//                    "........\n" +
//                    "....T...\n" +
//                    "...TTT..\n" +
//                    "....T...\n" +
//                    "...TTT..\n", board.toString());
//        }
=======
        public void test_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());
        }
>>>>>>> 8dcba9521ac8e475566619da0883abafcd8f8b14
    }
*/
}
Solution content 
                    "...TTT..\n", board.toString());
        }

//        public void test_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());
//        }
    }
*/
}
File
FallingPiecesTest.java
Developer's decision
Manual
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
        return new TestSuite(RotatingPiecesOfBlocksTest.class.getDeclaredClasses());
    }

<<<<<<< HEAD
/*
    public static class APieceOf3x3Blocks extends TestCase {
=======
    public static class A_piece_of_3x3_blocks extends TestCase {
>>>>>>> 8dcba9521ac8e475566619da0883abafcd8f8b14

        private Piece piece;
Solution content 
        return new TestSuite(RotatingPiecesOfBlocksTest.class.getDeclaredClasses());
    }

/*
    public static class A_piece_of_3x3_blocks extends TestCase {

        private Piece piece;
File
RotatingPiecesOfBlocksTest.java
Developer's decision
Combination
Kind of conflict
Class signature
Comment
Chunk
Conflicting content 
                    "...\n", piece.toString());
        }

<<<<<<< HEAD
//        public void testCanBeRotatedRight() {
//            piece = piece.rotateRight();
//            assertEquals("" +
//                    "...\n" +
//                    ".XX\n" +
//                    "...\n", piece.toString());
//        }

//        public void testCanBeRotatedLeft() {
//            piece = piece.rotateLeft();
//            assertEquals("" +
//                    "...\n" +
//                    "XX.\n" +
//                    "...\n", piece.toString());
//        }
=======
        public void test_Can_be_rotated_right() {
            piece = piece.rotateRight();
            assertEquals("" +
                    "...\n" +
                    ".XX\n" +
                    "...\n", piece.toString());
        }

        public void test_Can_be_rotated_left() {
            piece = piece.rotateLeft();
            assertEquals("" +
                    "...\n" +
                    "XX.\n" +
                    "...\n", piece.toString());
        }
>>>>>>> 8dcba9521ac8e475566619da0883abafcd8f8b14
    }
*/
Solution content 
//            assertEquals("" +
//                    "...\n" +
//                    "XX.\n" +
                    "...\n", piece.toString());
        }

//        public void test_Can_be_rotated_right() {
//            piece = piece.rotateRight();
//            assertEquals("" +
//                    "...\n" +
//                    ".XX\n" +
//                    "...\n", piece.toString());
//        }

//        public void test_Can_be_rotated_left() {
//            piece = piece.rotateLeft();
//                    "...\n", piece.toString());
//        }
    }
*/
File
RotatingPiecesOfBlocksTest.java
Developer's decision
Manual
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
    }
*/

<<<<<<< HEAD
/*
    public static class APieceOf5x5Blocks extends TestCase {
=======
    public static class A_piece_of_5x5_blocks extends TestCase {
>>>>>>> 8dcba9521ac8e475566619da0883abafcd8f8b14

        private Piece piece;
Solution content 
    }
*/

/*
    public static class A_piece_of_5x5_blocks extends TestCase {

        private Piece piece;
File
RotatingPiecesOfBlocksTest.java
Developer's decision
Combination
Kind of conflict
Class signature
Comment
Chunk
Conflicting content 
                    ".....\n", piece.toString());
        }

<<<<<<< HEAD
//        public void testCanBeRotatedRight() {
//            piece = piece.rotateRight();
//            assertEquals("" +
//                    ".....\n" +
//                    "XX...\n" +
//                    ".....\n" +
//                    "..XXX\n" +
//                    "...XX\n" +
//                    "....X\n", piece.toString());
//        }

//        public void testCanBeRotatedLeft() {
//            piece = piece.rotateLeft();
//            assertEquals("" +
//                    "X....\n" +
//                    "XXX..\n" +
//                    ".....\n" +
//                    ".....\n", piece.toString());
//        }
=======
        public void test_Can_be_rotated_right() {
            piece = piece.rotateRight();
            assertEquals("" +
                    ".....\n" +
                    ".....\n" +
                    "..XXX\n" +
                    "...XX\n" +
                    "....X\n", piece.toString());
        }

        public void test_Can_be_rotated_left() {
            piece = piece.rotateLeft();
            assertEquals("" +
                    "X....\n" +
                    "XX...\n" +
                    "XXX..\n" +
                    ".....\n" +
                    ".....\n", piece.toString());
        }
>>>>>>> 8dcba9521ac8e475566619da0883abafcd8f8b14
    }
*/
}
Solution content 
                    ".....\n", piece.toString());
        }

//        public void test_Can_be_rotated_right() {
//            piece = piece.rotateRight();
//            assertEquals("" +
//                    ".....\n" +
//                    ".....\n" +
//                    "..XXX\n" +
//                    "...XX\n" +
//                    "....X\n", piece.toString());
//        }

//        public void test_Can_be_rotated_left() {
//            piece = piece.rotateLeft();
//            assertEquals("" +
//                    "X....\n" +
//                    "XX...\n" +
//                    "XXX..\n" +
//                    ".....\n" +
//                    ".....\n", piece.toString());
//        }
    }
*/
}
File
RotatingPiecesOfBlocksTest.java
Developer's decision
Manual
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
        return new TestSuite(RotatingTetrominoesTest.class.getDeclaredClasses());
    }

<<<<<<< HEAD
/*
    public static class AllShapeInstances extends TestCase {
=======
    public static class All_shape_instances extends TestCase {
>>>>>>> 8dcba9521ac8e475566619da0883abafcd8f8b14

        private Tetrominoe shape;
Solution content 
        return new TestSuite(RotatingTetrominoesTest.class.getDeclaredClasses());
    }

/*
    public static class All_shape_instances extends TestCase {

        private Tetrominoe shape;
File
RotatingTetrominoesTest.java
Developer's decision
Combination
Kind of conflict
Class signature
Comment
Chunk
Conflicting content 
    }
*/

<<<<<<< HEAD
/*
    public static class TheTShape extends TestCase {
=======
    public static class The_T_shape extends TestCase {
>>>>>>> 8dcba9521ac8e475566619da0883abafcd8f8b14

        private Tetrominoe shape;
Solution content 
    }
*/

/*
    public static class The_T_shape extends TestCase {

        private Tetrominoe shape;
File
RotatingTetrominoesTest.java
Developer's decision
Combination
Kind of conflict
Class signature
Comment
Chunk
Conflicting content 
            shape = shape.rotateLeft();
                    "...\n", shape.toString());
        }

<<<<<<< HEAD
//        public void testCanBeRotatedRightThreeTimes() {
//            shape = shape.rotateRight();
//            assertEquals("" +
//                    ".T.\n" +
//                    ".TT\n" +
//                    ".T.\n", shape.toString());
//            shape = shape.rotateRight();
//            assertEquals("" +
//                    "...\n" +
//                    "TTT\n" +
//                    ".T.\n", shape.toString());
//            shape = shape.rotateRight();
//            assertEquals("" +
//                    ".T.\n" +
//                    "TT.\n" +
//                    ".T.\n", shape.toString());
//        }

//        public void testCanBeRotatedLeftThreeTimes() {
//            shape = shape.rotateLeft();
//            assertEquals("" +
//                    ".T.\n" +
//                    "TT.\n" +
//                    ".T.\n", shape.toString());
//            shape = shape.rotateLeft();
//            assertEquals("" +
//                    "...\n" +
//                    "TTT\n" +
//                    ".T.\n", shape.toString());
//            shape = shape.rotateLeft();
//            assertEquals("" +
//                    ".T.\n" +
//                    ".TT\n" +
//                    ".T.\n", shape.toString());
//        }

//        public void testRotatingItFourTimesWillGoBackToTheOriginalShape() {
//            String originalShape = shape.toString();
//            shape = shape.rotateRight().rotateRight().rotateRight().rotateRight();
//            assertEquals(originalShape, shape.toString());
//            shape = shape.rotateLeft().rotateLeft().rotateLeft().rotateLeft();
//            assertEquals(originalShape, shape.toString());
//        }
=======
        public void test_Can_be_rotated_right_3_times() {
            assertEquals("" +
            shape = shape.rotateRight();
            assertEquals("" +
                    ".T.\n" +
                    ".TT\n" +
                    ".T.\n", shape.toString());
            shape = shape.rotateRight();
            assertEquals("" +
                    "...\n" +
                    "TTT\n" +
                    ".T.\n", shape.toString());
            assertEquals("" +
                    ".T.\n" +
                    "TT.\n" +
                    ".T.\n", shape.toString());
            shape = shape.rotateLeft();
            shape = shape.rotateRight();
            assertEquals("" +
                    ".T.\n" +
                    "TT.\n" +
                    ".T.\n", shape.toString());
        }

        public void test_Can_be_rotated_left_3_times() {
                    "...\n" +
                    "TTT\n" +
                    ".T.\n", shape.toString());
            shape = shape.rotateLeft();
            assertEquals("" +
                    ".T.\n" +
                    ".TT\n" +
                    ".T.\n", shape.toString());
        }

        public void test_Rotating_it_4_times_will_go_back_to_the_original_shape() {
            String originalShape = shape.toString();
            shape = shape.rotateRight().rotateRight().rotateRight().rotateRight();
            assertEquals(originalShape, shape.toString());
            shape = shape.rotateLeft().rotateLeft().rotateLeft().rotateLeft();
            assertEquals(originalShape, shape.toString());
        }
>>>>>>> 8dcba9521ac8e475566619da0883abafcd8f8b14
    }
*/
Solution content 
                    "...\n", shape.toString());
        }

//        public void test_Can_be_rotated_right_3_times() {
//            shape = shape.rotateRight();
//            assertEquals("" +
//                    ".T.\n" +
//                    ".TT\n" +
//                    ".T.\n", shape.toString());
//            shape = shape.rotateRight();
//            assertEquals("" +
//                    "...\n" +
//            shape = shape.rotateLeft().rotateLeft().rotateLeft().rotateLeft();
//            assertEquals(originalShape, shape.toString());
//        }
    }
//                    "TTT\n" +
*/

//                    ".T.\n", shape.toString());
//            shape = shape.rotateRight();
//            assertEquals("" +
//                    ".T.\n" +
//                    "TT.\n" +
//                    ".T.\n", shape.toString());
//        }

//        public void test_Can_be_rotated_left_3_times() {
//            shape = shape.rotateLeft();
//            assertEquals("" +
//                    ".T.\n" +
//                    "TT.\n" +
//                    ".T.\n", shape.toString());
//            shape = shape.rotateLeft();
//            assertEquals("" +
//                    "...\n" +
//                    "TTT\n" +
//                    ".T.\n", shape.toString());
//            shape = shape.rotateLeft();
//            assertEquals("" +
//                    ".T.\n" +
//                    ".TT\n" +
//                    ".T.\n", shape.toString());
//        }

//        public void test_Rotating_it_4_times_will_go_back_to_the_original_shape() {
//            String originalShape = shape.toString();
//            shape = shape.rotateRight().rotateRight().rotateRight().rotateRight();
//            assertEquals(originalShape, shape.toString());
File
RotatingTetrominoesTest.java
Developer's decision
Manual
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
    }
*/

<<<<<<< HEAD
/*
    public static class TheIShape extends TestCase {
=======
    public static class The_I_shape extends TestCase {
>>>>>>> 8dcba9521ac8e475566619da0883abafcd8f8b14

        private Tetrominoe shape;
Solution content 
    }
*/

/*
    public static class The_I_shape extends TestCase {

        private Tetrominoe shape;
File
RotatingTetrominoesTest.java
Developer's decision
Combination
Kind of conflict
Class signature
Comment
Chunk
Conflicting content 
                    ".....\n", shape.toString());
        }

<<<<<<< HEAD
//        public void testCanBeRotatedRightOnce() {
//            shape = shape.rotateRight();
//            assertEquals("" +
//                    ".....\n" +
//                    "..I..\n" +
//                    "..I..\n" +
//                    "..I..\n" +
//                    "..I..\n", shape.toString());
//        }

//        public void testCanBeRotatedLeftOnce() {
//            shape = shape.rotateLeft();
//            assertEquals("" +
//                    ".....\n" +
//                    "..I..\n" +
//                    "..I..\n" +
//                    "..I..\n" +
//                    "..I..\n", shape.toString());
//        }

//        public void testRotatingItTwiseWillGetBackToTheOriginalShape() {
//            String originalShape = shape.toString();
//            shape = shape.rotateRight().rotateRight();
//            assertEquals(originalShape, shape.toString());
//            shape = shape.rotateLeft().rotateLeft();
//            assertEquals(originalShape, shape.toString());
//        }
=======
        public void test_Can_be_rotated_right_once() {
            shape = shape.rotateRight();
            assertEquals("" +
                    ".....\n" +
                    "..I..\n" +
                    "..I..\n" +
                    "..I..\n" +
                    "..I..\n", shape.toString());
        }

        public void test_Can_be_rotated_left_once() {
            shape = shape.rotateLeft();
            assertEquals("" +
                    ".....\n" +
                    "..I..\n" +
                    "..I..\n" +
                    "..I..\n" +
                    "..I..\n", shape.toString());
        }

        public void test_Rotating_it_twise_will_get_back_to_the_original_shape() {
            String originalShape = shape.toString();
            shape = shape.rotateRight().rotateRight();
            assertEquals(originalShape, shape.toString());
            shape = shape.rotateLeft().rotateLeft();
            assertEquals(originalShape, shape.toString());
        }
>>>>>>> 8dcba9521ac8e475566619da0883abafcd8f8b14
    }
*/
Solution content 
//                    "..I..\n" +
                    ".....\n", shape.toString());
        }

//        public void test_Can_be_rotated_right_once() {
//            shape = shape.rotateRight();
//            assertEquals("" +
//                    ".....\n" +
//                    "..I..\n" +
//                    "..I..\n" +
//                    "..I..\n", shape.toString());
//        }

//        public void test_Can_be_rotated_left_once() {
//            shape = shape.rotateLeft();
//            assertEquals("" +
//                    ".....\n" +
//                    "..I..\n" +
//                    "..I..\n" +
//                    "..I..\n" +
//                    "..I..\n", shape.toString());
//        }

//        public void test_Rotating_it_twise_will_get_back_to_the_original_shape() {
//            String originalShape = shape.toString();
//            shape = shape.rotateRight().rotateRight();
//            assertEquals(originalShape, shape.toString());
//            shape = shape.rotateLeft().rotateLeft();
//            assertEquals(originalShape, shape.toString());
//        }
    }
*/
File
RotatingTetrominoesTest.java
Developer's decision
Manual
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
    public static class TheOShape extends TestCase {
    }
*/

<<<<<<< HEAD
/*
=======
    public static class The_O_shape extends TestCase {
>>>>>>> 8dcba9521ac8e475566619da0883abafcd8f8b14

        private Tetrominoe shape;
Solution content 
    }
*/

/*
    public static class The_O_shape extends TestCase {

        private Tetrominoe shape;
File
RotatingTetrominoesTest.java
Developer's decision
Combination
Kind of conflict
Class signature
Comment
Chunk
Conflicting content 
//                    ".OO\n" +
//                    "...\n", shape.toString());
//        }
                    "...\n", shape.toString());
        }

<<<<<<< HEAD
//        public void testCanNotBeRotatedRight() {
//            shape = shape.rotateRight();
//            assertEquals("" +
//                    ".OO\n" +
//        public void testCanNotBeRotatedLeft() {
//            shape = shape.rotateLeft();
//            assertEquals("" +
//                    ".OO\n" +
//                    ".OO\n" +
//                    "...\n", shape.toString());
//        }
=======
        public void test_Can_not_be_rotated_right() {
            shape = shape.rotateRight();
            assertEquals("" +
                    ".OO\n" +
                    ".OO\n" +
                    "...\n", shape.toString());
        }

        public void test_Can_not_be_rotated_left() {
            shape = shape.rotateLeft();
            assertEquals("" +
                    ".OO\n" +
                    ".OO\n" +
                    "...\n", shape.toString());
        }
>>>>>>> 8dcba9521ac8e475566619da0883abafcd8f8b14
    }
*/
}
Solution content 
                    "...\n", shape.toString());
        }

//        public void test_Can_not_be_rotated_right() {
//            shape = shape.rotateRight();
//            assertEquals("" +
//                    ".OO\n" +
//                    ".OO\n" +
//                    "...\n", shape.toString());
//        }

//        public void test_Can_not_be_rotated_left() {
//            shape = shape.rotateLeft();
//            assertEquals("" +
//                    ".OO\n" +
//                    ".OO\n" +
//                    "...\n", shape.toString());
//        }
    }
*/
}
File
RotatingTetrominoesTest.java
Developer's decision
Manual
Kind of conflict
Comment
Method declaration