From c4cc9b024583493abc8e363b43380d69d326a6bb Mon Sep 17 00:00:00 2001
From: ehermakov <ehermakov@gmail.com>
Date: Wed, 20 Mar 2024 21:19:24 +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=B4=D0=B7=20=D1=81=202-=D1=8F=20=D1=82=D0=B5=D1=81?=
 =?UTF-8?q?=D1=82=D0=B0=D0=BC=D0=B8=20=D0=B8=20=D0=BF=D0=B5=D1=80=D0=B5?=
 =?UTF-8?q?=D1=87=D1=81=D0=B8=D1=81=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=D0=BC=20?=
 =?UTF-8?q?Enum?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ShipCraft/Переделка/ShipField.py          |   1 +
 .../ShipCraft/Переделка/ShipModeDirection.py  |  11 +++++
 .../__pycache__/test_ShipField.cpython-311.pyc | Bin 12076 -> 15504 bytes
 .../ShipCraft/Переделка/test_ShipField.py     |  44 +++++++++++++++++-
 4 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 HNS/Excercises/ShipCraft/Переделка/ShipModeDirection.py

diff --git a/HNS/Excercises/ShipCraft/Переделка/ShipField.py b/HNS/Excercises/ShipCraft/Переделка/ShipField.py
index c82fe05..7acded4 100644
--- a/HNS/Excercises/ShipCraft/Переделка/ShipField.py
+++ b/HNS/Excercises/ShipCraft/Переделка/ShipField.py
@@ -1,4 +1,5 @@
 from ShootResult import ShootResult
+from ShipModeDirection import ShipMode, ShipDirection
 
 
 class ShipField:
diff --git a/HNS/Excercises/ShipCraft/Переделка/ShipModeDirection.py b/HNS/Excercises/ShipCraft/Переделка/ShipModeDirection.py
new file mode 100644
index 0000000..3d8e08e
--- /dev/null
+++ b/HNS/Excercises/ShipCraft/Переделка/ShipModeDirection.py
@@ -0,0 +1,11 @@
+from enum import Enum
+
+
+class ShipMode(Enum):
+    PUT = "PUT"
+    SHOOT = "SHOOT"
+
+
+class ShipDirection(Enum):
+    VERTICAL = "VERTICAL"
+    HORIZONTAL = "HORIZONTAL"
diff --git a/HNS/Excercises/ShipCraft/Переделка/__pycache__/test_ShipField.cpython-311.pyc b/HNS/Excercises/ShipCraft/Переделка/__pycache__/test_ShipField.cpython-311.pyc
index caf4c6f9c0cd4dd8e2605ef39c1c0c635775cbba..fe37947debee1d056e5d949b560273ea29c56246 100644
GIT binary patch
delta 2268
zcmZ1zH=&YmIWI340}ya3{!aa`yphjFhMNt@Wd`EUlUODfa`;YGQ_E#qz&bflO^qpq
zb@F*NEeKCskZ~Ck1H)<{h5%GaW_*%txFtn}*-}{WOXIN@q#KXTAZfgIvt!uJf$*`Y
zFnbER-DuM2cB4t7+s!eVQA4DDC8u8z4=@aiIDy1VRuGFDNVpYAg81w}B1Ds|hy^6h
z2PAF@6{nWO7iVM^#HVByr6!kT=I7nwfQc3HgOu<kXQU=)#~0)m7iT8rq!tMR1&cv3
zrJztG0#YDcl3H964^}mKwTuCCu{hJ@SK6kN6I59zztxbbzb<KXNz!P8;fBPEk``Aa
zEq170<Z!sc;c$V&;RXlKbq<M391=66Xr`(j)yfBSuoA__dLn&^&tWPTIqa`+*k9nV
z#}{JQRVAYbKXzrfRRL`Uq9QS1TqiRE2^bjWnVTJ7$uSU_+p5SH81%^5w<rK8P!tFv
zz*&_Sl2wy(@{_YuQ;>4%WJg&W_8y=*%)DuMNz!nG;)cMBlIB+=&3A}mPiZt#1<aes
zR-$A98d-^AV?Anq!f7QwhlyO|u)D%xcY(tWC2yjcg<X}KBvHz6s{+~zM3WnYr6(_x
z{lyAS5R=!-r7<qvEGA#g$QUtsl0p{a>dk)@=7Ko0l`_~igOWkbWNCRNPzk-+K)HvJ
zF<|mu6$Qq~$@f&E824<pRDH?BROB~VMMIAhp28+4X!tOm*t}Mwj!CD;AC%-k6^kYZ
zqB4P`Mt6{u2Z+!I5rLD#wR;$^ZhoT8$fyzw5(xtlQ6M4)M8tuJL=ce<A~Gj)>dG;i
zOxDodqA1Gh!1#dyiPRHiwFe163BAd`bo-=oLE1ot6Sy||#bJ}1pHiBWYFCs$d6Ax{
YV<a=9?FR<z<OGk8V3{vC<iW-Q0Af6MdjJ3c

delta 434
zcmbPGxh9TpIWI340}%Yz{+{|=Y9pVG%;bK)Fh=3Yjf%pP3l-HT3-F7BL?$oOFlDTm
z%*(GlSxozv$StAb)ROq(jLd@gl+2>k<dV$%yvd?EX^hpIYjmm^83QLX8i-Ej)eB{7
z1{z+RHn~wpY4Qa{*3JETg%H^cwr-G24NPWozaH!6*#_;5Y(YTrTcVTWjYQdt_<`)A
zV6b74My`xgHqSSD$;9-Mb#j-f9v@gC2h1Up51RTgF4)XxR>!3Ck{zUv8%St!6tRHV
zd>{g(p~xLXcz_6f5Ro)_heZ$L+Rd((jEpM2AQ68M5dtE@Ktu$Hhz1eKAR=vYmX#c%
z;p9%MEpm*kA|Dvw1RI<M7Gs+nXWhq`HTkWz1Y^!*HXBdJLMBGr4-DAJ2_7H8GGB1W
J7l{Ea2LMCLb!h+q

diff --git a/HNS/Excercises/ShipCraft/Переделка/test_ShipField.py b/HNS/Excercises/ShipCraft/Переделка/test_ShipField.py
index 6af2e04..cac78aa 100644
--- a/HNS/Excercises/ShipCraft/Переделка/test_ShipField.py
+++ b/HNS/Excercises/ShipCraft/Переделка/test_ShipField.py
@@ -115,10 +115,50 @@ class TestShipField(TestCase):
         self.assertEqual(new_field_string, old_field_string)
 
     def test_check_possible(self):
-        self.fail()
+        # arrangement установка
+        ship_field = ShipField()
+        ship_field.set_ship_size(4)
+        ship_field.set_ship_direction(1)
+        # action действие
+        ship_field.set_ship(5, 3)
+        # assertion проверка занятых
+        self.assertEqual(ship_field.check_possible(5, 3), False)
+        self.assertEqual(ship_field.check_possible(5, 4), False)
+        self.assertEqual(ship_field.check_possible(5, 5), False)
+        self.assertEqual(ship_field.check_possible(5, 6), False)
+        # проверка строки ниже
+        self.assertEqual(ship_field.check_possible(6, 3), False)
+        self.assertEqual(ship_field.check_possible(6, 4), False)
+        self.assertEqual(ship_field.check_possible(6, 5), False)
+        self.assertEqual(ship_field.check_possible(6, 6), False)
+        # проверка свободных ниже на 2 строки
+        self.assertEqual(ship_field.check_possible(7, 3), True)
+        self.assertEqual(ship_field.check_possible(7, 4), True)
+        self.assertEqual(ship_field.check_possible(7, 5), True)
+        self.assertEqual(ship_field.check_possible(7, 6), True)
 
     def test_check_blocked(self):
-        self.fail()
+        # arrangement установка
+        ship_field = ShipField()
+        ship_field.set_ship_size(4)
+        ship_field.set_ship_direction(1)
+        # action действие
+        ship_field.set_ship(5, 3)
+        # assertion проверка занятых
+        self.assertEqual(ship_field.check_blocked(5, 3), False)
+        self.assertEqual(ship_field.check_blocked(5, 4), False)
+        self.assertEqual(ship_field.check_blocked(5, 5), False)
+        self.assertEqual(ship_field.check_blocked(5, 6), False)
+        #проверка строки ниже
+        self.assertEqual(ship_field.check_blocked(6, 3), False)
+        self.assertEqual(ship_field.check_blocked(6, 4), False)
+        self.assertEqual(ship_field.check_blocked(6, 5), False)
+        self.assertEqual(ship_field.check_blocked(6, 7), False)
+        #проверка свободных ниже на 2 строки
+        self.assertEqual(ship_field.check_blocked(7, 3), True)
+        self.assertEqual(ship_field.check_blocked(7, 4), True)
+        self.assertEqual(ship_field.check_blocked(7, 5), True)
+        self.assertEqual(ship_field.check_blocked(7, 6), True)
 
     def test_set_ship_direction(self):
         ship_field = ShipField()  # Заводим объект типа ShipField