Skip to content

Refactor run_app helpers into single entry point#255

Merged
leynos merged 4 commits intomainfrom
codex/refactor-run_app_with-functions-in-helpers.rs
Aug 4, 2025
Merged

Refactor run_app helpers into single entry point#255
leynos merged 4 commits intomainfrom
codex/refactor-run_app_with-functions-in-helpers.rs

Conversation

@leynos
Copy link
Copy Markdown
Owner

@leynos leynos commented Aug 3, 2025

Summary

  • replace multiple run_app_with_* helpers with unified run_app
  • update lifecycle tests to use the new helper
  • document the consolidated API in wireframe_testing

Testing

  • make fmt
  • make markdownlint
  • make lint
  • make test
  • make nixie (fails: libasound.so.2: cannot open shared object file)

https://chatgpt.com/codex/tasks/task_e_688fd4cfeec883228dd716e83449a668

Summary by Sourcery

Consolidate multiple test helper functions into a single run_app entry point and update code, documentation, and tests to use the unified API

Enhancements:

  • Introduce a unified run_app function with an optional capacity parameter replacing several run_app_with_* variants
  • Simplify helper reexports by removing deprecated run_app_with_frame, run_app_with_frames, and related functions
  • Clean up helper implementation style (e.g., minor formatting in processor())

Documentation:

  • Revise crate documentation to describe the consolidated run_app API and eliminate references to deprecated helpers

Tests:

  • Update lifecycle tests to invoke run_app instead of deprecated helper functions

@sourcery-ai
Copy link
Copy Markdown
Contributor

sourcery-ai Bot commented Aug 3, 2025

Reviewer's Guide

This PR refactors multiple specialized run_app_* helpers into a single run_app entry point with optional capacity, updates docs and tests to use the new API, and adjusts crate exports accordingly.

Class diagram for refactored run_app helpers

classDiagram
    class helpers {
        +processor() LengthPrefixedProcessor
        +run_app(app, frames, capacity) io::Result<Vec<u8>>
        +TestSerializer
    }
    class TestSerializer {
        <<trait>>
    }
    class WireframeApp {
        +handle_connection(server)
    }
    helpers --> TestSerializer : uses
    helpers --> WireframeApp : uses
    helpers : -run_app_with_frame
    helpers : -run_app_with_frame_with_capacity
    helpers : -run_app_with_frames
    helpers : -run_app_with_frames_with_capacity
    helpers : +run_app
Loading

Class diagram for updated wireframe_testing exports

classDiagram
    class wireframe_testing {
        +TestSerializer
        +drive_with_bincode
        +drive_with_frame
        +drive_with_frame_mut
        +drive_with_frame_with_capacity
        +drive_with_frames
        +drive_with_frames_mut
        +drive_with_frames_with_capacity
        +processor
        +run_app
        +run_with_duplex_server
        +LoggerHandle
        +logger
    }
    wireframe_testing : -run_app_with_frame
    wireframe_testing : -run_app_with_frame_with_capacity
    wireframe_testing : -run_app_with_frames
    wireframe_testing : -run_app_with_frames_with_capacity
    wireframe_testing : +run_app
Loading

File-Level Changes

Change Details Files
Consolidate app-running helpers into run_app
  • Removed run_app_with_frame, run_app_with_frames, and their capacity variants
  • Introduced run_app(app, frames, capacity: Option<usize>)
  • Internal logic unwraps capacity or uses default and drives duplex stream
  • Spawn server task and write frames loop consolidated
wireframe_testing/src/helpers.rs
Update crate exports to expose only run_app
  • Removed old helper exports from lib.rs
  • Added run_app to public API
wireframe_testing/src/lib.rs
Revise documentation to reflect unified API
  • Replaced examples for old helpers with run_app usage
  • Updated motivation and descriptions to reference the consolidated helper
  • Removed mentions of deprecated functions
docs/wireframe-testing-crate.md
Migrate lifecycle tests to new helper
  • Changed imports from run_app_with_frame to run_app
  • Updated test calls to pass frame list and optional capacity
tests/lifecycle.rs
Minor code cleanup
  • Adjusted formatting on processor() function
  • Refined doc comments on helper function signature
wireframe_testing/src/helpers.rs

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Aug 3, 2025

Note

Other AI code review bot(s) detected

CodeRabbit has detected other AI code review bot(s) in this pull request and will avoid duplicating their findings in the review comments. This may lead to a less comprehensive review.

Summary by CodeRabbit

  • New Features

    • Introduced a unified test helper function for running applications with multiple frames and optional buffer capacity.
  • Refactor

    • Consolidated multiple test helper functions into a single, streamlined API.
    • Improved error handling to return errors instead of panicking on server task failures.
  • Documentation

    • Updated documentation to reflect the new unified helper function and clarified usage instructions.

Walkthrough

Unify all references and implementations of test helper functions for the Wireframe app into a single run_app function. Remove all previous variants and update documentation, exports, and tests to use this consolidated helper. Add input validation for buffer capacity and improve error propagation in the helper logic.

Changes

Cohort / File(s) Change Summary
Documentation Update
docs/wireframe-testing-crate.md
Update documentation to reference only the unified run_app helper. Remove mentions of previous variants and clarify API narrative. Adjust formatting for type references.
Test Helper Refactor
wireframe_testing/src/helpers.rs
Remove all run_app_with_* helper variants. Introduce a single run_app function with input validation and improved error handling. Add MAX_CAPACITY constant.
Exports Update
wireframe_testing/src/lib.rs
Replace multiple run_app_with_* exports with a single run_app export. Compact the export list formatting.
Test Usage Update
tests/lifecycle.rs
Replace usage of run_app_with_frame with the new run_app helper in test imports and function calls.

Sequence Diagram(s)

sequenceDiagram
    participant Test as Test Code
    participant Helpers as run_app
    participant App as WireframeApp
    participant Duplex as DuplexStream

    Test->>Helpers: Call run_app(app, frames, capacity)
    Helpers->>Helpers: Validate capacity
    Helpers->>Duplex: Create duplex stream with capacity
    Helpers->>App: Spawn app task with duplex
    loop For each frame
        Helpers->>Duplex: Write frame
    end
    Helpers->>Duplex: Shutdown write
    Helpers->>App: Await app task
    Helpers->>Helpers: Collect output bytes
    Helpers-->>Test: Return output or error
Loading

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~15 minutes

Possibly related PRs

Poem

Streamline the helpers, let clutter depart,
One run_app to rule them, a fresh, single start.
Docs now are clearer, the exports are neat,
No more confusion, just code that’s elite.
🧹✨

Testing made simple—now isn’t that sweet?


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: ASSERTIVE
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 38b9511 and eb2be1a.

📒 Files selected for processing (2)
  • wireframe_testing/src/helpers.rs (3 hunks)
  • wireframe_testing/src/lib.rs (1 hunks)
🧰 Additional context used
📓 Path-based instructions (1)
**/*.rs

📄 CodeRabbit Inference Engine (AGENTS.md)

**/*.rs: Function documentation must include clear examples demonstrating the usage and outcome of the function. Test documentation should omit examples where the example serves only to reiterate the test logic.
No single code file may be longer than 400 lines. Long switch statements or dispatch tables should be broken up by feature and constituents colocated with targets. Large blocks of test data should be moved to external data files.
Clippy warnings MUST be disallowed.
Fix any warnings emitted during tests in the code itself rather than silencing them.
Where a function is too long, extract meaningfully named helper functions adhering to separation of concerns and CQRS.
Where a function has too many parameters, group related parameters in meaningfully named structs.
Where a function is returning a large error consider using Arc to reduce the amount of data returned.
Write unit and behavioural tests for new functionality. Run both before and after making any change.
Every module must begin with a module level (//! ) comment explaining the module's purpose and utility.
Document public APIs using Rustdoc comments (///) so documentation can be generated with cargo doc.
Prefer immutable data and avoid unnecessary mut bindings.
Handle errors with the Result type instead of panicking where feasible.
Avoid unsafe code unless absolutely necessary and document any usage clearly.
Place function attributes after doc comments.
Do not use return in single-line functions.
Use predicate functions for conditional criteria with more than two branches.
Lints must not be silenced except as a last resort.
Lint rule suppressions must be tightly scoped and include a clear reason.
Prefer expect over allow.
Prefer .expect() over .unwrap().
Use concat!() to combine long string literals rather than escaping newlines with a backslash.
Prefer semantic error enums. Derive std::error::Error (via the thiserror crate) for any condition the caller might inspect, retry, or map to an HTTP status....

Files:

  • wireframe_testing/src/lib.rs
  • wireframe_testing/src/helpers.rs

⚙️ CodeRabbit Configuration File

**/*.rs: * Seek to keep the cyclomatic complexity of functions no more than 12.

  • Adhere to single responsibility and CQRS

  • Place function attributes after doc comments.

  • Do not use return in single-line functions.

  • Move conditionals with >2 branches into a predicate function.

  • Avoid unsafe unless absolutely necessary.

  • Every module must begin with a //! doc comment that explains the module's purpose and utility.

  • Comments and docs must follow en-GB-oxendict (-ize / -our) spelling and grammar

  • Lints must not be silenced except as a last resort.

    • #[allow] is forbidden.
    • Only narrowly scoped #[expect(lint, reason = "...")] is allowed.
    • No lint groups, no blanket or file-wide suppression.
    • Include FIXME: with link if a fix is expected.
  • Use rstest fixtures for shared setup and to avoid repetition between tests.

  • Replace duplicated tests with #[rstest(...)] parameterised cases.

  • Prefer mockall for mocks/stubs.

  • Prefer .expect() over .unwrap()

  • Ensure that any API or behavioural changes are reflected in the documentation in docs/

  • Ensure that any completed roadmap steps are recorded in the appropriate roadmap in docs/

  • Files must not exceed 400 lines in length

    • Large modules must be decomposed
    • Long match statements or dispatch tables should be decomposed by domain and collocated with targets
    • Large blocks of inline data (e.g., test fixtures, constants or templates) must be moved to external files and inlined at compile-time or loaded at run-time.

Files:

  • wireframe_testing/src/lib.rs
  • wireframe_testing/src/helpers.rs
🧬 Code Graph Analysis (1)
wireframe_testing/src/lib.rs (1)
wireframe_testing/src/helpers.rs (1)
  • run_app (373-416)
🔇 Additional comments (3)
wireframe_testing/src/lib.rs (1)

34-34: Export consolidation looks good

The single run_app export appropriately replaces the multiple run_app_with_* variants as part of the API simplification.

wireframe_testing/src/helpers.rs (2)

103-103: MAX_CAPACITY constant is well-defined

The 10MB limit provides a reasonable upper bound for test buffer sizes.


352-416: Excellent consolidation of helper functions

The unified run_app function successfully:

  • Validates capacity with clear error messages
  • Handles server task failures gracefully
  • Maintains backward compatibility through the optional capacity parameter
  • Provides comprehensive documentation including error conditions

The implementation properly addresses the previous review concerns about capacity validation and error handling.

✨ Finishing Touches
  • 📝 Generate Docstrings
🧪 Generate unit tests
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch codex/refactor-run_app_with-functions-in-helpers.rs

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai generate unit tests to generate unit tests for this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Copy Markdown
Contributor

@sourcery-ai sourcery-ai Bot left a comment

Choose a reason for hiding this comment

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

Hey @leynos - I've reviewed your changes and found some issues that need to be addressed.

Prompt for AI Agents
Please address the comments from this code review:
## Individual Comments

### Comment 1
<location> `wireframe_testing/src/helpers.rs:365` </location>
<code_context>
     C: Send + 'static,
     E: Packet,
 {
+    let capacity = capacity.unwrap_or(DEFAULT_CAPACITY);
     let (mut client, server) = duplex(capacity);
-    let server_task = tokio::spawn(async move {
-        app.handle_connection(server).await;
</code_context>

<issue_to_address>
No validation is performed on the provided capacity value.

Validating the `capacity` parameter can prevent issues from zero or excessively large values, reducing the risk of unexpected behavior or resource exhaustion.
</issue_to_address>

<suggested_fix>
<<<<<<< SEARCH
    let capacity = capacity.unwrap_or(DEFAULT_CAPACITY);
    let (mut client, server) = duplex(capacity);
    let server_task = tokio::spawn(async move { app.handle_connection(server).await });
=======
    const MAX_CAPACITY: usize = 1024 * 1024 * 10; // 10 MB, adjust as needed
    let capacity = capacity.unwrap_or(DEFAULT_CAPACITY);

    if capacity == 0 {
        return Err(io::Error::new(
            io::ErrorKind::InvalidInput,
            "Capacity must be greater than zero",
        ));
    }
    if capacity > MAX_CAPACITY {
        return Err(io::Error::new(
            io::ErrorKind::InvalidInput,
            format!("Capacity must not exceed {MAX_CAPACITY} bytes"),
        ));
    }

    let (mut client, server) = duplex(capacity);
    let server_task = tokio::spawn(async move { app.handle_connection(server).await });
>>>>>>> REPLACE

</suggested_fix>

### Comment 2
<location> `wireframe_testing/src/helpers.rs:367` </location>
<code_context>
-    let server_task = tokio::spawn(async move {
-        app.handle_connection(server).await;
-    });
+    let server_task = tokio::spawn(async move { app.handle_connection(server).await });

     for frame in &frames {
</code_context>

<issue_to_address>
The spawned task's result is not checked for panics or errors.

Consider matching on the JoinHandle's result to handle panics gracefully, rather than allowing them to propagate.
</issue_to_address>

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

Comment thread wireframe_testing/src/helpers.rs
Comment thread wireframe_testing/src/helpers.rs
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Aug 4, 2025

@coderabbitai review

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Aug 4, 2025

✅ Actions performed

Review triggered.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

@leynos leynos merged commit efca653 into main Aug 4, 2025
5 checks passed
@leynos leynos deleted the codex/refactor-run_app_with-functions-in-helpers.rs branch August 4, 2025 11:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant