chiark / gitweb /
refactor a bit nfc
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 6 Jan 2021 01:48:15 +0000 (01:48 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 6 Jan 2021 01:48:37 +0000 (01:48 +0000)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
wdriver/wdt-simple.rs

index 2a5241e9cab49973522ecb639220e2f43273b5ab..72d20798db8af87ecc222b45e0ac772ff915e4bc 100644 (file)
@@ -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)?;
     }
   }
 }