From 222d48ea097df6ff849330132ae4fa4daec0cfe7 Mon Sep 17 00:00:00 2001 From: JRoot Junior Date: Sat, 27 Jan 2024 18:44:14 +0200 Subject: [PATCH] Fixed coverage --- aiogram/utils/keyboard.py | 10 +--------- tests/test_utils/test_keyboard.py | 16 +++++----------- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/aiogram/utils/keyboard.py b/aiogram/utils/keyboard.py index 454d51e3..8ff8463f 100644 --- a/aiogram/utils/keyboard.py +++ b/aiogram/utils/keyboard.py @@ -106,7 +106,7 @@ class KeyboardBuilder(Generic[ButtonType], ABC): f"not type {type(row).__name__}" ) if len(row) > self.max_width: - raise ValueError(f"Row {row!r} is too long (MAX_WIDTH={self.max_width})") + raise ValueError(f"Row {row!r} is too long (max width: {self.max_width})") self._validate_buttons(*row) return True @@ -144,14 +144,6 @@ class KeyboardBuilder(Generic[ButtonType], ABC): raise ValueError(f"Row size {size} are not allowed") return size - def copy(self: "KeyboardBuilder[ButtonType]") -> "KeyboardBuilder[ButtonType]": - """ - Make full copy of current builder with markup - - :return: - """ - return self.__class__(self._button_type, markup=self.export()) - def export(self) -> List[List[ButtonType]]: """ Export configured markup as list of lists of buttons diff --git a/tests/test_utils/test_keyboard.py b/tests/test_utils/test_keyboard.py index c49bda7d..27aeb1ac 100644 --- a/tests/test_utils/test_keyboard.py +++ b/tests/test_utils/test_keyboard.py @@ -78,27 +78,21 @@ class TestKeyboardBuilder: row=[KeyboardButton(text=f"test {index}") for index in range(count)] ) - def test_validate_markup(self): + def test_validate_markup_invalid_type(self): builder = ReplyKeyboardBuilder() - with pytest.raises(ValueError): builder._validate_markup(markup=()) + def test_validate_markup_too_many_buttons(self): + builder = ReplyKeyboardBuilder() with pytest.raises(ValueError): builder._validate_markup( markup=[ - [KeyboardButton(text=f"{row}.{col}") for col in range(builder.max_width + 5)] - for row in range(5) + [KeyboardButton(text=f"{row}.{col}") for col in range(builder.max_width)] + for row in range(builder.max_buttons) ] ) - assert builder._validate_markup( - markup=[ - [KeyboardButton(text=f"{row}.{col}") for col in range(builder.max_width)] - for row in range(5) - ] - ) - def test_validate_size(self): builder = ReplyKeyboardBuilder() with pytest.raises(ValueError):