From cce631261b4fe7b457972456dccdb4d88fc7d0b6 Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Mon, 6 Mar 2023 15:34:11 +0100 Subject: [PATCH] Coverage(actions) - Adds coverage of actions.rs --- coverage/html/badges/flat.svg | 8 +-- coverage/html/badges/flat_square.svg | 6 +- coverage/html/badges/for_the_badge.svg | 6 +- coverage/html/badges/plastic.svg | 8 +-- coverage/html/badges/social.svg | 8 +-- src/action.rs | 93 ++++++++++++++++++++++++++ src/craft.rs | 36 +++++++++- 7 files changed, 145 insertions(+), 20 deletions(-) diff --git a/coverage/html/badges/flat.svg b/coverage/html/badges/flat.svg index d9147e7..6febf64 100644 --- a/coverage/html/badges/flat.svg +++ b/coverage/html/badges/flat.svg @@ -1,6 +1,6 @@ - coverage: 22% + xmlns:xlink="http://www.w3.org/1999/xlink" width="96" height="20" role="img" aria-label="coverage: 48%"> + coverage: 48% @@ -16,8 +16,8 @@ coverage - - 22% + + 48% \ No newline at end of file diff --git a/coverage/html/badges/flat_square.svg b/coverage/html/badges/flat_square.svg index 76037e6..9907885 100644 --- a/coverage/html/badges/flat_square.svg +++ b/coverage/html/badges/flat_square.svg @@ -1,13 +1,13 @@ - coverage: 22% + xmlns:xlink="http://www.w3.org/1999/xlink" width="96" height="20" role="img" aria-label="coverage: 48%"> + coverage: 48% coverage - 22% + 48% \ No newline at end of file diff --git a/coverage/html/badges/for_the_badge.svg b/coverage/html/badges/for_the_badge.svg index 53a73bc..7d6b58d 100644 --- a/coverage/html/badges/for_the_badge.svg +++ b/coverage/html/badges/for_the_badge.svg @@ -1,13 +1,13 @@ - COVERAGE: 22% + xmlns:xlink="http://www.w3.org/1999/xlink" width="142.5" height="28" role="img" aria-label="COVERAGE: 48%"> + COVERAGE: 48% COVERAGE - 22% + 48% \ No newline at end of file diff --git a/coverage/html/badges/plastic.svg b/coverage/html/badges/plastic.svg index 1296731..209f476 100644 --- a/coverage/html/badges/plastic.svg +++ b/coverage/html/badges/plastic.svg @@ -1,6 +1,6 @@ - coverage: 22% + xmlns:xlink="http://www.w3.org/1999/xlink" width="96" height="18" role="img" aria-label="coverage: 48%"> + coverage: 48% @@ -18,8 +18,8 @@ coverage - - 22% + + 48% \ No newline at end of file diff --git a/coverage/html/badges/social.svg b/coverage/html/badges/social.svg index 5dc8ab7..ccb1035 100644 --- a/coverage/html/badges/social.svg +++ b/coverage/html/badges/social.svg @@ -1,6 +1,6 @@ - Coverage: 22% + xmlns:xlink="http://www.w3.org/1999/xlink" width="99" height="20" role="img" aria-label="Coverage: 48%"> + Coverage: 48% @@ -20,8 +20,8 @@ Coverage - - 22% + + 48% \ No newline at end of file diff --git a/src/action.rs b/src/action.rs index 89f16bb..9ff889f 100644 --- a/src/action.rs +++ b/src/action.rs @@ -454,3 +454,96 @@ lazy_static! { /// Initialize a static pseudo &Craft: ACTIONS pub static ref ACTIONS: ActionList = ActionList::default(); } + +#[cfg(test)] +mod test { + use crate::action::ACTIONS; + use pretty_assertions::assert_eq; + use strum::IntoEnumIterator; + #[test] + pub fn test_structs() { + let ac = crate::action::Action { + name: "Michel".to_string(), + dur: 0, + cp: 0, + progress: 0, + quality: 0, + buff: None, + short_name: "miguel".to_string(), + }; + let ab = crate::action::ActionBuilder { action: ac }; + let ba = crate::action::ActionBuilder::new(&"Basic Synthesis"); + let _ = crate::action::ActionBuilder::new(&"Groundwork"); + let cs = crate::action::ActionBuilder::new(&"Careful Synthesis"); + ab.dur(10) + .cp(10) + .progress(10) + .quality(10) + .buff(None) + .build(); + let act1 = ba.cp(10).dur(22).progress(33).quality(44).build(); + let act2 = cs.cp(10).dur(22).progress(33).quality(44).build(); + assert_eq!(act1, act2); + format!("{:?}", act1); + let _ = crate::action::ActionList::default(); + } + + #[test] + pub fn test_with_craft() { + let mut bbs = crate::specs::BuffState::default(); + for buff in crate::specs::Buff::iter() { + bbs.apply(buff, 2); + } + let mut act1 = crate::action::ActionBuilder::new(&"Basic Synthesis") + .dur(22) + .cp(10) + .progress(100) + .quality(100) + .build(); + let mut craft = crate::craft::Craft::default(); + craft.buffs = bbs; + + assert_eq!(act1.get_name(), "Basic Synthesis"); + assert_eq!(act1.get_cp_cost(&craft), 10); + assert_eq!(act1.get_durability_cost(&craft), 11); + assert_eq!(act1.get_progress(&craft), 250); + assert_eq!(act1.get_quality(&craft), 300); + assert_eq!(act1.get_buff(), None); + + assert!(act1.can_use(&craft)); + + assert_eq!(&ACTIONS.standard_touch.get_cp_cost(&craft), &18); + assert_eq!(&ACTIONS.advanced_touch.get_cp_cost(&craft), &18); + assert_eq!(&ACTIONS.masters_mend.get_durability_cost(&craft), &30); + + assert_eq!(&ACTIONS.byregot_blessing.get_quality(&craft), &420); + assert_eq!(&ACTIONS.byregot_blessing.can_use(&craft), &true); + assert_eq!(&ACTIONS.muscle_memory.can_use(&craft), &true); + assert_eq!(&ACTIONS.trained_finesse.can_use(&craft), &false); + assert_eq!(&ACTIONS.reflect.can_use(&craft), &true); + + act1.progress = 0; + act1.quality = 0; + assert_eq!(act1.get_durability_cost(&craft), 0); + act1.dur = 0; + act1.progress = 100; + act1.quality = 100; + assert_eq!(act1.get_durability_cost(&craft), 0); + + act1.dur = 20; + craft.durability = 10; + craft.buffs = crate::specs::BuffState::default(); + assert_eq!(act1.get_progress(&craft), 50); + assert_eq!(act1.get_quality(&craft), 50); + + act1.dur = 2; + assert_eq!(act1.get_durability_cost(&craft), 5); + + craft.cp = 0; + assert_eq!(&ACTIONS.reflect.can_use(&craft), &false); + + craft.cp = 100; + craft.success = crate::specs::Success::Failure; + assert_eq!(&ACTIONS.reflect.can_use(&craft), &false); + } +} diff --git a/src/craft.rs b/src/craft.rs index 863fa66..2a43a4d 100644 --- a/src/craft.rs +++ b/src/craft.rs @@ -42,7 +42,6 @@ pub struct Craft<'a> { impl<'a> Craft<'a> { /// Create a new craft with a recipe, stats and parameters - /// pub fn new(recipe: Recipe, stats: Stats, params: Parameters) -> Craft<'a> { Self { recipe, @@ -184,9 +183,42 @@ impl<'a> Display for Craft<'a> { } } +#[cfg(test)] +impl<'a> Craft<'a> { + /// Create a "Default" craft, testing only + pub fn default() -> Craft<'a> { + Self::new( + crate::specs::Recipe { + durability: 200, + progress: 200, + progress_divider: 100, + progress_modifier: 100, + quality: 100, + quality_divider: 100, + quality_modifier: 100, + }, + crate::specs::Stats { + craftsmanship: 200, + control: 200, + max_cp: 200, + }, + crate::io::Parameters { + threads: 10, + verbose: 2, + depth: 10, + desperate: false, + byregot_step: 10, + }, + ) + } +} + #[cfg(test)] mod test { + // use pretty_assertions::assert_eq; // Struct Test #[test] - pub fn struct_tests() {} + pub fn struct_tests() { + let _craft = crate::craft::Craft::default(); + } } -- 2.45.1