From 96e77df387e95f1a3be2dd636e44b1f2e5a4d829 Mon Sep 17 00:00:00 2001 From: Rhys Lloyd Date: Tue, 9 Jun 2026 09:49:32 -0700 Subject: [PATCH] move tests to klondike --- Cargo.lock | 5 ++--- klondike-cli/Cargo.toml | 5 ----- klondike-cli/src/main.rs | 3 --- klondike/Cargo.toml | 5 +++++ klondike/src/lib.rs | 3 +++ {klondike-cli => klondike}/src/test.rs | 4 +++- 6 files changed, 13 insertions(+), 12 deletions(-) rename {klondike-cli => klondike}/src/test.rs (98%) diff --git a/Cargo.lock b/Cargo.lock index 467c99c..f9e3990 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -138,8 +138,10 @@ version = "0.3.0" dependencies = [ "card_game", "rand", + "rmp-serde", "serde", "serde_derive", + "serde_json", ] [[package]] @@ -158,9 +160,6 @@ dependencies = [ "card_game", "klondike", "rand", - "rmp-serde", - "serde", - "serde_json", ] [[package]] diff --git a/klondike-cli/Cargo.toml b/klondike-cli/Cargo.toml index 032e985..a4769cd 100644 --- a/klondike-cli/Cargo.toml +++ b/klondike-cli/Cargo.toml @@ -8,10 +8,5 @@ card_game.workspace = true klondike.workspace = true rand = { version = "0.10.1", default-features = false, features = ["thread_rng"] } -[dev-dependencies] -rmp-serde = "1.3.1" -serde = { version = "1.0.228", default-features = false } -serde_json = "1.0.149" - [lints] workspace = true diff --git a/klondike-cli/src/main.rs b/klondike-cli/src/main.rs index 22ba410..60c3740 100644 --- a/klondike-cli/src/main.rs +++ b/klondike-cli/src/main.rs @@ -4,9 +4,6 @@ use klondike::{ KlondikePile, KlondikePileStack, SkipCards, Tableau, TableauStack, }; -#[cfg(test)] -mod test; - use std::fmt::Display; struct Displayed(T); diff --git a/klondike/Cargo.toml b/klondike/Cargo.toml index 557c118..56c2787 100644 --- a/klondike/Cargo.toml +++ b/klondike/Cargo.toml @@ -9,6 +9,11 @@ rand = { version = "0.10.1", default-features = false, features = ["std_rng"] } serde = { version = "1.0.228", default-features = false, optional = true } serde_derive = { version = "1.0.228", default-features = false, optional = true } +[dev-dependencies] +rmp-serde = "1.3.1" +serde = { version = "1.0.228", default-features = false } +serde_json = "1.0.149" + [lints] workspace = true diff --git a/klondike/src/lib.rs b/klondike/src/lib.rs index 4e1dd50..425201f 100644 --- a/klondike/src/lib.rs +++ b/klondike/src/lib.rs @@ -2,6 +2,9 @@ pub type Rng = rand::rngs::StdRng; use card_game::{Card, Game, Pile, Rank, Stack}; +#[cfg(test)] +mod test; + // test readme #[doc = include_str!("../README.md")] #[cfg(doctest)] diff --git a/klondike-cli/src/test.rs b/klondike/src/test.rs similarity index 98% rename from klondike-cli/src/test.rs rename to klondike/src/test.rs index 25b6617..d7931e1 100644 --- a/klondike-cli/src/test.rs +++ b/klondike/src/test.rs @@ -1,5 +1,6 @@ use card_game::Session; -use klondike::Klondike; +use crate::Klondike; + #[test] fn test_is_winnable() { // is winnable @@ -15,6 +16,7 @@ fn test_is_winnable() { } } + #[test] fn test_json() { let mut session = Session::new_default(Klondike::with_seed(124));