From c2cee28ecb163edd2622475a7425fedcbbc31c70 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 6 Jan 2021 01:48:15 +0000 Subject: [PATCH] refactor a bit nfc Signed-off-by: Ian Jackson --- wdriver/wdt-simple.rs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/wdriver/wdt-simple.rs b/wdriver/wdt-simple.rs index 2a5241e9..72d20798 100644 --- a/wdriver/wdt-simple.rs +++ b/wdriver/wdt-simple.rs @@ -50,7 +50,13 @@ impl Ctx { #[throws(AE)] fn rotate(&mut self){ let su = &mut self.su; - let transform = format!("rotate(-90)"); + + let chk = |w: &WindowGuard<'_>| { + let transform = format!("rotate(-90)"); + let pd = w.find_element(By::Id("piece4.1"))?; + ensure_eq!(pd.get_attribute("transform")?, Some(transform)); + Ok::<_,AE>(()) + }; { let mut w = su.w(&self.alice)?; @@ -65,17 +71,14 @@ impl Ctx { .perform() .always_context("rotate")?; - let transform = format!("rotate(-90)"); - let pd = w.find_element(By::Id("piece4.1"))?; - ensure_eq!(pd.get_attribute("transform")?, Some(transform)); + chk(&w)?; w.synch()?; } { let mut w = su.w(&self.bob)?; w.synch()?; - let pd = w.find_element(By::Id("piece4.1"))?; - ensure_eq!(pd.get_attribute("transform")?, Some(transform)); + chk(&w)?; } } } -- 2.30.2