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 133e5033ba81a1a86221e53ec301fa74672d2f00..28c1b10108c3111c3ba00a49f55b70f0ddbf90e4 100644 (file)
--- 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 f38a211c8970ada9821d469216bcf49b06d71780..167235e7a46ceeaf22c70f12b227a8276f8ead20 100644 (file)
--- 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