chiark / gitweb /
at-currency: Break out PieceInfo::assert_desc_contains
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 1 May 2022 19:48:26 +0000 (20:48 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 1 May 2022 20:03:40 +0000 (21:03 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
apitest/at-currency.rs
apitest/atmain.rs

index b304555c8ad97ae9427c0baf777effca413c107c..8811c216959f700b13ceb019fd96f4bba2781feb 100644 (file)
@@ -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)?;
index b093e55c33a71bfc9a4500ce41e34cec1d68f67d..103367a0e103dea1555311e0b15502ff258ed795 100644 (file)
@@ -228,6 +228,13 @@ pub struct PieceInfo<I> {
   info: I,
 }
 
+impl PieceInfo<JsV> {
+  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<PI:Idx>(&self) -> Pieces<PI> {