diff --git a/tests/test_admin.py b/tests/test_admin.py index 1e248d3..907e37b 100644 --- a/tests/test_admin.py +++ b/tests/test_admin.py @@ -38,19 +38,6 @@ def zone(): return z -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - def make_player(name, zone, mock_writer, mock_reader, is_admin=False): p = Player( name=name, diff --git a/tests/test_build_commands.py b/tests/test_build_commands.py index b25bfde..9eb9cb3 100644 --- a/tests/test_build_commands.py +++ b/tests/test_build_commands.py @@ -1,7 +1,5 @@ """Tests for builder commands.""" -from unittest.mock import AsyncMock, MagicMock - import pytest from mudlib.player import Player, players @@ -26,19 +24,6 @@ def zone(): return z -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def player(zone, mock_writer, mock_reader): p = Player( diff --git a/tests/test_combat_commands.py b/tests/test_combat_commands.py index 01e1670..1a0b0fb 100644 --- a/tests/test_combat_commands.py +++ b/tests/test_combat_commands.py @@ -2,7 +2,6 @@ import time from pathlib import Path -from unittest.mock import AsyncMock, MagicMock import pytest @@ -38,19 +37,6 @@ def test_zone(): return zone -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def player(mock_reader, mock_writer, test_zone): p = Player(name="Goku", x=0, y=0, reader=mock_reader, writer=mock_writer) diff --git a/tests/test_commands.py b/tests/test_commands.py index 003ab98..bbff32f 100644 --- a/tests/test_commands.py +++ b/tests/test_commands.py @@ -21,19 +21,6 @@ def _clean_test_commands(): commands._registry.update(snapshot) -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def test_zone(): # Create a 100x100 zone filled with passable terrain diff --git a/tests/test_commands_list.py b/tests/test_commands_list.py index 61d0c62..8ed2914 100644 --- a/tests/test_commands_list.py +++ b/tests/test_commands_list.py @@ -1,7 +1,6 @@ """Tests for the commands listing command.""" from pathlib import Path -from unittest.mock import AsyncMock, MagicMock import pytest @@ -18,19 +17,6 @@ from mudlib.commands import ( ) -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def player(mock_reader, mock_writer): from mudlib.player import Player diff --git a/tests/test_container_display.py b/tests/test_container_display.py index b333da6..07f8a1f 100644 --- a/tests/test_container_display.py +++ b/tests/test_container_display.py @@ -1,7 +1,5 @@ """Tests for container state display in look and inventory commands.""" -from unittest.mock import AsyncMock, MagicMock - import pytest from mudlib.container import Container @@ -10,19 +8,6 @@ from mudlib.thing import Thing from mudlib.zone import Zone -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def test_zone(): terrain = [["." for _ in range(10)] for _ in range(10)] diff --git a/tests/test_content_loader.py b/tests/test_content_loader.py index 59591e4..18505d2 100644 --- a/tests/test_content_loader.py +++ b/tests/test_content_loader.py @@ -3,7 +3,6 @@ import logging import tempfile from pathlib import Path -from unittest.mock import AsyncMock, MagicMock import pytest @@ -11,19 +10,6 @@ from mudlib.content import load_command, load_commands from mudlib.player import Player -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def player(mock_reader, mock_writer): return Player(name="TestPlayer", x=5, y=5, reader=mock_reader, writer=mock_writer) diff --git a/tests/test_editor_integration.py b/tests/test_editor_integration.py index 6a1f4b4..f0173de 100644 --- a/tests/test_editor_integration.py +++ b/tests/test_editor_integration.py @@ -1,6 +1,6 @@ """Tests for editor integration with the shell and command system.""" -from unittest.mock import AsyncMock, MagicMock +from unittest.mock import MagicMock import pytest @@ -10,19 +10,6 @@ from mudlib.editor import Editor from mudlib.player import Player -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def player(mock_reader, mock_writer): return Player(name="TestPlayer", x=5, y=5, reader=mock_reader, writer=mock_writer) diff --git a/tests/test_enter_portal.py b/tests/test_enter_portal.py index af0c0bf..f9871fd 100644 --- a/tests/test_enter_portal.py +++ b/tests/test_enter_portal.py @@ -11,19 +11,6 @@ from mudlib.zone import Zone from mudlib.zones import register_zone, zone_registry -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def test_zone(): terrain = [["." for _ in range(10)] for _ in range(10)] diff --git a/tests/test_entity_posture.py b/tests/test_entity_posture.py index d7d96fd..4ddf98b 100644 --- a/tests/test_entity_posture.py +++ b/tests/test_entity_posture.py @@ -1,26 +1,9 @@ """Tests for Entity.posture property.""" -from unittest.mock import AsyncMock, MagicMock - -import pytest - from mudlib.entity import Entity, Mob from mudlib.player import Player -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - def test_entity_default_posture(): """Entity with no special state should be 'standing'.""" entity = Entity(name="Test", x=0, y=0) diff --git a/tests/test_examine.py b/tests/test_examine.py index 4378dc6..afe3476 100644 --- a/tests/test_examine.py +++ b/tests/test_examine.py @@ -1,5 +1,3 @@ -from unittest.mock import AsyncMock, MagicMock - import pytest from mudlib.commands.examine import cmd_examine @@ -10,19 +8,6 @@ from mudlib.thing import Thing from mudlib.zone import Zone -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def test_zone(): terrain = [["." for _ in range(10)] for _ in range(10)] diff --git a/tests/test_fly.py b/tests/test_fly.py index eb8d30f..5d5f3d3 100644 --- a/tests/test_fly.py +++ b/tests/test_fly.py @@ -11,19 +11,6 @@ from mudlib.player import Player, players from mudlib.zone import Zone -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def test_zone(): terrain = [["." for _ in range(100)] for _ in range(100)] diff --git a/tests/test_get_drop.py b/tests/test_get_drop.py index 7c37ce3..f9866c4 100644 --- a/tests/test_get_drop.py +++ b/tests/test_get_drop.py @@ -1,7 +1,5 @@ """Tests for get and drop commands.""" -from unittest.mock import AsyncMock, MagicMock - import pytest from mudlib.commands import _registry @@ -11,19 +9,6 @@ from mudlib.thing import Thing from mudlib.zone import Zone -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def test_zone(): terrain = [["." for _ in range(10)] for _ in range(10)] diff --git a/tests/test_help_command.py b/tests/test_help_command.py index cbf12c7..c4e70cd 100644 --- a/tests/test_help_command.py +++ b/tests/test_help_command.py @@ -1,7 +1,5 @@ """Tests for the standalone help command.""" -from unittest.mock import AsyncMock, MagicMock - import pytest from mudlib import commands @@ -16,19 +14,6 @@ from mudlib.commands.help import _help_topics from mudlib.content import load_help_topics -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def player(mock_reader, mock_writer): from mudlib.player import Player diff --git a/tests/test_help_topics.py b/tests/test_help_topics.py index e42ff82..d9bbd04 100644 --- a/tests/test_help_topics.py +++ b/tests/test_help_topics.py @@ -1,7 +1,7 @@ """Tests for TOML help topic loading.""" import textwrap -from unittest.mock import AsyncMock, MagicMock +from unittest.mock import MagicMock import pytest @@ -84,14 +84,6 @@ def test_load_help_topics_skips_bad_files(tmp_path): assert "broken" not in topics -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - @pytest.fixture def player(mock_writer): from mudlib.player import Player diff --git a/tests/test_help_unlock.py b/tests/test_help_unlock.py index 91c450b..aa0c53b 100644 --- a/tests/test_help_unlock.py +++ b/tests/test_help_unlock.py @@ -1,6 +1,6 @@ """Tests for help command showing unlock status for combat moves.""" -from unittest.mock import AsyncMock, MagicMock, patch +from unittest.mock import patch import pytest @@ -17,14 +17,6 @@ def clear_state(): players.clear() -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - @pytest.fixture def player(mock_writer): return Player(name="Test", writer=mock_writer) diff --git a/tests/test_if_mode.py b/tests/test_if_mode.py index e3f7ec9..4afa763 100644 --- a/tests/test_if_mode.py +++ b/tests/test_if_mode.py @@ -8,19 +8,6 @@ from mudlib.if_session import IFResponse, IFSession from mudlib.player import Player -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def player(mock_reader, mock_writer): return Player(name="TestPlayer", x=5, y=5, reader=mock_reader, writer=mock_writer) diff --git a/tests/test_if_spectator.py b/tests/test_if_spectator.py index 4235108..ac59cab 100644 --- a/tests/test_if_spectator.py +++ b/tests/test_if_spectator.py @@ -9,19 +9,6 @@ from mudlib.player import Player, players from mudlib.zone import Zone -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture(autouse=True) def clear_players(): """Clear players registry before and after each test.""" diff --git a/tests/test_inventory.py b/tests/test_inventory.py index fcce885..aa714c6 100644 --- a/tests/test_inventory.py +++ b/tests/test_inventory.py @@ -1,7 +1,5 @@ """Tests for inventory command.""" -from unittest.mock import AsyncMock, MagicMock - import pytest from mudlib import commands @@ -23,18 +21,6 @@ def test_zone(): ) -@pytest.fixture -def mock_writer(): - """Create a mock writer.""" - return MagicMock(write=MagicMock(), drain=AsyncMock()) - - -@pytest.fixture -def mock_reader(): - """Create a mock reader.""" - return MagicMock() - - @pytest.fixture def player(mock_reader, mock_writer, test_zone): """Create a test player.""" diff --git a/tests/test_key_unlock.py b/tests/test_key_unlock.py index a6cb402..e3436af 100644 --- a/tests/test_key_unlock.py +++ b/tests/test_key_unlock.py @@ -1,5 +1,3 @@ -from unittest.mock import AsyncMock, MagicMock - import pytest from mudlib.container import Container @@ -8,19 +6,6 @@ from mudlib.thing import Thing from mudlib.zone import Zone -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def test_zone(): terrain = [["." for _ in range(10)] for _ in range(10)] diff --git a/tests/test_look_command.py b/tests/test_look_command.py index daf38d7..afe8f0d 100644 --- a/tests/test_look_command.py +++ b/tests/test_look_command.py @@ -26,19 +26,6 @@ def _reset_globals(): mudlib.weather._current_weather = None -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def test_zone(): """Create a test zone with simple terrain.""" diff --git a/tests/test_mob_ai.py b/tests/test_mob_ai.py index 5f75dd0..14579bf 100644 --- a/tests/test_mob_ai.py +++ b/tests/test_mob_ai.py @@ -2,7 +2,6 @@ import time from pathlib import Path -from unittest.mock import AsyncMock, MagicMock import pytest @@ -51,19 +50,6 @@ def test_zone(): return zone -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def player(mock_reader, mock_writer, test_zone): p = Player(name="Goku", x=0, y=0, reader=mock_reader, writer=mock_writer) diff --git a/tests/test_mob_ai_behavior_integration.py b/tests/test_mob_ai_behavior_integration.py index 427a12d..54741dc 100644 --- a/tests/test_mob_ai_behavior_integration.py +++ b/tests/test_mob_ai_behavior_integration.py @@ -1,7 +1,6 @@ """Tests for mob AI integration with behavior states.""" from pathlib import Path -from unittest.mock import AsyncMock, MagicMock import pytest @@ -43,19 +42,6 @@ def test_zone(): return zone -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def player(mock_reader, mock_writer, test_zone): p = Player(name="Hero", x=0, y=0, reader=mock_reader, writer=mock_writer) diff --git a/tests/test_mobs.py b/tests/test_mobs.py index 3bc79de..a742e1c 100644 --- a/tests/test_mobs.py +++ b/tests/test_mobs.py @@ -1,7 +1,7 @@ """Tests for mob templates, registry, spawn/despawn, and combat integration.""" from pathlib import Path -from unittest.mock import AsyncMock, MagicMock +from unittest.mock import MagicMock import pytest @@ -182,19 +182,6 @@ class TestGetNearbyMob: # --- Phase 2: target resolution tests --- -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def player(mock_reader, mock_writer, test_zone): p = Player(name="Goku", x=0, y=0, reader=mock_reader, writer=mock_writer) diff --git a/tests/test_npc_integration.py b/tests/test_npc_integration.py index faf82a9..a877bbf 100644 --- a/tests/test_npc_integration.py +++ b/tests/test_npc_integration.py @@ -1,7 +1,5 @@ """End-to-end integration tests for NPC system (behavior + dialogue + schedule).""" -from unittest.mock import AsyncMock, MagicMock - import pytest from mudlib.commands.talk import cmd_reply, cmd_talk, dialogue_trees @@ -44,19 +42,6 @@ def test_zone(): return zone -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def player(mock_reader, mock_writer, test_zone): p = Player(name="Hero", x=10, y=10, reader=mock_reader, writer=mock_writer) diff --git a/tests/test_open_close.py b/tests/test_open_close.py index 1cd7134..1e520dc 100644 --- a/tests/test_open_close.py +++ b/tests/test_open_close.py @@ -1,7 +1,5 @@ """Tests for open and close commands.""" -from unittest.mock import AsyncMock, MagicMock - import pytest from mudlib.commands import _registry @@ -11,19 +9,6 @@ from mudlib.thing import Thing from mudlib.zone import Zone -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def test_zone(): terrain = [["." for _ in range(10)] for _ in range(10)] diff --git a/tests/test_persistence.py b/tests/test_persistence.py index c8d671d..0d391f7 100644 --- a/tests/test_persistence.py +++ b/tests/test_persistence.py @@ -2,7 +2,6 @@ import os import tempfile -from unittest.mock import AsyncMock, MagicMock import pytest @@ -25,21 +24,6 @@ def temp_db(): os.unlink(db_path) -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - writer.close = MagicMock() - writer.is_closing = MagicMock(return_value=False) - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.mark.asyncio async def test_quit_saves_player_state(temp_db, mock_reader, mock_writer): """Quit command saves player state before disconnecting.""" diff --git a/tests/test_play_command.py b/tests/test_play_command.py index 3950bf2..b3fda26 100644 --- a/tests/test_play_command.py +++ b/tests/test_play_command.py @@ -1,20 +1,12 @@ """Tests for the play command.""" -from unittest.mock import AsyncMock, MagicMock, Mock, patch +from unittest.mock import AsyncMock, Mock, patch import pytest from mudlib.zone import Zone -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - @pytest.fixture def test_zone(): """Create a test zone for spatial queries.""" diff --git a/tests/test_player_fields.py b/tests/test_player_fields.py index 5bf8667..de36cdb 100644 --- a/tests/test_player_fields.py +++ b/tests/test_player_fields.py @@ -1,25 +1,8 @@ """Tests for player description and home_zone fields.""" -from unittest.mock import AsyncMock, MagicMock - -import pytest - from mudlib.player import Player -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - def test_player_default_description(mock_reader, mock_writer): """Test that Player has default empty description.""" player = Player(name="Hero", x=0, y=0, reader=mock_reader, writer=mock_writer) diff --git a/tests/test_portal_autotrigger.py b/tests/test_portal_autotrigger.py index dde35b5..de15fc0 100644 --- a/tests/test_portal_autotrigger.py +++ b/tests/test_portal_autotrigger.py @@ -1,7 +1,5 @@ """Tests for auto-triggering portals on movement.""" -from unittest.mock import AsyncMock, MagicMock - import pytest from mudlib.player import Player @@ -10,19 +8,6 @@ from mudlib.zone import Zone from mudlib.zones import register_zone, zone_registry -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def test_zone(): terrain = [["." for _ in range(10)] for _ in range(10)] diff --git a/tests/test_portal_display.py b/tests/test_portal_display.py index ff271bf..b36b0b8 100644 --- a/tests/test_portal_display.py +++ b/tests/test_portal_display.py @@ -1,7 +1,5 @@ """Tests for portal display in look command.""" -from unittest.mock import AsyncMock, MagicMock - import pytest from mudlib.player import Player @@ -9,19 +7,6 @@ from mudlib.portal import Portal from mudlib.zone import Zone -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def test_zone(): terrain = [["." for _ in range(10)] for _ in range(10)] diff --git a/tests/test_prefix_matching.py b/tests/test_prefix_matching.py index 02e1996..8fd8327 100644 --- a/tests/test_prefix_matching.py +++ b/tests/test_prefix_matching.py @@ -1,26 +1,11 @@ """Tests for prefix matching in command dispatch.""" -from unittest.mock import AsyncMock, MagicMock - import pytest from mudlib import commands from mudlib.commands import CommandDefinition -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def player(mock_reader, mock_writer): from mudlib.player import Player diff --git a/tests/test_prompt_command.py b/tests/test_prompt_command.py index 3967bf9..004e060 100644 --- a/tests/test_prompt_command.py +++ b/tests/test_prompt_command.py @@ -1,26 +1,11 @@ """Tests for the prompt command.""" -from unittest.mock import AsyncMock, MagicMock - import pytest from mudlib.commands.prompt import cmd_prompt from mudlib.prompt import render_prompt -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def player(mock_reader, mock_writer): from mudlib.player import Player diff --git a/tests/test_put_take.py b/tests/test_put_take.py index a070154..010e82e 100644 --- a/tests/test_put_take.py +++ b/tests/test_put_take.py @@ -1,7 +1,5 @@ """Tests for put and take-from commands.""" -from unittest.mock import AsyncMock, MagicMock - import pytest from mudlib.commands import _registry @@ -11,19 +9,6 @@ from mudlib.thing import Thing from mudlib.zone import Zone -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def test_zone(): terrain = [["." for _ in range(10)] for _ in range(10)] diff --git a/tests/test_readable.py b/tests/test_readable.py index 949ddab..8abf035 100644 --- a/tests/test_readable.py +++ b/tests/test_readable.py @@ -1,7 +1,5 @@ """Tests for readable objects.""" -from unittest.mock import AsyncMock, MagicMock - import pytest from mudlib.player import Player, players @@ -27,19 +25,6 @@ def zone(): ) -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - # --- Thing model --- diff --git a/tests/test_reload.py b/tests/test_reload.py index 8718a33..2b2ab7b 100644 --- a/tests/test_reload.py +++ b/tests/test_reload.py @@ -1,7 +1,6 @@ """Tests for the reload command.""" from pathlib import Path -from unittest.mock import AsyncMock, MagicMock import pytest @@ -19,19 +18,6 @@ def clear_state(): players.clear() -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def player(mock_reader, mock_writer): """Create a test player.""" diff --git a/tests/test_rest.py b/tests/test_rest.py index f5a8c6d..c0372ef 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -1,7 +1,5 @@ """Tests for rest command.""" -from unittest.mock import AsyncMock, MagicMock - import pytest from mudlib.commands.rest import cmd_rest @@ -33,19 +31,6 @@ def test_zone(): return zone -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def player(mock_reader, mock_writer, test_zone): p = Player(name="Goku", x=0, y=0, reader=mock_reader, writer=mock_writer) diff --git a/tests/test_safe_zones.py b/tests/test_safe_zones.py index bbdf655..79ed09b 100644 --- a/tests/test_safe_zones.py +++ b/tests/test_safe_zones.py @@ -2,7 +2,6 @@ import pathlib import tempfile -from unittest.mock import AsyncMock, MagicMock import pytest @@ -47,19 +46,6 @@ def unsafe_zone(): ) -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - # --- Zone property tests --- diff --git a/tests/test_spawn_command.py b/tests/test_spawn_command.py index 3733a0f..2438a4b 100644 --- a/tests/test_spawn_command.py +++ b/tests/test_spawn_command.py @@ -1,7 +1,5 @@ """Tests for the spawn command.""" -from unittest.mock import AsyncMock, MagicMock - import pytest from mudlib.commands.spawn import cmd_spawn @@ -22,19 +20,6 @@ def clear_state(): players.clear() -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def test_zone(): """Create a test zone for spawning.""" diff --git a/tests/test_talk.py b/tests/test_talk.py index a199a09..86a16df 100644 --- a/tests/test_talk.py +++ b/tests/test_talk.py @@ -2,7 +2,6 @@ import tempfile from pathlib import Path -from unittest.mock import AsyncMock, MagicMock import pytest @@ -47,19 +46,6 @@ def test_zone(): return zone -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def player(mock_reader, mock_writer, test_zone): p = Player(name="Hero", x=10, y=10, reader=mock_reader, writer=mock_writer) diff --git a/tests/test_toml_verbs.py b/tests/test_toml_verbs.py index 762e0b1..9b71bdb 100644 --- a/tests/test_toml_verbs.py +++ b/tests/test_toml_verbs.py @@ -1,7 +1,6 @@ """Tests for TOML verb support in thing templates.""" import textwrap -from unittest.mock import AsyncMock, MagicMock import pytest @@ -26,19 +25,6 @@ async def _another_test_handler(obj, player, args): await player.send(f"another verb on {obj.name}\r\n") -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def test_zone(): terrain = [["." for _ in range(10)] for _ in range(10)] diff --git a/tests/test_two_way_portals.py b/tests/test_two_way_portals.py index 2e043ae..8133f3e 100644 --- a/tests/test_two_way_portals.py +++ b/tests/test_two_way_portals.py @@ -1,7 +1,5 @@ """Tests for two-way portal transitions.""" -from unittest.mock import AsyncMock, MagicMock - import pytest from mudlib.player import Player @@ -10,19 +8,6 @@ from mudlib.zone import Zone from mudlib.zones import register_zone, zone_registry -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def zone_a(): terrain = [["." for _ in range(10)] for _ in range(10)] diff --git a/tests/test_use.py b/tests/test_use.py index 5d9048a..c0dad3c 100644 --- a/tests/test_use.py +++ b/tests/test_use.py @@ -1,5 +1,3 @@ -from unittest.mock import AsyncMock, MagicMock - import pytest from mudlib.commands.use import cmd_use @@ -9,19 +7,6 @@ from mudlib.verbs import verb from mudlib.zone import Zone -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def test_zone(): terrain = [["." for _ in range(10)] for _ in range(10)] diff --git a/tests/test_variant_prefix.py b/tests/test_variant_prefix.py index c84fa7e..f3e4382 100644 --- a/tests/test_variant_prefix.py +++ b/tests/test_variant_prefix.py @@ -1,7 +1,6 @@ """Tests for variant prefix matching in combat commands.""" from pathlib import Path -from unittest.mock import AsyncMock, MagicMock import pytest @@ -37,19 +36,6 @@ def test_zone(): return zone -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def player(mock_reader, mock_writer, test_zone): p = Player(name="Goku", x=0, y=0, reader=mock_reader, writer=mock_writer) diff --git a/tests/test_verb_dispatch.py b/tests/test_verb_dispatch.py index 53110e7..afb86e1 100644 --- a/tests/test_verb_dispatch.py +++ b/tests/test_verb_dispatch.py @@ -1,7 +1,5 @@ """Tests for verb dispatch fallback in command system.""" -from unittest.mock import AsyncMock, MagicMock - import pytest from mudlib.commands import dispatch @@ -11,19 +9,6 @@ from mudlib.verbs import verb from mudlib.zone import Zone -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def test_zone(): terrain = [["." for _ in range(10)] for _ in range(10)] diff --git a/tests/test_verbs.py b/tests/test_verbs.py index 800157d..3bc4b8b 100644 --- a/tests/test_verbs.py +++ b/tests/test_verbs.py @@ -1,7 +1,5 @@ """Tests for the verb system on Object.""" -from unittest.mock import AsyncMock, MagicMock - import pytest from mudlib.object import Object @@ -11,19 +9,6 @@ from mudlib.verbs import find_object, verb from mudlib.zone import Zone -@pytest.fixture -def mock_writer(): - writer = MagicMock() - writer.write = MagicMock() - writer.drain = AsyncMock() - return writer - - -@pytest.fixture -def mock_reader(): - return MagicMock() - - @pytest.fixture def test_zone(): terrain = [["." for _ in range(10)] for _ in range(10)]