Improve test suite layering by orting · Pull Request #93 · daisy-model/daisy

orting · 2026-07-06T09:35:31Z

Summary

add suite-level CTest labels for cxx-unit, dai-unit, and dai-system
document the test-layer selectors and local test entrypoints
restore the C++ unit-test harness/build under explicit registration
update Linux, macOS, and Windows test workflows to build and run C++ unit tests

Notes

this branch is based on explicit-registration-phase1
this PR is draft-only for now so CI can run on the workflow updates

Replace file-scope format registration globals with an explicit register_format_models() bootstrap. The format component and the LaTeX formatter now register through function-local statics created on demand instead of relying on static initialization side effects. Call the bootstrap before Toplevel constructs Metalib, because Metalib snapshots Librarian::intrinsics() via clone() during construction. Registering later leaves the format component out of that snapshot and breaks document-related commands and tests. This keeps DeclareComponent, DeclareModel, Librarian, and Intrinsics unchanged while proving the explicit-registration pattern on a narrow slice of the codebase. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Add register_util_models() as the util-level bootstrap and call it from the early Toplevel startup hook, before Metalib clones the intrinsic registry snapshot. Migrate the active util registration sites behind explicit per-file bootstrap functions: scope, scope_exchange, depth, scopesel, solver, solver_none, solver_ublas, solver_cxsparse, and the existing format bootstrap. The file-scope registration globals for these compiled util units are removed in favor of function-local statics constructed on demand. Keep the existing DeclareComponent / DeclareModel / Librarian / Intrinsics machinery intact. This change only switches activation from link-time static initialization to explicit startup registration for the util subsystem. Validation: native Linux build succeeded; dai_unit_test.document passed; the full Linux system suite held the current baseline with only the two existing failures in dai_system_test.programs.hydraulic and dai_system_test.programs.spawn. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Add register_object_model_models() as an early startup bootstrap and call it before util registration, so Metalib snapshots a parser and core parameter-type registry that no longer depends on file-scope static initialization. Migrate the first object_model slice behind explicit per-file bootstrap functions: parser, parser_file, function, number, stringer, boolean, and integer. The existing DeclareComponent / DeclareModel / DeclareBase / DeclareSubmodel machinery stays intact; only activation changes from translation-unit side effects to explicit startup registration. Validation: native Linux build succeeded; dai_unit_test.document passed; the full Linux system suite held the current baseline with only the two existing failures in dai_system_test.programs.hydraulic and dai_system_test.programs.spawn. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Extend register_object_model_models() with the unit subsystem and move unit_model.C away from file-scope registration instances. The unit component, SI bases, factor and offset models, and the built-in base units now register through register_unit_models() instead of depending on translation-unit side effects. This keeps the existing DeclareComponent / DeclareBase / DeclareModel / DeclareParam machinery intact while making unit registration follow the same explicit startup path as the earlier parser and parameter-type slices. Validation: native Linux build succeeded; dai_unit_test.document passed; the full Linux system suite held the current baseline with only the existing failures in dai_system_test.programs.hydraulic and dai_system_test.programs.spawn. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Add register_rate_models() to the object_model startup bootstrap and move rate.C away from file-scope registration instances. The rate component, the direct-rate model, the halftime model, and the built-in zero parameterization now register through explicit startup code instead of translation-unit side effects. This keeps rate registration aligned with the explicit bootstrap path already used for parser, parameter roots, and unit models while preserving the existing DeclareComponent / DeclareModel / DeclareParam registry behavior. Validation: native Linux build succeeded; dai_unit_test.document passed; the full Linux system suite held the current baseline with only the existing failures in dai_system_test.programs.hydraulic and dai_system_test.programs.spawn. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Extend the object_model startup bootstrap with the first broad parameter-type model slice: number const/apply/plf/arithmetic/lisp models, integer arithmetic models, and boolean string comparison. These files no longer depend on file-scope registration instances; each now registers through an explicit per-file bootstrap function called from register_object_model_models(). This keeps the existing DeclareBase / DeclareModel registry semantics intact while moving the commonly used derived parameter-type models onto the same explicit startup path as the object_model roots, units, and rate component. Validation: native Linux build succeeded; dai_unit_test.document passed; the full Linux system suite held the current baseline with only the existing failures in dai_system_test.programs.hydraulic and dai_system_test.programs.spawn. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Complete the object_model migration by moving the remaining compiled registration sites onto explicit startup code. This finishes number source and soil models, the Python-backed function model, the conditional submodel helpers in integer and stringer, and the top-level Toplevel submodel registration without relying on file-scope registration instances. With this change, register_object_model_models() covers the full compiled object_model tree: parser and parser_file, function and optional Python support, number/string/boolean/integer roots and derived parameter-type models, rate, unit, and the top-level object-model entry point. Validation: native Linux build succeeded; dai_unit_test.document passed; the full Linux system suite held the current baseline with only the existing failures in dai_system_test.programs.hydraulic and dai_system_test.programs.spawn. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Add a dedicated UI subsystem bootstrap and call it during early startup from Toplevel. This moves the compiled UI registration sites in ui.C and uifilter.C behind register_ui_models(), using internal per-file bootstrap functions instead of file-scope DeclareComponent / DeclareBase / DeclareModel instances. This starts phase 4 with the smallest leaf subsystem while keeping UI registration on the same explicit startup path as object_model and util. Validation: native Linux build succeeded; dai_unit_test.document passed; the full Linux system suite held the current baseline with only the existing failures in dai_system_test.programs.hydraulic and dai_system_test.programs.spawn. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Use daisy.exe for packaged Windows test runs so the Python-based dai_unit_test and dai_system_test harnesses can launch the installed binary correctly. This addresses the CreateProcess/FileNotFound failure caused by pointing the Windows test runner at bin/daisy instead of bin/daisy.exe. Also centralize platform-specific system-test disables inside the dai_system_test() helper so known failures stay visible during configure and remain registered in CTest as disabled tests. For now: macOS disables groundwater-deep, hydraulic, and spawn; Linux and Windows disable hydraulic and spawn. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Point the Windows dai_unit_test and dai_system_test harnesses at the actual packaged executable, bin/daisy-bin.exe. The Windows ZIP does not install daisy.exe, and using the real packaged binary keeps the test runner aligned with the packaged DLL layout in the same bin directory. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Extend the centralized Windows system-test skip list with vernalization-default and groundwater-deep so the Windows workflow can report the current known-failure set explicitly as disabled tests alongside the existing hydraulic and spawn skips. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Start the programs subsystem migration with an explicit register_program_models() bootstrap and wire it into early startup from Toplevel. This first slice moves the program component root, file programs, and the extract/listsum registration cluster off file-scope registration instances and behind explicit per-file bootstrap functions. Validation: native Linux build succeeded; dai_unit_test.document passed; the full Linux system suite passed with the current known failures reported as disabled tests. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>