Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .coverage
Binary file not shown.
File renamed without changes.
File renamed without changes.
10 changes: 3 additions & 7 deletions burger.py → praktikumm/burger.py
Original file line number Diff line number Diff line change
@@ -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:
"""
Expand Down Expand Up @@ -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)
7 changes: 3 additions & 4 deletions database.py → praktikumm/database.py
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
File renamed without changes.
File renamed without changes.
9 changes: 4 additions & 5 deletions praktikum.py → praktikumm/praktikum.py
Original file line number Diff line number Diff line change
@@ -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():
Expand Down
Binary file added requirements.txt
Binary file not shown.
Empty file added tests/__init__.py
Empty file.
10 changes: 10 additions & 0 deletions tests/test_bun.py
Original file line number Diff line number Diff line change
@@ -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
52 changes: 52 additions & 0 deletions tests/test_burger.py
Original file line number Diff line number Diff line change
@@ -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()
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Отлично: благодаря мокам тесты стали быстрее и управляемее, теперь они меньше зависят от внешних данных

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
29 changes: 29 additions & 0 deletions tests/test_database.py
Original file line number Diff line number Diff line change
@@ -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)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Можно лучше: мы тестируем не атрибуты экземпляров класса или наполнение базы данных, а методы приложения. Необходимо добавить шаги в которых будут использованы методы и проверить результат. Базу данных тестировать юниттестами не получится


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
14 changes: 14 additions & 0 deletions tests/test_ingredient.py
Original file line number Diff line number Diff line change
@@ -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"