From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 22 May 2022 09:27:04 +0000 (+0100)
Subject: at-currency: More tests
X-Git-Tag: otter-1.1.0~30
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=783747fd21e23880e0a8b28b87497987749a9778;p=otter.git

at-currency: More tests

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/apitest/at-currency.rs b/apitest/at-currency.rs
index 686b5aa5..9ce5fd43 100644
--- a/apitest/at-currency.rs
+++ b/apitest/at-currency.rs
@@ -90,7 +90,7 @@ impl Ctx {
     alice.synchu(&mut a_pieces)?;
     // aside has 90, in hand has 9, original hand pos has 309
 
-    let expected = [399];
+    let expected = [1, 399];
     let expected = expected.into_iter()
       .map(|s| s.to_string())
       .chain(iter::once("?".to_string()))
@@ -99,10 +99,13 @@ impl Ctx {
     let mut qtys = vec![];
     bob.synchx::<PIB,_>(None, None, |_session, gen, _k, v| v.tree_walk(|k,v| {
       if let Some(s) = v.as_str() {
-        for (_, qty) in regex_captures!(r#"([0-9.?]*)ƒ"#, s) {
+        for m in regex!(
+          r#"(?x) ([0-9.?]*) (:?<tspan[^<>]*>)? ƒ "#
+        ).captures_iter(s) {
+          let qty = m.get(1).unwrap().as_str();
           dbg!(gen, qty, k, s);
           qtys.push(qty.to_string());
-//          assert!(expected.iter().map(|s| &**s).contains(&qty));
+          assert!(expected.iter().map(|s| &**s).contains(&qty));
         }
       }
       Ok::<_,Void>(())