diff options
author | Tim Oram <dev@mitmaro.ca> | 2024-02-12 22:35:01 -0330 |
---|---|---|
committer | Tim Oram <dev@mitmaro.ca> | 2024-02-15 20:27:06 -0330 |
commit | 5e1a39ae5b83b0c1344f5426b364484a1917b5b1 (patch) | |
tree | 8c75132a83178af5f29d3dd7386a31fdaf3c2db2 | |
parent | bdb94556fba28fd2e31c1a0a8369acd204b6bcf0 (diff) |
Move assert_results to test helpers
-rw-r--r-- | src/test_helpers/assertions.rs | 3 | ||||
-rw-r--r-- | src/test_helpers/assertions/assert_results.rs (renamed from src/testutil/assert_results.rs) | 20 | ||||
-rw-r--r-- | src/testutil.rs | 2 |
3 files changed, 13 insertions, 12 deletions
diff --git a/src/test_helpers/assertions.rs b/src/test_helpers/assertions.rs index afd8845..0a11cfd 100644 --- a/src/test_helpers/assertions.rs +++ b/src/test_helpers/assertions.rs @@ -1 +1,4 @@ pub(crate) mod assert_rendered_output; +mod assert_results; + +pub(crate) use assert_results::_assert_results; diff --git a/src/testutil/assert_results.rs b/src/test_helpers/assertions/assert_results.rs index 76ad5b5..12ad20c 100644 --- a/src/testutil/assert_results.rs +++ b/src/test_helpers/assertions/assert_results.rs @@ -38,13 +38,13 @@ pub(crate) fn _assert_results(results: Results, expected_artifacts: &[Artifact]) #[macro_export] macro_rules! assert_results { - ($actual:expr) => {{ - use $crate::testutil::_assert_results; - _assert_results($actual, &[]); - }}; - ($actual:expr, $($arg:expr),*) => {{ - use $crate::testutil::_assert_results; - let expected = vec![$( $arg, )*]; - _assert_results($actual, &expected); - }}; - } + ($actual:expr) => {{ + use $crate::test_helpers::assertions::_assert_results; + _assert_results($actual, &[]); + }}; + ($actual:expr, $($arg:expr),*) => {{ + use $crate::test_helpers::assertions::_assert_results; + let expected = vec![$( $arg, )*]; + _assert_results($actual, &expected); + }}; +} diff --git a/src/testutil.rs b/src/testutil.rs index d849b90..81f3927 100644 --- a/src/testutil.rs +++ b/src/testutil.rs @@ -1,4 +1,3 @@ -mod assert_results; mod mocked_searchable; mod module_test; mod process_test; @@ -8,7 +7,6 @@ mod test_module_provider; mod with_search; pub(crate) use self::{ - assert_results::_assert_results, mocked_searchable::MockedSearchable, module_test::module_test, process_test::{process_test, TestContext as ProcessTestContext}, |