From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 27 Feb 2021 20:57:58 +0000 (+0000)
Subject: tests: Use assert_eq! and assert! a lot more
X-Git-Tag: otter-0.4.0~290
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=4c5685786ce067f48272a160b154f1473f4258d2;p=otter.git

tests: Use assert_eq! and assert! a lot more

This is actually better because you can get a backtrace.

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

diff --git a/wdriver/wdt-altergame.rs b/wdriver/wdt-altergame.rs
index 133e5033..28c1b101 100644
--- a/wdriver/wdt-altergame.rs
+++ b/wdriver/wdt-altergame.rs
@@ -28,10 +28,10 @@ impl Ctx {
         .iter()
         .filter(|(_e, txt)| txt == desc)
         .collect();
-      ensure!(relevant.len() == url.iter().len());
+      assert_eq!(relevant.len(), url.iter().len());
       if let Some(url) = url {
-        ensure!(relevant[0].0.get_attribute("href")?
-                .as_ref().map(|s| s.as_str()) == Some(url));
+        assert_eq!(relevant[0].0.get_attribute("href")?
+                   .as_ref().map(|s| s.as_str()), Some(url));
       }
       Ok::<_,AE>(())
     })()
diff --git a/wdriver/wdt-simple.rs b/wdriver/wdt-simple.rs
index f38a211c..167235e7 100644
--- a/wdriver/wdt-simple.rs
+++ b/wdriver/wdt-simple.rs
@@ -34,7 +34,7 @@ impl Ctx {
 
       let p1g_new = p1.posg()?;
       dbg!(p1g_old, p1g_new);
-      ensure!( p1g_new != p1g_old );
+      assert!( p1g_new != p1g_old );
 
       w.synch()?;
       p1g_new