From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 6 Jan 2021 01:48:15 +0000 (+0000)
Subject: refactor a bit nfc
X-Git-Tag: otter-0.2.0~3
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c2cee28ecb163edd2622475a7425fedcbbc31c70;p=otter.git

refactor a bit nfc

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

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)?;
     }
   }
 }