Skip to content

armgit / cua

Public Imported from GitHub
0

Scale computer-use 2.0 with open-source drivers, cross-OS sandboxes, and benchmarks for training, evaluation, and data generation.

Rehome cua-driver test fixtures

Francesco Bonacci9a5455ac25b8
diff --git a/.github/workflows/ci-cua-driver-interactive-linux.yml b/.github/workflows/ci-cua-driver-interactive-linux.yml
index 9d94a9b1b6..3601e10a10 100644
--- a/.github/workflows/ci-cua-driver-interactive-linux.yml
+++ b/.github/workflows/ci-cua-driver-interactive-linux.yml
@@ -23,13 +23,13 @@ on:
pull_request:
paths:
- "libs/cua-driver/rust/**"
- - "libs/cua-driver/test-harness/**"
+ - "libs/cua-driver/tests/fixtures/**"
- ".github/workflows/ci-cua-driver-interactive-linux.yml"
push:
branches: [main]
paths:
- "libs/cua-driver/rust/**"
- - "libs/cua-driver/test-harness/**"
+ - "libs/cua-driver/tests/fixtures/**"
- ".github/workflows/ci-cua-driver-interactive-linux.yml"
workflow_dispatch:
@@ -68,7 +68,7 @@ jobs:
run: cargo build --release -p cua-driver
- name: Build the GTK3 harness app
- run: bash libs/cua-driver/test-harness/build/linux.sh
+ run: bash libs/cua-driver/tests/fixtures/build/linux.sh
- name: AT-SPI reachability probe (diagnostic, non-fatal)
run: |
diff --git a/.gitignore b/.gitignore
index a91bb24b5e..f1f7a42c6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,8 +13,8 @@ node_modules/*
build/
!libs/lume/scripts/build/
!libs/cua-driver/scripts/build/
-!libs/cua-driver/test-harness/build/
-!libs/cua-driver/test-harness/build/**
+!libs/cua-driver/tests/fixtures/build/
+!libs/cua-driver/tests/fixtures/build/**
develop-eggs/
dist/
downloads/
diff --git a/docs/content/docs/reference/cua-driver/development.mdx b/docs/content/docs/reference/cua-driver/development.mdx
index 5e16d62068..d90b09cba5 100644
--- a/docs/content/docs/reference/cua-driver/development.mdx
+++ b/docs/content/docs/reference/cua-driver/development.mdx
@@ -13,7 +13,7 @@ they stay close to implementation changes.
|---|---|
| `libs/cua-driver/rust` | Rust workspace for the daemon, platform crates, testkit, and helper crates |
| `libs/cua-driver/python` | Python package wrapper around the driver binary |
-| `libs/cua-driver/test-harness` | Source-built GUI harness apps and shared fixtures |
+| `libs/cua-driver/tests/fixtures` | Source-built GUI harness apps and shared fixtures |
| `libs/cua-driver/tests/e2e` | Manual Python e2e tests against real apps and harness apps |
| `libs/cua-driver/scripts` | Install, uninstall, local build, and VM sync helpers |
@@ -22,7 +22,7 @@ they stay close to implementation changes.
- `libs/cua-driver/README.md` gives the repo-local overview.
- `libs/cua-driver/rust/README.md` maps the Cargo workspace and test classes.
- `libs/cua-driver/rust/crates/cua-driver/tests/README.md` explains Rust test naming and ignored GUI lanes.
-- `libs/cua-driver/test-harness/README.md` explains source-built harness apps and staged outputs.
+- `libs/cua-driver/tests/fixtures/README.md` explains source-built harness apps and staged outputs.
- `libs/cua-driver/tests/e2e/README.md` explains the Python e2e suite.
- `libs/cua-driver/scripts/README.md` explains install and VM sync helpers.
diff --git a/libs/cua-driver/README.md b/libs/cua-driver/README.md
index eeab1ed0e1..d71449e9ff 100644
--- a/libs/cua-driver/README.md
+++ b/libs/cua-driver/README.md
@@ -10,12 +10,12 @@ Background computer-use driver for any agents. Speaks MCP over stdio; drives nat
| --- | --- |
| `rust/` | Cargo workspace for the driver daemon, platform crates, and Rust tests |
| `python/` | Python package wrapper and package tests |
-| `test-harness/` | Source-built GUI harness apps and shared fixtures |
+| `tests/fixtures/` | Source-built GUI harness apps and shared fixtures |
| `tests/e2e/` | Manual Python e2e tests against real apps and harness apps |
| `scripts/` | Install, uninstall, local build, and VM sync helpers |
| `docs/` | Small repo-local specs that are not part of the hosted docs site |
-Start with `rust/README.md`, `test-harness/README.md`, and
+Start with `rust/README.md`, `tests/fixtures/README.md`, and
`tests/e2e/README.md` when changing driver behavior or tests.
## Claude Code computer-use compatibility
diff --git a/libs/cua-driver/rust/README.md b/libs/cua-driver/rust/README.md
index 01338b1766..11570f7a52 100644
--- a/libs/cua-driver/rust/README.md
+++ b/libs/cua-driver/rust/README.md
@@ -42,7 +42,7 @@ cargo test -p cua-driver --test protocol_mcp_test
```
GUI and VM-backed tests are marked `#[ignore]` and require harness apps from
-`../test-harness/build/` plus a real interactive desktop session:
+`../tests/fixtures/build/` plus a real interactive desktop session:
```bash
cargo test -p cua-driver --test harness_appkit_test -- --ignored --nocapture
diff --git a/libs/cua-driver/rust/crates/cua-driver-testkit/src/paths.rs b/libs/cua-driver/rust/crates/cua-driver-testkit/src/paths.rs
index 132a952600..33c107d465 100644
--- a/libs/cua-driver/rust/crates/cua-driver-testkit/src/paths.rs
+++ b/libs/cua-driver/rust/crates/cua-driver-testkit/src/paths.rs
@@ -36,7 +36,7 @@ pub fn driver_binary() -> PathBuf {
}
/// A built harness app under `test-apps/<dir>/<exe>` (produced by
-/// `test-harness/build/{windows.ps1,macos.sh}`). Example:
+/// `tests/fixtures/build/{windows.ps1,macos.sh}`). Example:
/// `harness_app("harness-wpf", "CuaTestHarness.Wpf.exe")`.
pub fn harness_app(dir: &str, exe: &str) -> PathBuf {
workspace_root().join("test-apps").join(dir).join(exe)
diff --git a/libs/cua-driver/rust/crates/cua-driver/tests/README.md b/libs/cua-driver/rust/crates/cua-driver/tests/README.md
index 4bf932d193..326097381e 100644
--- a/libs/cua-driver/rust/crates/cua-driver/tests/README.md
+++ b/libs/cua-driver/rust/crates/cua-driver/tests/README.md
@@ -20,15 +20,15 @@ Build harness apps before running ignored tests:
```bash
# macOS
-../../../../test-harness/build/macos.sh
+../../../../tests/fixtures/build/macos.sh
# Linux
-../../../../test-harness/build/linux.sh
+../../../../tests/fixtures/build/linux.sh
```
```powershell
# Windows
-..\..\..\..\test-harness\build\windows.ps1
+..\..\..\..\tests\fixtures\build\windows.ps1
```
Staged outputs are read from `../../test-apps/harness-<name>/`.
diff --git a/libs/cua-driver/rust/crates/cua-driver/tests/harness_appkit_test.rs b/libs/cua-driver/rust/crates/cua-driver/tests/harness_appkit_test.rs
index f08bcac889..65711e784f 100644
--- a/libs/cua-driver/rust/crates/cua-driver/tests/harness_appkit_test.rs
+++ b/libs/cua-driver/rust/crates/cua-driver/tests/harness_appkit_test.rs
@@ -1,11 +1,11 @@
//! Integration test against the CuaTestHarness.AppKit Swift app.
//!
//! Mirror of `harness_wpf_test.rs` for the macOS AppKit hosting pattern.
-//! The harness app lives at `libs/cua-driver/test-harness/apps/macos/appkit`
+//! The harness app lives at `libs/cua-driver/tests/fixtures/apps/macos/appkit`
//! and is published into `libs/cua-driver/rust/test-apps/harness-appkit/`
-//! by `libs/cua-driver/test-harness/build/macos.sh`.
+//! by `libs/cua-driver/tests/fixtures/build/macos.sh`.
//!
-//! Scenarios (see `libs/cua-driver/test-harness/shared/scenarios.json`
+//! Scenarios (see `libs/cua-driver/tests/fixtures/shared/scenarios.json`
//! `appkit` section):
//! - counter : NSButton AXPress invocation increments counter
//! - text_body : get_window_state extracts known marker text
@@ -14,7 +14,7 @@
//! - scroll_target : scroll updates VerticalOffset label
//! - ns_menubar : main menubar item enumerable (Mac-specific)
//!
-//! Run locally (after `libs/cua-driver/test-harness/build/macos.sh`):
+//! Run locally (after `libs/cua-driver/tests/fixtures/build/macos.sh`):
//! cargo test --test harness_appkit_test -- --ignored --nocapture
//!
//! Tests are `#[ignore]` so they don't run in plain `cargo test`.
@@ -38,7 +38,9 @@ use cua_driver_testkit::{Driver, McpDriver, ToolResponse};
fn harness_app() -> PathBuf {
if let Ok(p) = std::env::var("HARNESS_APPKIT_APP") {
let pb = PathBuf::from(p);
- if pb.exists() { return pb; }
+ if pb.exists() {
+ return pb;
+ }
}
cua_driver_testkit::harness_app("harness-appkit", "CuaTestHarness.AppKit.app")
}
@@ -58,16 +60,20 @@ impl Harness {
fn launch() -> Option<Self> {
let exe = harness_exe();
if !exe.exists() {
- eprintln!("harness exe not found at {exe:?} \
- — run libs/cua-driver/test-harness/build/macos.sh first");
+ eprintln!(
+ "harness exe not found at {exe:?} \
+ — run libs/cua-driver/tests/fixtures/build/macos.sh first"
+ );
return None;
}
// Launch the binary directly (not via `open`) so we control the pid
// and can kill it cleanly on Drop. The app still installs an AppKit
// window via NSApp.run().
let app = Command::new(&exe)
- .stdout(Stdio::null()).stderr(Stdio::null())
- .spawn().ok()?;
+ .stdout(Stdio::null())
+ .stderr(Stdio::null())
+ .spawn()
+ .ok()?;
let pid = app.id();
// Settle for window creation + activation.
std::thread::sleep(Duration::from_millis(800));
@@ -86,12 +92,14 @@ impl Drop for Harness {
// ── window / element helpers ─────────────────────────────────────────────────
fn snapshot_elements(driver: &mut McpDriver, pid: u32, window_id: u64) -> ToolResponse {
- driver.call("get_window_state",
+ driver.call(
+ "get_window_state",
serde_json::json!({
"pid": pid as i64,
"window_id": window_id,
"capture_mode": "ax"
- }))
+ }),
+ )
}
// ── tests ────────────────────────────────────────────────────────────────────
@@ -99,27 +107,35 @@ fn snapshot_elements(driver: &mut McpDriver, pid: u32, window_id: u64) -> ToolRe
#[test]
#[ignore]
fn harness_appkit_smoke() {
- let Some(mut driver) = McpDriver::spawn() else { return };
+ let Some(mut driver) = McpDriver::spawn_macos_daemon_proxy() else {
+ return;
+ };
let harness = match Harness::launch() {
Some(h) => h,
- None => { eprintln!("harness not built — skipping"); return; }
+ None => {
+ eprintln!("harness not built — skipping");
+ return;
+ }
};
println!("harness pid={}", harness.pid);
- let (wid, title) = driver.find_window(harness.pid as i64, "CuaTestHarness AppKit")
+ let (wid, title) = driver
+ .find_window(harness.pid as i64, "CuaTestHarness AppKit")
.expect("main window not found via list_windows");
println!("main window: id={wid} title={title:?}");
let snap = snapshot_elements(&mut driver, harness.pid, wid);
- if looks_empty(snap.text()) {
- eprintln!("AX tree empty — likely TCC Accessibility not granted to the test runner. \
+ if looks_empty(snap.tree_text()) {
+ eprintln!(
+ "AX tree empty — likely TCC Accessibility not granted to the test runner. \
Skipping element-assertion phase. To enable: System Settings → Privacy & \
- Security → Accessibility → add the binary running `cargo test`.");
+ Security → Accessibility → add the binary running `cargo test`."
+ );
return;
}
- let text = snap.text();
+ let text = snap.tree_text();
println!("snapshot:\n{text}");
// AppKit AX quirk (mirrors the WPF behavior documented in
@@ -130,23 +146,31 @@ fn harness_appkit_smoke() {
// those, and on AX ids only for actionable controls (Buttons,
// TextFields).
for aid in [
- "wnd-main", // NSWindow
- "btn-increment", "btn-reset", // NSButton
- "txt-input", // editable NSTextField
- "menu-test-item", // NSMenuItem (Mac-specific)
+ "wnd-main", // NSWindow
+ "btn-increment",
+ "btn-reset", // NSButton
+ "txt-input", // editable NSTextField
+ "menu-test-item", // NSMenuItem (Mac-specific)
"btn-exit",
] {
- assert!(has_id(snap.text(), aid),
- "missing AX identifier {aid} in AppKit snapshot");
+ assert!(
+ has_id(snap.tree_text(), aid),
+ "missing AX identifier {aid} in AppKit snapshot"
+ );
}
// text_body marker carried by the visible string of the NSTextField
- assert!(text.contains("HARNESS_TEXT_MARKER_v1"),
- "text_body marker not in AppKit snapshot");
+ assert!(
+ text.contains("HARNESS_TEXT_MARKER_v1"),
+ "text_body marker not in AppKit snapshot"
+ );
// The two label-mode NSTextFields under click_target render as
// AXStaticText nodes — assert on their starting text instead of ids.
- assert!(text.contains("L=0 R=0 D=0"), "click_count label missing");
- assert!(text.contains("(none)"), "last_action label missing");
+ assert!(text.contains("clicks=0"), "click_count label missing");
+ assert!(
+ text.contains("last_action=none"),
+ "last_action label missing"
+ );
}
/// text_input: type_text into the NSTextField, verify the mirror label
@@ -155,37 +179,48 @@ fn harness_appkit_smoke() {
#[test]
#[ignore]
fn harness_appkit_text_input() {
- let Some(mut driver) = McpDriver::spawn() else { return };
+ let Some(mut driver) = McpDriver::spawn_macos_daemon_proxy() else {
+ return;
+ };
let harness = match Harness::launch() {
Some(h) => h,
- None => { eprintln!("harness not built — skipping"); return; }
+ None => {
+ eprintln!("harness not built — skipping");
+ return;
+ }
};
- let (wid, _) = driver.find_window(harness.pid as i64, "CuaTestHarness AppKit")
+ let (wid, _) = driver
+ .find_window(harness.pid as i64, "CuaTestHarness AppKit")
.expect("main window not found");
let snap_pre = snapshot_elements(&mut driver, harness.pid, wid);
- if looks_empty(snap_pre.text()) {
- eprintln!("AX empty — TCC not granted; skipping"); return;
+ if looks_empty(snap_pre.tree_text()) {
+ eprintln!("AX empty — TCC not granted; skipping");
+ return;
}
- let idx = element_index_by_id(snap_pre.text(), "txt-input")
+ let idx = element_index_by_id(snap_pre.tree_text(), "txt-input")
.expect("txt-input element_index not found");
// set_value via AX is the deterministic background path; type_text would
// also work but races with cursor focus on cold-launched windows.
- let resp = driver.call("set_value",
+ let resp = driver.call(
+ "set_value",
serde_json::json!({
"pid": harness.pid as i64,
"window_id": wid,
"element_index": idx,
"value": "hello-cua"
- }));
+ }),
+ );
println!("set_value resp: {}", resp.text());
std::thread::sleep(Duration::from_millis(250));
let snap_post = snapshot_elements(&mut driver, harness.pid, wid);
- let post_text = snap_post.text().to_owned();
- assert!(post_text.contains("hello-cua"),
- "text_input value did not propagate to mirror; snapshot:\n{post_text}");
+ let post_text = snap_post.tree_text().to_owned();
+ assert!(
+ post_text.contains("hello-cua"),
+ "text_input value did not propagate to mirror; snapshot:\n{post_text}"
+ );
}
/// type_text: synthesize a keystroke into the NSTextField (CGEvent
@@ -194,54 +229,68 @@ fn harness_appkit_text_input() {
#[test]
#[ignore]
fn harness_appkit_type_text_keystroke() {
- let Some(mut driver) = McpDriver::spawn() else { return };
+ let Some(mut driver) = McpDriver::spawn_macos_daemon_proxy() else {
+ return;
+ };
let harness = match Harness::launch() {
Some(h) => h,
- None => { eprintln!("harness not built — skipping"); return; }
+ None => {
+ eprintln!("harness not built — skipping");
+ return;
+ }
};
- let (wid, _) = driver.find_window(harness.pid as i64, "CuaTestHarness AppKit")
+ let (wid, _) = driver
+ .find_window(harness.pid as i64, "CuaTestHarness AppKit")
.expect("main window not found");
let snap_pre = snapshot_elements(&mut driver, harness.pid, wid);
- if looks_empty(snap_pre.text()) {
- eprintln!("AX empty — TCC not granted; skipping"); return;
+ if looks_empty(snap_pre.tree_text()) {
+ eprintln!("AX empty — TCC not granted; skipping");
+ return;
}
- let idx: u64 = if let Some(i) = element_index_by_id(snap_pre.text(), "txt-input") {
+ let idx: u64 = if let Some(i) = element_index_by_id(snap_pre.tree_text(), "txt-input") {
i
} else {
- eprintln!("txt-input not found; skipping"); return;
+ eprintln!("txt-input not found; skipping");
+ return;
};
// Focus the field first so the keystrokes land in it. AX press on
// a text field has the side effect of giving it keyboard focus.
- let _ = driver.call("click",
+ let _ = driver.call(
+ "click",
serde_json::json!({
"pid": harness.pid as i64, "window_id": wid,
"element_index": idx, "action": "press"
- }));
+ }),
+ );
std::thread::sleep(Duration::from_millis(150));
// CGEvent-based type_text against the focused field (does NOT use
// set_value — exercises the keystroke synthesis chain).
- let resp = driver.call("type_text",
+ let resp = driver.call(
+ "type_text",
serde_json::json!({
"pid": harness.pid as i64, "window_id": wid,
"text": "kbd-cua"
- }));
+ }),
+ );
println!("type_text resp: {}", resp.text());
std::thread::sleep(Duration::from_millis(250));
let snap_post = snapshot_elements(&mut driver, harness.pid, wid);
- let post = snap_post.text().to_owned();
- assert!(post.contains("kbd-cua"),
- "type_text keystroke did not land in the text field; snapshot:\n{post}");
+ let post = snap_post.tree_text().to_owned();
+ assert!(
+ post.contains("kbd-cua"),
+ "type_text keystroke did not land in the text field; snapshot:\n{post}"
+ );
}
/// scroll: scroll the NSScrollView downward, verify the offset label
/// changes (it mirrors the clip view's documentVisibleRect.origin.y).
///
/// **Status:** EXPECTED-FAIL today (see notes below). The `scroll` tool
-/// itself works at the API level — `libs/cua-driver/test-harness/smoke/macos.sh` confirms it
+/// itself works at the API level — `libs/cua-driver/tests/fixtures/smoke/macos.sh` confirms it
/// PASSes against the same harness window. What this test would
/// verify additionally is that the scroll event actually moved the
/// scroll view's bounds (state-change observation, not just API
@@ -261,41 +310,52 @@ fn harness_appkit_type_text_keystroke() {
#[ignore]
#[should_panic(expected = "scroll offset label did not advance from 0")]
fn harness_appkit_scroll_expected_fail() {
- let Some(mut driver) = McpDriver::spawn() else { return };
+ let Some(mut driver) = McpDriver::spawn_macos_daemon_proxy() else {
+ return;
+ };
let harness = match Harness::launch() {
Some(h) => h,
- None => { eprintln!("harness not built — skipping"); return; }
+ None => {
+ eprintln!("harness not built — skipping");
+ return;
+ }
};
- let (wid, _) = driver.find_window(harness.pid as i64, "CuaTestHarness AppKit")
+ let (wid, _) = driver
+ .find_window(harness.pid as i64, "CuaTestHarness AppKit")
.expect("main window not found");
let snap_pre = snapshot_elements(&mut driver, harness.pid, wid);
- if looks_empty(snap_pre.text()) {
- eprintln!("AX empty — TCC not granted; skipping"); return;
+ if looks_empty(snap_pre.tree_text()) {
+ eprintln!("AX empty — TCC not granted; skipping");
+ return;
}
// Pre-condition: offset label should be at "0" (the controller
// initial state). The label text appears as an AXStaticText leaf
// immediately after the AXTextArea body in the rendered tree.
- let pre = snap_pre.text().to_owned();
- let pre_has_zero_offset = pre.lines()
- .any(|l| l.trim() == "- AXStaticText = \"0\"");
- assert!(pre_has_zero_offset, "scroll offset label not at 0 pre-scroll");
+ let pre = snap_pre.tree_text().to_owned();
+ let pre_has_zero_offset = pre.lines().any(|l| l.trim() == "- AXStaticText = \"0\"");
+ assert!(
+ pre_has_zero_offset,
+ "scroll offset label not at 0 pre-scroll"
+ );
// Scroll the scroll view down a few ticks. The scroll tool takes
// window-local pixel coords; pick a point inside the scroller
// (the scroll target sits roughly mid-window).
- let resp = driver.call("scroll",
+ let resp = driver.call(
+ "scroll",
serde_json::json!({
"pid": harness.pid as i64, "window_id": wid,
"x": 180, "y": 450, // inside the scroll view
"direction": "down",
"amount": 5
- }));
+ }),
+ );
println!("scroll resp: {}", resp.text());
std::thread::sleep(Duration::from_millis(250));
let snap_post = snapshot_elements(&mut driver, harness.pid, wid);
- let post = snap_post.text().to_owned();
+ let post = snap_post.tree_text().to_owned();
// After scroll, the offset label should no longer be "0" — any
// positive integer indicates the bounds-change notification fired
// and the label updated. We don't pin a specific value (scroll
@@ -309,7 +369,8 @@ fn harness_appkit_scroll_expected_fail() {
assert!(
unchanged_count < pre_count || !still_zero,
"scroll offset label did not advance from 0; pre: {} \"0\" leaves; post: {} \"0\" leaves",
- pre_count, unchanged_count
+ pre_count,
+ unchanged_count
);
}
@@ -318,38 +379,52 @@ fn harness_appkit_scroll_expected_fail() {
#[test]
#[ignore]
fn harness_appkit_counter() {
- let Some(mut driver) = McpDriver::spawn() else { return };
+ let Some(mut driver) = McpDriver::spawn_macos_daemon_proxy() else {
+ return;
+ };
let harness = match Harness::launch() {
Some(h) => h,
- None => { eprintln!("harness not built — skipping"); return; }
+ None => {
+ eprintln!("harness not built — skipping");
+ return;
+ }
};
- let (wid, _) = driver.find_window(harness.pid as i64, "CuaTestHarness AppKit")
+ let (wid, _) = driver
+ .find_window(harness.pid as i64, "CuaTestHarness AppKit")
.expect("main window not found");
let snap_pre = snapshot_elements(&mut driver, harness.pid, wid);
- if looks_empty(snap_pre.text()) {
- eprintln!("AX empty — TCC not granted; skipping"); return;
+ if looks_empty(snap_pre.tree_text()) {
+ eprintln!("AX empty — TCC not granted; skipping");
+ return;
}
- let pre_text = snap_pre.text().to_owned();
- assert!(pre_text.contains("\"0\""), "counter not 0 pre-click; snapshot:\n{pre_text}");
+ let pre_text = snap_pre.tree_text().to_owned();
+ assert!(
+ pre_text.contains("\"0\""),
+ "counter not 0 pre-click; snapshot:\n{pre_text}"
+ );
- let idx = element_index_by_id(snap_pre.text(), "btn-increment")
+ let idx = element_index_by_id(snap_pre.tree_text(), "btn-increment")
.expect("btn-increment element_index not found");
- let click_resp = driver.call("click",
+ let click_resp = driver.call(
+ "click",
serde_json::json!({
"pid": harness.pid as i64,
"window_id": wid,
"element_index": idx,
"action": "press"
- }));
+ }),
+ );
println!("click resp: {}", click_resp.text());
// Let the AppKit run-loop process the press and refresh the label.
std::thread::sleep(Duration::from_millis(200));
let snap_post = snapshot_elements(&mut driver, harness.pid, wid);
- let post_text = snap_post.text().to_owned();
- assert!(post_text.contains("\"1\""),
- "counter did not advance to 1 after press; post snapshot:\n{post_text}");
+ let post_text = snap_post.tree_text().to_owned();
+ assert!(
+ post_text.contains("\"1\""),
+ "counter did not advance to 1 after press; post snapshot:\n{post_text}"
+ );
}
diff --git a/libs/cua-driver/rust/crates/cua-driver/tests/harness_gtk3_test.rs b/libs/cua-driver/rust/crates/cua-driver/tests/harness_gtk3_test.rs
index 8b59d41169..87f2f51776 100644
--- a/libs/cua-driver/rust/crates/cua-driver/tests/harness_gtk3_test.rs
+++ b/libs/cua-driver/rust/crates/cua-driver/tests/harness_gtk3_test.rs
@@ -14,7 +14,7 @@
//!
//! Requires a real Linux desktop with AT-SPI running + a display (Xwayland is
//! fine — the launcher forces `GDK_BACKEND=x11`), GTK3 + PyGObject, and the app
-//! built via `test-harness/build/linux.sh`. `#[ignore]`; run explicitly:
+//! built via `tests/fixtures/build/linux.sh`. `#[ignore]`; run explicitly:
//! cargo test -p cua-driver --test harness_gtk3_test -- --ignored --nocapture --test-threads=1
#![cfg(target_os = "linux")]
@@ -39,7 +39,7 @@ fn harness_exe() -> std::path::PathBuf {
fn launch(driver: &mut McpDriver) -> Option<(u32, u64)> {
let exe = harness_exe();
if !exe.exists() {
- eprintln!("GTK3 harness not built at {exe:?} — run test-harness/build/linux.sh");
+ eprintln!("GTK3 harness not built at {exe:?} — run tests/fixtures/build/linux.sh");
return None;
}
driver
diff --git a/libs/cua-driver/rust/crates/cua-driver/tests/harness_swiftui_test.rs b/libs/cua-driver/rust/crates/cua-driver/tests/harness_swiftui_test.rs
index ab51a1068b..42fa67a1e1 100644
--- a/libs/cua-driver/rust/crates/cua-driver/tests/harness_swiftui_test.rs
+++ b/libs/cua-driver/rust/crates/cua-driver/tests/harness_swiftui_test.rs
@@ -11,7 +11,7 @@
//! - text_input: TextField with mirror Text
//! - popover : .popover() — SwiftUI analogue of WinUI3 CommandBarFlyout
//!
-//! Run locally (after `libs/cua-driver/test-harness/build/macos.sh`):
+//! Run locally (after `libs/cua-driver/tests/fixtures/build/macos.sh`):
//! cargo test --test harness_swiftui_test -- --ignored --nocapture
#![cfg(target_os = "macos")]
diff --git a/libs/cua-driver/rust/crates/cua-driver/tests/harness_web_test.rs b/libs/cua-driver/rust/crates/cua-driver/tests/harness_web_test.rs
index 3268c1c247..89b1bfc1b7 100644
--- a/libs/cua-driver/rust/crates/cua-driver/tests/harness_web_test.rs
+++ b/libs/cua-driver/rust/crates/cua-driver/tests/harness_web_test.rs
@@ -1,6 +1,6 @@
//! Integration tests against the CuaTestHarness.WebView (WPF + WebView2)
//! and CuaTestHarness.Electron hosts. Both load the same
-//! `test-harness/shared/web/index.html`, so the same `page` tool flows
+//! `tests/fixtures/shared/web/index.html`, so the same `page` tool flows
//! are exercised against two Chromium-based hosts.
//!
//! Run via:
@@ -77,7 +77,7 @@ where
F: FnOnce(i64, u64, &mut McpDriver),
{
if !host_exe.exists() {
- eprintln!("{label} host exe not found at {host_exe:?} — run test-harness/build/windows.ps1");
+ eprintln!("{label} host exe not found at {host_exe:?} — run tests/fixtures/build/windows.ps1");
return;
}
// A prior test's host may still hold this fixed CDP port — wait for it to
diff --git a/libs/cua-driver/rust/crates/cua-driver/tests/harness_winui3_test.rs b/libs/cua-driver/rust/crates/cua-driver/tests/harness_winui3_test.rs
index 63aad3f33a..841e8cb015 100644
--- a/libs/cua-driver/rust/crates/cua-driver/tests/harness_winui3_test.rs
+++ b/libs/cua-driver/rust/crates/cua-driver/tests/harness_winui3_test.rs
@@ -44,7 +44,7 @@ fn harness_winui3_exe() -> PathBuf {
fn launch_winui3(driver: &mut McpDriver) -> Option<u32> {
let exe = harness_winui3_exe();
if !exe.exists() {
- eprintln!("WinUI3 harness exe not found at {exe:?} — run test-harness/build/windows.ps1");
+ eprintln!("WinUI3 harness exe not found at {exe:?} — run tests/fixtures/build/windows.ps1");
return None;
}
let child = spawn_in_job(Command::new(&exe).stdout(Stdio::null()).stderr(Stdio::null())).ok()?;
diff --git a/libs/cua-driver/rust/crates/cua-driver/tests/harness_wpf_test.rs b/libs/cua-driver/rust/crates/cua-driver/tests/harness_wpf_test.rs
index 9aa6f74e17..f7d0c4c6fb 100644
--- a/libs/cua-driver/rust/crates/cua-driver/tests/harness_wpf_test.rs
+++ b/libs/cua-driver/rust/crates/cua-driver/tests/harness_wpf_test.rs
@@ -1,6 +1,6 @@
//! Integration test against the CuaTestHarness.Wpf .NET 8 app.
//!
-//! Pairs of test apps live under `libs/cua-driver/test-harness/`. They
+//! Pairs of test apps live under `libs/cua-driver/tests/fixtures/`. They
//! publish into `libs/cua-driver/rust/test-apps/harness-{wpf,winui3}/` and
//! get mapped into the sandbox via the existing run-tests-in-sandbox.ps1
//! mapped folder.
@@ -19,7 +19,7 @@
//! Run via the sandbox runner:
//! .\sandbox\run-tests-in-sandbox.ps1 harness_wpf
//!
-//! Or locally (requires .NET 8 SDK + `test-harness/build/windows.ps1`):
+//! Or locally (requires .NET 8 SDK + `tests/fixtures/build/windows.ps1`):
//! cargo test --test harness_wpf_test -- --ignored --nocapture
//!
//! Tests are `#[ignore]` so they don't run in plain `cargo test`. The
@@ -65,7 +65,7 @@ fn harness_exe() -> PathBuf {
fn launch_harness(driver: &mut McpDriver) -> Option<u32> {
let exe = harness_exe();
if !exe.exists() {
- eprintln!("harness exe not found at {exe:?} — run test-harness/build/windows.ps1 first");
+ eprintln!("harness exe not found at {exe:?} — run tests/fixtures/build/windows.ps1 first");
return None;
}
let app = spawn_in_job(
diff --git a/libs/cua-driver/rust/crates/cua-driver/tests/modality_desktop_scope_linux_test.rs b/libs/cua-driver/rust/crates/cua-driver/tests/modality_desktop_scope_linux_test.rs
index 349e610f4d..ec2c43cc39 100644
--- a/libs/cua-driver/rust/crates/cua-driver/tests/modality_desktop_scope_linux_test.rs
+++ b/libs/cua-driver/rust/crates/cua-driver/tests/modality_desktop_scope_linux_test.rs
@@ -36,7 +36,7 @@ fn harness_exe() -> std::path::PathBuf {
fn launch(driver: &mut McpDriver) -> Option<(u32, u64)> {
let exe = harness_exe();
if !exe.exists() {
- eprintln!("[desktop-linux] GTK3 harness not built ({exe:?}) — run test-harness/build/linux.sh; skipping");
+ eprintln!("[desktop-linux] GTK3 harness not built ({exe:?}) — run tests/fixtures/build/linux.sh; skipping");
return None;
}
driver
diff --git a/libs/cua-driver/rust/crates/cua-driver/tests/modality_desktop_scope_macos_test.rs b/libs/cua-driver/rust/crates/cua-driver/tests/modality_desktop_scope_macos_test.rs
index 60b76a0e7e..39db3d248e 100644
--- a/libs/cua-driver/rust/crates/cua-driver/tests/modality_desktop_scope_macos_test.rs
+++ b/libs/cua-driver/rust/crates/cua-driver/tests/modality_desktop_scope_macos_test.rs
@@ -46,7 +46,7 @@ fn harness_exe() -> std::path::PathBuf {
fn launch(driver: &mut McpDriver) -> Option<(u32, u64)> {
let exe = harness_exe();
if !exe.exists() {
- eprintln!("[desktop-mac] AppKit harness not built ({exe:?}) — run test-harness/build/macos.sh; skipping");
+ eprintln!("[desktop-mac] AppKit harness not built ({exe:?}) — run tests/fixtures/build/macos.sh; skipping");
return None;
}
driver
diff --git a/libs/cua-driver/rust/crates/cua-driver/tests/modality_desktop_scope_test.rs b/libs/cua-driver/rust/crates/cua-driver/tests/modality_desktop_scope_test.rs
index ff5a35c399..1ca79a9989 100644
--- a/libs/cua-driver/rust/crates/cua-driver/tests/modality_desktop_scope_test.rs
+++ b/libs/cua-driver/rust/crates/cua-driver/tests/modality_desktop_scope_test.rs
@@ -27,7 +27,7 @@ use std::time::{Duration, Instant};
use cua_driver_testkit::{harness_app, Driver, McpDriver};
-/// WPF harness app (built by `test-harness/build/windows.ps1`). Path mirrors
+/// WPF harness app (built by `tests/fixtures/build/windows.ps1`). Path mirrors
/// `shared/scenarios.json`'s `wpf.exe_relative_path`.
fn harness_wpf_exe() -> std::path::PathBuf {
harness_app("harness-wpf", "CuaTestHarness.Wpf.exe")
diff --git a/libs/cua-driver/rust/crates/cua-driver/tests/modality_input_e2e_test.rs b/libs/cua-driver/rust/crates/cua-driver/tests/modality_input_e2e_test.rs
index 1ba19787d4..5fbdaa3269 100644
--- a/libs/cua-driver/rust/crates/cua-driver/tests/modality_input_e2e_test.rs
+++ b/libs/cua-driver/rust/crates/cua-driver/tests/modality_input_e2e_test.rs
@@ -18,7 +18,7 @@
//! held ports. Broker-spawned window pids (packaged apps / Electron) are
//! tree-killed via `reaper().track_pid`.
//!
-//! Targets (repo-local harness apps staged by `test-harness/build/windows.ps1`):
+//! Targets (repo-local harness apps staged by `tests/fixtures/build/windows.ps1`):
//! - Electron (Chromium content) — `CuaTestHarness.Electron.exe`.
//! - Tauri (WebView2 content) — `CuaTestHarness.Tauri.exe`.
//! - Win32 baseline — `notepad.exe`.
diff --git a/libs/cua-driver/rust/sandbox/run-tests-in-sandbox.ps1 b/libs/cua-driver/rust/sandbox/run-tests-in-sandbox.ps1
index f41b452e28..dca3c31a09 100644
--- a/libs/cua-driver/rust/sandbox/run-tests-in-sandbox.ps1
+++ b/libs/cua-driver/rust/sandbox/run-tests-in-sandbox.ps1
@@ -85,31 +85,31 @@ try {
if ($LASTEXITCODE -ne 0) { throw "cargo test --no-run (harness_bg_modality_test) failed" }
} finally { Pop-Location }
-# -- 1.5. Build the test-harness if dependencies are on PATH ------------------
+# -- 1.5. Build the test fixtures if dependencies are on PATH ------------------
# The harness produces test-apps/harness-*/ which the sandbox
# runner picks up via the existing mapped-folder route. Skip silently if
# a dependency isn't available - the smoke tests degrade to "skipped" inside
# the sandbox rather than failing the whole run.
if (Get-Command dotnet -ErrorAction SilentlyContinue) {
- $harnessBuild = Join-Path $wsRoot "..\test-harness\build\windows.ps1"
+ $harnessBuild = Join-Path $wsRoot "..\tests\fixtures\build\windows.ps1"
if (Test-Path $harnessBuild) {
- Write-Host "`n[BUILD] test-harness (dotnet publish)..." -ForegroundColor Yellow
+ Write-Host "`n[BUILD] test fixtures (dotnet publish)..." -ForegroundColor Yellow
# build.ps1 sets $ErrorActionPreference=Stop and throws on
# `dotnet publish` failure - wrap so the throw doesn't abort
# the whole sandbox runner before we can log the skip.
try {
& $harnessBuild
if ($LASTEXITCODE -ne 0) {
- Write-Host "[WARN] test-harness build failed (exit $LASTEXITCODE) - harness tests will skip." -ForegroundColor Yellow
+ Write-Host "[WARN] test fixture build failed (exit $LASTEXITCODE) - harness tests will skip." -ForegroundColor Yellow
}
} catch {
- Write-Host "[WARN] test-harness build errored: $($_.Exception.Message) - harness tests will skip." -ForegroundColor Yellow
+ Write-Host "[WARN] test fixture build errored: $($_.Exception.Message) - harness tests will skip." -ForegroundColor Yellow
}
} else {
- Write-Host "`n[SKIP] test-harness/build/windows.ps1 not found - harness tests will skip." -ForegroundColor Yellow
+ Write-Host "`n[SKIP] tests/fixtures/build/windows.ps1 not found - harness tests will skip." -ForegroundColor Yellow
}
} else {
- Write-Host "`n[SKIP] dotnet CLI not on PATH - test-harness build skipped, harness tests will degrade." -ForegroundColor Yellow
+ Write-Host "`n[SKIP] dotnet CLI not on PATH - test fixture build skipped, harness tests will degrade." -ForegroundColor Yellow
}
$mcpBin = Get-ChildItem "$wsRoot\target\debug\deps\mcp_protocol_test-*.exe" |
diff --git a/libs/cua-driver/rust/test-apps/.gitignore b/libs/cua-driver/rust/test-apps/.gitignore
index 56b007e740..afcacfa198 100644
--- a/libs/cua-driver/rust/test-apps/.gitignore
+++ b/libs/cua-driver/rust/test-apps/.gitignore
@@ -7,7 +7,7 @@
*.AppImage
*.deb
-# Locally-built .NET test harness output (see ../../test-harness/build.ps1).
+# Locally-built .NET test fixture output (see ../../tests/fixtures/build/windows.ps1).
# These dirs are produced by `dotnet publish -o ...` and contain the
# CuaTestHarness.{Wpf,WinUI3} binaries + their self-contained runtime
# (several thousand files, ~150 MB). Always rebuilt locally.
diff --git a/libs/cua-driver/rust/test-apps/README.md b/libs/cua-driver/rust/test-apps/README.md
index ff1e4f8d13..69c993e721 100644
--- a/libs/cua-driver/rust/test-apps/README.md
+++ b/libs/cua-driver/rust/test-apps/README.md
@@ -1,8 +1,8 @@
# test-apps
-Local staging directory for cua-driver test harness applications.
+Local staging directory for cua-driver test fixture applications.
-Build scripts under `../test-harness/build/` write `harness-<name>/`
+Build scripts under `../tests/fixtures/build/` write `harness-<name>/`
directories here. The staged outputs are intentionally git-ignored; rebuild
them from source instead of committing binaries.
@@ -21,10 +21,10 @@ Common outputs:
Run the host build script for your platform:
```bash
-../../test-harness/build/macos.sh
-../../test-harness/build/linux.sh
+../../tests/fixtures/build/macos.sh
+../../tests/fixtures/build/linux.sh
```
```powershell
-..\..\test-harness\build\windows.ps1
+..\..\tests\fixtures\build\windows.ps1
```
diff --git a/libs/cua-driver/tests/e2e/README.md b/libs/cua-driver/tests/e2e/README.md
index 463f03bf71..367dc722c0 100644
--- a/libs/cua-driver/tests/e2e/README.md
+++ b/libs/cua-driver/tests/e2e/README.md
@@ -31,8 +31,8 @@ builds `libs/cua-driver/rust` and uses `rust/target/debug/cua-driver`.
`test_electron.py` and `test_tauri.py` use repo-local shared harnesses:
-- `test-harness/apps/cross-platform/electron`
-- `test-harness/apps/cross-platform/tauri`
+- `tests/fixtures/apps/cross-platform/electron`
+- `tests/fixtures/apps/cross-platform/tauri`
The fixtures build missing staged apps on demand with each harness `build.sh`.
They no longer download prebuilt app releases.
diff --git a/libs/cua-driver/tests/e2e/conftest.py b/libs/cua-driver/tests/e2e/conftest.py
index d6f818dfe6..125bd4583a 100644
--- a/libs/cua-driver/tests/e2e/conftest.py
+++ b/libs/cua-driver/tests/e2e/conftest.py
@@ -26,7 +26,7 @@ _TESTS_ROOT = os.path.dirname(_HERE)
_CUA_DRIVER_ROOT = os.path.dirname(_TESTS_ROOT)
_DRIVER_RS_ROOT = os.path.join(_CUA_DRIVER_ROOT, "rust")
_LIBS_ROOT = os.path.dirname(_CUA_DRIVER_ROOT)
-_TEST_HARNESS_ROOT = os.path.join(_CUA_DRIVER_ROOT, "test-harness")
+_TEST_HARNESS_ROOT = os.path.join(_TESTS_ROOT, "fixtures")
sys.path.insert(0, _HERE)
from driver_client import default_binary_path # noqa: E402
@@ -209,7 +209,7 @@ def html_server():
def tauri_app():
"""Build, launch, and yield (proc, pid, base_url) for the Tauri harness.
- This uses test-harness/apps/cross-platform/tauri, the same shared DOM
+ This uses tests/fixtures/apps/cross-platform/tauri, the same shared DOM
harness used by the Electron/WebView/WKWebView harnesses. It does not
download a prebuilt Tauri app release.
"""
@@ -252,7 +252,7 @@ def tauri_app():
def electron_app():
"""Build, launch, and yield (proc, pid, base_url) for the Electron harness.
- This uses test-harness/apps/cross-platform/electron, the same shared DOM
+ This uses tests/fixtures/apps/cross-platform/electron, the same shared DOM
harness used by the Rust harness tests. It does not download a prebuilt
Electron app release.
"""
diff --git a/libs/cua-driver/tests/e2e/test_electron.py b/libs/cua-driver/tests/e2e/test_electron.py
index e6b9a80b20..dd9d55e9ea 100644
--- a/libs/cua-driver/tests/e2e/test_electron.py
+++ b/libs/cua-driver/tests/e2e/test_electron.py
@@ -1,7 +1,7 @@
"""Electron shared-harness background automation tests — v2 harness.
-The Electron test app is built from test-harness/apps/cross-platform/electron
-and loads test-harness/shared/web/index.html, the same DOM used by the WebView2
+The Electron test app is built from tests/fixtures/apps/cross-platform/electron
+and loads tests/fixtures/shared/web/index.html, the same DOM used by the WebView2
and Rust Electron harness tests.
Run: python3 -m pytest test_electron.py -v
diff --git a/libs/cua-driver/tests/e2e/test_tauri.py b/libs/cua-driver/tests/e2e/test_tauri.py
index 5845c83824..e8b6aaee8a 100644
--- a/libs/cua-driver/tests/e2e/test_tauri.py
+++ b/libs/cua-driver/tests/e2e/test_tauri.py
@@ -1,7 +1,7 @@
"""Tauri shared-harness background automation tests.
-The Tauri test app is built from test-harness/apps/cross-platform/tauri
-and loads test-harness/shared/web/index.html, the same DOM used by the
+The Tauri test app is built from tests/fixtures/apps/cross-platform/tauri
+and loads tests/fixtures/shared/web/index.html, the same DOM used by the
Electron, WebView2, and WKWebView harnesses.
Run: python3 -m pytest test_tauri.py -v
diff --git a/libs/cua-driver/test-harness/.gitignore b/libs/cua-driver/tests/fixtures/.gitignore
similarity index 100%
rename from libs/cua-driver/test-harness/.gitignore
rename to libs/cua-driver/tests/fixtures/.gitignore
diff --git a/libs/cua-driver/test-harness/CuaTestHarness.sln b/libs/cua-driver/tests/fixtures/CuaTestHarness.sln
similarity index 100%
rename from libs/cua-driver/test-harness/CuaTestHarness.sln
rename to libs/cua-driver/tests/fixtures/CuaTestHarness.sln
diff --git a/libs/cua-driver/test-harness/README.md b/libs/cua-driver/tests/fixtures/README.md
similarity index 83%
rename from libs/cua-driver/test-harness/README.md
rename to libs/cua-driver/tests/fixtures/README.md
index 69dbca7d8e..c72f28a5b1 100644
--- a/libs/cua-driver/test-harness/README.md
+++ b/libs/cua-driver/tests/fixtures/README.md
@@ -1,14 +1,14 @@
-# cua-driver test harness
+# cua-driver test fixtures
Deterministic host apps and shared fixtures used to verify cua-driver across
-Windows, macOS, and Linux. The harness is source-first: build scripts stage
-local outputs into `../rust/test-apps/harness-<name>/`; binaries are not
+Windows, macOS, and Linux. The fixtures are source-first: build scripts stage
+local outputs into `libs/cua-driver/rust/test-apps/harness-<name>/`; binaries are not
committed.
## Layout
```text
-test-harness/
+tests/fixtures/
├── shared/
│ ├── scenarios.json # scenario ids, titles, and expected controls
│ └── web/index.html # shared DOM for webview-style harnesses
@@ -38,21 +38,21 @@ load `shared/web/index.html`, either directly or through a build-staged copy.
## Build
-Build scripts stage outputs into `../rust/test-apps/`.
+Build scripts stage outputs into `libs/cua-driver/rust/test-apps/`.
```bash
# macOS: AppKit, SwiftUI, WKWebView, Electron, Tauri
-libs/cua-driver/test-harness/build/macos.sh
-libs/cua-driver/test-harness/build/macos.sh --skip electron
+libs/cua-driver/tests/fixtures/build/macos.sh
+libs/cua-driver/tests/fixtures/build/macos.sh --skip electron
# Linux: GTK3, Electron, Tauri
-libs/cua-driver/test-harness/build/linux.sh
-libs/cua-driver/test-harness/build/linux.sh --skip tauri
+libs/cua-driver/tests/fixtures/build/linux.sh
+libs/cua-driver/tests/fixtures/build/linux.sh --skip tauri
```
```powershell
# Windows: WPF, WinUI3, WebView2, Electron, Tauri
-cd libs\cua-driver\test-harness
+cd libs\cua-driver\tests\fixtures
.\build\windows.ps1
.\build\windows.ps1 -Skip winui3
```
@@ -66,7 +66,7 @@ Host requirements:
## Test Mapping
-Rust tests under `../rust/crates/cua-driver/tests/` consume the staged
+Rust tests under `libs/cua-driver/rust/crates/cua-driver/tests/` consume the staged
`rust/test-apps/harness-<name>/` outputs:
- `harness_<toolkit>_test.rs`: toolkit-specific app coverage, usually ignored.
@@ -74,7 +74,7 @@ Rust tests under `../rust/crates/cua-driver/tests/` consume the staged
modality coverage, ignored/manual or VM-backed.
- `protocol_*_test.rs` and schema tests: headless protocol coverage, default.
-The Python e2e suite under `../tests/e2e/` drives real apps and the shared
+The Python e2e suite under `libs/cua-driver/tests/e2e/` drives real apps and the shared
Electron/Tauri harnesses through the public MCP interface.
## App Coverage
diff --git a/libs/cua-driver/test-harness/apps/README.md b/libs/cua-driver/tests/fixtures/apps/README.md
similarity index 92%
rename from libs/cua-driver/test-harness/apps/README.md
rename to libs/cua-driver/tests/fixtures/apps/README.md
index fabff8c5f9..7e3346165c 100644
--- a/libs/cua-driver/test-harness/apps/README.md
+++ b/libs/cua-driver/tests/fixtures/apps/README.md
@@ -1,4 +1,4 @@
-# test-harness apps
+# test fixture apps
Each subdirectory is one deterministic host app cua-driver can drive. Apps
share fixtures through `../shared/scenarios.json` and, for webview hosts,
@@ -16,7 +16,7 @@ share fixtures through `../shared/scenarios.json` and, for webview hosts,
| `windows/winui3` | Windows | WinUI3/XAML controls and popups |
| `windows/webview2` | Windows | WebView2 loading the shared DOM |
-Built outputs land in `../../rust/test-apps/harness-<name>/` via
+Built outputs land in `libs/cua-driver/rust/test-apps/harness-<name>/` via
`../build/<host>`.
Adding a new app:
diff --git a/libs/cua-driver/test-harness/apps/cross-platform/electron/.gitignore b/libs/cua-driver/tests/fixtures/apps/cross-platform/electron/.gitignore
similarity index 100%
rename from libs/cua-driver/test-harness/apps/cross-platform/electron/.gitignore
rename to libs/cua-driver/tests/fixtures/apps/cross-platform/electron/.gitignore
diff --git a/libs/cua-driver/test-harness/apps/cross-platform/electron/build.ps1 b/libs/cua-driver/tests/fixtures/apps/cross-platform/electron/build.ps1
similarity index 94%
rename from libs/cua-driver/test-harness/apps/cross-platform/electron/build.ps1
rename to libs/cua-driver/tests/fixtures/apps/cross-platform/electron/build.ps1
index d132fba3df..3f0c4e4d2c 100644
--- a/libs/cua-driver/test-harness/apps/cross-platform/electron/build.ps1
+++ b/libs/cua-driver/tests/fixtures/apps/cross-platform/electron/build.ps1
@@ -5,7 +5,7 @@
# the electron runtime + our app resources, with electron.exe renamed to
# CuaTestHarness.Electron.exe so tests get a deterministic exe name.
#
-# Output: ../../../../rust/test-apps/harness-electron/
+# Output: libs/cua-driver/rust/test-apps/harness-electron/
Set-StrictMode -Version Latest
$ErrorActionPreference = "Stop"
@@ -14,7 +14,8 @@ $elecDir = Split-Path -Parent $MyInvocation.MyCommand.Definition
$crossDir = Split-Path -Parent $elecDir
$appsDir = Split-Path -Parent $crossDir
$harnessDir = Split-Path -Parent $appsDir
-$cuaDriverDir = Split-Path -Parent $harnessDir
+$testsDir = Split-Path -Parent $harnessDir
+$cuaDriverDir = Split-Path -Parent $testsDir
$testAppsDir = Join-Path $cuaDriverDir "rust\test-apps"
$outDir = Join-Path $testAppsDir "harness-electron"
diff --git a/libs/cua-driver/test-harness/apps/cross-platform/electron/build.sh b/libs/cua-driver/tests/fixtures/apps/cross-platform/electron/build.sh
similarity index 96%
rename from libs/cua-driver/test-harness/apps/cross-platform/electron/build.sh
rename to libs/cua-driver/tests/fixtures/apps/cross-platform/electron/build.sh
index 4c8037c20c..fb9b73204a 100755
--- a/libs/cua-driver/test-harness/apps/cross-platform/electron/build.sh
+++ b/libs/cua-driver/tests/fixtures/apps/cross-platform/electron/build.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# build.sh — stage the Electron test harness for cua-driver tests / modality
+# build.sh — stage the Electron test fixture app for cua-driver tests / modality
# recordings on Linux and macOS.
#
# On Linux we run the app straight from node_modules (electron's prebuilt
@@ -15,7 +15,7 @@ elecDir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
crossDir="$(dirname "$elecDir")"
appsDir="$(dirname "$crossDir")"
harnessDir="$(dirname "$appsDir")"
-cuaDriverDir="$(dirname "$harnessDir")"
+cuaDriverDir="$(cd "$harnessDir/../.." && pwd)"
outDir="$cuaDriverDir/rust/test-apps/harness-electron"
platform="$(uname -s)"
diff --git a/libs/cua-driver/test-harness/apps/cross-platform/electron/main.js b/libs/cua-driver/tests/fixtures/apps/cross-platform/electron/main.js
similarity index 100%
rename from libs/cua-driver/test-harness/apps/cross-platform/electron/main.js
rename to libs/cua-driver/tests/fixtures/apps/cross-platform/electron/main.js
diff --git a/libs/cua-driver/test-harness/apps/cross-platform/electron/package.json b/libs/cua-driver/tests/fixtures/apps/cross-platform/electron/package.json
similarity index 100%
rename from libs/cua-driver/test-harness/apps/cross-platform/electron/package.json
rename to libs/cua-driver/tests/fixtures/apps/cross-platform/electron/package.json
diff --git a/libs/cua-driver/test-harness/apps/cross-platform/tauri/.gitignore b/libs/cua-driver/tests/fixtures/apps/cross-platform/tauri/.gitignore
similarity index 100%
rename from libs/cua-driver/test-harness/apps/cross-platform/tauri/.gitignore
rename to libs/cua-driver/tests/fixtures/apps/cross-platform/tauri/.gitignore
diff --git a/libs/cua-driver/test-harness/apps/cross-platform/tauri/build.ps1 b/libs/cua-driver/tests/fixtures/apps/cross-platform/tauri/build.ps1
similarity index 90%
rename from libs/cua-driver/test-harness/apps/cross-platform/tauri/build.ps1
rename to libs/cua-driver/tests/fixtures/apps/cross-platform/tauri/build.ps1
index d7d82a6b85..dc0e39c211 100644
--- a/libs/cua-driver/test-harness/apps/cross-platform/tauri/build.ps1
+++ b/libs/cua-driver/tests/fixtures/apps/cross-platform/tauri/build.ps1
@@ -1,6 +1,6 @@
# build.ps1 - stage the Tauri test harness for cua-driver tests on Windows.
#
-# Output: ../../../../rust/test-apps/harness-tauri/CuaTestHarness.Tauri.exe
+# Output: libs/cua-driver/rust/test-apps/harness-tauri/CuaTestHarness.Tauri.exe
Set-StrictMode -Version Latest
$ErrorActionPreference = "Stop"
@@ -9,7 +9,8 @@ $tauriDir = Split-Path -Parent $MyInvocation.MyCommand.Definition
$crossDir = Split-Path -Parent $tauriDir
$appsDir = Split-Path -Parent $crossDir
$harnessDir = Split-Path -Parent $appsDir
-$cuaDriverDir = Split-Path -Parent $harnessDir
+$testsDir = Split-Path -Parent $harnessDir
+$cuaDriverDir = Split-Path -Parent $testsDir
$testAppsDir = Join-Path $cuaDriverDir "rust\test-apps"
$outDir = Join-Path $testAppsDir "harness-tauri"
diff --git a/libs/cua-driver/test-harness/apps/cross-platform/tauri/build.sh b/libs/cua-driver/tests/fixtures/apps/cross-platform/tauri/build.sh
similarity index 91%
rename from libs/cua-driver/test-harness/apps/cross-platform/tauri/build.sh
rename to libs/cua-driver/tests/fixtures/apps/cross-platform/tauri/build.sh
index 4aa7f363ac..ef10bd5976 100755
--- a/libs/cua-driver/test-harness/apps/cross-platform/tauri/build.sh
+++ b/libs/cua-driver/tests/fixtures/apps/cross-platform/tauri/build.sh
@@ -1,16 +1,16 @@
#!/usr/bin/env bash
-# Stage the Tauri test harness for cua-driver tests on Linux and macOS.
+# Stage the Tauri test fixture app for cua-driver tests on Linux and macOS.
#
# The app embeds the same shared/web/index.html DOM used by Electron,
# WebView2, and WKWebView. Build output is copied into
-# rust/test-apps/harness-tauri/ with deterministic executable names.
+# libs/cua-driver/rust/test-apps/harness-tauri/ with deterministic executable names.
set -euo pipefail
tauriDir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
crossDir="$(dirname "$tauriDir")"
appsDir="$(dirname "$crossDir")"
harnessDir="$(dirname "$appsDir")"
-cuaDriverDir="$(dirname "$harnessDir")"
+cuaDriverDir="$(cd "$harnessDir/../.." && pwd)"
outDir="$cuaDriverDir/rust/test-apps/harness-tauri"
platform="$(uname -s)"
diff --git a/libs/cua-driver/test-harness/apps/cross-platform/tauri/package.json b/libs/cua-driver/tests/fixtures/apps/cross-platform/tauri/package.json
similarity index 100%
rename from libs/cua-driver/test-harness/apps/cross-platform/tauri/package.json
rename to libs/cua-driver/tests/fixtures/apps/cross-platform/tauri/package.json
diff --git a/libs/cua-driver/test-harness/apps/cross-platform/tauri/src-tauri/Cargo.toml b/libs/cua-driver/tests/fixtures/apps/cross-platform/tauri/src-tauri/Cargo.toml
similarity index 100%
rename from libs/cua-driver/test-harness/apps/cross-platform/tauri/src-tauri/Cargo.toml
rename to libs/cua-driver/tests/fixtures/apps/cross-platform/tauri/src-tauri/Cargo.toml
diff --git a/libs/cua-driver/test-harness/apps/cross-platform/tauri/src-tauri/build.rs b/libs/cua-driver/tests/fixtures/apps/cross-platform/tauri/src-tauri/build.rs
similarity index 100%
rename from libs/cua-driver/test-harness/apps/cross-platform/tauri/src-tauri/build.rs
rename to libs/cua-driver/tests/fixtures/apps/cross-platform/tauri/src-tauri/build.rs
diff --git a/libs/cua-driver/test-harness/apps/cross-platform/tauri/src-tauri/icons/icon.ico b/libs/cua-driver/tests/fixtures/apps/cross-platform/tauri/src-tauri/icons/icon.ico
similarity index 100%
rename from libs/cua-driver/test-harness/apps/cross-platform/tauri/src-tauri/icons/icon.ico
rename to libs/cua-driver/tests/fixtures/apps/cross-platform/tauri/src-tauri/icons/icon.ico
diff --git a/libs/cua-driver/test-harness/apps/cross-platform/tauri/src-tauri/icons/icon.png b/libs/cua-driver/tests/fixtures/apps/cross-platform/tauri/src-tauri/icons/icon.png
similarity index 100%
rename from libs/cua-driver/test-harness/apps/cross-platform/tauri/src-tauri/icons/icon.png
rename to libs/cua-driver/tests/fixtures/apps/cross-platform/tauri/src-tauri/icons/icon.png
diff --git a/libs/cua-driver/test-harness/apps/cross-platform/tauri/src-tauri/src/main.rs b/libs/cua-driver/tests/fixtures/apps/cross-platform/tauri/src-tauri/src/main.rs
similarity index 100%
rename from libs/cua-driver/test-harness/apps/cross-platform/tauri/src-tauri/src/main.rs
rename to libs/cua-driver/tests/fixtures/apps/cross-platform/tauri/src-tauri/src/main.rs
diff --git a/libs/cua-driver/test-harness/apps/cross-platform/tauri/src-tauri/tauri.conf.json b/libs/cua-driver/tests/fixtures/apps/cross-platform/tauri/src-tauri/tauri.conf.json
similarity index 100%
rename from libs/cua-driver/test-harness/apps/cross-platform/tauri/src-tauri/tauri.conf.json
rename to libs/cua-driver/tests/fixtures/apps/cross-platform/tauri/src-tauri/tauri.conf.json
diff --git a/libs/cua-driver/test-harness/apps/linux/gtk3/main.py b/libs/cua-driver/tests/fixtures/apps/linux/gtk3/main.py
similarity index 100%
rename from libs/cua-driver/test-harness/apps/linux/gtk3/main.py
rename to libs/cua-driver/tests/fixtures/apps/linux/gtk3/main.py
diff --git a/libs/cua-driver/test-harness/apps/macos/appkit/main.swift b/libs/cua-driver/tests/fixtures/apps/macos/appkit/main.swift
similarity index 100%
rename from libs/cua-driver/test-harness/apps/macos/appkit/main.swift
rename to libs/cua-driver/tests/fixtures/apps/macos/appkit/main.swift
diff --git a/libs/cua-driver/test-harness/apps/macos/swiftui/main.swift b/libs/cua-driver/tests/fixtures/apps/macos/swiftui/main.swift
similarity index 100%
rename from libs/cua-driver/test-harness/apps/macos/swiftui/main.swift
rename to libs/cua-driver/tests/fixtures/apps/macos/swiftui/main.swift
diff --git a/libs/cua-driver/test-harness/apps/macos/wkwebview/main.swift b/libs/cua-driver/tests/fixtures/apps/macos/wkwebview/main.swift
similarity index 97%
rename from libs/cua-driver/test-harness/apps/macos/wkwebview/main.swift
rename to libs/cua-driver/tests/fixtures/apps/macos/wkwebview/main.swift
index e150a82cff..f070f20eb4 100644
--- a/libs/cua-driver/test-harness/apps/macos/wkwebview/main.swift
+++ b/libs/cua-driver/tests/fixtures/apps/macos/wkwebview/main.swift
@@ -2,7 +2,7 @@
//
// A minimal AppKit NSWindow hosting a WKWebView (Apple WebKit, NOT Chromium)
// that loads the SAME shared web DOM as the WebView2 / Electron harnesses
-// (test-harness/shared/web/index.html). The build script copies that shared
+// (tests/fixtures/shared/web/index.html). The build script copies that shared
// file into the app bundle's Resources/web/ so the harness is self-contained
// and reuses the canonical web content rather than duplicating it in source.
//
diff --git a/libs/cua-driver/test-harness/apps/windows/webview2/.gitignore b/libs/cua-driver/tests/fixtures/apps/windows/webview2/.gitignore
similarity index 100%
rename from libs/cua-driver/test-harness/apps/windows/webview2/.gitignore
rename to libs/cua-driver/tests/fixtures/apps/windows/webview2/.gitignore
diff --git a/libs/cua-driver/test-harness/apps/windows/webview2/App.xaml b/libs/cua-driver/tests/fixtures/apps/windows/webview2/App.xaml
similarity index 100%
rename from libs/cua-driver/test-harness/apps/windows/webview2/App.xaml
rename to libs/cua-driver/tests/fixtures/apps/windows/webview2/App.xaml
diff --git a/libs/cua-driver/test-harness/apps/windows/webview2/App.xaml.cs b/libs/cua-driver/tests/fixtures/apps/windows/webview2/App.xaml.cs
similarity index 100%
rename from libs/cua-driver/test-harness/apps/windows/webview2/App.xaml.cs
rename to libs/cua-driver/tests/fixtures/apps/windows/webview2/App.xaml.cs
diff --git a/libs/cua-driver/test-harness/apps/windows/webview2/CuaTestHarness.WebView.csproj b/libs/cua-driver/tests/fixtures/apps/windows/webview2/CuaTestHarness.WebView.csproj
similarity index 100%
rename from libs/cua-driver/test-harness/apps/windows/webview2/CuaTestHarness.WebView.csproj
rename to libs/cua-driver/tests/fixtures/apps/windows/webview2/CuaTestHarness.WebView.csproj
diff --git a/libs/cua-driver/test-harness/apps/windows/webview2/MainWindow.xaml b/libs/cua-driver/tests/fixtures/apps/windows/webview2/MainWindow.xaml
similarity index 100%
rename from libs/cua-driver/test-harness/apps/windows/webview2/MainWindow.xaml
rename to libs/cua-driver/tests/fixtures/apps/windows/webview2/MainWindow.xaml
diff --git a/libs/cua-driver/test-harness/apps/windows/webview2/MainWindow.xaml.cs b/libs/cua-driver/tests/fixtures/apps/windows/webview2/MainWindow.xaml.cs
similarity index 100%
rename from libs/cua-driver/test-harness/apps/windows/webview2/MainWindow.xaml.cs
rename to libs/cua-driver/tests/fixtures/apps/windows/webview2/MainWindow.xaml.cs
diff --git a/libs/cua-driver/test-harness/apps/windows/webview2/app.manifest b/libs/cua-driver/tests/fixtures/apps/windows/webview2/app.manifest
similarity index 100%
rename from libs/cua-driver/test-harness/apps/windows/webview2/app.manifest
rename to libs/cua-driver/tests/fixtures/apps/windows/webview2/app.manifest
diff --git a/libs/cua-driver/test-harness/apps/windows/winui3/App.xaml b/libs/cua-driver/tests/fixtures/apps/windows/winui3/App.xaml
similarity index 100%
rename from libs/cua-driver/test-harness/apps/windows/winui3/App.xaml
rename to libs/cua-driver/tests/fixtures/apps/windows/winui3/App.xaml
diff --git a/libs/cua-driver/test-harness/apps/windows/winui3/App.xaml.cs b/libs/cua-driver/tests/fixtures/apps/windows/winui3/App.xaml.cs
similarity index 100%
rename from libs/cua-driver/test-harness/apps/windows/winui3/App.xaml.cs
rename to libs/cua-driver/tests/fixtures/apps/windows/winui3/App.xaml.cs
diff --git a/libs/cua-driver/test-harness/apps/windows/winui3/CuaTestHarness.WinUI3.csproj b/libs/cua-driver/tests/fixtures/apps/windows/winui3/CuaTestHarness.WinUI3.csproj
similarity index 100%
rename from libs/cua-driver/test-harness/apps/windows/winui3/CuaTestHarness.WinUI3.csproj
rename to libs/cua-driver/tests/fixtures/apps/windows/winui3/CuaTestHarness.WinUI3.csproj
diff --git a/libs/cua-driver/test-harness/apps/windows/winui3/MainWindow.xaml b/libs/cua-driver/tests/fixtures/apps/windows/winui3/MainWindow.xaml
similarity index 100%
rename from libs/cua-driver/test-harness/apps/windows/winui3/MainWindow.xaml
rename to libs/cua-driver/tests/fixtures/apps/windows/winui3/MainWindow.xaml
diff --git a/libs/cua-driver/test-harness/apps/windows/winui3/MainWindow.xaml.cs b/libs/cua-driver/tests/fixtures/apps/windows/winui3/MainWindow.xaml.cs
similarity index 100%
rename from libs/cua-driver/test-harness/apps/windows/winui3/MainWindow.xaml.cs
rename to libs/cua-driver/tests/fixtures/apps/windows/winui3/MainWindow.xaml.cs
diff --git a/libs/cua-driver/test-harness/apps/windows/winui3/Program.cs b/libs/cua-driver/tests/fixtures/apps/windows/winui3/Program.cs
similarity index 100%
rename from libs/cua-driver/test-harness/apps/windows/winui3/Program.cs
rename to libs/cua-driver/tests/fixtures/apps/windows/winui3/Program.cs
diff --git a/libs/cua-driver/test-harness/apps/windows/winui3/app.manifest b/libs/cua-driver/tests/fixtures/apps/windows/winui3/app.manifest
similarity index 100%
rename from libs/cua-driver/test-harness/apps/windows/winui3/app.manifest
rename to libs/cua-driver/tests/fixtures/apps/windows/winui3/app.manifest
diff --git a/libs/cua-driver/test-harness/apps/windows/wpf/App.xaml b/libs/cua-driver/tests/fixtures/apps/windows/wpf/App.xaml
similarity index 100%
rename from libs/cua-driver/test-harness/apps/windows/wpf/App.xaml
rename to libs/cua-driver/tests/fixtures/apps/windows/wpf/App.xaml
diff --git a/libs/cua-driver/test-harness/apps/windows/wpf/App.xaml.cs b/libs/cua-driver/tests/fixtures/apps/windows/wpf/App.xaml.cs
similarity index 100%
rename from libs/cua-driver/test-harness/apps/windows/wpf/App.xaml.cs
rename to libs/cua-driver/tests/fixtures/apps/windows/wpf/App.xaml.cs
diff --git a/libs/cua-driver/test-harness/apps/windows/wpf/CuaTestHarness.Wpf.csproj b/libs/cua-driver/tests/fixtures/apps/windows/wpf/CuaTestHarness.Wpf.csproj
similarity index 100%
rename from libs/cua-driver/test-harness/apps/windows/wpf/CuaTestHarness.Wpf.csproj
rename to libs/cua-driver/tests/fixtures/apps/windows/wpf/CuaTestHarness.Wpf.csproj
diff --git a/libs/cua-driver/test-harness/apps/windows/wpf/LayeredPopupWindow.xaml b/libs/cua-driver/tests/fixtures/apps/windows/wpf/LayeredPopupWindow.xaml
similarity index 100%
rename from libs/cua-driver/test-harness/apps/windows/wpf/LayeredPopupWindow.xaml
rename to libs/cua-driver/tests/fixtures/apps/windows/wpf/LayeredPopupWindow.xaml
diff --git a/libs/cua-driver/test-harness/apps/windows/wpf/LayeredPopupWindow.xaml.cs b/libs/cua-driver/tests/fixtures/apps/windows/wpf/LayeredPopupWindow.xaml.cs
similarity index 100%
rename from libs/cua-driver/test-harness/apps/windows/wpf/LayeredPopupWindow.xaml.cs
rename to libs/cua-driver/tests/fixtures/apps/windows/wpf/LayeredPopupWindow.xaml.cs
diff --git a/libs/cua-driver/test-harness/apps/windows/wpf/MainWindow.xaml b/libs/cua-driver/tests/fixtures/apps/windows/wpf/MainWindow.xaml
similarity index 100%
rename from libs/cua-driver/test-harness/apps/windows/wpf/MainWindow.xaml
rename to libs/cua-driver/tests/fixtures/apps/windows/wpf/MainWindow.xaml
diff --git a/libs/cua-driver/test-harness/apps/windows/wpf/MainWindow.xaml.cs b/libs/cua-driver/tests/fixtures/apps/windows/wpf/MainWindow.xaml.cs
similarity index 100%
rename from libs/cua-driver/test-harness/apps/windows/wpf/MainWindow.xaml.cs
rename to libs/cua-driver/tests/fixtures/apps/windows/wpf/MainWindow.xaml.cs
diff --git a/libs/cua-driver/test-harness/apps/windows/wpf/NativeButtonHost.cs b/libs/cua-driver/tests/fixtures/apps/windows/wpf/NativeButtonHost.cs
similarity index 100%
rename from libs/cua-driver/test-harness/apps/windows/wpf/NativeButtonHost.cs
rename to libs/cua-driver/tests/fixtures/apps/windows/wpf/NativeButtonHost.cs
diff --git a/libs/cua-driver/test-harness/apps/windows/wpf/OwnedPopupWindow.xaml b/libs/cua-driver/tests/fixtures/apps/windows/wpf/OwnedPopupWindow.xaml
similarity index 100%
rename from libs/cua-driver/test-harness/apps/windows/wpf/OwnedPopupWindow.xaml
rename to libs/cua-driver/tests/fixtures/apps/windows/wpf/OwnedPopupWindow.xaml
diff --git a/libs/cua-driver/test-harness/apps/windows/wpf/OwnedPopupWindow.xaml.cs b/libs/cua-driver/tests/fixtures/apps/windows/wpf/OwnedPopupWindow.xaml.cs
similarity index 100%
rename from libs/cua-driver/test-harness/apps/windows/wpf/OwnedPopupWindow.xaml.cs
rename to libs/cua-driver/tests/fixtures/apps/windows/wpf/OwnedPopupWindow.xaml.cs
diff --git a/libs/cua-driver/test-harness/apps/windows/wpf/Scenarios.cs b/libs/cua-driver/tests/fixtures/apps/windows/wpf/Scenarios.cs
similarity index 100%
rename from libs/cua-driver/test-harness/apps/windows/wpf/Scenarios.cs
rename to libs/cua-driver/tests/fixtures/apps/windows/wpf/Scenarios.cs
diff --git a/libs/cua-driver/test-harness/apps/windows/wpf/app.manifest b/libs/cua-driver/tests/fixtures/apps/windows/wpf/app.manifest
similarity index 100%
rename from libs/cua-driver/test-harness/apps/windows/wpf/app.manifest
rename to libs/cua-driver/tests/fixtures/apps/windows/wpf/app.manifest
diff --git a/libs/cua-driver/test-harness/build/README.md b/libs/cua-driver/tests/fixtures/build/README.md
similarity index 87%
rename from libs/cua-driver/test-harness/build/README.md
rename to libs/cua-driver/tests/fixtures/build/README.md
index 156654ecc5..a879e311f6 100644
--- a/libs/cua-driver/test-harness/build/README.md
+++ b/libs/cua-driver/tests/fixtures/build/README.md
@@ -1,7 +1,7 @@
-# test-harness build scripts
+# test fixture build scripts
These host-specific scripts stage source-built harness apps into
-`../../rust/test-apps/harness-<name>/`.
+`libs/cua-driver/rust/test-apps/harness-<name>/`.
| Script | Host | Builds |
| --- | --- | --- |
diff --git a/libs/cua-driver/test-harness/build/linux.sh b/libs/cua-driver/tests/fixtures/build/linux.sh
similarity index 93%
rename from libs/cua-driver/test-harness/build/linux.sh
rename to libs/cua-driver/tests/fixtures/build/linux.sh
index 4f8fabf586..b82c7e87a8 100755
--- a/libs/cua-driver/test-harness/build/linux.sh
+++ b/libs/cua-driver/tests/fixtures/build/linux.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# Stage Linux-runnable test-harness apps into ../../rust/test-apps/harness-*/.
+# Stage Linux-runnable test fixture apps into libs/cua-driver/rust/test-apps/harness-*/.
#
# GTK3 is PyGObject: a real GTK3 widget tree (identical AT-SPI exposure to a C
# app), so there's no compile step. Electron and Tauri are shared cross-platform
@@ -16,7 +16,7 @@ set -euo pipefail
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
HARNESS_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
-TEST_APPS_DIR="$(cd "$HARNESS_DIR/../rust/test-apps" && pwd)"
+TEST_APPS_DIR="$(cd "$HARNESS_DIR/../../rust/test-apps" && pwd)"
STAGE="$TEST_APPS_DIR/harness-gtk3"
SRC="$HARNESS_DIR/apps/linux/gtk3"
SKIP="none"
diff --git a/libs/cua-driver/test-harness/build/macos.sh b/libs/cua-driver/tests/fixtures/build/macos.sh
similarity index 95%
rename from libs/cua-driver/test-harness/build/macos.sh
rename to libs/cua-driver/tests/fixtures/build/macos.sh
index 233e464b72..f2747c7f54 100755
--- a/libs/cua-driver/test-harness/build/macos.sh
+++ b/libs/cua-driver/tests/fixtures/build/macos.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-# Build the macOS test-harness apps (AppKit + SwiftUI + WKWebView + Electron + Tauri)
-# into app bundles under ../../rust/test-apps/harness-* —
+# Build the macOS test fixture apps (AppKit + SwiftUI + WKWebView + Electron + Tauri)
+# into app bundles under libs/cua-driver/rust/test-apps/harness-* —
# matching the convention used by windows.ps1 for the Windows WPF + WinUI3 +
# WebView2 apps. WKWebView is the Apple-WebKit host; Electron is the shared
# Chromium harness used across Windows, Linux, and macOS. Tauri is the shared
@@ -14,7 +14,7 @@ set -euo pipefail
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
HARNESS_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
-STAGE_DIR="$(cd "$HARNESS_DIR/../rust/test-apps" && pwd)"
+STAGE_DIR="$(cd "$HARNESS_DIR/../../rust/test-apps" && pwd)"
SKIP=""
CLEAN=0
diff --git a/libs/cua-driver/test-harness/build/windows.ps1 b/libs/cua-driver/tests/fixtures/build/windows.ps1
similarity index 96%
rename from libs/cua-driver/test-harness/build/windows.ps1
rename to libs/cua-driver/tests/fixtures/build/windows.ps1
index aafe772a2b..7e3b150522 100644
--- a/libs/cua-driver/test-harness/build/windows.ps1
+++ b/libs/cua-driver/tests/fixtures/build/windows.ps1
@@ -1,4 +1,4 @@
-# windows.ps1 - publish the cua-driver test harness binaries.
+# windows.ps1 - publish the cua-driver test fixture binaries.
#
# Outputs land in libs/cua-driver/rust/test-apps/harness-{wpf,winui3,webview,electron,tauri}/
# so the existing sandbox runner picks them up via its mapped folder.
@@ -20,7 +20,8 @@ $ErrorActionPreference = "Stop"
$buildDir = Split-Path -Parent $MyInvocation.MyCommand.Definition
$harnessDir = Split-Path -Parent $buildDir
-$cuaDriverDir = Split-Path -Parent $harnessDir
+$testsDir = Split-Path -Parent $harnessDir
+$cuaDriverDir = Split-Path -Parent $testsDir
$testAppsDir = Join-Path $cuaDriverDir "rust\test-apps"
if (-not (Get-Command dotnet -ErrorAction SilentlyContinue)) {
diff --git a/libs/cua-driver/test-harness/linux-container/README.md b/libs/cua-driver/tests/fixtures/linux-container/README.md
similarity index 100%
rename from libs/cua-driver/test-harness/linux-container/README.md
rename to libs/cua-driver/tests/fixtures/linux-container/README.md
diff --git a/libs/cua-driver/test-harness/linux-container/calc.sh b/libs/cua-driver/tests/fixtures/linux-container/calc.sh
similarity index 100%
rename from libs/cua-driver/test-harness/linux-container/calc.sh
rename to libs/cua-driver/tests/fixtures/linux-container/calc.sh
diff --git a/libs/cua-driver/test-harness/linux-container/derec.sh b/libs/cua-driver/tests/fixtures/linux-container/derec.sh
similarity index 100%
rename from libs/cua-driver/test-harness/linux-container/derec.sh
rename to libs/cua-driver/tests/fixtures/linux-container/derec.sh
diff --git a/libs/cua-driver/test-harness/linux-container/modality_matrix.sh b/libs/cua-driver/tests/fixtures/linux-container/modality_matrix.sh
similarity index 100%
rename from libs/cua-driver/test-harness/linux-container/modality_matrix.sh
rename to libs/cua-driver/tests/fixtures/linux-container/modality_matrix.sh
diff --git a/libs/cua-driver/test-harness/linux-container/validate.sh b/libs/cua-driver/tests/fixtures/linux-container/validate.sh
similarity index 100%
rename from libs/cua-driver/test-harness/linux-container/validate.sh
rename to libs/cua-driver/tests/fixtures/linux-container/validate.sh
diff --git a/libs/cua-driver/test-harness/modality-recordings/FINDINGS.md b/libs/cua-driver/tests/fixtures/modality-recordings/FINDINGS.md
similarity index 100%
rename from libs/cua-driver/test-harness/modality-recordings/FINDINGS.md
rename to libs/cua-driver/tests/fixtures/modality-recordings/FINDINGS.md
diff --git a/libs/cua-driver/test-harness/modality-recordings/README.md b/libs/cua-driver/tests/fixtures/modality-recordings/README.md
similarity index 100%
rename from libs/cua-driver/test-harness/modality-recordings/README.md
rename to libs/cua-driver/tests/fixtures/modality-recordings/README.md
diff --git a/libs/cua-driver/test-harness/modality-recordings/index.html b/libs/cua-driver/tests/fixtures/modality-recordings/index.html
similarity index 100%
rename from libs/cua-driver/test-harness/modality-recordings/index.html
rename to libs/cua-driver/tests/fixtures/modality-recordings/index.html
diff --git a/libs/cua-driver/test-harness/modality-recordings/linux/lin-all-electron.sh b/libs/cua-driver/tests/fixtures/modality-recordings/linux/lin-all-electron.sh
similarity index 100%
rename from libs/cua-driver/test-harness/modality-recordings/linux/lin-all-electron.sh
rename to libs/cua-driver/tests/fixtures/modality-recordings/linux/lin-all-electron.sh
diff --git a/libs/cua-driver/test-harness/modality-recordings/linux/lin-all.sh b/libs/cua-driver/tests/fixtures/modality-recordings/linux/lin-all.sh
similarity index 100%
rename from libs/cua-driver/test-harness/modality-recordings/linux/lin-all.sh
rename to libs/cua-driver/tests/fixtures/modality-recordings/linux/lin-all.sh
diff --git a/libs/cua-driver/test-harness/modality-recordings/linux/lin-dash.py b/libs/cua-driver/tests/fixtures/modality-recordings/linux/lin-dash.py
similarity index 100%
rename from libs/cua-driver/test-harness/modality-recordings/linux/lin-dash.py
rename to libs/cua-driver/tests/fixtures/modality-recordings/linux/lin-dash.py
diff --git a/libs/cua-driver/test-harness/modality-recordings/linux/lin-dashboard-electron.html b/libs/cua-driver/tests/fixtures/modality-recordings/linux/lin-dashboard-electron.html
similarity index 100%
rename from libs/cua-driver/test-harness/modality-recordings/linux/lin-dashboard-electron.html
rename to libs/cua-driver/tests/fixtures/modality-recordings/linux/lin-dashboard-electron.html
diff --git a/libs/cua-driver/test-harness/modality-recordings/linux/lin-dashboard.html b/libs/cua-driver/tests/fixtures/modality-recordings/linux/lin-dashboard.html
similarity index 100%
rename from libs/cua-driver/test-harness/modality-recordings/linux/lin-dashboard.html
rename to libs/cua-driver/tests/fixtures/modality-recordings/linux/lin-dashboard.html
diff --git a/libs/cua-driver/test-harness/modality-recordings/linux/lin-harness.py b/libs/cua-driver/tests/fixtures/modality-recordings/linux/lin-harness.py
similarity index 100%
rename from libs/cua-driver/test-harness/modality-recordings/linux/lin-harness.py
rename to libs/cua-driver/tests/fixtures/modality-recordings/linux/lin-harness.py
diff --git a/libs/cua-driver/test-harness/modality-recordings/linux/lin-rec-electron.py b/libs/cua-driver/tests/fixtures/modality-recordings/linux/lin-rec-electron.py
similarity index 99%
rename from libs/cua-driver/test-harness/modality-recordings/linux/lin-rec-electron.py
rename to libs/cua-driver/tests/fixtures/modality-recordings/linux/lin-rec-electron.py
index 4326ecf0d4..7721e779e1 100644
--- a/libs/cua-driver/test-harness/modality-recordings/linux/lin-rec-electron.py
+++ b/libs/cua-driver/tests/fixtures/modality-recordings/linux/lin-rec-electron.py
@@ -14,7 +14,7 @@ import json, os, subprocess, sys, time, glob, re
MODE = sys.argv[1] if len(sys.argv) > 1 else "ax-bg"
HOME = os.path.expanduser("~")
DRV = f"{HOME}/cua/libs/cua-driver/rust/target/release/cua-driver"
-ELECTRON_DIR = f"{HOME}/cua/libs/cua-driver/test-harness/apps/cross-platform/electron"
+ELECTRON_DIR = f"{HOME}/cua/libs/cua-driver/tests/fixtures/apps/cross-platform/electron"
ELECTRON_BIN = f"{ELECTRON_DIR}/node_modules/electron/dist/electron"
DASH = "/tmp/lin-dash.py"
DASH_HTML = "/tmp/lin-dashboard-electron.html"
diff --git a/libs/cua-driver/test-harness/modality-recordings/linux/lin-rec.py b/libs/cua-driver/tests/fixtures/modality-recordings/linux/lin-rec.py
similarity index 100%
rename from libs/cua-driver/test-harness/modality-recordings/linux/lin-rec.py
rename to libs/cua-driver/tests/fixtures/modality-recordings/linux/lin-rec.py
diff --git a/libs/cua-driver/test-harness/modality-recordings/linux/lin-run-electron.sh b/libs/cua-driver/tests/fixtures/modality-recordings/linux/lin-run-electron.sh
similarity index 100%
rename from libs/cua-driver/test-harness/modality-recordings/linux/lin-run-electron.sh
rename to libs/cua-driver/tests/fixtures/modality-recordings/linux/lin-run-electron.sh
diff --git a/libs/cua-driver/test-harness/modality-recordings/linux/lin-run.sh b/libs/cua-driver/tests/fixtures/modality-recordings/linux/lin-run.sh
similarity index 100%
rename from libs/cua-driver/test-harness/modality-recordings/linux/lin-run.sh
rename to libs/cua-driver/tests/fixtures/modality-recordings/linux/lin-run.sh
diff --git a/libs/cua-driver/test-harness/modality-recordings/macos/mac-rec.py b/libs/cua-driver/tests/fixtures/modality-recordings/macos/mac-rec.py
similarity index 100%
rename from libs/cua-driver/test-harness/modality-recordings/macos/mac-rec.py
rename to libs/cua-driver/tests/fixtures/modality-recordings/macos/mac-rec.py
diff --git a/libs/cua-driver/test-harness/modality-recordings/windows/run-one.ps1 b/libs/cua-driver/tests/fixtures/modality-recordings/windows/run-one.ps1
similarity index 100%
rename from libs/cua-driver/test-harness/modality-recordings/windows/run-one.ps1
rename to libs/cua-driver/tests/fixtures/modality-recordings/windows/run-one.ps1
diff --git a/libs/cua-driver/test-harness/modality-recordings/windows/wpf-recorder.ps1 b/libs/cua-driver/tests/fixtures/modality-recordings/windows/wpf-recorder.ps1
similarity index 100%
rename from libs/cua-driver/test-harness/modality-recordings/windows/wpf-recorder.ps1
rename to libs/cua-driver/tests/fixtures/modality-recordings/windows/wpf-recorder.ps1
diff --git a/libs/cua-driver/test-harness/shared/scenarios.json b/libs/cua-driver/tests/fixtures/shared/scenarios.json
similarity index 100%
rename from libs/cua-driver/test-harness/shared/scenarios.json
rename to libs/cua-driver/tests/fixtures/shared/scenarios.json
diff --git a/libs/cua-driver/test-harness/shared/web/index.html b/libs/cua-driver/tests/fixtures/shared/web/index.html
similarity index 100%
rename from libs/cua-driver/test-harness/shared/web/index.html
rename to libs/cua-driver/tests/fixtures/shared/web/index.html
diff --git a/libs/cua-driver/test-harness/smoke/README.md b/libs/cua-driver/tests/fixtures/smoke/README.md
similarity index 76%
rename from libs/cua-driver/test-harness/smoke/README.md
rename to libs/cua-driver/tests/fixtures/smoke/README.md
index f6ab8598ff..c4f624b87f 100644
--- a/libs/cua-driver/test-harness/smoke/README.md
+++ b/libs/cua-driver/tests/fixtures/smoke/README.md
@@ -1,7 +1,7 @@
-# test-harness CLI smoke runners
+# test fixture CLI smoke runners
Per-OS broad PASS / FAIL / SKIP probes across the full cua-driver tool
-surface. Complements the Rust integration tests under `../../rust/crates/cua-driver/tests/`:
+surface. Complements the Rust integration tests under `libs/cua-driver/rust/crates/cua-driver/tests/`:
- Integration tests drive cua-driver through the MCP stdio loop and
assert on specific UIA / AX state changes.
@@ -23,6 +23,6 @@ diff results/macos.txt /tmp/run.txt
```
Prereqs (macOS):
-- `../build/macos.sh` must have produced `../../rust/test-apps/harness-appkit/`
-- `../../rust/target/release/cua-driver` built (debug works too)
+- `../build/macos.sh` must have produced `libs/cua-driver/rust/test-apps/harness-appkit/`
+- `libs/cua-driver/rust/target/release/cua-driver` built (debug works too)
- TCC Accessibility granted to the cua-driver binary
diff --git a/libs/cua-driver/test-harness/smoke/macos.sh b/libs/cua-driver/tests/fixtures/smoke/macos.sh
similarity index 97%
rename from libs/cua-driver/test-harness/smoke/macos.sh
rename to libs/cua-driver/tests/fixtures/smoke/macos.sh
index fdf9caba20..5537558b32 100755
--- a/libs/cua-driver/test-harness/smoke/macos.sh
+++ b/libs/cua-driver/tests/fixtures/smoke/macos.sh
@@ -2,7 +2,7 @@
# macOS cua-driver per-tool smoke test.
#
# Spawns the built AppKit harness app from libs/cua-driver/rust/test-apps/harness-appkit
-# (source lives under libs/cua-driver/test-harness/apps/macos),
+# (source lives under libs/cua-driver/tests/fixtures/apps/macos),
# runs every cua-driver tool against it with sensible JSON args, and reports
# PASS / FAIL / SKIP in a sorted table.
#
@@ -14,7 +14,7 @@
# surface in ~30 seconds.
#
# Prereqs:
-# - libs/cua-driver/test-harness/build/macos.sh must have been run
+# - libs/cua-driver/tests/fixtures/build/macos.sh must have been run
# - cua-driver binary built (this script uses target/release if present)
# - TCC Accessibility permission granted to the cua-driver binary
# (otherwise AX-using tools return empty trees, which scores as PASS
@@ -79,7 +79,7 @@ fi
if [[ ! -x "$HARNESS_EXE" ]]; then
echo "ERROR: AppKit harness not built at $HARNESS_EXE" >&2
- echo " Run: libs/cua-driver/test-harness/build/macos.sh" >&2
+ echo " Run: libs/cua-driver/tests/fixtures/build/macos.sh" >&2
exit 1
fi
diff --git a/libs/cua-driver/test-harness/vision-agent-test/README.md b/libs/cua-driver/tests/fixtures/vision-agent-test/README.md
similarity index 100%
rename from libs/cua-driver/test-harness/vision-agent-test/README.md
rename to libs/cua-driver/tests/fixtures/vision-agent-test/README.md
diff --git a/libs/cua-driver/test-harness/vision-agent-test/vision_agent_test.py b/libs/cua-driver/tests/fixtures/vision-agent-test/vision_agent_test.py
similarity index 100%
rename from libs/cua-driver/test-harness/vision-agent-test/vision_agent_test.py
rename to libs/cua-driver/tests/fixtures/vision-agent-test/vision_agent_test.py