From 902061be53829eb2de8b7d4a20d660de15d89e69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Joly?= Date: Sun, 8 Jun 2025 22:34:33 +0100 Subject: [PATCH] refactor: move display test in separate file This should make maintenance easier as the number of those files grows. Also update the insta snapshots by running: ``` cargo insta test --accept --unreferenced delete ``` --- rusqlite_migration/src/tests/core.rs | 25 ----------- rusqlite_migration/src/tests/display.rs | 44 +++++++++++++++++++ rusqlite_migration/src/tests/mod.rs | 1 + ...igration__tests__display__everything.snap} | 2 +- ...tion__tests__display__everything_alt.snap} | 2 +- ...s__display__everything_compact_debug.snap} | 2 +- ...on__tests__display__everything_debug.snap} | 2 +- ...e_migration__tests__display__up_down.snap} | 2 +- ...gration__tests__display__up_down_alt.snap} | 2 +- ...igration__tests__display__up_down_fk.snap} | 2 +- ...tion__tests__display__up_down_fk_alt.snap} | 2 +- ...e_migration__tests__display__up_only.snap} | 2 +- ...gration__tests__display__up_only_alt.snap} | 2 +- 13 files changed, 55 insertions(+), 35 deletions(-) create mode 100644 rusqlite_migration/src/tests/display.rs rename rusqlite_migration/src/tests/snapshots/{rusqlite_migration__tests__core__everything.snap => rusqlite_migration__tests__display__everything.snap} (77%) rename rusqlite_migration/src/tests/snapshots/{rusqlite_migration__tests__core__everything_alt.snap => rusqlite_migration__tests__display__everything_alt.snap} (81%) rename rusqlite_migration/src/tests/snapshots/{rusqlite_migration__tests__core__everything_compact_debug.snap => rusqlite_migration__tests__display__everything_compact_debug.snap} (84%) rename rusqlite_migration/src/tests/snapshots/{rusqlite_migration__tests__core__everything_debug.snap => rusqlite_migration__tests__display__everything_debug.snap} (87%) rename rusqlite_migration/src/tests/snapshots/{rusqlite_migration__tests__core__up_down.snap => rusqlite_migration__tests__display__up_down.snap} (76%) rename rusqlite_migration/src/tests/snapshots/{rusqlite_migration__tests__core__up_down_alt.snap => rusqlite_migration__tests__display__up_down_alt.snap} (79%) rename rusqlite_migration/src/tests/snapshots/{rusqlite_migration__tests__core__up_down_fk.snap => rusqlite_migration__tests__display__up_down_fk.snap} (89%) rename rusqlite_migration/src/tests/snapshots/{rusqlite_migration__tests__core__up_down_fk_alt.snap => rusqlite_migration__tests__display__up_down_fk_alt.snap} (89%) rename rusqlite_migration/src/tests/snapshots/{rusqlite_migration__tests__core__up_only.snap => rusqlite_migration__tests__display__up_only.snap} (70%) rename rusqlite_migration/src/tests/snapshots/{rusqlite_migration__tests__core__up_only_alt.snap => rusqlite_migration__tests__display__up_only_alt.snap} (74%) diff --git a/rusqlite_migration/src/tests/core.rs b/rusqlite_migration/src/tests/core.rs index 086fea9..f0ea542 100644 --- a/rusqlite_migration/src/tests/core.rs +++ b/rusqlite_migration/src/tests/core.rs @@ -573,28 +573,3 @@ fn test_pending_migrations_errors() -> Result<(), Box> { Ok(()) } - -#[test] -fn test_display() { - insta::assert_snapshot!("up_only", m_valid0_up()); - insta::assert_snapshot!("up_only_alt", format!("{:#}", m_valid0_up())); - - insta::assert_snapshot!("up_down", m_valid0_down()); - insta::assert_snapshot!("up_down_alt", format!("{:#}", m_valid0_down())); - - insta::assert_snapshot!("up_down_fk", m_valid_fk_down()); - insta::assert_snapshot!("up_down_fk_alt", format!("{:#}", m_valid_fk_down())); - - let everything = M { - up: "UP", - up_hook: Some(Box::new(|_: &Transaction| Ok(()))), - down: Some("DOWN"), - down_hook: Some(Box::new(|_: &Transaction| Ok(()))), - foreign_key_check: true, - comment: Some("Comment, likely a filename in practice!"), - }; - insta::assert_snapshot!("everything", everything); - insta::assert_debug_snapshot!("everything_debug", everything); - insta::assert_compact_debug_snapshot!("everything_compact_debug", everything); - insta::assert_snapshot!("everything_alt", format!("{everything:#}")); -} diff --git a/rusqlite_migration/src/tests/display.rs b/rusqlite_migration/src/tests/display.rs new file mode 100644 index 0000000..1d13c9a --- /dev/null +++ b/rusqlite_migration/src/tests/display.rs @@ -0,0 +1,44 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Clément Joly and contributors. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +use insta::assert_snapshot; + +use crate::tests::helpers::{all_valid_down, m_valid0_down, m_valid0_up, m_valid_fk_down}; +use crate::*; + +#[test] +fn test_m_display() { + insta::assert_snapshot!("up_only", m_valid0_up()); + insta::assert_snapshot!("up_only_alt", format!("{:#}", m_valid0_up())); + + insta::assert_snapshot!("up_down", m_valid0_down()); + insta::assert_snapshot!("up_down_alt", format!("{:#}", m_valid0_down())); + + insta::assert_snapshot!("up_down_fk", m_valid_fk_down()); + insta::assert_snapshot!("up_down_fk_alt", format!("{:#}", m_valid_fk_down())); + + let everything = M { + up: "UP", + up_hook: Some(Box::new(|_: &Transaction| Ok(()))), + down: Some("DOWN"), + down_hook: Some(Box::new(|_: &Transaction| Ok(()))), + foreign_key_check: true, + comment: Some("Comment, likely a filename in practice!"), + }; + insta::assert_snapshot!("everything", everything); + insta::assert_debug_snapshot!("everything_debug", everything); + insta::assert_compact_debug_snapshot!("everything_compact_debug", everything); + insta::assert_snapshot!("everything_alt", format!("{everything:#}")); +} diff --git a/rusqlite_migration/src/tests/mod.rs b/rusqlite_migration/src/tests/mod.rs index 52f27f4..b3fcce4 100644 --- a/rusqlite_migration/src/tests/mod.rs +++ b/rusqlite_migration/src/tests/mod.rs @@ -17,4 +17,5 @@ mod builder; mod core; +mod display; mod helpers; diff --git a/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__core__everything.snap b/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__display__everything.snap similarity index 77% rename from rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__core__everything.snap rename to rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__display__everything.snap index a5217ce..a5a0659 100644 --- a/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__core__everything.snap +++ b/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__display__everything.snap @@ -1,5 +1,5 @@ --- -source: rusqlite_migration/src/tests/core.rs +source: rusqlite_migration/src/tests/display.rs expression: everything snapshot_kind: text --- diff --git a/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__core__everything_alt.snap b/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__display__everything_alt.snap similarity index 81% rename from rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__core__everything_alt.snap rename to rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__display__everything_alt.snap index 6d00849..11073cd 100644 --- a/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__core__everything_alt.snap +++ b/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__display__everything_alt.snap @@ -1,5 +1,5 @@ --- -source: rusqlite_migration/src/tests/core.rs +source: rusqlite_migration/src/tests/display.rs expression: "format!(\"{everything:#}\")" snapshot_kind: text --- diff --git a/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__core__everything_compact_debug.snap b/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__display__everything_compact_debug.snap similarity index 84% rename from rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__core__everything_compact_debug.snap rename to rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__display__everything_compact_debug.snap index f691cef..64bcccf 100644 --- a/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__core__everything_compact_debug.snap +++ b/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__display__everything_compact_debug.snap @@ -1,5 +1,5 @@ --- -source: rusqlite_migration/src/tests/core.rs +source: rusqlite_migration/src/tests/display.rs expression: everything snapshot_kind: text --- diff --git a/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__core__everything_debug.snap b/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__display__everything_debug.snap similarity index 87% rename from rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__core__everything_debug.snap rename to rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__display__everything_debug.snap index d0d3f86..ea8b63c 100644 --- a/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__core__everything_debug.snap +++ b/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__display__everything_debug.snap @@ -1,5 +1,5 @@ --- -source: rusqlite_migration/src/tests/core.rs +source: rusqlite_migration/src/tests/display.rs expression: everything snapshot_kind: text --- diff --git a/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__core__up_down.snap b/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__display__up_down.snap similarity index 76% rename from rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__core__up_down.snap rename to rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__display__up_down.snap index 9f55810..825ef11 100644 --- a/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__core__up_down.snap +++ b/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__display__up_down.snap @@ -1,5 +1,5 @@ --- -source: rusqlite_migration/src/tests/core.rs +source: rusqlite_migration/src/tests/display.rs expression: m_valid0_down() snapshot_kind: text --- diff --git a/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__core__up_down_alt.snap b/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__display__up_down_alt.snap similarity index 79% rename from rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__core__up_down_alt.snap rename to rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__display__up_down_alt.snap index 0482df1..0a30577 100644 --- a/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__core__up_down_alt.snap +++ b/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__display__up_down_alt.snap @@ -1,5 +1,5 @@ --- -source: rusqlite_migration/src/tests/core.rs +source: rusqlite_migration/src/tests/display.rs expression: "format!(\"{:#}\", m_valid0_down())" snapshot_kind: text --- diff --git a/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__core__up_down_fk.snap b/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__display__up_down_fk.snap similarity index 89% rename from rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__core__up_down_fk.snap rename to rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__display__up_down_fk.snap index 4a2d643..e2edfe9 100644 --- a/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__core__up_down_fk.snap +++ b/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__display__up_down_fk.snap @@ -1,5 +1,5 @@ --- -source: rusqlite_migration/src/tests/core.rs +source: rusqlite_migration/src/tests/display.rs expression: m_valid_fk_down() snapshot_kind: text --- diff --git a/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__core__up_down_fk_alt.snap b/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__display__up_down_fk_alt.snap similarity index 89% rename from rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__core__up_down_fk_alt.snap rename to rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__display__up_down_fk_alt.snap index 7f567e7..b50c22a 100644 --- a/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__core__up_down_fk_alt.snap +++ b/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__display__up_down_fk_alt.snap @@ -1,5 +1,5 @@ --- -source: rusqlite_migration/src/tests/core.rs +source: rusqlite_migration/src/tests/display.rs expression: "format!(\"{:#}\", m_valid_fk_down())" snapshot_kind: text --- diff --git a/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__core__up_only.snap b/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__display__up_only.snap similarity index 70% rename from rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__core__up_only.snap rename to rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__display__up_only.snap index e797b7c..5241dd5 100644 --- a/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__core__up_only.snap +++ b/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__display__up_only.snap @@ -1,5 +1,5 @@ --- -source: rusqlite_migration/src/tests/core.rs +source: rusqlite_migration/src/tests/display.rs expression: m_valid0_up() snapshot_kind: text --- diff --git a/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__core__up_only_alt.snap b/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__display__up_only_alt.snap similarity index 74% rename from rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__core__up_only_alt.snap rename to rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__display__up_only_alt.snap index bcedc75..6c98373 100644 --- a/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__core__up_only_alt.snap +++ b/rusqlite_migration/src/tests/snapshots/rusqlite_migration__tests__display__up_only_alt.snap @@ -1,5 +1,5 @@ --- -source: rusqlite_migration/src/tests/core.rs +source: rusqlite_migration/src/tests/display.rs expression: "format!(\"{:#}\", m_valid0_up())" snapshot_kind: text ---