From ed0e2ff7a60582520c77ebc75eab36ab77853c11 Mon Sep 17 00:00:00 2001 From: G Sh Date: Sun, 9 Mar 2025 20:31:33 +0300 Subject: [PATCH 01/21] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20README.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 164 +++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 3 +- 2 files changed, 166 insertions(+), 1 deletion(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..dda4f8f --- /dev/null +++ b/.gitignore @@ -0,0 +1,164 @@ +### Python template +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$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 + +# 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 + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +#pdm.lock +# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it +# in version control. +# https://pdm.fming.dev/latest/usage/project/#working-with-version-control +.pdm.toml +.pdm-python +.pdm-build/ + +# 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 +.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/ + diff --git a/README.md b/README.md index 1cc701d..43364df 100644 --- a/README.md +++ b/README.md @@ -1 +1,2 @@ -# qa_python \ No newline at end of file +# qa_python +# Начинаю работать над проектом \ No newline at end of file From 45f233f05e9f9530c9222966a9d667193c96e421 Mon Sep 17 00:00:00 2001 From: G Sh Date: Sun, 9 Mar 2025 21:36:29 +0300 Subject: [PATCH 02/21] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=82=D0=B5=D1=81=D1=82=20test=5Fadd=5Fnew=5Fbook=5Fa?= =?UTF-8?q?dd=5Fone=5Fbook=5Fbook=5Fadded?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 ++- tests.py | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 43364df..508dc42 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # qa_python -# Начинаю работать над проектом \ No newline at end of file +# Начинаю работать над проектом +1. Добавил тест test_add_new_book_add_one_book_book_added \ No newline at end of file diff --git a/tests.py b/tests.py index 383385e..dd5a7a1 100644 --- a/tests.py +++ b/tests.py @@ -21,4 +21,20 @@ def test_add_new_book_add_two_books(self): assert len(collector.get_books_rating()) == 2 # напиши свои тесты ниже - # чтобы тесты были независимыми в каждом из них создавай отдельный экземпляр класса BooksCollector() \ No newline at end of file + # чтобы тесты были независимыми в каждом из них создавай отдельный экземпляр класса BooksCollector() + + def test_add_new_book_add_one_book_book_added(self): + # создаем экземпляр (объект) класса BooksCollector + collector = BooksCollector() + #добавляем книгу + collector.add_new_book('The Shawshank Redemption') + # проверяем, что добавилось именно одна книга + assert len(collector.books_genre) == 1 + + def test_add_new_book_add_one_book_book_added(self): + # создаем экземпляр (объект) класса BooksCollector + collector = BooksCollector() + #добавляем книгу + collector.add_new_book('The Shawshank Redemption') + # проверяем, что добавилось именно одна книга + assert len(collector.books_genre) == 1 \ No newline at end of file From 7b866da257bbaf3e84e73f43dd82f3f51f8d8201 Mon Sep 17 00:00:00 2001 From: G Sh Date: Sun, 9 Mar 2025 21:48:02 +0300 Subject: [PATCH 03/21] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BE=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?README.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +++- tests.py | 23 ----------------------- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 508dc42..d5b6892 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ # qa_python # Начинаю работать над проектом -1. Добавил тест test_add_new_book_add_one_book_book_added \ No newline at end of file +1. Добавил тест test_add_new_book_add_one_book_book_added +проверка добавления новой книги. +2. \ No newline at end of file diff --git a/tests.py b/tests.py index dd5a7a1..c70f7af 100644 --- a/tests.py +++ b/tests.py @@ -4,22 +4,6 @@ # обязательно указывать префикс Test class TestBooksCollector: - # пример теста: - # обязательно указывать префикс test_ - # дальше идет название метода, который тестируем add_new_book_ - # затем, что тестируем add_two_books - добавление двух книг - def test_add_new_book_add_two_books(self): - # создаем экземпляр (объект) класса BooksCollector - collector = BooksCollector() - - # добавляем две книги - collector.add_new_book('Гордость и предубеждение и зомби') - collector.add_new_book('Что делать, если ваш кот хочет вас убить') - - # проверяем, что добавилось именно две - # словарь books_rating, который нам возвращает метод get_books_rating, имеет длину 2 - assert len(collector.get_books_rating()) == 2 - # напиши свои тесты ниже # чтобы тесты были независимыми в каждом из них создавай отдельный экземпляр класса BooksCollector() @@ -31,10 +15,3 @@ def test_add_new_book_add_one_book_book_added(self): # проверяем, что добавилось именно одна книга assert len(collector.books_genre) == 1 - def test_add_new_book_add_one_book_book_added(self): - # создаем экземпляр (объект) класса BooksCollector - collector = BooksCollector() - #добавляем книгу - collector.add_new_book('The Shawshank Redemption') - # проверяем, что добавилось именно одна книга - assert len(collector.books_genre) == 1 \ No newline at end of file From 69dde0411de024dcc55228a12969fc948c175adf Mon Sep 17 00:00:00 2001 From: G Sh Date: Sun, 9 Mar 2025 21:51:32 +0300 Subject: [PATCH 04/21] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=82=D0=B5=D1=81=D1=82=20=D0=BF=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=B5=D1=80=D0=BA=D0=B8=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B6=D0=B0=D0=BD=D1=80=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests.py b/tests.py index c70f7af..cb2ed13 100644 --- a/tests.py +++ b/tests.py @@ -15,3 +15,11 @@ def test_add_new_book_add_one_book_book_added(self): # проверяем, что добавилось именно одна книга assert len(collector.books_genre) == 1 + def test_set_book_genre_set_genre_genre_added(self): + # создаем экземпляр (объект) класса BooksCollector + collector = BooksCollector() + #добавляем книгу + collector.add_new_book('The Shawshank Redemption') + collector.set_book_genre('The Shawshank Redemption', 'Фантастика') + # проверяем, что добавился жанр + assert collector.books_genre['The Shawshank Redemption'] == 'Фантастика' From a55642a81f1c5a854dee9ecd4469f821b8e1f204 Mon Sep 17 00:00:00 2001 From: G Sh Date: Sun, 9 Mar 2025 22:07:11 +0300 Subject: [PATCH 05/21] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=82=D0=B5=D1=81=D1=82=20test=5Fset=5Fbook=5Fgenre?= =?UTF-8?q?=5Fbook=5Fgenre=5Fgenre=5Fadded=20=D0=BF=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=B5=D1=80=D0=BA=D0=B0=20=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=B6=D0=B0=D0=BD=D1=80=D0=B0=20=D0=BA?= =?UTF-8?q?=D0=BD=D0=B8=D0=B3=D0=B8=20=D0=BF=D0=BE=20=D0=B5=D0=B5=20=D0=BD?= =?UTF-8?q?=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D1=8E.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 ++- tests.py | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d5b6892..8ee55d1 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,5 @@ # Начинаю работать над проектом 1. Добавил тест test_add_new_book_add_one_book_book_added проверка добавления новой книги. -2. \ No newline at end of file +2. Добавил тест test_set_book_genre_book_genre_genre_added проверки добавления жанра. +3. Добавил тест test_set_book_genre_book_genre_genre_added проверка получения жанра книги по ее названию. \ No newline at end of file diff --git a/tests.py b/tests.py index cb2ed13..b26eeb5 100644 --- a/tests.py +++ b/tests.py @@ -15,11 +15,22 @@ def test_add_new_book_add_one_book_book_added(self): # проверяем, что добавилось именно одна книга assert len(collector.books_genre) == 1 - def test_set_book_genre_set_genre_genre_added(self): + def test_set_book_genre_book_genre_genre_added(self): # создаем экземпляр (объект) класса BooksCollector collector = BooksCollector() #добавляем книгу collector.add_new_book('The Shawshank Redemption') + #устанавливаем жанр collector.set_book_genre('The Shawshank Redemption', 'Фантастика') - # проверяем, что добавился жанр + #проверяем, что добавился жанр assert collector.books_genre['The Shawshank Redemption'] == 'Фантастика' + + def test_set_book_genre_book_genre_genre_added(self): + # создаем экземпляр (объект) класса BooksCollector + collector = BooksCollector() + #добавляем книгу + collector.add_new_book('The Shawshank Redemption') + #устанавливаем жанр + collector.set_book_genre('The Shawshank Redemption', 'Фантастика') + #проверяем, что добавился жанр + assert collector.books_genre.get('The Shawshank Redemption') == 'Фантастика' \ No newline at end of file From 5539cf2dd4ab6a6b41fdb98d08f65de6c3125c10 Mon Sep 17 00:00:00 2001 From: G Sh Date: Sun, 9 Mar 2025 22:26:13 +0300 Subject: [PATCH 06/21] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=84=D0=B8=D0=BA=D1=81=D1=82=D1=83=D1=80=D1=83=20?= =?UTF-8?q?=D0=B8=20=D1=84=D0=B0=D0=B9=D0=BB=20conftest.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conftest.py | 10 ++++++++++ tests.py | 14 ++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 conftest.py diff --git a/conftest.py b/conftest.py new file mode 100644 index 0000000..56ecb4e --- /dev/null +++ b/conftest.py @@ -0,0 +1,10 @@ +import pytest + +# класс BooksCollector, в котором реализован конструктор и методы +from main import BooksCollector + +@pytest.fixture # фикстура, которая создаёт коллекцию +def collector(): + collector = BooksCollector() + + return collector \ No newline at end of file diff --git a/tests.py b/tests.py index b26eeb5..310f678 100644 --- a/tests.py +++ b/tests.py @@ -7,9 +7,9 @@ class TestBooksCollector: # напиши свои тесты ниже # чтобы тесты были независимыми в каждом из них создавай отдельный экземпляр класса BooksCollector() - def test_add_new_book_add_one_book_book_added(self): + def test_add_new_book_add_one_book_book_added(self, collector): # создаем экземпляр (объект) класса BooksCollector - collector = BooksCollector() + # collector = BooksCollector() #добавляем книгу collector.add_new_book('The Shawshank Redemption') # проверяем, что добавилось именно одна книга @@ -26,6 +26,16 @@ def test_set_book_genre_book_genre_genre_added(self): assert collector.books_genre['The Shawshank Redemption'] == 'Фантастика' def test_set_book_genre_book_genre_genre_added(self): + # создаем экземпляр (объект) класса BooksCollector + collector = BooksCollector() + #добавляем книгу + collector.add_new_book('The Shawshank Redemption') + #устанавливаем жанр + collector.set_book_genre('The Shawshank Redemption', 'Фантастика') + #проверяем, что добавился жанр + assert collector.books_genre.get('The Shawshank Redemption') == 'Фантастика' + + def test_get_books_with_specific_genre_book_genre_specific_books(self): # создаем экземпляр (объект) класса BooksCollector collector = BooksCollector() #добавляем книгу From 07e2b41de5b720d3b2d50e638537c025a73093ea Mon Sep 17 00:00:00 2001 From: G Sh Date: Sun, 9 Mar 2025 22:28:47 +0300 Subject: [PATCH 07/21] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=84=D0=B8=D0=BA=D1=81=D1=82=D1=83=D1=80=D1=83=20?= =?UTF-8?q?=D0=B2=D0=BE=20=D0=B2=D1=81=D0=B5=20=D1=82=D0=B5=D1=81=D1=82?= =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/tests.py b/tests.py index 310f678..c1e94d7 100644 --- a/tests.py +++ b/tests.py @@ -8,16 +8,12 @@ class TestBooksCollector: # чтобы тесты были независимыми в каждом из них создавай отдельный экземпляр класса BooksCollector() def test_add_new_book_add_one_book_book_added(self, collector): - # создаем экземпляр (объект) класса BooksCollector - # collector = BooksCollector() #добавляем книгу collector.add_new_book('The Shawshank Redemption') # проверяем, что добавилось именно одна книга assert len(collector.books_genre) == 1 - def test_set_book_genre_book_genre_genre_added(self): - # создаем экземпляр (объект) класса BooksCollector - collector = BooksCollector() + def test_set_book_genre_book_genre_genre_added(self, collector): #добавляем книгу collector.add_new_book('The Shawshank Redemption') #устанавливаем жанр @@ -25,9 +21,7 @@ def test_set_book_genre_book_genre_genre_added(self): #проверяем, что добавился жанр assert collector.books_genre['The Shawshank Redemption'] == 'Фантастика' - def test_set_book_genre_book_genre_genre_added(self): - # создаем экземпляр (объект) класса BooksCollector - collector = BooksCollector() + def test_set_book_genre_book_genre_genre_added(self, collector): #добавляем книгу collector.add_new_book('The Shawshank Redemption') #устанавливаем жанр @@ -35,9 +29,7 @@ def test_set_book_genre_book_genre_genre_added(self): #проверяем, что добавился жанр assert collector.books_genre.get('The Shawshank Redemption') == 'Фантастика' - def test_get_books_with_specific_genre_book_genre_specific_books(self): - # создаем экземпляр (объект) класса BooksCollector - collector = BooksCollector() + def test_get_books_with_specific_genre_book_genre_specific_books(self, collector): #добавляем книгу collector.add_new_book('The Shawshank Redemption') #устанавливаем жанр From d3ac6e9d3625515ed1bb36063594778cf32caff2 Mon Sep 17 00:00:00 2001 From: G Sh Date: Sun, 9 Mar 2025 22:52:33 +0300 Subject: [PATCH 08/21] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=82=D0=B5=D1=81=D1=82=20test=5Fget=5Fbooks=5Fwith?= =?UTF-8?q?=5Fspecific=5Fgenre=5Fbook=5Fgenre=5Fspecific=5Fbooks=20=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B0=20=D0=BF=D0=BE=D0=BB?= =?UTF-8?q?=D1=83=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=81=D0=BF=D0=B8=D1=81?= =?UTF-8?q?=D0=BA=D0=B2=20=D0=BA=D0=BD=D0=B8=D0=B3=20=D1=81=20=D0=BE=D0=BF?= =?UTF-8?q?=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D1=91=D0=BD=D0=BD=D1=8B=D0=BC=20?= =?UTF-8?q?=D0=B6=D0=B0=D0=BD=D1=80=D0=BE=D0=BC.=20=D0=98=20=D1=84=D0=B8?= =?UTF-8?q?=D0=BA=D1=81=D1=82=D1=83=D1=80=D1=83=20=D0=B7=D0=B0=D0=BF=D0=BE?= =?UTF-8?q?=D0=BB=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=81=D0=BF=D0=B8=D1=81?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=BA=D0=BD=D0=B8=D0=B3.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +++- conftest.py | 11 ++++++++++- tests.py | 12 +++++------- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 8ee55d1..c6bddf7 100644 --- a/README.md +++ b/README.md @@ -3,4 +3,6 @@ 1. Добавил тест test_add_new_book_add_one_book_book_added проверка добавления новой книги. 2. Добавил тест test_set_book_genre_book_genre_genre_added проверки добавления жанра. -3. Добавил тест test_set_book_genre_book_genre_genre_added проверка получения жанра книги по ее названию. \ No newline at end of file +3. Добавил тест test_get_book_genre_book_genre_genre_get проверка получения жанра книги по ее названию. +4. Добавил тест test_get_books_with_specific_genre_book_genre_specific_books +проверка получения спискв книг с определённым жанром. \ No newline at end of file diff --git a/conftest.py b/conftest.py index 56ecb4e..22f0ace 100644 --- a/conftest.py +++ b/conftest.py @@ -3,8 +3,17 @@ # класс BooksCollector, в котором реализован конструктор и методы from main import BooksCollector -@pytest.fixture # фикстура, которая создаёт коллекцию +@pytest.fixture +# фикстура, которая создаёт коллекцию def collector(): collector = BooksCollector() + return collector + +@pytest.fixture +# фикстура, которая набор коллекции книг +def collector_full(): + collector = BooksCollector() + collector.books_genre = {'The Fifth Element': 'Фантастика', 'Infinite': 'Фантастика', + 'Jurassic Park': 'Фантастика', 'A Quiet Place': 'Ужасы', 'The Skeleton Key': 'Ужасы'} return collector \ No newline at end of file diff --git a/tests.py b/tests.py index c1e94d7..737f1d1 100644 --- a/tests.py +++ b/tests.py @@ -21,7 +21,7 @@ def test_set_book_genre_book_genre_genre_added(self, collector): #проверяем, что добавился жанр assert collector.books_genre['The Shawshank Redemption'] == 'Фантастика' - def test_set_book_genre_book_genre_genre_added(self, collector): + def test_get_book_genre_book_genre_genre_get(self, collector): #добавляем книгу collector.add_new_book('The Shawshank Redemption') #устанавливаем жанр @@ -29,10 +29,8 @@ def test_set_book_genre_book_genre_genre_added(self, collector): #проверяем, что добавился жанр assert collector.books_genre.get('The Shawshank Redemption') == 'Фантастика' - def test_get_books_with_specific_genre_book_genre_specific_books(self, collector): - #добавляем книгу - collector.add_new_book('The Shawshank Redemption') - #устанавливаем жанр - collector.set_book_genre('The Shawshank Redemption', 'Фантастика') + def test_get_books_with_specific_genre_book_genre_specific_books(self, collector_full): + books_fantasy =[] + books_fantasy = collector_full.get_books_with_specific_genre('Фантастика') #проверяем, что добавился жанр - assert collector.books_genre.get('The Shawshank Redemption') == 'Фантастика' \ No newline at end of file + assert collector_full.books_genre.get(books_fantasy[0]) == 'Фантастика' \ No newline at end of file From fd5ca0e120b1194e8cb00da3608b3f2b139ea937 Mon Sep 17 00:00:00 2001 From: G Sh Date: Sun, 9 Mar 2025 23:04:06 +0300 Subject: [PATCH 09/21] =?UTF-8?q?=D0=94=D0=BE=D0=BA=D0=BE=D0=BD=D1=87?= =?UTF-8?q?=D0=B8=D0=BB=20=D1=82=D0=B5=D1=81=D1=82=20test=5Fget=5Fbooks=5F?= =?UTF-8?q?with=5Fspecific=5Fgenre=5Fbook=5Fgenre=5Fspecific=5Fbooks=20?= =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B0=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=BB=D1=83=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=81=D0=BF=D0=B8?= =?UTF-8?q?=D1=81=D0=BA=D0=B0=20=D0=BA=D0=BD=D0=B8=D0=B3=20=D1=81=20=D0=BE?= =?UTF-8?q?=D0=BF=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D1=91=D0=BD=D0=BD=D1=8B?= =?UTF-8?q?=D0=BC=20=D0=B6=D0=B0=D0=BD=D1=80=D0=BE=D0=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests.py b/tests.py index 737f1d1..86ddd6c 100644 --- a/tests.py +++ b/tests.py @@ -31,6 +31,11 @@ def test_get_book_genre_book_genre_genre_get(self, collector): def test_get_books_with_specific_genre_book_genre_specific_books(self, collector_full): books_fantasy =[] + #заполнем коллекцию данными books_fantasy = collector_full.get_books_with_specific_genre('Фантастика') - #проверяем, что добавился жанр - assert collector_full.books_genre.get(books_fantasy[0]) == 'Фантастика' \ No newline at end of file + #проверяем, что выводятся книги нужного жанра + isTrue = True + for item in books_fantasy: + if collector_full.books_genre[item] != 'Фантастика': + isTrue = False + assert isTrue \ No newline at end of file From 5b49ee6048cf6763d8cb74ade16e292d6964c56c Mon Sep 17 00:00:00 2001 From: G Sh Date: Sun, 9 Mar 2025 23:19:56 +0300 Subject: [PATCH 10/21] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=82=D0=B5=D1=81=D1=82=20test=5Fget=5Fbooks=5Fgenre?= =?UTF-8?q?=5Fcollecor=5Fbooks=5Fgenre?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests.py b/tests.py index 86ddd6c..32142c9 100644 --- a/tests.py +++ b/tests.py @@ -38,4 +38,11 @@ def test_get_books_with_specific_genre_book_genre_specific_books(self, collector for item in books_fantasy: if collector_full.books_genre[item] != 'Фантастика': isTrue = False - assert isTrue \ No newline at end of file + assert isTrue + + def test_get_books_genre_collecor_books_genre(self, collector_full): + books_genre = {} + #заполнем коллекцию данными + books_genre = collector_full.books_genre + #проверяем, что выводятся книги нужного жанра + assert collector_full.get_books_genre() == books_genre From f6239e2a8c40de9b78169681f65e66d3f5fdfc3b Mon Sep 17 00:00:00 2001 From: G Sh Date: Sun, 9 Mar 2025 23:32:43 +0300 Subject: [PATCH 11/21] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=82=D0=B5=D1=81=D1=82=20test=5Fget=5Fbooks=5Ffor=5F?= =?UTF-8?q?children=5Fcollecor=5Fbooks=5Ffor=5Fchildren?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +++- tests.py | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c6bddf7..6cdd4a5 100644 --- a/README.md +++ b/README.md @@ -5,4 +5,6 @@ 2. Добавил тест test_set_book_genre_book_genre_genre_added проверки добавления жанра. 3. Добавил тест test_get_book_genre_book_genre_genre_get проверка получения жанра книги по ее названию. 4. Добавил тест test_get_books_with_specific_genre_book_genre_specific_books -проверка получения спискв книг с определённым жанром. \ No newline at end of file +проверка получения спискв книг с определённым жанром. +5. Добавил тест test_get_books_genre_collecor_books_genre +6. Добавил тест test_get_books_for_children_collecor_books_for_children \ No newline at end of file diff --git a/tests.py b/tests.py index 32142c9..702407d 100644 --- a/tests.py +++ b/tests.py @@ -46,3 +46,14 @@ def test_get_books_genre_collecor_books_genre(self, collector_full): books_genre = collector_full.books_genre #проверяем, что выводятся книги нужного жанра assert collector_full.get_books_genre() == books_genre + + def test_get_books_for_children_collecor_books_for_children(self, collector_full): + books_for_children =[] + #заполнем коллекцию данными + books_for_children = collector_full.get_books_for_children() + #проверяем, что выводятся книги нужного жанра + isTrue = True + for item in books_for_children: + if collector_full.books_genre.get(item) == 'Ужасы' or collector_full.books_genre[item] == 'Детективы': + isTrue = False + assert isTrue \ No newline at end of file From db4f42c0660f0075062bace87afa0d5260a7474f Mon Sep 17 00:00:00 2001 From: G Sh Date: Sun, 9 Mar 2025 23:37:18 +0300 Subject: [PATCH 12/21] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=82=D0=B5=D1=81=D1=82=20test=5Fadd=5Fbook=5Fin=5Ffa?= =?UTF-8?q?vorites=5Fbooks=5Fbook=5Fin=5Ffavorites?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 ++- tests.py | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6cdd4a5..364e872 100644 --- a/README.md +++ b/README.md @@ -7,4 +7,5 @@ 4. Добавил тест test_get_books_with_specific_genre_book_genre_specific_books проверка получения спискв книг с определённым жанром. 5. Добавил тест test_get_books_genre_collecor_books_genre -6. Добавил тест test_get_books_for_children_collecor_books_for_children \ No newline at end of file +6. Добавил тест test_get_books_for_children_collecor_books_for_children +7. Добавил тест test_add_book_in_favorites_books_book_in_favorites \ No newline at end of file diff --git a/tests.py b/tests.py index 702407d..fad6a9e 100644 --- a/tests.py +++ b/tests.py @@ -56,4 +56,11 @@ def test_get_books_for_children_collecor_books_for_children(self, collector_full for item in books_for_children: if collector_full.books_genre.get(item) == 'Ужасы' or collector_full.books_genre[item] == 'Детективы': isTrue = False - assert isTrue \ No newline at end of file + assert isTrue + + def test_add_book_in_favorites_books_book_in_favorites(self, collector): + #добавляем книгу + collector.add_new_book('The Shawshank Redemption') + collector.add_book_in_favorites('The Shawshank Redemption') + + assert collector.favorites[0] == 'The Shawshank Redemption' \ No newline at end of file From fd22f6a0a5ddd8ab3d3fcb679894cdd4ccd41d92 Mon Sep 17 00:00:00 2001 From: G Sh Date: Sun, 9 Mar 2025 23:40:39 +0300 Subject: [PATCH 13/21] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=82=D0=B5=D1=81=D1=82=20test=5Fdelete=5Fbook=5Ffrom?= =?UTF-8?q?=5Ffavorites=5Fbooks=5Fbook=5Fnot=5Fin=5Ffavorites?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 ++- tests.py | 13 ++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 364e872..a2a7991 100644 --- a/README.md +++ b/README.md @@ -8,4 +8,5 @@ проверка получения спискв книг с определённым жанром. 5. Добавил тест test_get_books_genre_collecor_books_genre 6. Добавил тест test_get_books_for_children_collecor_books_for_children -7. Добавил тест test_add_book_in_favorites_books_book_in_favorites \ No newline at end of file +7. Добавил тест test_add_book_in_favorites_books_book_in_favorites +8. Добавил тест test_delete_book_from_favorites_books_book_not_in_favorites \ No newline at end of file diff --git a/tests.py b/tests.py index fad6a9e..3c05e66 100644 --- a/tests.py +++ b/tests.py @@ -61,6 +61,17 @@ def test_get_books_for_children_collecor_books_for_children(self, collector_full def test_add_book_in_favorites_books_book_in_favorites(self, collector): #добавляем книгу collector.add_new_book('The Shawshank Redemption') + #добавляем книгу в избранное collector.add_book_in_favorites('The Shawshank Redemption') - assert collector.favorites[0] == 'The Shawshank Redemption' \ No newline at end of file + assert collector.favorites[0] == 'The Shawshank Redemption' + + def test_delete_book_from_favorites_books_book_not_in_favorites(self, collector): + #добавляем книгу + collector.add_new_book('The Shawshank Redemption') + # добавляем книгу в избранное + collector.add_book_in_favorites('The Shawshank Redemption') + # удаляем книгу из избранного + collector.delete_book_from_favorites('The Shawshank Redemption') + + assert collector.favorites == [] \ No newline at end of file From 35a3e417c01291b206df7e8d283d5d4ef8b85dca Mon Sep 17 00:00:00 2001 From: G Sh Date: Sun, 9 Mar 2025 23:43:05 +0300 Subject: [PATCH 14/21] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=82=D0=B5=D1=81=D1=82=20test=5Fget=5Flist=5Fof=5Ffa?= =?UTF-8?q?vorites=5Fbooks=5Fcollector=5Fbook=5Fin=5Ffavorites?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tests.py b/tests.py index 3c05e66..80a64b5 100644 --- a/tests.py +++ b/tests.py @@ -74,4 +74,12 @@ def test_delete_book_from_favorites_books_book_not_in_favorites(self, collector) # удаляем книгу из избранного collector.delete_book_from_favorites('The Shawshank Redemption') - assert collector.favorites == [] \ No newline at end of file + assert collector.favorites == [] + + def test_get_list_of_favorites_books_collector_book_in_favorites(self, collector): + #добавляем книгу + collector.add_new_book('The Shawshank Redemption') + # добавляем книгу в избранное + collector.add_book_in_favorites('The Shawshank Redemption') + + assert collector.favorites == collector.get_list_of_favorites_books() \ No newline at end of file From c7a88692abd6142f0c99d9805013b50328232bbc Mon Sep 17 00:00:00 2001 From: G Sh Date: Sun, 9 Mar 2025 23:50:11 +0300 Subject: [PATCH 15/21] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BD=D0=B5=D0=B3=D0=B0=D1=82=D0=B8=D0=B2=D0=BD=D1=8B?= =?UTF-8?q?=D0=B5=20=D1=82=D0=B5=D1=81=D1=82=D1=8B=20=D1=81=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=BC=D0=BE=D1=89=D1=8C=D1=8E=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC?= =?UTF-8?q?=D0=B5=D1=82=D1=80=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D0=B8=D0=B8=20?= =?UTF-8?q?test=5Fadd=5Fnew=5Fbook=5Fadd=5Fnegative=5Finput=5Fbook=5Fnot?= =?UTF-8?q?=5Fadded?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +++- tests.py | 15 +++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index a2a7991..fa14723 100644 --- a/README.md +++ b/README.md @@ -9,4 +9,6 @@ 5. Добавил тест test_get_books_genre_collecor_books_genre 6. Добавил тест test_get_books_for_children_collecor_books_for_children 7. Добавил тест test_add_book_in_favorites_books_book_in_favorites -8. Добавил тест test_delete_book_from_favorites_books_book_not_in_favorites \ No newline at end of file +8. Добавил тест test_delete_book_from_favorites_books_book_not_in_favorites +9. Добавил тест test_get_list_of_favorites_books_collector_book_in_favorites +10. Добавил негативные тесты с помощью параметризациии test_add_new_book_add_negative_input_book_not_added \ No newline at end of file diff --git a/tests.py b/tests.py index 80a64b5..6c1e077 100644 --- a/tests.py +++ b/tests.py @@ -1,12 +1,11 @@ +import pytest + from main import BooksCollector # класс TestBooksCollector объединяет набор тестов, которыми мы покрываем наше приложение BooksCollector # обязательно указывать префикс Test class TestBooksCollector: - # напиши свои тесты ниже - # чтобы тесты были независимыми в каждом из них создавай отдельный экземпляр класса BooksCollector() - def test_add_new_book_add_one_book_book_added(self, collector): #добавляем книгу collector.add_new_book('The Shawshank Redemption') @@ -82,4 +81,12 @@ def test_get_list_of_favorites_books_collector_book_in_favorites(self, collector # добавляем книгу в избранное collector.add_book_in_favorites('The Shawshank Redemption') - assert collector.favorites == collector.get_list_of_favorites_books() \ No newline at end of file + assert collector.favorites == collector.get_list_of_favorites_books() + + @pytest.mark.parametrize('name', ['Ghjhjhjhdhdhdhfhfjfjjk kfkdkdkdkdkskskdkfgk', 'The Shawshank Redemption'] ) + def test_add_new_book_add_negative_input_book_not_added(self, name, collector): + #добавляем книгу + collector.add_new_book('The Shawshank Redemption') + collector.add_new_book(name) + # проверяем, что добавилось именно одна книга + assert len(collector.books_genre) == 1 \ No newline at end of file From 0d3e5a8fb2b2affe60da77ba87abbd3ffb6dd925 Mon Sep 17 00:00:00 2001 From: G Sh Date: Tue, 11 Mar 2025 08:25:02 +0300 Subject: [PATCH 16/21] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=BD=D0=B0=D1=8F=20"=D0=B2=20python=20=D0=BF=D1=80?= =?UTF-8?q?=D0=B8=D0=BD=D1=8F=D1=82=D0=BE=20=D0=BF=D0=B8=D1=81=D0=B0=D1=82?= =?UTF-8?q?=D1=8C=20=D0=B2=20snake=20case"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests.py b/tests.py index 6c1e077..ba62a0a 100644 --- a/tests.py +++ b/tests.py @@ -33,11 +33,11 @@ def test_get_books_with_specific_genre_book_genre_specific_books(self, collector #заполнем коллекцию данными books_fantasy = collector_full.get_books_with_specific_genre('Фантастика') #проверяем, что выводятся книги нужного жанра - isTrue = True + is_true = True for item in books_fantasy: if collector_full.books_genre[item] != 'Фантастика': - isTrue = False - assert isTrue + is_true = False + assert is_true def test_get_books_genre_collecor_books_genre(self, collector_full): books_genre = {} @@ -51,11 +51,11 @@ def test_get_books_for_children_collecor_books_for_children(self, collector_full #заполнем коллекцию данными books_for_children = collector_full.get_books_for_children() #проверяем, что выводятся книги нужного жанра - isTrue = True + is_true = True for item in books_for_children: if collector_full.books_genre.get(item) == 'Ужасы' or collector_full.books_genre[item] == 'Детективы': - isTrue = False - assert isTrue + is_true = False + assert is_true def test_add_book_in_favorites_books_book_in_favorites(self, collector): #добавляем книгу From 4011de987a730bf2035db280b57e884c5b448057 Mon Sep 17 00:00:00 2001 From: G Sh Date: Tue, 11 Mar 2025 08:27:32 +0300 Subject: [PATCH 17/21] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=BE=20-=20"=D0=BD=D0=B5=D0=BE=D0=B1=D1=8F?= =?UTF-8?q?=D0=B7=D0=B0=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D0=BE=20=D0=B7=D0=B0?= =?UTF-8?q?=D1=80=D0=B0=D0=BD=D0=B5=D0=B5=20=D0=BE=D0=B1=D1=8A=D1=8F=D0=B2?= =?UTF-8?q?=D0=BB=D1=8F=D1=82=D1=8C=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=BD=D1=83=D1=8E"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests.py b/tests.py index ba62a0a..d66717b 100644 --- a/tests.py +++ b/tests.py @@ -29,7 +29,7 @@ def test_get_book_genre_book_genre_genre_get(self, collector): assert collector.books_genre.get('The Shawshank Redemption') == 'Фантастика' def test_get_books_with_specific_genre_book_genre_specific_books(self, collector_full): - books_fantasy =[] + #заполнем коллекцию данными books_fantasy = collector_full.get_books_with_specific_genre('Фантастика') #проверяем, что выводятся книги нужного жанра @@ -40,14 +40,12 @@ def test_get_books_with_specific_genre_book_genre_specific_books(self, collector assert is_true def test_get_books_genre_collecor_books_genre(self, collector_full): - books_genre = {} #заполнем коллекцию данными books_genre = collector_full.books_genre #проверяем, что выводятся книги нужного жанра assert collector_full.get_books_genre() == books_genre def test_get_books_for_children_collecor_books_for_children(self, collector_full): - books_for_children =[] #заполнем коллекцию данными books_for_children = collector_full.get_books_for_children() #проверяем, что выводятся книги нужного жанра From ce5503b86048167978fa1beda5162c0bbc2ceb2a Mon Sep 17 00:00:00 2001 From: G Sh Date: Tue, 11 Mar 2025 08:48:46 +0300 Subject: [PATCH 18/21] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BD=20=D1=86?= =?UTF-8?q?=D0=B8=D0=BA=D0=BB=20for=20=D0=B2=20=D1=82=D0=B5=D1=81=D1=82?= =?UTF-8?q?=D0=B5=20test=5Fget=5Fbooks=5Fwith=5Fspecific=5Fgenre=5Fbook=5F?= =?UTF-8?q?genre=5Fspecific=5Fbooks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tests.py b/tests.py index d66717b..6c9b230 100644 --- a/tests.py +++ b/tests.py @@ -33,11 +33,7 @@ def test_get_books_with_specific_genre_book_genre_specific_books(self, collector #заполнем коллекцию данными books_fantasy = collector_full.get_books_with_specific_genre('Фантастика') #проверяем, что выводятся книги нужного жанра - is_true = True - for item in books_fantasy: - if collector_full.books_genre[item] != 'Фантастика': - is_true = False - assert is_true + assert list(filter(lambda x: collector_full.books_genre[x] != 'Фантастика', books_fantasy)) == [] def test_get_books_genre_collecor_books_genre(self, collector_full): #заполнем коллекцию данными From 2c65c993685a7de4d188bd4fd29a1aa5aa185471 Mon Sep 17 00:00:00 2001 From: G Sh Date: Tue, 11 Mar 2025 08:52:39 +0300 Subject: [PATCH 19/21] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BD=20if,=20el?= =?UTF-8?q?se=20=D0=B2=20=D1=82=D0=B5=D1=81=D1=82=D0=B5=20test=5Fget=5Fboo?= =?UTF-8?q?ks=5Fwith=5Fspecific=5Fgenre=5Fbook=5Fgenre=5Fspecific=5Fbooks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conftest.py | 2 +- tests.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/conftest.py b/conftest.py index 22f0ace..a6057ac 100644 --- a/conftest.py +++ b/conftest.py @@ -11,7 +11,7 @@ def collector(): return collector @pytest.fixture -# фикстура, которая набор коллекции книг +# фикстура, которая создает набор коллекции книг def collector_full(): collector = BooksCollector() collector.books_genre = {'The Fifth Element': 'Фантастика', 'Infinite': 'Фантастика', diff --git a/tests.py b/tests.py index 6c9b230..233a7bd 100644 --- a/tests.py +++ b/tests.py @@ -33,6 +33,7 @@ def test_get_books_with_specific_genre_book_genre_specific_books(self, collector #заполнем коллекцию данными books_fantasy = collector_full.get_books_with_specific_genre('Фантастика') #проверяем, что выводятся книги нужного жанра + assert list(filter(lambda x: collector_full.books_genre[x] != 'Фантастика', books_fantasy)) == [] def test_get_books_genre_collecor_books_genre(self, collector_full): From dd91066b1a80c3248f6a4fb341500b153b635f1b Mon Sep 17 00:00:00 2001 From: G Sh Date: Tue, 11 Mar 2025 08:54:53 +0300 Subject: [PATCH 20/21] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20filter=20=20=D0=B2=20=D1=82=D0=B5=D1=81=D1=82?= =?UTF-8?q?=D0=B5=20test=5Fget=5Fbooks=5Fwith=5Fspecific=5Fgenre=5Fbook=5F?= =?UTF-8?q?genre=5Fspecific=5Fbooks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests.py b/tests.py index 233a7bd..6c9b230 100644 --- a/tests.py +++ b/tests.py @@ -33,7 +33,6 @@ def test_get_books_with_specific_genre_book_genre_specific_books(self, collector #заполнем коллекцию данными books_fantasy = collector_full.get_books_with_specific_genre('Фантастика') #проверяем, что выводятся книги нужного жанра - assert list(filter(lambda x: collector_full.books_genre[x] != 'Фантастика', books_fantasy)) == [] def test_get_books_genre_collecor_books_genre(self, collector_full): From 77031f1c481e1ddb99382c6c11743f8064722d72 Mon Sep 17 00:00:00 2001 From: G Sh Date: Tue, 11 Mar 2025 09:01:00 +0300 Subject: [PATCH 21/21] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20filter=20=20=D0=B2=20=D1=82=D0=B5=D1=81=D1=82?= =?UTF-8?q?=D0=B5=20test=5Fget=5Fbooks=5Ffor=5Fchildren=5Fcollecor=5Fbooks?= =?UTF-8?q?=5Ffor=5Fchildren?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tests.py b/tests.py index 6c9b230..115950c 100644 --- a/tests.py +++ b/tests.py @@ -33,7 +33,7 @@ def test_get_books_with_specific_genre_book_genre_specific_books(self, collector #заполнем коллекцию данными books_fantasy = collector_full.get_books_with_specific_genre('Фантастика') #проверяем, что выводятся книги нужного жанра - assert list(filter(lambda x: collector_full.books_genre[x] != 'Фантастика', books_fantasy)) == [] + assert list(filter(lambda x: collector_full.books_genre[x] == 'Фантастика', books_fantasy)) != [] def test_get_books_genre_collecor_books_genre(self, collector_full): #заполнем коллекцию данными @@ -45,11 +45,7 @@ def test_get_books_for_children_collecor_books_for_children(self, collector_full #заполнем коллекцию данными books_for_children = collector_full.get_books_for_children() #проверяем, что выводятся книги нужного жанра - is_true = True - for item in books_for_children: - if collector_full.books_genre.get(item) == 'Ужасы' or collector_full.books_genre[item] == 'Детективы': - is_true = False - assert is_true + assert list(filter(lambda x: collector_full.books_genre[x] == 'Ужасы' or collector_full.books_genre[x] == 'Детективы', books_for_children)) == [] def test_add_book_in_favorites_books_book_in_favorites(self, collector): #добавляем книгу