From a0050ef3f064b1236d8b651ef2eed26a38f7dd1c Mon Sep 17 00:00:00 2001
From: ehermakov <ehermakov@gmail.com>
Date: Mon, 11 Mar 2024 20:56:56 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B6=D0=B0?=
 =?UTF-8?q?=D1=8E=20=D0=BA=D0=BE=D0=B4=2016=20=D1=83=D1=80=D0=BE=D0=BA?=
 =?UTF-8?q?=D0=B0=20+=201=20=D1=82=D0=B5=D1=81=D1=82=D0=B8=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HNS/Excercises/ShipCraft/.idea/.name          |   2 +-
 .../__pycache__/test_ShipField.cpython-311.pyc | Bin 3338 -> 8870 bytes
 .../ShipCraft/Переделка/test_ShipField.py     | 130 +++++++++++++++---
 3 files changed, 111 insertions(+), 21 deletions(-)

diff --git a/HNS/Excercises/ShipCraft/.idea/.name b/HNS/Excercises/ShipCraft/.idea/.name
index fc75dea..3d4f3fa 100644
--- a/HNS/Excercises/ShipCraft/.idea/.name
+++ b/HNS/Excercises/ShipCraft/.idea/.name
@@ -1 +1 @@
-ShipField.py
\ No newline at end of file
+test_ShipField.py
\ No newline at end of file
diff --git a/HNS/Excercises/ShipCraft/Переделка/__pycache__/test_ShipField.cpython-311.pyc b/HNS/Excercises/ShipCraft/Переделка/__pycache__/test_ShipField.cpython-311.pyc
index da352d5d5409256bc43cb0bd1dabdaf3cb79eb4f..ff4a6d091812ad3257b99081bf250a11003e0df5 100644
GIT binary patch
literal 8870
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

delta 1008
zcmZ4H+9k!eoR^o20SGp|eVfY7GLcV$(Q2Z)tOFB+J3|U{3quM^D&sO{28Pu@3;|Kh
zDXhT^nrtsYTusJX93iR2CC-V(sX#Voa7Jc<TV`rb%Eb9%jA0YEg|h&a@=excl$l)1
zXFZvVkC*!vOL1yWS}`L~_vB#ag_AY-)EU_(2k=QVeP)=vpVwQwhyy59#0es}fdp8k
zLJ{xe^L*OeU{QXMlmK3}x&r3hJRoI6sO^%`=LRc7sMWyX2B3+zxJrQjjW5o~&o8Nx
znEX*hf?J44i_~PTxkZUodrsDpTLM+B6mCaN{>*H~Esd%iXE=VBbLN&KQteZDPi{pd
zwFSbGo2POsFiO4z#h)fi5etyI#hqAOoLW@kT3DKxGx->gJi8`S5h(O0J2DHi7x99W
zh)tH`6`Rb*tH!7@*_5}F5gdJbxP5d>036H(MVWae@oAtGRV6q1A)l}el87GAU}yvb
zS$>-QlkF8$)A&H5;3yFRvBW?GI3%S&EEy01_Pqj#r34~0L4-DtSP4v4AU4RwMQkvF
z704()0VEpW@B`CiDMh)-nu`2*F}I@Z<g<!go?t^k=J{!|+~O$B%PawTt_YN+zyS!c
zOCQ9A+y9HhCO1E&G$+-r$Pg$23hv_A$*M{^mLJ%(7)3rXU=kBNK7vHQV37iw3jl|s
B#MJ-*

diff --git a/HNS/Excercises/ShipCraft/Переделка/test_ShipField.py b/HNS/Excercises/ShipCraft/Переделка/test_ShipField.py
index 87908a1..02f9e22 100644
--- a/HNS/Excercises/ShipCraft/Переделка/test_ShipField.py
+++ b/HNS/Excercises/ShipCraft/Переделка/test_ShipField.py
@@ -1,8 +1,58 @@
 from unittest import TestCase
 from ShipField import ShipField
+from ShootResult import ShootResult
 
 
 class TestShipField(TestCase):
+
+    def test_set_ship_size(self):
+        ship_field = ShipField() # Заводим объект типа ShipField
+
+        ship_field.set_ship_size(1)
+        self.assertEqual(ship_field.ship_size, 1)
+        ship_field.set_ship_size(2)
+        self.assertEqual(ship_field.ship_size, 2)
+        ship_field.set_ship_size(3)
+        self.assertEqual(ship_field.ship_size, 3)
+        ship_field.set_ship_size(4)
+        self.assertEqual(ship_field.ship_size, 4)
+
+    def test_set_ship_size_outofrange(self):
+        ship_field = ShipField() # Заводим объект типа ShipField
+        ship_field.set_ship_size(1)
+
+        ship_field.set_ship_size(-1)
+        self.assertEqual(ship_field.ship_size, 1)
+        ship_field.set_ship_size(0)
+        self.assertEqual(ship_field.ship_size, 1)
+        ship_field.set_ship_size(6)
+        self.assertEqual(ship_field.ship_size, 1)
+        ship_field.set_ship_size(100)
+        self.assertEqual(ship_field.ship_size, 1)
+
+    def test_set_ship_size_wrongtype(self):
+        ship_field = ShipField() # Заводим объект типа ShipField
+        ship_field.set_ship_size(1)
+
+        ship_field.set_ship_size([])
+        self.assertEqual(ship_field.ship_size, 1)
+        ship_field.set_ship_size('')
+        self.assertEqual(ship_field.ship_size, 1)
+        ship_field.set_ship_size(None)
+        self.assertEqual(ship_field.ship_size, 1)
+        ship_field.set_ship_size(False)
+        self.assertEqual(ship_field.ship_size, 1)
+
+    def test_toggle_field_mode(self):
+        ship_field = ShipField() # Заводим объект типа ShipField
+        self.assertEqual(ship_field.field_mode, 0) # Проверяем, что изначальное значение field_mode равно 0
+
+        ship_field.toggle_field_mode() # Вызываем метод, который тестируем
+        self.assertEqual(ship_field.field_mode, 1) # Проверяем, что field_mode принял желаемое значение
+
+        ship_field.toggle_field_mode() # Вызываем метод, который тестируем
+        self.assertEqual(ship_field.field_mode, 0) # Проверяем, что field_mode принял желаемое значение
+
     def test_action(self):
         self.fail()
 
@@ -10,38 +60,78 @@ class TestShipField(TestCase):
         self.fail()
 
     def test_clear_marker(self):
-        self.fail()
+        ship_field = ShipField()
+        ship_field.field[0] = 'p'
+        ship_field.field[ship_field.field_size - 1] = 'p'
+
+        ship_field.clear_marker()
+
+        self.assertNotIn('p', ship_field.field)
+
+    def test_shoot_empty(self):
+        ship_field = ShipField()
+
+        self.assertEqual(ship_field.field[0].strip(), '')
+        result = ship_field.shoot(0, 0)
+
+        self.assertEqual(ship_field.field[0].strip(), '0')
+        self.assertEqual(result, ShootResult.EMPTY)
+
+    def test_shoot_ship(self):
+        ship_field = ShipField()
+
+        ship_field.field[0] = '1'
+        result = ship_field.shoot(0, 0)
+
+        self.assertEqual(ship_field.field[0].strip(), '\\')
+        self.assertEqual(result, ShootResult.DAMAGED)
+
+    def test_shoot_unknown(self):
+        ship_field = ShipField()
+
+        ship_field.field[0] = 'x'
+        result = ship_field.shoot(0, 0)
+
+        self.assertEqual(ship_field.field[0].strip(), 'x')
+        self.assertEqual(result, ShootResult.UNDEFINED)
+
+    def test_shoot_outofrange(self):
+        ship_field = ShipField()
+        old_field_string = str.join(' ', ship_field.field)
+
+        result = ship_field.shoot(-1, -1)
+        self.assertEqual(result, ShootResult.UNDEFINED)
+
+        result = ship_field.shoot(-1, 0)
+        self.assertEqual(result, ShootResult.UNDEFINED)
+
+        result = ship_field.shoot(1000, 1000)
+        self.assertEqual(result, ShootResult.UNDEFINED)
+
+        result = ship_field.shoot(0, 1000)
+        self.assertEqual(result, ShootResult.UNDEFINED)
+
+        new_field_string = str.join(' ', ship_field.field)
+        self.assertEqual(new_field_string, old_field_string)
 
     def test_set_ship(self):
         self.fail()
 
-    def test_shoot(self):
-        self.fail()
-
     def test_check_possible(self):
         self.fail()
 
     def test_check_blocked(self):
         self.fail()
 
-    def test_set_ship_size(self):
-        self.fail()
-
     def test_set_ship_direction(self):
-        self.fail()
+        ship_field = ShipField()  # Заводим объект типа ShipField
+        ship_field.set_ship_direction(1)
+        self.assertEqual(ship_field.ship_direction, 1)
+        
+        self.assertEqual(ship_field.ship_direction, 0)
+
+
 
     def test_toggle_ship_direction(self):
         self.fail()
 
-    def test_toggle_field_mode(self):
-        ship_field = ShipField()
-        self.assertEqual(ship_field.field_mode, 0)
-
-        ship_field.toggle_field_mode()
-        self.assertEqual(ship_field.field_mode, 1)
-
-        ship_field.toggle_field_mode()
-        self.assertEqual(ship_field.field_mode, 0)
-
-    def test_print_field(self):
-        self.fail()