tests: Use assert_eq! 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-hand.rs b/wdriver/wdt-hand.rs
index 981f47b4ca1ced298ba70a0c7af0772be8a9a2cf..301f0be7d4a25edcc65b9e7734f1cd3b347f893f 100644 (file)
--- a/wdriver/wdt-hand.rs
+++ b/wdriver/wdt-hand.rs
@@ -41,7 +41,7 @@ impl Ctx {
       let epath = euse.find_element(By::Tag("path"))?;
       let attr = epath.get_attribute("stroke-dasharray")?;
 
-      ensure_eq!(attr, dasharray);
+      assert_eq!(attr, dasharray);
       Ok::<_,AE>(())
     };
 

diff --git a/wdriver/wdt-simple.rs b/wdriver/wdt-simple.rs
index 834965145a29b8ba0925ed3d8ee094bc653c4404..f38a211c8970ada9821d469216bcf49b06d71780 100644 (file)
--- a/wdriver/wdt-simple.rs
+++ b/wdriver/wdt-simple.rs
@@ -44,7 +44,7 @@ impl Ctx {
       let mut w = su.w(&self.bob)?;
       w.synch()?;
       let p1 = w.find_piece("1.1")?;
-      ensure_eq!(p1.posg()?, alice_p1g);
+      assert_eq!(p1.posg()?, alice_p1g);
     }
   }
 
@@ -56,7 +56,7 @@ impl Ctx {
     let chk = |w: &WindowGuard<'_>| {
       let transform = format!("rotate(-90)");
       let pd = w.find_element(By::Id(&format!("piece{}",pc)))?;
-      ensure_eq!(pd.get_attribute("transform")?, Some(transform));
+      assert_eq!(pd.get_attribute("transform")?, Some(transform));
       Ok::<_,AE>(())
     };
 
@@ -91,7 +91,7 @@ impl Ctx {
 
     let chk = |w: &WindowGuard<'_>, exp_end| {
       let got_end = w.find_piece(pc)?.posg()?;
-      ensure_eq!(got_end, exp_end);
+      assert_eq!(got_end, exp_end);
       Ok::<_,AE>(())
     };
 
@@ -134,7 +134,7 @@ impl Ctx {
 
     let chk = |w: &WindowGuard<'_>| {
       let held = w.piece_held(pc)?;
-      ensure_eq!(held, None);
+      assert_eq!(held, None);
       Ok::<_,AE>(())
     };
 
@@ -266,14 +266,14 @@ impl Ctx {
 
     let y = gots.iter().filter(|got|  got.yes).next().expect("y");
     let n = gots.iter().filter(|got| !got.yes).next().expect("n");
-    ensure_eq!(y.now, y.try_end);
-    ensure_eq!(n.now, y.try_end);
-    ensure_eq!(n.now, y.try_end);
-    ensure_eq!(n.held, y.held);
+    assert_eq!(y.now, y.try_end);
+    assert_eq!(n.now, y.try_end);
+    assert_eq!(n.now, y.try_end);
+    assert_eq!(n.held, y.held);
 
     for got in &gots {
       let conflict = got.log.iter().any(|m| m.starts_with("Conflict!"));
-      ensure_eq!(conflict, !got.yes);
+      assert_eq!(conflict, !got.yes);
     }
   }
 }