@micro-os-plus/micro-test-plus 4.0.0 → 4.1.1

package/include/micro-os-plus/micro-test-plus/test.h

@@ -54,12 +54,14 @@
 
 // ----------------------------------------------------------------------------
 
-#include "runner-totals.h"
-#include "timings.h"
-
 #include <functional>
 #include <memory>
 
+#include "runner-totals.h"
+#include "type-traits.h"
+#include "timings.h"
+#include "reflection.h"
+
 // ----------------------------------------------------------------------------
 
 #if defined(__GNUC__)
@@ -78,431 +80,440 @@
 
 namespace micro_os_plus::micro_test_plus
 {
+  // --------------------------------------------------------------------------
+
   class runner;
   class static_runner;
   class reporter;
   class runner_totals;
+  class subtest;
   class suite;
+  class static_suite;
 
-  // --------------------------------------------------------------------------
-
-  /**
-   * @brief Base class for all test suites.
-   *
-   * @details
-   * The `test_node` class provides the foundational interface for
-   * managing test suites within the µTest++ framework. It maintains counters
-   * for successful and failed checks, tracks test cases, and offers methods
-   * for marking the commencement and completion of test cases and suites.
-   *
-   * This class ensures consistent state management and reporting for all
-   * derived test suites. It also provides utility methods for querying the
-   * suite's name, the number of successful and failed checks, the number of
-   * test cases, and the overall result of the suite.
-   *
-   * All members and methods are defined within the
-   * `micro_os_plus::micro_test_plus` namespace, ensuring clear separation from
-   * user code and minimising the risk of naming conflicts.
-   *
-   * @headerfile micro-test-plus.h <micro-os-plus/micro-test-plus.h>
-   */
-  class test_node
+  namespace detail
   {
-  public:
-    /**
-     * @brief Constructs a test suite.
-     *
-     * @param [in] name The test suite name.
-     *
-     * @details
-     * The rule of five is enforced to prevent accidental copying or moving.
-     */
-    test_node (const char* name);
-
-    /**
-     * @brief Deleted copy constructor to prevent copying.
-     */
-    test_node (const test_node&) = delete;
-
-    /**
-     * @brief Deleted move constructor to prevent moving.
-     */
-    test_node (test_node&&) = delete;
-
-    /**
-     * @brief Deleted copy assignment operator to prevent copying.
-     */
-    test_node&
-    operator= (const test_node&) = delete;
-
-    /**
-     * @brief Deleted move assignment operator to prevent moving.
-     */
-    test_node&
-    operator= (test_node&&) = delete;
-
-    /**
-     * @brief Virtual destructor for the test_node class.
-     */
-    virtual ~test_node ();
-
-    // ------------------------------------------------------------------------
-
-    /**
-     * @brief Gets the suite name.
-     *
-     * @par Parameters
-     *	None.
-     * @return A pointer to the null-terminated test suite name.
-     */
-    [[nodiscard]] const char*
-    name (void) const noexcept
-    {
-      return name_;
-    }
-
-  public:
-    /**
-     * @brief Gets the totals for the test suite.
-     *
-     * @par Parameters
-     *	None.
-     * @return A reference to the runner_totals instance.
-     */
-    [[nodiscard]] runner_totals&
-    totals () noexcept
-    {
-      return totals_;
-    }
-
-    /**
-     * @brief Gets the totals for the test suite (const overload).
-     *
-     * @par Parameters
-     *	None.
-     * @return A const reference to the runner_totals instance.
-     */
-    [[nodiscard]] const runner_totals&
-    totals () const noexcept
-    {
-      return totals_;
-    }
-
-  protected:
-    /**
-     * @brief The test suite name.
-     *
-     * @note Derived classes may access this member directly in
-     * addition to the public `name()` getter.
-     */
-    const char* name_;
+    // ========================================================================
 
     /**
-     * @brief Totals for the test suite, including nested cases.
-     */
-    runner_totals totals_;
-  };
-
-  // ==========================================================================
-
-  /**
-   * @brief Non-template base for all runnable objects (suites and subtests).
-   *
-   * @details
-   * `runnable_base` extends `test_node` with the state that is shared by
-   * every runnable object but does not depend on the CRTP self-type:
-   * - a reference to the owning `runner`,
-   * - the object's own index within its parent container,
-   * - a sequential subtest index used when creating nested subtests, and
-   * - an owning vector of child `subtest` instances.
-   *
-   * Concrete runnable classes (`suite`, `subtest`) derive from
-   * `runnable<Self_T>` which in turn derives from `runnable_base`.
-   *
-   * The class is non-copyable and non-movable to preserve unique ownership
-   * and consistent state throughout the test session.
-   *
-   * @headerfile micro-test-plus.h <micro-os-plus/micro-test-plus.h>
-   */
-  class runnable_base : public test_node
-  {
-  public:
-    /**
-     * @brief Constructs a `runnable_base` with a name, runner, and index.
+     * @brief Converts a `static_runner` reference to a `runner` reference.
      *
-     * @param name The name used in reports.
-     * @param runner The test runner managing this object.
-     * @param own_index The positional index of this object within its parent.
-     */
-    runnable_base (const char* name, runner& runner, size_t own_index);
-
-    /**
-     * @brief Deleted copy constructor to prevent copying.
-     */
-    runnable_base (const runnable_base&) = delete;
-
-    /**
-     * @brief Deleted move constructor to prevent moving.
-     */
-    runnable_base (runnable_base&&) = delete;
-
-    /**
-     * @brief Deleted copy assignment operator to prevent copying.
-     */
-    runnable_base&
-    operator= (const runnable_base&) = delete;
-
-    /**
-     * @brief Deleted move assignment operator to prevent moving.
-     */
-    runnable_base&
-    operator= (runnable_base&&) = delete;
-
-    /**
-     * @brief Virtual destructor.
-     */
-    virtual ~runnable_base () override;
-
-    // ------------------------------------------------------------------------
-
-    /**
-     * @brief Returns the positional index of this object within its parent.
+     * @details
+     * This declaration breaks the include-order cycle between `test` and
+     * `runner` headers. The definition is provided in a translation unit where
+     * both types are complete, so the conversion remains type-safe.
      *
-     * @par Parameters
-     *   None.
-     * @return The one-based own index.
+     * @param static_runner_ref The source `static_runner` reference.
+     * @return The same object viewed as its `runner` base.
      */
-    [[nodiscard]] size_t
-    own_index () const noexcept
-    {
-      return own_index_;
-    }
+    runner&
+    to_runner (static_runner& static_runner_ref) noexcept;
 
     /**
-     * @brief Sets the positional index of this object within its parent.
+     * @brief Registers a static suite with a static runner.
      *
-     * @note This overload follows the same-name getter/setter pattern
-     * used throughout the framework: the getter is the `const` overload
-     * and the setter is the non-`const` single-argument overload.
+     * @details
+     * This declaration allows `test-inlines.h` to request registration
+     * without requiring the complete `static_runner` type in that header.
      *
-     * @param index The new index value.
-     * @par Returns
-     *   Nothing.
+     * @param static_runner_ref The destination static runner.
+     * @param static_suite_ref The static suite to register.
      */
     void
-    own_index (size_t index) noexcept
-    {
-      own_index_ = index;
-    }
+    register_static_suite (static_runner& static_runner_ref,
+                           static_suite& static_suite_ref);
 
     /**
-     * @brief Returns the index of the most recently created child subtest.
-     *
-     * @par Parameters
-     *   None.
-     * @return The current child subtest sequential index.
-     */
-    [[nodiscard]] size_t
-    current_subtest_index () const noexcept
-    {
-      return current_subtest_index_;
-    }
-
-    /**
-     * @brief Increments and returns the child subtest sequential index.
+     * @brief Base class for runners and runable tests.
      *
      * @details
-     * Each call to `test()` invokes this method before constructing the new
-     * `subtest`, so the index values form a strictly increasing, one-based
-     * sequence.
-     *
-     * @par Parameters
-     *   None.
-     * @return The new index value after incrementing.
-     */
-    size_t
-    increment_subtest_index () noexcept
-    {
-      return ++current_subtest_index_;
-    }
-
-    /**
-     * @brief Returns the number of direct child subtests owned by this node.
+     * The `test_node` class provides the foundational interface for
+     * managing test within the µTest++ framework. It maintains counters
+     * for successful and failed checks, tracks test cases, and offers methods
+     * for marking the commencement and completion of test cases and suites.
      *
-     * @par Parameters
-     *   None.
-     * @return The number of child subtests.
-     */
-    [[nodiscard]] size_t
-    children_subtests_count (void) const noexcept
-    {
-      return children_subtests_.size ();
-    }
-
-    /**
-     * @brief Gets the test reporter associated with this test suite.
-     *
-     * @par Parameters
-     *	None.
-     * @return A reference to the test reporter.
-     */
-    [[nodiscard]] class reporter&
-    reporter (void) const noexcept;
-
-    /**
-     * @brief Aborts test execution via the owning runner.
+     * This class ensures consistent state management and reporting for all
+     * derived classes. It also provides utility methods for querying the
+     * node's name, the number of successful and failed checks, the number of
+     * test cases, and the overall result of the node.
      *
-     * @param sl The source location from which the abort is triggered.
-     * @par Returns
-     *   Does not return.
-     */
-    [[noreturn]] void
-    abort (const reflection::source_location& sl
-           = reflection::source_location::current ());
-
-    /**
-     * @brief Gets the test runner associated with this test suite.
+     * All members and methods are defined within the
+     * `micro_os_plus::micro_test_plus` namespace, ensuring clear separation
+     * from user code and minimising the risk of naming conflicts.
      *
-     * @par Parameters
-     *	None.
-     * @return A reference to the test runner.
+     * @headerfile micro-test-plus.h <micro-os-plus/micro-test-plus.h>
      */
-    [[nodiscard]] class runner&
-    runner (void) const noexcept
+    class test_node
     {
-      return runner_;
-    }
-
-  protected:
-    /**
-     * @brief Registers a newly constructed child subtest and executes it
-     * immediately.
-     *
-     * @param child_test Owning pointer to the newly created `subtest`.
-     * @param suite The parent `suite` to which execution results are reported.
-     * @par Returns
-     *   Nothing.
-     */
-    void
-    after_subtest_create_ (std::unique_ptr<class subtest> child_test,
-                           suite& suite);
-
-  protected:
-    /**
-     * @brief Reference to the test runner that owns this object.
-     */
-    class runner& runner_;
-
-    /**
-     * @brief The test suite index, counting from 1.
-     */
-    size_t own_index_;
-
-    /**
-     * @brief The subtest index, counting from 1.
+    public:
+      /**
+       * @brief Constructs a test node.
+       *
+       * @param [in] name The test node name.
+       */
+      test_node (const char* name);
+
+      /**
+       * @brief Deleted copy constructor to prevent copying.
+       */
+      test_node (const test_node&) = delete;
+
+      /**
+       * @brief Deleted move constructor to prevent moving.
+       */
+      test_node (test_node&&) = delete;
+
+      /**
+       * @brief Deleted copy assignment operator to prevent copying.
+       */
+      test_node&
+      operator= (const test_node&)
+          = delete;
+
+      /**
+       * @brief Deleted move assignment operator to prevent moving.
+       */
+      test_node&
+      operator= (test_node&&)
+          = delete;
+
+      /**
+       * @brief Virtual destructor for the test_node class.
+       */
+      virtual ~test_node ();
+
+      // ----------------------------------------------------------------------
+
+      /**
+       * @brief Gets the node name.
+       *
+       * @par Parameters
+       *	None.
+       * @return A pointer to the null-terminated test node name.
+       */
+      [[nodiscard]] const char*
+      name (void) const noexcept;
+
+    public:
+      /**
+       * @brief Gets the totals for the test.
+       *
+       * @par Parameters
+       *	None.
+       * @return A reference to the runner_totals instance.
+       */
+      [[nodiscard]] runner_totals&
+      totals () noexcept;
+
+      /**
+       * @brief Gets the totals for the test (const overload).
+       *
+       * @par Parameters
+       *	None.
+       * @return A const reference to the runner_totals instance.
+       */
+      [[nodiscard]] const runner_totals&
+      totals () const noexcept;
+
+    protected:
+      /**
+       * @brief The test node name.
+       *
+       * @note Derived classes may access this member directly in
+       * addition to the public `name()` getter.
+       */
+      const char* name_;
+
+      /**
+       * @brief Totals for the test node, including nested cases.
+       */
+      runner_totals totals_;
+    };
+
+    // ========================================================================
+
+    /**
+     * @brief Non-template base for all runnable objects (suites and subtests).
      *
      * @details
-     * This index is used for reporting and tracking the execution order of
-     * subtests within a suite, especially when nested subtests are
-     * involved. It is incremented for each subtest created, allowing for
-     * clear identification of subtests in reports and diagnostics.
-     */
-    size_t current_subtest_index_ = 0;
-
-    /**
-     * @brief Owning collection of direct child subtests.
-     *
-     * @details
-     * Each call to `test()` appends a new `subtest` to this vector and
-     * runs it immediately. The vector retains ownership for the lifetime of
-     * the parent runnable.
-     */
-    std::vector<std::unique_ptr<subtest>> children_subtests_;
-  };
-
-  // ==========================================================================
-
-  /**
-   * @brief CRTP base class factoring out callable storage, rule-of-five, and
-   * `run()` logic shared by `test` and `static_suite`.
-   *
-   * @tparam Self_T The concrete derived class type (CRTP pattern). The stored
-   * callable receives a `Self_T&` reference when the suite is executed.
-   *
-   * @headerfile micro-test-plus.h <micro-os-plus/micro-test-plus.h>
-   */
-  template <typename Self_T>
-  class runnable : public runnable_base
-  {
-  public:
-    /**
-     * @brief Class template constructor.
+     * `runnable_base` extends `test_node` with the state that is shared by
+     * every runnable object but does not depend on the CRTP self-type:
+     * - a reference to the owning `runner`,
+     * - the object's own index within its parent container,
+     * - a sequential subtest index used when creating nested subtests, and
+     * - an owning vector of child `subtest` instances.
      *
-     * @tparam Callable_T The callable type.
-     * @tparam Args_T The additional argument types.
+     * Concrete runnable classes (`suite`, `subtest`) derive from
+     * `runnable<Self_T>` which in turn derives from `runnable_base`.
      *
-     * @param [in] name The test suite name, used in reports.
-     * @param [in] runner The test runner managing this suite.
-     * @param [in] own_index The suite index within the runner.
-     * @param [in] callable The callable invoked when the suite runs.
-     * @param [in] arguments Additional arguments forwarded to the callable
-     * after the leading `Self_T&` reference.
+     * The class is non-copyable and non-movable to preserve unique ownership
+     * and consistent state throughout the test session.
      *
-     * @details
-     * The rule of five is enforced to prevent accidental copying or moving.
-     */
-    template <typename Callable_T, typename... Args_T>
-    runnable (const char* name, class runner& runner, size_t own_index,
-              Callable_T&& callable, Args_T&&... arguments);
-
-    /**
-     * @brief Deleted copy constructor to prevent copying.
-     */
-    runnable (const runnable&) = delete;
-
-    /**
-     * @brief Deleted move constructor to prevent moving.
+     * @headerfile micro-test-plus.h <micro-os-plus/micro-test-plus.h>
      */
-    runnable (runnable&&) = delete;
-
-    /**
-     * @brief Deleted copy assignment operator to prevent copying.
-     */
-    runnable&
-    operator= (const runnable&) = delete;
-
-    /**
-     * @brief Deleted move assignment operator to prevent moving.
-     */
-    runnable&
-    operator= (runnable&&) = delete;
-
-    /**
-     * @brief Virtual destructor.
-     */
-    virtual ~runnable () override;
+    class runnable_base : public test_node
+    {
+    public:
+      /**
+       * @brief Constructs a `runnable_base` with a name, runner, and index.
+       *
+       * @param name The name used in reports.
+       * @param runner The test runner managing this object.
+       * @param own_index The positional index of this object within its
+       * parent.
+       */
+      runnable_base (const char* name, runner& runner, size_t own_index);
+
+      /**
+       * @brief Deleted copy constructor to prevent copying.
+       */
+      runnable_base (const runnable_base&) = delete;
+
+      /**
+       * @brief Deleted move constructor to prevent moving.
+       */
+      runnable_base (runnable_base&&) = delete;
+
+      /**
+       * @brief Deleted copy assignment operator to prevent copying.
+       */
+      runnable_base&
+      operator= (const runnable_base&)
+          = delete;
+
+      /**
+       * @brief Deleted move assignment operator to prevent moving.
+       */
+      runnable_base&
+      operator= (runnable_base&&)
+          = delete;
+
+      /**
+       * @brief Virtual destructor.
+       */
+      virtual ~runnable_base () override;
+
+      // ----------------------------------------------------------------------
+
+      /**
+       * @brief Returns the positional index of this object within its parent.
+       *
+       * @par Parameters
+       *   None.
+       * @return The one-based own index.
+       */
+      [[nodiscard]] size_t
+      own_index () const noexcept;
+
+      /**
+       * @brief Sets the positional index of this object within its parent.
+       *
+       * @note This overload follows the same-name getter/setter pattern
+       * used throughout the framework: the getter is the `const` overload
+       * and the setter is the non-`const` single-argument overload.
+       *
+       * @param index The new index value.
+       * @par Returns
+       *   Nothing.
+       */
+      void
+      own_index (size_t index) noexcept;
+
+      /**
+       * @brief Returns the index of the most recently created child subtest.
+       *
+       * @par Parameters
+       *   None.
+       * @return The current child subtest sequential index.
+       */
+      [[nodiscard]] size_t
+      current_subtest_index () const noexcept;
+
+      /**
+       * @brief Increments and returns the child subtest sequential index.
+       *
+       * @par Parameters
+       *   None.
+       * @return The new index value after incrementing.
+       */
+      size_t
+      increment_subtest_index () noexcept;
+
+      /**
+       * @brief Returns the number of direct child subtests owned by this node.
+       *
+       * @par Parameters
+       *   None.
+       * @return The number of child subtests.
+       */
+      [[nodiscard]] size_t
+      children_subtests_count (void) const noexcept;
+
+      /**
+       * @brief Gets the test reporter associated with this test runnable.
+       *
+       * @par Parameters
+       *	None.
+       * @return A reference to the test reporter.
+       */
+      [[nodiscard]] class reporter&
+      reporter (void) const noexcept;
+
+      /**
+       * @brief Aborts test execution via the owning runner.
+       *
+       * @param sl The source location from which the abort is triggered.
+       * @par Returns
+       *   Does not return.
+       */
+      [[noreturn]] void
+      abort (const reflection::source_location& sl
+             = reflection::source_location::current ());
+
+      /**
+       * @brief Gets the test runner associated with this test runnable.
+       *
+       * @par Parameters
+       *	None.
+       * @return A reference to the test runner.
+       */
+      [[nodiscard]] class runner&
+      runner (void) const noexcept;
+
+    protected:
+      /**
+       * @brief Registers a newly constructed child subtest and executes it
+       * immediately.
+       *
+       * @param child_test Owning pointer to the newly created `subtest`.
+       * @param suite The parent `suite` to which execution results are
+       * reported.
+       * @par Returns
+       *   Nothing.
+       */
+      void
+      after_subtest_create_ (std::unique_ptr<subtest> child_test,
+                             suite& suite);
+
+    protected:
+      /**
+       * @brief Reference to the test runner that owns this object.
+       */
+      class runner& runner_;
+
+      /**
+       * @brief The test index, counting from 1.
+       */
+      size_t own_index_;
+
+      /**
+       * @brief The subtest index, counting from 1.
+       *
+       * @details
+       * This index is used for reporting and tracking the execution order of
+       * subtests within a suite, especially when nested subtests are
+       * involved. It is incremented for each subtest created, allowing for
+       * clear identification of subtests in reports and diagnostics.
+       */
+      size_t current_subtest_index_ = 0;
+
+      /**
+       * @brief Owning collection of direct child subtests.
+       *
+       * @details
+       * Each call to `test()` appends a new `subtest` to this vector and
+       * runs it immediately. The vector retains ownership for the lifetime of
+       * the parent runnable.
+       */
+      std::vector<std::unique_ptr<subtest>> children_subtests_;
+    };
+
+    // ========================================================================
+
+    /**
+     * @brief CRTP base class factoring out callable storage, rule-of-five, and
+     * `run()` logic shared by `subtest` and `suite`.
+     *
+     * @tparam Self_T The concrete derived class type (CRTP pattern). The
+     * stored callable receives a `Self_T&` reference when the test is
+     * executed.
+     *
+     * @headerfile micro-test-plus.h <micro-os-plus/micro-test-plus.h>
+     */
+    template <typename Self_T>
+    class runnable : public detail::runnable_base
+    {
+    public:
+      /**
+       * @brief Class template constructor.
+       *
+       * @tparam Callable_T The callable type.
+       * @tparam Args_T The additional argument types.
+       *
+       * @param [in] name The test name, used in reports.
+       * @param [in] runner The test runner managing this test.
+       * @param [in] own_index The test index within the runner.
+       * @param [in] callable The callable invoked when the test runs.
+       * @param [in] arguments Additional arguments forwarded to the callable
+       * after the leading `Self_T&` reference.
+       */
+      template <typename Callable_T, typename... Args_T>
+      runnable (const char* name, class runner& runner, size_t own_index,
+                Callable_T&& callable, Args_T&&... arguments);
+
+      /**
+       * @brief Deleted copy constructor to prevent copying.
+       */
+      runnable (const runnable&) = delete;
+
+      /**
+       * @brief Deleted move constructor to prevent moving.
+       */
+      runnable (runnable&&) = delete;
+
+      /**
+       * @brief Deleted copy assignment operator to prevent copying.
+       */
+      runnable&
+      operator= (const runnable&)
+          = delete;
+
+      /**
+       * @brief Deleted move assignment operator to prevent moving.
+       */
+      runnable&
+      operator= (runnable&&)
+          = delete;
+
+      /**
+       * @brief Virtual destructor.
+       */
+      virtual ~runnable () override;
+
+      // ----------------------------------------------------------------------
+
+      /**
+       * @brief Runs the test function by invoking the stored callable with the
+       * derived self instance.
+       *
+       * @par Parameters
+       *   None.
+       * @par Returns
+       *   Nothing.
+       */
+      virtual void
+      run (void)
+          = 0;
+
+    protected:
+      /**
+       * @brief Callable storing the test body and any bound arguments.
+       * Invoked with a reference to the derived `Self_T` instance.
+       */
+      std::function<void (Self_T&)> callable_;
+    };
 
     // ------------------------------------------------------------------------
-
-    /**
-     * @brief Runs the test function by invoking the stored callable with the
-     * derived self instance.
-     *
-     * @par Parameters
-     *   None.
-     * @par Returns
-     *   Nothing.
-     */
-    virtual void
-    run (void) = 0;
-
-  protected:
-    /**
-     * @brief Callable storing the test suite body and any bound arguments.
-     * Invoked with a reference to the derived `Self_T` instance.
-     */
-    std::function<void (Self_T&)> callable_;
-  };
+  } // namespace detail
 
   // ==========================================================================
 
@@ -512,10 +523,10 @@ namespace micro_os_plus::micro_test_plus
    *
    * @details
    * `subtest` represents a single, named test case or a nested group of
-   * checks within a parent `suite`. It is constructed by calling
+   * checks within a parent `suite` or `subtest`. It is constructed by calling
    * `suite::test()` or `subtest::test()`, both of which create the object,
    * immediately execute its callable body via `run()`, and register the
-   * result with the parent suite.
+   * result with the parent node.
    *
    * The body of the subtest is supplied as a callable (typically a lambda)
    * that receives a `subtest&` reference as its first argument. Inside the
@@ -527,7 +538,7 @@ namespace micro_os_plus::micro_test_plus
    *
    * @headerfile micro-test-plus.h <micro-os-plus/micro-test-plus.h>
    */
-  class subtest : public runnable<subtest>
+  class subtest : public detail::runnable<subtest>
   {
   public:
     /**
@@ -547,9 +558,6 @@ namespace micro_os_plus::micro_test_plus
      * invoked when the subtest executes.
      * @param [in] arguments A possibly empty list of arguments forwarded to
      * the callable after the leading `subtest&` reference.
-     *
-     * @details
-     * The rule of five is enforced to prevent accidental copying or moving.
      */
     template <typename Callable_T, typename... Args_T>
     subtest (const char* name, class runner& runner, suite& parent_suite,
@@ -570,13 +578,15 @@ namespace micro_os_plus::micro_test_plus
      * @brief Deleted copy assignment operator to prevent copying.
      */
     subtest&
-    operator= (const subtest&) = delete;
+    operator= (const subtest&)
+        = delete;
 
     /**
      * @brief Deleted move assignment operator to prevent moving.
      */
     subtest&
-    operator= (subtest&&) = delete;
+    operator= (subtest&&)
+        = delete;
 
     /**
      * @brief Virtual destructor.
@@ -616,39 +626,12 @@ namespace micro_os_plus::micro_test_plus
      * @param [in] expr Logical expression to evaluate.
      * @param [in] sl Optional source location, defaulting to the current line.
      * @return An output stream to write optional messages.
-     *
-     * @details
-     * The `expect` function template evaluates a logical condition or custom
-     * expression and reports the result within the µTest++ framework. It is
-     * designed to provide detailed diagnostics for test failures, including
-     * the actual and expected values, when using the provided comparators
-     * (`eq()`, `ne()`, `lt()`, `le()`, `gt()`, `ge()`) or custom operators.
-     *
-     * The function template can be used with any expression that evaluates to
-     * a boolean or with custom comparators/operators derived from the local
-     * `detail::op` type. For complex checks performed outside the `expect()`
-     * logical expression (such as within `if` or `try`/`catch` statements),
-     * the result can be reported by calling `expect(true)` or `expect(false)`.
-     *
-     * The function returns an output stream, allowing optional messages to be
-     * appended to the test report.
-     *
-     * **Example**
-     *
-     * @code{.cpp}
-     * namespace mt = micro_os_plus::micro_test_plus;
-     *
-     * t.expect(compute_answer() == 42) << "answer is 42";
-     * @endcode
      */
     template <class Expr_T>
       requires type_traits::checkable<Expr_T>
     auto
     expect (const Expr_T& expr, const reflection::source_location& sl
-                                = reflection::source_location::current ())
-    {
-      return detail::deferred_reporter<Expr_T>{ expr, false, sl, *this };
-    }
+                                = reflection::source_location::current ());
 
     /**
      * @ingroup micro-test-plus-assumptions
@@ -663,49 +646,18 @@ namespace micro_os_plus::micro_test_plus
      * @param [in] expr Logical expression to evaluate.
      * @param [in] sl Optional source location, defaulting to the current line.
      * @return An output stream to write optional messages.
-     *
-     * @details
-     * The `assume` function template evaluates a logical condition or custom
-     * expression and reports the result within the µTest++ framework. It is
-     * designed to provide detailed diagnostics for test failures, including
-     * the actual and expected values, when using the provided comparators
-     * (`eq()`, `ne()`, `lt()`, `le()`, `gt()`, `ge()`) or custom operators.
-     *
-     * The function template can be used with any expression that evaluates to
-     * a boolean or with custom comparators/operators derived from the local
-     * `detail::op` type. For complex checks performed outside the `expect()`
-     * logical expression (such as within `if` or `try`/`catch` statements),
-     * the result can be reported by calling `expect(true)` or `expect(false)`.
-     *
-     * The function returns an output stream, allowing optional messages to be
-     * appended to the test report.
-     *
-     * **Example**
-     *
-     * @code{.cpp}
-     * namespace mt = micro_os_plus::micro_test_plus;
-     * mt::assume(compute_answer() == 42) << "answer is 42";
-     * @endcode
      */
     template <class Expr_T>
       requires type_traits::checkable<Expr_T>
     auto
     assume (const Expr_T& expr, const reflection::source_location& sl
-                                = reflection::source_location::current ())
-    {
-      return detail::deferred_reporter<Expr_T>{ expr, true, sl, *this };
-    }
+                                = reflection::source_location::current ());
 
     // ------------------------------------------------------------------------
 
     /**
      * @brief Executes the subtest body by invoking the stored callable.
      *
-     * @details
-     * Calls `begin_subtest()` on the reporter, invokes `callable_(*this)`,
-     * then calls `end_subtest()`. The results are propagated to the parent
-     * suite's totals.
-     *
      * @par Parameters
      *   None.
      * @par Returns
@@ -717,19 +669,12 @@ namespace micro_os_plus::micro_test_plus
     /**
      * @brief Returns the nesting depth of this subtest.
      *
-     * @details
-     * Top-level subtests (direct children of a `suite`) have depth 1.
-     * Each additional level of nesting increments the depth by 1.
-     *
      * @par Parameters
      *   None.
      * @return The nesting depth (1 = top-level).
      */
     [[nodiscard]] size_t
-    nesting_depth () const noexcept
-    {
-      return nesting_depth_;
-    }
+    nesting_depth () const noexcept;
 
   protected:
     /**
@@ -765,7 +710,7 @@ namespace micro_os_plus::micro_test_plus
    *
    * @headerfile micro-test-plus.h <micro-os-plus/micro-test-plus.h>
    */
-  class suite : public runnable<suite>
+  class suite : public detail::runnable<suite>
   {
   public:
     /**
@@ -781,9 +726,6 @@ namespace micro_os_plus::micro_test_plus
      * `suite&`.
      * @param [in] arguments A possibly empty list of arguments forwarded to
      * the callable after the leading `suite&` reference.
-     *
-     * @details
-     * The rule of five is enforced to prevent accidental copying or moving.
      */
     template <typename Callable_T, typename... Args_T>
     suite (const char* name, class runner& runner, Callable_T&& callable,
@@ -803,13 +745,15 @@ namespace micro_os_plus::micro_test_plus
      * @brief Deleted copy assignment operator to prevent copying.
      */
     suite&
-    operator= (const suite&) = delete;
+    operator= (const suite&)
+        = delete;
 
     /**
      * @brief Deleted move assignment operator to prevent moving.
      */
     suite&
-    operator= (suite&&) = delete;
+    operator= (suite&&)
+        = delete;
 
     /**
      * @brief Virtual destructor.
@@ -843,11 +787,8 @@ namespace micro_os_plus::micro_test_plus
      *	None.
      * @return A reference to the timestamps instance.
      */
-    [[nodiscard]] timestamps&
-    timings () noexcept
-    {
-      return timings_;
-    }
+    [[nodiscard]] detail::timestamps&
+    timings () noexcept;
 
     /**
      * @brief Gets the timings for this suite (const overload).
@@ -856,20 +797,12 @@ namespace micro_os_plus::micro_test_plus
      *	None.
      * @return A const reference to the timestamps instance.
      */
-    [[nodiscard]] const timestamps&
-    timings () const noexcept
-    {
-      return timings_;
-    }
+    [[nodiscard]] const detail::timestamps&
+    timings () const noexcept;
 
     /**
      * @brief Executes the suite body by invoking the stored callable.
      *
-     * @details
-     * Calls `begin_suite()` on the reporter, records timing, invokes
-     * `callable_(*this)`, records end timing, and calls `end_suite()`. The
-     * results are propagated to the owning `runner`'s totals.
-     *
      * @par Parameters
      *   None.
      * @par Returns
@@ -882,7 +815,7 @@ namespace micro_os_plus::micro_test_plus
     /**
      * @brief Timing measurements for this suite's execution.
      */
-    timestamps timings_;
+    detail::timestamps timings_;
   };
 
   // ==========================================================================
@@ -905,6 +838,11 @@ namespace micro_os_plus::micro_test_plus
   class top_suite : public suite
   {
   public:
+    // Expose the accessor for the suite name from the base test_node class,
+    // since the top_suite may need to change its name after construction, and
+    // the base class provides the necessary interface for that purpose.
+    using detail::test_node::name;
+
     /**
      * @brief Constructs the top-level suite with a name and runner reference.
      *
@@ -927,18 +865,28 @@ namespace micro_os_plus::micro_test_plus
      * @brief Deleted copy assignment operator to prevent copying.
      */
     top_suite&
-    operator= (const top_suite&) = delete;
+    operator= (const top_suite&)
+        = delete;
 
     /**
      * @brief Deleted move assignment operator to prevent moving.
      */
     top_suite&
-    operator= (top_suite&&) = delete;
+    operator= (top_suite&&)
+        = delete;
 
     /**
      * @brief Virtual destructor.
      */
     virtual ~top_suite () override;
+
+    /**
+     * @brief Sets the name of the top-level suite.
+     *
+     * @param [in] new_name The new name for the top-level suite.
+     */
+    void
+    name (const char* new_name) noexcept;
   };
 
   // ==========================================================================
@@ -987,11 +935,6 @@ namespace micro_os_plus::micro_test_plus
      * function, invoked to perform the test suite.
      * @param [in] arguments A possibly empty list of arguments to be passed to
      * the callable.
-     *
-     * @details
-     * The rule of five is enforced to prevent accidental copying or moving.
-     * Upon construction, the suite is automatically registered with the
-     * runner.
      */
     template <typename Callable_T, typename... Args_T>
     static_suite (const char* name, static_runner& runner,
@@ -1011,13 +954,15 @@ namespace micro_os_plus::micro_test_plus
      * @brief Deleted copy assignment operator to prevent copying.
      */
     static_suite&
-    operator= (const static_suite&) = delete;
+    operator= (const static_suite&)
+        = delete;
 
     /**
      * @brief Deleted move assignment operator to prevent moving.
      */
     static_suite&
-    operator= (static_suite&&) = delete;
+    operator= (static_suite&&)
+        = delete;
 
     /**
      * @brief Virtual destructor.
@@ -1029,12 +974,6 @@ namespace micro_os_plus::micro_test_plus
     /**
      * @brief Executes the static suite body using the stored static callable.
      *
-     * @details
-     * Calls the base `suite::run()` implementation for the dynamically
-     * registered callable, then additionally invokes `static_callable_(*this)`
-     * if it is set. This allows `static_suite` objects to carry two separate
-     * bodies: a standard one and a statically-registered one.
-     *
      * @par Parameters
      *   None.
      * @par Returns
@@ -1062,6 +1001,11 @@ namespace micro_os_plus::micro_test_plus
 
 #endif // __cplusplus
 
+// ============================================================================
+// Templates & constexpr implementations.
+
+#include "inlines/test-inlines.h"
+
 // ----------------------------------------------------------------------------
 
 #endif // MICRO_TEST_PLUS_TEST_H_