diff --git a/.coveragerc b/.coveragerc new file mode 100644 index 000000000..a7dec102c --- /dev/null +++ b/.coveragerc @@ -0,0 +1,6 @@ +[run] +source = . +omit = tests/* +branch = True +parallel = False +data_file = .coverage diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..b7faf403d --- /dev/null +++ b/.gitignore @@ -0,0 +1,207 @@ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[codz] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py.cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# UV +# Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +#uv.lock + +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +#poetry.lock +#poetry.toml + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +# pdm recommends including project-wide configuration in pdm.toml, but excluding .pdm-python. +# https://pdm-project.org/en/latest/usage/project/#working-with-version-control +#pdm.lock +#pdm.toml +.pdm-python +.pdm-build/ + +# pixi +# Similar to Pipfile.lock, it is generally recommended to include pixi.lock in version control. +#pixi.lock +# Pixi creates a virtual environment in the .pixi directory, just like venv module creates one +# in the .venv directory. It is recommended not to include this directory in version control. +.pixi + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.envrc +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +# PyCharm +# JetBrains specific template is maintained in a separate JetBrains.gitignore that can +# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore +# and can be added to the global gitignore or merged into this file. For a more nuclear +# option (not recommended) you can uncomment the following to ignore the entire idea folder. +#.idea/ + +# Abstra +# Abstra is an AI-powered process automation framework. +# Ignore directories containing user credentials, local state, and settings. +# Learn more at https://abstra.io/docs +.abstra/ + +# Visual Studio Code +# Visual Studio Code specific template is maintained in a separate VisualStudioCode.gitignore +# that can be found at https://github.com/github/gitignore/blob/main/Global/VisualStudioCode.gitignore +# and can be added to the global gitignore or merged into this file. However, if you prefer, +# you could uncomment the following to ignore the entire vscode folder +# .vscode/ + +# Ruff stuff: +.ruff_cache/ + +# PyPI configuration file +.pypirc + +# Cursor +# Cursor is an AI-powered code editor. `.cursorignore` specifies files/directories to +# exclude from AI features like autocomplete and code analysis. Recommended for sensitive data +# refer to https://docs.cursor.com/context/ignore-files +.cursorignore +.cursorindexingignore + +# Marimo +marimo/_static/ +marimo/_lsp/ +__marimo__/ diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..1b213ba60 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,14 @@ +{ + "python.testing.unittestArgs": [ + "-v", + "-s", + "./tests", + "-p", + "test_*.py" + ], + "python.testing.pytestEnabled": true, + "python.testing.unittestEnabled": false, + "python.testing.pytestArgs": [ + "tests" + ] +} \ No newline at end of file diff --git a/burger.py b/burger.py index 2b3b6a88b..366d3a172 100644 --- a/burger.py +++ b/burger.py @@ -1,7 +1,7 @@ from typing import List - -from praktikum.bun import Bun -from praktikum.ingredient import Ingredient +import pytest +from bun import Bun +from ingredient import Ingredient class Burger: @@ -37,12 +37,15 @@ def get_price(self) -> float: return price def get_receipt(self) -> str: - receipt: List[str] = [f'(==== {self.bun.get_name()} ====)'] - + 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'= {str(ingredient.get_type()).lower()} {ingredient.get_name()} =') # Добавляем ингредиенты + receipt.append(f'(==== {self.bun.get_name()} ====)\n') #Добавляем нижнюю булочку + receipt.append(f'Price: {self.get_price()}') # Завершаем ценой + return '\n'.join(receipt) + + - receipt.append(f'(==== {self.bun.get_name()} ====)\n') - receipt.append(f'Price: {self.get_price()}') - return '\n'.join(receipt) + + \ No newline at end of file diff --git a/database.py b/database.py index 4c75baf71..84d3685d0 100644 --- a/database.py +++ b/database.py @@ -1,8 +1,8 @@ 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 bun import Bun +from ingredient import Ingredient +from ingredient_types import INGREDIENT_TYPE_SAUCE, INGREDIENT_TYPE_FILLING class Database: diff --git a/praktikum.py b/praktikum.py index ec522fa6d..88b77abd1 100644 --- a/praktikum.py +++ b/praktikum.py @@ -1,9 +1,9 @@ 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 bun import Bun +from burger import Burger +from database import Database +from ingredient import Ingredient def main(): diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 000000000..9936ad101 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,5 @@ +pytest==8.4.1 +allure-pytest==2.15.0 +Faker==37.11.0 +tzdata==2025.2 +requests==2.32.5 \ No newline at end of file diff --git a/__init__.py b/tests/__init__.py similarity index 100% rename from __init__.py rename to tests/__init__.py diff --git a/tests/test_burger.py b/tests/test_burger.py new file mode 100644 index 000000000..f44f7b2d9 --- /dev/null +++ b/tests/test_burger.py @@ -0,0 +1,75 @@ +import unittest +import pytest +from unittest.mock import Mock +from burger import Burger +from bun import Bun +from ingredient import Ingredient + +class TestBurger(unittest.TestCase): + def setUp(self): + self.burger = Burger() + self.bun = Mock(spec=Bun) + self.ingredient = Mock(spec=Ingredient) + + def test_set_buns(self): + # Проверяем, что булочка устанавливается корректно + self.burger.set_buns(self.bun) + self.assertEqual(self.burger.bun, self.bun) + + def test_add_ingredient(self): + # Проверяем добавление ингредиента + self.burger.add_ingredient(self.ingredient) + self.assertIn(self.ingredient, self.burger.ingredients) + + def test_remove_ingredient(self): + # Добавляем ингредиент и затем удаляем его + self.burger.add_ingredient(self.ingredient) + index = self.burger.ingredients.index(self.ingredient) + self.burger.remove_ingredient(index) + self.assertNotIn(self.ingredient, self.burger.ingredients) + + def test_move_ingredient(self): + # Добавляем два ингредиента и перемещаем их + ingredient1 = Mock(spec=Ingredient) + ingredient2 = Mock(spec=Ingredient) + self.burger.add_ingredient(ingredient1) + self.burger.add_ingredient(ingredient2) + self.burger.move_ingredient(0, 1) + self.assertEqual(self.burger.ingredients, [ingredient2, ingredient1]) + + def test_get_price(self): + # Проверяем расчёт цены + self.bun.get_price.return_value = 10.0 + self.ingredient.get_price.return_value = 5.0 + self.burger.set_buns(self.bun) + self.burger.add_ingredient(self.ingredient) + price = self.burger.get_price() + self.assertEqual(price, 25.0) + + def test_get_receipt(self): + # Проверяем генерацию чека + self.bun.get_name.return_value = "Classic Bun" + self.ingredient.get_type.return_value = "Meat" + self.ingredient.get_name.return_value = "Beef" + + # Устанавливаем булочку перед генерацией чека + self.burger.set_buns(self.bun) + + # Добавляем ингредиент в бургер + self.burger.add_ingredient(self.ingredient) + + # Добавляем настройку для метода get_price + self.bun.get_price.return_value = 10.0 # Пример значения цены булочки + self.ingredient.get_price.return_value = 5.0 # Добавляем настройку цены для ингредиента + + receipt = self.burger.get_receipt() + expected_receipt = "(==== Classic Bun ====)\n= meat Beef =\n(==== Classic Bun ====)\n\nPrice: 25.0" + self.assertEqual(receipt, expected_receipt) + +if __name__ == '__main__': + unittest.main() + + + + +