From 693660f74d5ee00b8e5724a82d0c13b5238b89d2 Mon Sep 17 00:00:00 2001 From: Markus Date: Sun, 15 Feb 2026 16:19:54 +0100 Subject: [PATCH] Move tests --- tests/mod.rs | 2 ++ tests/nca.rs | 16 ---------------- tests/nca/mod.rs | 1 + tests/{pknca_validation => nca/pknca}/README.md | 0 .../pknca}/expected_values.json | 4 ++-- .../pknca}/generate_expected.R | 0 .../pknca}/test_scenarios.json | 0 tests/{pknca_validation.rs => nca/test_pknca.rs} | 2 +- 8 files changed, 6 insertions(+), 19 deletions(-) create mode 100644 tests/mod.rs delete mode 100644 tests/nca.rs rename tests/{pknca_validation => nca/pknca}/README.md (100%) rename tests/{pknca_validation => nca/pknca}/expected_values.json (99%) rename tests/{pknca_validation => nca/pknca}/generate_expected.R (100%) rename tests/{pknca_validation => nca/pknca}/test_scenarios.json (100%) rename tests/{pknca_validation.rs => nca/test_pknca.rs} (99%) diff --git a/tests/mod.rs b/tests/mod.rs new file mode 100644 index 00000000..7d924fd7 --- /dev/null +++ b/tests/mod.rs @@ -0,0 +1,2 @@ +/// NCA integration tests +mod nca; diff --git a/tests/nca.rs b/tests/nca.rs deleted file mode 100644 index 05792544..00000000 --- a/tests/nca.rs +++ /dev/null @@ -1,16 +0,0 @@ -//! NCA Integration Tests -//! -//! Tests for the public NCA API using Subject::builder().nca() - -// Include test modules from nca/ directory -#[path = "nca/test_auc.rs"] -mod test_auc; - -#[path = "nca/test_params.rs"] -mod test_params; - -#[path = "nca/test_quality.rs"] -mod test_quality; - -#[path = "nca/test_terminal.rs"] -mod test_terminal; diff --git a/tests/nca/mod.rs b/tests/nca/mod.rs index 4ad3c7eb..e4576238 100644 --- a/tests/nca/mod.rs +++ b/tests/nca/mod.rs @@ -6,5 +6,6 @@ pub mod test_auc; pub mod test_params; +pub mod test_pknca; pub mod test_quality; pub mod test_terminal; diff --git a/tests/pknca_validation/README.md b/tests/nca/pknca/README.md similarity index 100% rename from tests/pknca_validation/README.md rename to tests/nca/pknca/README.md diff --git a/tests/pknca_validation/expected_values.json b/tests/nca/pknca/expected_values.json similarity index 99% rename from tests/pknca_validation/expected_values.json rename to tests/nca/pknca/expected_values.json index 316aceb5..bf66e2cd 100644 --- a/tests/pknca_validation/expected_values.json +++ b/tests/nca/pknca/expected_values.json @@ -1,6 +1,6 @@ { - "generated_at": "2026-01-11T19:51:40", - "r_version": "R version 4.5.1 (2025-06-13)", + "generated_at": "2026-02-15T16:07:09", + "r_version": "R version 4.5.1 (2025-06-13 ucrt)", "pknca_version": "0.12.1", "scenario_count": 25, "results": { diff --git a/tests/pknca_validation/generate_expected.R b/tests/nca/pknca/generate_expected.R similarity index 100% rename from tests/pknca_validation/generate_expected.R rename to tests/nca/pknca/generate_expected.R diff --git a/tests/pknca_validation/test_scenarios.json b/tests/nca/pknca/test_scenarios.json similarity index 100% rename from tests/pknca_validation/test_scenarios.json rename to tests/nca/pknca/test_scenarios.json diff --git a/tests/pknca_validation.rs b/tests/nca/test_pknca.rs similarity index 99% rename from tests/pknca_validation.rs rename to tests/nca/test_pknca.rs index 24255cdc..dea294d2 100644 --- a/tests/pknca_validation.rs +++ b/tests/nca/test_pknca.rs @@ -333,7 +333,7 @@ mod tests { /// Load test scenarios and expected values, run validation #[test] fn validate_against_pknca() { - let base_path = Path::new(env!("CARGO_MANIFEST_DIR")).join("tests/pknca_validation"); + let base_path = Path::new(env!("CARGO_MANIFEST_DIR")).join("tests/nca/pknca/"); // Load scenarios let scenarios_path = base_path.join("test_scenarios.json");