Bridge Servo touch tap input

crates/ely_servo_host/tests/sidecar.rs

@@ -27,6 +27,9 @@ const SERVO_SCROLL_OFFSET: ScrollOffset = ScrollOffset { x: 0, y: 480 };
 const SERVO_CLICK_URL: &str = "data:text/html,%3C!doctype%20html%3E%3Ctitle%3EClick%20Probe%3C%2Ftitle%3E%3Cstyle%3Ebody%7Bmargin%3A0%3Bbackground%3A%23f7f7f7%3B%7Dbutton%7Bposition%3Aabsolute%3Bleft%3A80px%3Btop%3A80px%3Bwidth%3A220px%3Bheight%3A90px%3Bfont%3A28px%20sans-serif%3Bbackground%3A%23ffffff%3Bcolor%3A%23111111%3B%7D%3C%2Fstyle%3E%3Cbutton%20onclick%3D%22document.body.style.background%3D%27%230039ff%27%3Bdocument.title%3D%27Clicked%27%3Bthis.textContent%3D%27Clicked%27%3B%22%3ETap%3C%2Fbutton%3E";
 const SERVO_CLICK_SIZE: FrameSize = FrameSize { width: 640, height: 480 };
 const SERVO_CLICK_POINT: ClickPoint = ClickPoint { x: 160, y: 120 };
+const SERVO_TOUCH_URL: &str = "data:text/html,%3C%21doctype%20html%3E%3Ctitle%3ETouch%20Probe%3C%2Ftitle%3E%3Cstyle%3Ebody%7Bmargin%3A0%3Bbackground%3A%23f7f7f7%3B%7Dbutton%7Bposition%3Aabsolute%3Bleft%3A80px%3Btop%3A80px%3Bwidth%3A220px%3Bheight%3A90px%3Bfont%3A28px%20sans-serif%3Bbackground%3A%23ffffff%3Bcolor%3A%23111111%3Btouch-action%3Amanipulation%3B%7D%3C%2Fstyle%3E%3Cbutton%20ontouchstart%3D%22document.body.dataset.touch%3D%27start%27%3B%22%20onclick%3D%22document.body.style.background%3D%27%230039ff%27%3Bdocument.title%3D%27Touched%27%3Bthis.textContent%3D%27Touched%27%3B%22%3ETap%3C%2Fbutton%3E";
+const SERVO_TOUCH_SIZE: FrameSize = FrameSize { width: 640, height: 480 };
+const SERVO_TOUCH_POINT: ClickPoint = ClickPoint { x: 160, y: 120 };
 const SERVO_TEXT_URL: &str = "data:text/html,%3C!doctype%20html%3E%3Ctitle%3EText%20Probe%3C%2Ftitle%3E%3Cstyle%3Ebody%7Bmargin%3A0%3Bbackground%3A%23f7f7f7%3Bfont%3A28px%20sans-serif%3B%7Dinput%7Bposition%3Aabsolute%3Bleft%3A80px%3Btop%3A80px%3Bwidth%3A260px%3Bheight%3A70px%3Bfont%3A28px%20sans-serif%3B%7Doutput%7Bposition%3Aabsolute%3Bleft%3A80px%3Btop%3A180px%3Bfont%3A32px%20sans-serif%3B%7D%3C%2Fstyle%3E%3Cinput%20id%3Dq%20autofocus%20oninput%3D%22document.body.style.background%3D%27%230039ff%27%3Bdocument.getElementById%28%27out%27%29.textContent%3Dthis.value%3B%22%3E%3Coutput%20id%3Dout%3Eempty%3C%2Foutput%3E";
 const SERVO_TEXT_SIZE: FrameSize = FrameSize { width: 640, height: 480 };
 const SERVO_TEXT_POINT: ClickPoint = ClickPoint { x: 160, y: 120 };
@@ -116,6 +119,22 @@ fn sidecar_clicks_page_with_servo_mouse_input() -> Result<(), Box<dyn Error>> {
     Ok(())
 }
 
+#[test]
+fn sidecar_touches_page_with_servo_touch_input() -> Result<(), Box<dyn Error>> {
+    let initial_report = snapshot_touch_probe(None)?;
+    let touched_report = snapshot_touch_probe(Some(SERVO_TOUCH_POINT))?;
+
+    assert_eq!(report_field_as_u64(&touched_report, "touch_x")?, SERVO_TOUCH_POINT.x);
+    assert_eq!(report_field_as_u64(&touched_report, "touch_y")?, SERVO_TOUCH_POINT.y);
+    assert!(report_field_as_bool(&touched_report, "touch_changed_frame")?);
+    assert_ne!(
+        report_field_as_u64(&initial_report, "sample_hash")?,
+        report_field_as_u64(&touched_report, "sample_hash")?
+    );
+
+    Ok(())
+}
+
 #[test]
 fn sidecar_types_text_with_servo_keyboard_input() -> Result<(), Box<dyn Error>> {
     let initial_report = snapshot_text_probe(None)?;
@@ -157,7 +176,8 @@ fn snapshot_prd_site(
         std::fs::remove_file(&output_path)?;
     }
 
-    let output = run_sidecar_snapshot(case.url, &output_path, size, scroll_offset, None, None)?;
+    let output =
+        run_sidecar_snapshot(case.url, &output_path, size, scroll_offset, None, None, None)?;
 
     assert!(
         output.status.success(),
@@ -215,6 +235,7 @@ fn snapshot_click_probe(
         ScrollOffset::ZERO,
         click_point,
         None,
+        None,
     )?;
 
     assert!(
@@ -238,6 +259,51 @@ fn snapshot_click_probe(
     Ok(report)
 }
 
+fn snapshot_touch_probe(
+    touch_point: Option<ClickPoint>,
+) -> Result<serde_json::Value, Box<dyn Error>> {
+    let output_path = std::env::temp_dir().join(format!(
+        "ely-servo-sidecar-{}-touch-{}x{}.rgba",
+        std::process::id(),
+        SERVO_TOUCH_SIZE.width,
+        SERVO_TOUCH_SIZE.height
+    ));
+
+    if output_path.exists() {
+        std::fs::remove_file(&output_path)?;
+    }
+
+    let output = run_sidecar_snapshot(
+        SERVO_TOUCH_URL,
+        &output_path,
+        SERVO_TOUCH_SIZE,
+        ScrollOffset::ZERO,
+        None,
+        touch_point,
+        None,
+    )?;
+
+    assert!(
+        output.status.success(),
+        "touch probe\nstatus: {:?}\nstdout: {}\nstderr: {}",
+        output.status.code(),
+        String::from_utf8_lossy(&output.stdout),
+        String::from_utf8_lossy(&output.stderr)
+    );
+
+    let report: serde_json::Value = serde_json::from_slice(&output.stdout)?;
+    assert_eq!(report_field_as_u64(&report, "width")?, SERVO_TOUCH_SIZE.width);
+    assert_eq!(report_field_as_u64(&report, "height")?, SERVO_TOUCH_SIZE.height);
+    assert!(report_field_as_u64(&report, "content_pixel_count")? > 0);
+    assert_eq!(
+        std::fs::metadata(&output_path)?.len(),
+        SERVO_TOUCH_SIZE.width * SERVO_TOUCH_SIZE.height * 4
+    );
+
+    std::fs::remove_file(&output_path)?;
+    Ok(report)
+}
+
 fn snapshot_text_probe(typed_text: Option<&str>) -> Result<serde_json::Value, Box<dyn Error>> {
     let output_path = std::env::temp_dir().join(format!(
         "ely-servo-sidecar-{}-text-{}x{}.rgba",
@@ -257,6 +323,7 @@ fn snapshot_text_probe(typed_text: Option<&str>) -> Result<serde_json::Value, Bo
         SERVO_TEXT_SIZE,
         ScrollOffset::ZERO,
         click_point,
+        None,
         typed_text,
     )?;
 
@@ -287,6 +354,7 @@ fn run_sidecar_snapshot(
     size: FrameSize,
     scroll_offset: ScrollOffset,
     click_point: Option<ClickPoint>,
+    touch_point: Option<ClickPoint>,
     typed_text: Option<&str>,
 ) -> Result<Output, Box<dyn Error>> {
     let mut command = Command::new(env!("CARGO_BIN_EXE_ely_servo_sidecar"));
@@ -310,6 +378,10 @@ fn run_sidecar_snapshot(
         command.arg("--click-x").arg(click_point.x.to_string());
         command.arg("--click-y").arg(click_point.y.to_string());
     }
+    if let Some(touch_point) = touch_point {
+        command.arg("--touch-x").arg(touch_point.x.to_string());
+        command.arg("--touch-y").arg(touch_point.y.to_string());
+    }
     if let Some(typed_text) = typed_text {
         command.arg("--type-text").arg(typed_text);
     }