diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 3330671..7138d94 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/app/src/test/java/com/avs/sea/battle/main/ShotManagerTest.kt b/app/src/test/java/com/avs/sea/battle/main/ShotManagerTest.kt
index 7c4ddcd..b8230a1 100644
--- a/app/src/test/java/com/avs/sea/battle/main/ShotManagerTest.kt
+++ b/app/src/test/java/com/avs/sea/battle/main/ShotManagerTest.kt
@@ -243,37 +243,37 @@ class ShotManagerTest {
@Test
fun getCoordinateToShot() {
- var coordinate = shotManager.getCoordinateToShot()
- assertEquals(coordinate, shotManager.getFirstCell().getCoordinate())
- shotManager.handleShot(true)
- assertFalse(shotManager.getBattleField().isCellFreeToBeSelected(coordinate))
- coordinate = shotManager.getCoordinateToShot()
- assertEquals(coordinate, shotManager.getSecondCell().getCoordinate())
- shotManager.handleShot(true)
- assertFalse(shotManager.getBattleField().isCellFreeToBeSelected(coordinate))
- coordinate = shotManager.getCoordinateToShot()
- assertEquals(coordinate, shotManager.getThirdCell().getCoordinate())
- shotManager.handleShot(true)
- assertFalse(shotManager.getBattleField().isCellFreeToBeSelected(coordinate))
- coordinate = shotManager.getCoordinateToShot()
- assertEquals(coordinate, shotManager.getFourthCell().getCoordinate())
- shotManager.handleShot(true)
- assertFalse(shotManager.getBattleField().isCellFreeToBeSelected(coordinate))
- coordinate = shotManager.getCoordinateToShot()
- assertEquals(coordinate, shotManager.getFirstCell().getCoordinate())
- shotManager.handleShot(false)
- assertFalse(shotManager.getBattleField().isCellFreeToBeSelected(coordinate))
- coordinate = shotManager.getCoordinateToShot()
- assertEquals(coordinate, shotManager.getFirstCell().getCoordinate())
- shotManager.handleShot(true)
- assertFalse(shotManager.getBattleField().isCellFreeToBeSelected(coordinate))
- coordinate = shotManager.getCoordinateToShot()
- assertEquals(coordinate, shotManager.getSecondCell().getCoordinate())
- shotManager.handleShot(false)
- assertFalse(shotManager.getBattleField().isCellFreeToBeSelected(coordinate))
- coordinate = shotManager.getCoordinateToShot()
- assertEquals(coordinate, shotManager.getSecondCell().getCoordinate())
- shotManager.handleShot(true)
- assertFalse(shotManager.getBattleField().isCellFreeToBeSelected(coordinate))
+ val coordinate1 = shotManager.getCoordinateToShot()
+ assertEquals(coordinate1, shotManager.getFirstCell().getCoordinate())
+ shotManager.handleShot(true to ArrayList())
+ assertFalse(shotManager.getBattleField().isCellFreeToBeSelected(coordinate1))
+ val coordinate2 = shotManager.getCoordinateToShot()
+ assertEquals(coordinate2, shotManager.getSecondCell().getCoordinate())
+ shotManager.handleShot(true to ArrayList())
+ assertFalse(shotManager.getBattleField().isCellFreeToBeSelected(coordinate2))
+ val coordinate3 = shotManager.getCoordinateToShot()
+ assertEquals(coordinate3, shotManager.getThirdCell().getCoordinate())
+ shotManager.handleShot(true to ArrayList())
+ assertFalse(shotManager.getBattleField().isCellFreeToBeSelected(coordinate3))
+ val coordinate4 = shotManager.getCoordinateToShot()
+ assertEquals(coordinate4, shotManager.getFourthCell().getCoordinate())
+ shotManager.handleShot(true to arrayListOf(coordinate1, coordinate2, coordinate3, coordinate4))
+ assertFalse(shotManager.getBattleField().isCellFreeToBeSelected(coordinate4))
+ val coordinate5 = shotManager.getCoordinateToShot()
+ assertEquals(coordinate5, shotManager.getFirstCell().getCoordinate())
+ shotManager.handleShot(false to ArrayList())
+ assertFalse(shotManager.getBattleField().isCellFreeToBeSelected(coordinate5))
+ val coordinate6 = shotManager.getCoordinateToShot()
+ assertEquals(coordinate6, shotManager.getFirstCell().getCoordinate())
+ shotManager.handleShot(true to ArrayList())
+ assertFalse(shotManager.getBattleField().isCellFreeToBeSelected(coordinate6))
+ val coordinate7 = shotManager.getCoordinateToShot()
+ assertEquals(coordinate7, shotManager.getSecondCell().getCoordinate())
+ shotManager.handleShot(false to ArrayList())
+ assertFalse(shotManager.getBattleField().isCellFreeToBeSelected(coordinate7))
+ val coordinate8 = shotManager.getCoordinateToShot()
+ assertEquals(coordinate8, shotManager.getSecondCell().getCoordinate())
+ shotManager.handleShot(true to ArrayList())
+ assertFalse(shotManager.getBattleField().isCellFreeToBeSelected(coordinate8))
}
}
\ No newline at end of file