Skip to content

Conversation

@sulahmed20
Copy link
Collaborator

tests: Add adapter-level tests for Merels via game_handler.

Mirror the style used by connect_four to exercise the GameAdapter
flow for Merels. Assert on stable fragments to avoid brittle failures
when wording changes.

Included:

  • “help” shows the Merels help block (checks for key commands).
  • “start game” posts an invite containing “wants to play”, “Merels”, “join”.
  • “join” after an invite surfaces the game’s start/help text (containment).
  • Light coverage of MerelsMessageHandler helpers:
    • parse_board identity
    • token mapping via get_player_color
    • alert_move_message formatting

Out of scope:

  • No production code changes.
  • No UI or bot behavior changes; tests only.

Rationale / approach:

  • Followed connect_four/test_connect_four.py structure (BotTestCase,
    transcript scanning) to test the adapter path users exercise in practice.
  • Used containment checks for help/start strings to reduce brittleness.

How did you test this PR?

  • Focused suite:
    pytest -q zulip_bots/zulip_bots/bots/merels/test_merels_adapter.py
    
  • Merels bot tests group:
    pytest -q zulip_bots/zulip_bots/bots/merels/test
    # (Observed: 36 passed locally)
    
  • Lint / types (per Zulip docs):
    ./tools/lint
    ./tools/run-mypy
    
    Both clean locally for the new test file.

Notes:

  • This change does not affect matrix bridge/integrations or require runtime
    configuration; it only adds tests under zulip_bots/.../merels/.

Fixes #433.

@timabbott
Copy link
Member

The tests seem fine.

I think the issue called for the existing zulip_bots/zulip_bots/bots/merels/test_merels.py test to be revised/cleaned up as part of the work; it should not have a bunch of TODOs about missing coverage. I don't see a reason to add a new file, you should just improve the existing bot test class, or add a second class in that file, and clean up or delete the existing tests based on what you think results in a good test suite.

@sulahmed20
Copy link
Collaborator Author

Thanks for the reminder, I started in a separate file for convenience while validating the adapter-flow checks and to keep the diff small for review. I’ve now merged the tests into test_merels.py and cleaned up the TODOs. All tests pass locally.

Mirror the style used by connect_four to exercise the GameAdapter
flow for Merels. Use stable fragments to avoid brittleness.

Included:
- help shows Merels help
- start game posts an invite with “wants to play”, “Merels”, “join”
- join triggers start message (containment)
- light checks for MerelsMessageHandler helpers

No production changes; tests only.

Fixes zulip#433.
)

# FIXME: Add tests for computer moves
# FIXME: Add test lib for game_handler
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do your new tests do either of these things?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just pushed a commit that addresses the test lib for game_handler. However, I did not add tests for computer moves because in merels.py, it shows that supports_computer = False, so I left a comment in test_merels.py to clarify that. I assumed I wasn't supposed to modify merels.py, which is why I went this route.

Combine the adapter-flow tests with the existing Merels bot tests
to keep the suite cohesive, mirroring connect_four.
Replace brittle exact-string checks with stable substring assertions.
Remove obsolete FIXME/TODO notes.

No production code changes; tests only. All suites pass locally.

Fixes zulip#433.
@sulahmed20 sulahmed20 force-pushed the merels/rework-tests-adapter branch from 213e350 to ec346d6 Compare December 11, 2025 02:26
Merels previously had adapter-focused tests for help/start/join, but
the move path through GameAdapter was untested. This adds a small
in-file test helper to drive the adapter and a test that starts a
2-player game, sends a move, counts model.make_move calls, and asserts
that the bot replies. This covers the 'test lib for game_handler'
FIXME.

I did not add 'computer move' tests, because the Merels bot declares
supports_computer = False; there is no single-player/computer flow
to exercise. I left a comment in above TestMerelsAdapter that
clarifies this.

No production changes; tests only. Passes local pytest, mypy, and
lint.

Fixes zulip#433.
@sulahmed20 sulahmed20 force-pushed the merels/rework-tests-adapter branch from 26dd45f to daecdc3 Compare December 11, 2025 03:30
self.assertIn("play game", help_text)
self.assertIn("quit", help_text)
self.assertIn("rules", help_text)
# Present today; OK if dropped in future wording changes.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't remove comments like this; did you generate this code with AI? It often removes comments randomly.

calls["n"] += 1
return original(*args, **kwargs)

bot.model.make_move = types.MethodType(_wrapped_make_move, bot.model) # type: ignore[attr-defined]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you explain why you did this weird mocking strategy here? It seems very hacky and I'm not sure what you're actually testing as a result. I think the goal here would usually be to just verify that the output of the actual bot's make_move function.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Rework and enable tests for Merels.

3 participants