From 1aaf162ca0671c6cf559cf5baf3633e54c5be97e Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 26 Jan 2021 23:58:16 +0000 Subject: [PATCH] wdt: drag_end test, works Signed-off-by: Ian Jackson --- wdriver/wdt-simple.rs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/wdriver/wdt-simple.rs b/wdriver/wdt-simple.rs index 67cd6181..12b3f3c4 100644 --- a/wdriver/wdt-simple.rs +++ b/wdriver/wdt-simple.rs @@ -90,14 +90,16 @@ impl Ctx { fn drag_off(&mut self, pc: &'static str) { let su = &mut self.su; - let chk = |w: &WindowGuard<'_>| { + let chk = |w: &WindowGuard<'_>, exp_end| { + let got_end = w.find_piece(pc)?.posg()?; + assert_eq!(got_end, exp_end); Ok::<_,AE>(()) }; let table_size = self.spec.table_size .ok_or(anyhow!("table size missing from spec"))?; - { + let exp_end = { let mut w = su.w(&self.alice)?; let p = w.find_piece(pc)?; let start = p.posg()?; @@ -114,14 +116,16 @@ impl Ctx { .perform() .always_context("drag off")?; - chk(&w)?; + chk(&w, exp_end)?; w.synch()?; - } + + exp_end + }; { let mut w = su.w(&self.bob)?; w.synch()?; - chk(&w)?; + chk(&w, exp_end)?; } pc -- 2.30.2