From: Ian Jackson Date: Sun, 1 May 2022 19:48:26 +0000 (+0100) Subject: at-currency: Break out PieceInfo::assert_desc_contains X-Git-Tag: otter-1.1.0~330 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=72f9baae57126bf79f46f1580770dca2ca2c943a;p=otter.git at-currency: Break out PieceInfo::assert_desc_contains Signed-off-by: Ian Jackson --- diff --git a/apitest/at-currency.rs b/apitest/at-currency.rs index b304555c..8811c216 100644 --- a/apitest/at-currency.rs +++ b/apitest/at-currency.rs @@ -21,8 +21,7 @@ impl Ctx { ))?; alice.synchu(&mut a_pieces)?; - let bn_desc = a_pieces[bn1].info["desc"].as_str().unwrap(); - assert!( bn_desc.contains("50ƒ"), "{bn_desc}" ); + a_pieces[bn1].assert_desc_contains("50ƒ"); let _change = a_pieces.find_by_desc_glob("*350ƒ*"); alice.api_piece(GH::Ungrab, PuSynch((&mut a_pieces, bn1)), other_pile)?; diff --git a/apitest/atmain.rs b/apitest/atmain.rs index b093e55c..103367a0 100644 --- a/apitest/atmain.rs +++ b/apitest/atmain.rs @@ -228,6 +228,13 @@ pub struct PieceInfo { info: I, } +impl PieceInfo { + fn assert_desc_contains(&self, needle: &str) { + let desc = self.info["desc"].as_str().unwrap(); + assert!(desc.contains(needle), "desc={desc:?}"); + } +} + impl Session { #[throws(Explode)] fn pieces(&self) -> Pieces {