From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 27 Feb 2021 19:28:44 +0000 (+0000)
Subject: apitest: Provide Session::api_with_piece_op
X-Git-Tag: otter-0.4.0~299
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=16b6fb2bb07c891f6104c2cdfb80245a6dda5115;p=otter.git

apitest: Provide Session::api_with_piece_op

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

diff --git a/apitest/at-otter.rs b/apitest/at-otter.rs
index 58eb893a..b99309a8 100644
--- a/apitest/at-otter.rs
+++ b/apitest/at-otter.rs
@@ -222,6 +222,14 @@ impl Session {
     ensure_eq!(resp.status(), 200);
   }
 
+  #[throws(AE)]
+  fn api_with_piece_op(&mut self, su: &SetupCore, piece: &str,
+                       opname: &str, op: serde_json::Value) {
+    self.api_piece_op(su, piece, "grab", json!({}))?;
+    self.api_piece_op(su, piece, "m", op)?;
+    self.api_piece_op(su, piece, "ungrab", json!({}))?;
+  }
+
   #[throws(AE)]
   fn await_update<
     R,
@@ -293,9 +301,7 @@ impl Ctx {
     dbg!(&llm);
 
     for (llm, pos) in izip!(&llm, [PosC([5,5]), PosC([50,25])].iter()) {
-      session.api_piece_op(&self.su, &llm.id, "grab", json!({}))?;
-      session.api_piece_op(&self.su, &llm.id, "m", json![pos.0])?;
-      session.api_piece_op(&self.su, &llm.id, "ungrab", json!({}))?;
+      session.api_with_piece_op(&self.su, &llm.id, "m", json![pos.0])?;
     }
 
     session.synch(&mut self.su)?;