From e2c772f7c48d1c6b05e12c1637bf7e9332569927 Mon Sep 17 00:00:00 2001
From: BabatenkoTO <tanya-mongush@mail.ru>
Date: Fri, 21 Nov 2025 00:25:36 +0700
Subject: [PATCH] add new changes

---
 .coverage                                     | Bin 0 -> 53248 bytes
 __init__.py => praktikumm/__init__.py         |   0
 bun.py => praktikumm/bun.py                   |   0
 burger.py => praktikumm/burger.py             |  10 +---
 database.py => praktikumm/database.py         |   7 +--
 ingredient.py => praktikumm/ingredient.py     |   0
 .../ingredient_types.py                       |   0
 praktikum.py => praktikumm/praktikum.py       |   9 ++-
 requirements.txt                              | Bin 0 -> 1324 bytes
 tests/__init__.py                             |   0
 tests/test_bun.py                             |  10 ++++
 tests/test_burger.py                          |  52 ++++++++++++++++++
 tests/test_database.py                        |  29 ++++++++++
 tests/test_ingredient.py                      |  14 +++++
 14 files changed, 115 insertions(+), 16 deletions(-)
 create mode 100644 .coverage
 rename __init__.py => praktikumm/__init__.py (100%)
 rename bun.py => praktikumm/bun.py (100%)
 rename burger.py => praktikumm/burger.py (90%)
 rename database.py => praktikumm/database.py (86%)
 rename ingredient.py => praktikumm/ingredient.py (100%)
 rename ingredient_types.py => praktikumm/ingredient_types.py (100%)
 rename praktikum.py => praktikumm/praktikum.py (87%)
 create mode 100644 requirements.txt
 create mode 100644 tests/__init__.py
 create mode 100644 tests/test_bun.py
 create mode 100644 tests/test_burger.py
 create mode 100644 tests/test_database.py
 create mode 100644 tests/test_ingredient.py

diff --git a/.coverage b/.coverage
new file mode 100644
index 0000000000000000000000000000000000000000..e9f7b1c2664ab6bf3bc4ba2b330620bd2e3f14e3
GIT binary patch
literal 53248
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

literal 0
HcmV?d00001

diff --git a/__init__.py b/praktikumm/__init__.py
similarity index 100%
rename from __init__.py
rename to praktikumm/__init__.py
diff --git a/bun.py b/praktikumm/bun.py
similarity index 100%
rename from bun.py
rename to praktikumm/bun.py
diff --git a/burger.py b/praktikumm/burger.py
similarity index 90%
rename from burger.py
rename to praktikumm/burger.py
index 2b3b6a88b..a0d377b32 100644
--- a/burger.py
+++ b/praktikumm/burger.py
@@ -1,8 +1,6 @@
 from typing import List
-
-from praktikum.bun import Bun
-from praktikum.ingredient import Ingredient
-
+from praktikumm.bun import Bun
+from praktikumm.ingredient import Ingredient
 
 class Burger:
     """
@@ -38,11 +36,9 @@ def get_price(self) -> float:
 
     def get_receipt(self) -> str:
         receipt: List[str] = [f'(==== {self.bun.get_name()} ====)']
-
         for ingredient in self.ingredients:
             receipt.append(f'= {str(ingredient.get_type()).lower()} {ingredient.get_name()} =')
-
-        receipt.append(f'(==== {self.bun.get_name()} ====)\n')
+        receipt.append(f'(==== {self.bun.get_name()} ====)')
         receipt.append(f'Price: {self.get_price()}')
 
         return '\n'.join(receipt)
diff --git a/database.py b/praktikumm/database.py
similarity index 86%
rename from database.py
rename to praktikumm/database.py
index 4c75baf71..6ee227dab 100644
--- a/database.py
+++ b/praktikumm/database.py
@@ -1,8 +1,7 @@
 from typing import List
-
-from praktikum.bun import Bun
-from praktikum.ingredient import Ingredient
-from praktikum.ingredient_types import INGREDIENT_TYPE_SAUCE, INGREDIENT_TYPE_FILLING
+from praktikumm.bun import Bun
+from praktikumm.ingredient import Ingredient
+from praktikumm.ingredient_types import INGREDIENT_TYPE_SAUCE, INGREDIENT_TYPE_FILLING
 
 
 class Database:
diff --git a/ingredient.py b/praktikumm/ingredient.py
similarity index 100%
rename from ingredient.py
rename to praktikumm/ingredient.py
diff --git a/ingredient_types.py b/praktikumm/ingredient_types.py
similarity index 100%
rename from ingredient_types.py
rename to praktikumm/ingredient_types.py
diff --git a/praktikum.py b/praktikumm/praktikum.py
similarity index 87%
rename from praktikum.py
rename to praktikumm/praktikum.py
index ec522fa6d..7852d8f0a 100644
--- a/praktikum.py
+++ b/praktikumm/praktikum.py
@@ -1,9 +1,8 @@
 from typing import List
-
-from praktikum.bun import Bun
-from praktikum.burger import Burger
-from praktikum.database import Database
-from praktikum.ingredient import Ingredient
+from praktikumm.bun import Bun
+from praktikumm.burger import Burger
+from praktikumm.database import Database
+from praktikumm.ingredient import Ingredient
 
 
 def main():
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..9c1634658c663d059a59ed9d8df1ae7bb84d66b4
GIT binary patch
literal 1324
zcmZ{k-BR0741{&f4383q6PLDJaLaXPcz}*EspBb$-PnYmhllPb<@lsP$7AP5dsZv0
z<hR$_?sYxb&Q`Xt!Jci>w^7e4T}wN&WEXm#+o_${XXv%{w$<52pBr8L8vk>867Oz~
z!duPUjq>gk@9dZE$bK#bpuRg21&yL5j;^e&v9<KUz7oqqDti6exaQ7YoE=s&e(^i_
zdeslIb}R@uL45U^scY}2Yisoh;+vw$ae=wk>EA~gh@&~WwiY(|Ihd1pbELC7>8w45
zE;v!u>EF&fy7g*XM}!;s>{hOA+_C6Y^s@5vy<*eBkx-n(9=$%(ncf|aT!ZpAQcrc{
z&AE!}AhuFk&&~zc(sK<yKdsI^yGk;Z3Yn-z8M8CHxss*yQ0osNT2-=Aj_D{vvP&^V
z4lp-Tjn0@YvV;q8yq{ZokAvx;uuOH#>E2bKvdmv_<Y}f_Hi15NsxbE$O}O~Jhh%s;
zpz_p)b~fvecw(!{W>mgi7p{<*z1NNFxJowkS4X=yD)!_NYENE$I5_&b*o%Hf#5~cR
z(dV0L?tCWbbM0QUaYYdsgOM%mbP63*Tlw?f*uoygc<b!=!q#Pc^4g;QN!|^ft+k&*
zJqbsp)KlIS;a2gCZiWZ39ZM;QcR{f7#^TM@NkQd#*^V-^AGP5;_?R=4(#Nu;k5V*<
MwU@rqMOdTmzq4Y%kN^Mx

literal 0
HcmV?d00001

diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/test_bun.py b/tests/test_bun.py
new file mode 100644
index 000000000..eadda0ecc
--- /dev/null
+++ b/tests/test_bun.py
@@ -0,0 +1,10 @@
+import pytest
+from praktikumm.bun import Bun
+
+def test_bun_get_name():
+    bun = Bun("white", 200)
+    assert bun.get_name() == "white"
+
+def test_bun_get_price():
+    bun = Bun("black", 100)
+    assert bun.get_price() == 100
\ No newline at end of file
diff --git a/tests/test_burger.py b/tests/test_burger.py
new file mode 100644
index 000000000..1ca3545f2
--- /dev/null
+++ b/tests/test_burger.py
@@ -0,0 +1,52 @@
+import pytest
+from unittest.mock import Mock
+from praktikumm.burger import Burger
+from praktikumm.bun import Bun
+from praktikumm.ingredient import Ingredient
+
+@pytest.fixture
+def burger():
+    return Burger()
+
+def test_set_buns(burger):
+    bun = Bun("black bun", 100)
+    burger.set_buns(bun)
+    assert burger.bun == bun
+
+@pytest.mark.parametrize("ingredient_type, name, price", [
+    ("SAUCE", "hot sauce", 100),
+    ("FILLING", "sausage", 300)
+])
+def test_add_ingredient(burger, ingredient_type, name, price):
+    ingredient = Ingredient(ingredient_type, name, price)
+    burger.add_ingredient(ingredient)
+    assert len(burger.ingredients) == 1
+    assert burger.ingredients[0] == ingredient
+
+def test_remove_ingredient(burger):
+    ingredient = Ingredient("SAUCE", "sour cream", 150)
+    burger.add_ingredient(ingredient)
+    idx = 0
+    burger.remove_ingredient(idx)
+    assert len(burger.ingredients) == 0
+
+def test_get_price_with_mock(burger):
+    bun = Mock()
+    bun.get_price.return_value = 60
+    burger.set_buns(bun)
+
+    ingredient = Mock()
+    ingredient.get_price.return_value = 60
+    burger.add_ingredient(ingredient)
+
+    expected = 60 * 2 + 60  # <-- исправлено
+    assert burger.get_price() == expected
+
+def test_get_receipt(burger):
+    bun = Bun("white bun", 200)
+    burger.set_buns(bun)
+    ingredient = Ingredient("SAUCE", "chili sauce", 300)
+    burger.add_ingredient(ingredient)
+
+    expected = "(==== white bun ====)\n= sauce chili sauce =\n(==== white bun ====)\nPrice: 700"
+    assert burger.get_receipt() == expected
\ No newline at end of file
diff --git a/tests/test_database.py b/tests/test_database.py
new file mode 100644
index 000000000..7e47e58a7
--- /dev/null
+++ b/tests/test_database.py
@@ -0,0 +1,29 @@
+import pytest
+from praktikumm.database import Database
+from praktikumm.bun import Bun
+from praktikumm.ingredient import Ingredient
+
+def test_available_buns():
+    db = Database()
+    buns = db.available_buns()
+    assert len(buns) == 3
+    assert isinstance(buns[0], Bun)
+
+def test_available_ingredients():
+    db = Database()
+    ingredients = db.available_ingredients()
+    assert len(ingredients) == 6
+    assert isinstance(ingredients[0], Ingredient)
+
+def test_buns_have_correct_data():
+    db = Database()
+    bun = db.available_buns()[0]
+    assert bun.get_name() == "black bun"
+    assert bun.get_price() == 100
+
+def test_ingredients_have_correct_data():
+    db = Database()
+    ingredient = db.available_ingredients()[0]
+    assert ingredient.get_type() == "SAUCE"
+    assert ingredient.get_name() == "hot sauce"
+    assert ingredient.get_price() == 100
\ No newline at end of file
diff --git a/tests/test_ingredient.py b/tests/test_ingredient.py
new file mode 100644
index 000000000..5ed8298d1
--- /dev/null
+++ b/tests/test_ingredient.py
@@ -0,0 +1,14 @@
+import pytest
+from praktikumm.ingredient import Ingredient
+
+def test_ingredient_get_name():
+    ingredient = Ingredient("SAUCE", "hot sauce", 100)
+    assert ingredient.get_name() == "hot sauce"
+
+def test_ingredient_get_price():
+    ingredient = Ingredient("FILLING", "sausage", 300)
+    assert ingredient.get_price() == 300
+
+def test_ingredient_get_type():
+    ingredient = Ingredient("SAUCE", "sour cream", 150)
+    assert ingredient.get_type() == "SAUCE"
\ No newline at end of file