Dev 3.x flat package (#961)

* Move packages

* Added changelog

* Update examples/echo_bot.py

Co-authored-by: Oleg A. <t0rr@mail.ru>

* Rename `handler` -> `handlers`

* Update __init__.py

Co-authored-by: Oleg A. <t0rr@mail.ru>

tests/test_fsm/storage/test_isolation.py

@@ -0,0 +1,30 @@
+import pytest
+
+from aiogram.fsm.storage.base import BaseEventIsolation, StorageKey
+from tests.mocked_bot import MockedBot
+
+pytestmark = pytest.mark.asyncio
+
+
+@pytest.fixture(name="storage_key")
+def create_storate_key(bot: MockedBot):
+    return StorageKey(chat_id=-42, user_id=42, bot_id=bot.id)
+
+
+@pytest.mark.parametrize(
+    "isolation",
+    [
+        pytest.lazy_fixture("redis_isolation"),
+        pytest.lazy_fixture("lock_isolation"),
+        pytest.lazy_fixture("disabled_isolation"),
+    ],
+)
+class TestIsolations:
+    async def test_lock(
+        self,
+        bot: MockedBot,
+        isolation: BaseEventIsolation,
+        storage_key: StorageKey,
+    ):
+        async with isolation.lock(bot=bot, key=storage_key):
+            assert True, "You are kidding me?"

tests/test_fsm/storage/test_redis.py

@@ -0,0 +1,53 @@
+import pytest
+
+from aiogram.fsm.storage.base import DEFAULT_DESTINY, StorageKey
+from aiogram.fsm.storage.redis import DefaultKeyBuilder, RedisEventIsolation, RedisStorage
+
+pytestmark = pytest.mark.asyncio
+
+PREFIX = "test"
+BOT_ID = 42
+CHAT_ID = -1
+USER_ID = 2
+FIELD = "data"
+
+
+class TestRedisDefaultKeyBuilder:
+    @pytest.mark.parametrize(
+        "with_bot_id,with_destiny,result",
+        [
+            [False, False, f"{PREFIX}:{CHAT_ID}:{USER_ID}:{FIELD}"],
+            [True, False, f"{PREFIX}:{BOT_ID}:{CHAT_ID}:{USER_ID}:{FIELD}"],
+            [True, True, f"{PREFIX}:{BOT_ID}:{CHAT_ID}:{USER_ID}:{DEFAULT_DESTINY}:{FIELD}"],
+            [False, True, f"{PREFIX}:{CHAT_ID}:{USER_ID}:{DEFAULT_DESTINY}:{FIELD}"],
+        ],
+    )
+    async def test_generate_key(self, with_bot_id: bool, with_destiny: bool, result: str):
+        key_builder = DefaultKeyBuilder(
+            prefix=PREFIX,
+            with_bot_id=with_bot_id,
+            with_destiny=with_destiny,
+        )
+        key = StorageKey(chat_id=CHAT_ID, user_id=USER_ID, bot_id=BOT_ID, destiny=DEFAULT_DESTINY)
+        assert key_builder.build(key, FIELD) == result
+
+    async def test_destiny_check(self):
+        key_builder = DefaultKeyBuilder(
+            with_destiny=False,
+        )
+        key = StorageKey(chat_id=CHAT_ID, user_id=USER_ID, bot_id=BOT_ID)
+        assert key_builder.build(key, FIELD)
+
+        key = StorageKey(
+            chat_id=CHAT_ID, user_id=USER_ID, bot_id=BOT_ID, destiny="CUSTOM_TEST_DESTINY"
+        )
+        with pytest.raises(ValueError):
+            key_builder.build(key, FIELD)
+
+    def test_create_isolation(self):
+        fake_redis = object()
+        storage = RedisStorage(redis=fake_redis)
+        isolation = storage.create_isolation()
+        assert isinstance(isolation, RedisEventIsolation)
+        assert isolation.redis is fake_redis
+        assert isolation.key_builder is storage.key_builder

tests/test_fsm/storage/test_storages.py

@@ -0,0 +1,49 @@
+import pytest
+
+from aiogram.fsm.storage.base import BaseStorage, StorageKey
+from tests.mocked_bot import MockedBot
+
+pytestmark = pytest.mark.asyncio
+
+
+@pytest.fixture(name="storage_key")
+def create_storate_key(bot: MockedBot):
+    return StorageKey(chat_id=-42, user_id=42, bot_id=bot.id)
+
+
+@pytest.mark.parametrize(
+    "storage",
+    [pytest.lazy_fixture("redis_storage"), pytest.lazy_fixture("memory_storage")],
+)
+class TestStorages:
+    async def test_set_state(self, bot: MockedBot, storage: BaseStorage, storage_key: StorageKey):
+        assert await storage.get_state(bot=bot, key=storage_key) is None
+
+        await storage.set_state(bot=bot, key=storage_key, state="state")
+        assert await storage.get_state(bot=bot, key=storage_key) == "state"
+        await storage.set_state(bot=bot, key=storage_key, state=None)
+        assert await storage.get_state(bot=bot, key=storage_key) is None
+
+    async def test_set_data(self, bot: MockedBot, storage: BaseStorage, storage_key: StorageKey):
+        assert await storage.get_data(bot=bot, key=storage_key) == {}
+
+        await storage.set_data(bot=bot, key=storage_key, data={"foo": "bar"})
+        assert await storage.get_data(bot=bot, key=storage_key) == {"foo": "bar"}
+        await storage.set_data(bot=bot, key=storage_key, data={})
+        assert await storage.get_data(bot=bot, key=storage_key) == {}
+
+    async def test_update_data(
+        self, bot: MockedBot, storage: BaseStorage, storage_key: StorageKey
+    ):
+        assert await storage.get_data(bot=bot, key=storage_key) == {}
+        assert await storage.update_data(bot=bot, key=storage_key, data={"foo": "bar"}) == {
+            "foo": "bar"
+        }
+        assert await storage.update_data(bot=bot, key=storage_key, data={"baz": "spam"}) == {
+            "foo": "bar",
+            "baz": "spam",
+        }
+        assert await storage.get_data(bot=bot, key=storage_key) == {
+            "foo": "bar",
+            "baz": "spam",
+        }