test: 重构测试

Author: st1020

alicebot/plugin.py

@@ -110,10 +110,7 @@ def __init_subclass__(
 
         if not hasattr(cls, "Config") and config is not None:
             cls.Config = config
-        if (
-            cls.__init_state__ is cast(Plugin[Any, Any, Any], Plugin).__init_state__  # type: ignore[comparison-overlap]
-            and init_state is not None
-        ):
+        if cls.__init_state__ is Plugin.__init_state__ and init_state is not None:
             cls.__init_state__ = lambda _: init_state  # type: ignore
 
     @final

tests/bad_plugins/plugin_error_ext.txt

@@ -1,9 +1,7 @@
-from typing import Any
-
 from alicebot import Plugin
 
 
-class Plugin1(Plugin[Any, None, None]):
+class Plugin1(Plugin):
     async def handle(self) -> None:
         pass
 

tests/fake_adapter.py

@@ -1,27 +1,29 @@
 import inspect
 from collections.abc import Awaitable
-from typing import Any, Callable, ClassVar, Optional, Union
+from typing import Any, Callable, Generic, Optional, Union
 from typing_extensions import override
 
 from anyio.lowlevel import checkpoint
 
 from alicebot import Adapter, Event, MessageEvent
+from alicebot.plugin import Plugin
+from alicebot.typing import ConfigT, StateT
+
+EventFactory = Callable[
+    ["FakeAdapter"],
+    Union[
+        Optional[Event["FakeAdapter"]],
+        Awaitable[Optional[Event["FakeAdapter"]]],
+    ],
+]
 
 
 class FakeAdapter(Adapter[Event[Any], None]):
     """用于测试的适配器。"""
 
-    EventFactory = Callable[
-        ["FakeAdapter"],
-        Union[
-            Optional[Event["FakeAdapter"]],
-            Awaitable[Optional[Event["FakeAdapter"]]],
-        ],
-    ]
-
     name: str = "fake_adapter"
-    event_factories: ClassVar[tuple[EventFactory, ...]] = ()
-    handle_get: ClassVar[bool] = True
+    event_factories: tuple[EventFactory, ...] = ()
+    handle_get: bool = True
 
     @override
     async def run(self) -> None:
@@ -42,10 +44,15 @@ async def run(self) -> None:
 
         self.bot.exit()
 
-    @classmethod
-    def set_event_factories(cls, *event_factories: EventFactory) -> None:
-        """设置适配器运行后将要产生的事件。"""
-        cls.event_factories = event_factories
+
+def fake_adapter_class_factory(
+    *event_factories: EventFactory, handle_get: bool = True
+) -> type[FakeAdapter]:
+    return type(
+        "FakeAdapter",
+        (FakeAdapter,),
+        {"event_factories": event_factories, "handle_get": handle_get},
+    )
 
 
 class FakeMessageEvent(MessageEvent[FakeAdapter]):
@@ -62,3 +69,22 @@ def get_plain_text(self) -> str:
     @override
     async def reply(self, message: str) -> None:
         pass
+
+
+def fake_message_event_factor(
+    adapter: FakeAdapter, message: str = "test"
+) -> FakeMessageEvent:
+    return FakeMessageEvent(adapter=adapter, type="message", message=message)
+
+
+class BaseTestPlugin(
+    Generic[StateT, ConfigT],
+    Plugin[FakeMessageEvent, StateT, ConfigT],
+):
+    @override
+    async def handle(self) -> None:
+        pass
+
+    @override
+    async def rule(self) -> bool:
+        return isinstance(self.event, FakeMessageEvent)

tests/plugins/plugin1.py

@@ -1,10 +1,9 @@
-from typing import Any
 from typing_extensions import override
 
 from alicebot import Plugin
 
 
-class Plugin1(Plugin[Any, None, None]):
+class Plugin1(Plugin):
     @override
     async def handle(self) -> None:
         pass

tests/plugins/plugin2/__init__.py

@@ -1,10 +1,9 @@
-from typing import Any
 from typing_extensions import override
 
 from alicebot import Plugin
 
 
-class Plugin2(Plugin[Any, None, None]):
+class Plugin2(Plugin):
     @override
     async def handle(self) -> None:
         pass

tests/test_hook.py

@@ -1,6 +1,6 @@
 from typing import Any, Callable
 
-from fake_adapter import FakeAdapter, FakeMessageEvent
+from fake_adapter import fake_adapter_class_factory, fake_message_event_factor
 
 from alicebot import Adapter, Bot, Event
 
@@ -37,10 +37,7 @@ async def event_preprocessor_hook(_event: Event[Any]) -> None:
     async def event_postprocessor_hook(_event: Event[Any]) -> None:
         hook_call_list.append(event_postprocessor_hook)
 
-    FakeAdapter.set_event_factories(
-        lambda self: FakeMessageEvent(adapter=self, type="message")
-    )
-    bot.load_adapters(FakeAdapter)
+    bot.load_adapters(fake_adapter_class_factory(fake_message_event_factor))
     bot.run()
 
     assert hook_call_list == [