mirror of
https://github.com/openai/codex.git
synced 2026-11-20 22:40:37 +00:00
Motivation:
- `cargo clippy --tests` is run in CI with `-D clippy::expect-used`; the new schema fixture test used `expect()`.
What changed:
- Convert test helpers to return `anyhow::Result` and add context instead of using `expect()`.
Refs: 3b069fda39 (schema fixture vendoring commit)
72 lines
2.4 KiB
Rust
72 lines
2.4 KiB
Rust
use anyhow::Context;
|
|
use anyhow::Result;
|
|
use codex_app_server_protocol::read_schema_fixture_tree;
|
|
use codex_app_server_protocol::write_schema_fixtures;
|
|
use similar::TextDiff;
|
|
use std::path::Path;
|
|
|
|
fn schema_root() -> Result<std::path::PathBuf> {
|
|
codex_utils_cargo_bin::find_resource!("schema").context("resolve schema fixture root")
|
|
}
|
|
|
|
fn read_tree(root: &Path) -> Result<std::collections::BTreeMap<std::path::PathBuf, Vec<u8>>> {
|
|
read_schema_fixture_tree(root).context("read schema fixture tree")
|
|
}
|
|
|
|
#[test]
|
|
fn schema_fixtures_match_generated() -> Result<()> {
|
|
let schema_root = schema_root()?;
|
|
let fixture_tree = read_tree(&schema_root)?;
|
|
|
|
let temp_dir = tempfile::tempdir().context("create temp dir")?;
|
|
write_schema_fixtures(temp_dir.path(), None).context("generate schema fixtures")?;
|
|
let generated_tree = read_tree(temp_dir.path())?;
|
|
|
|
if fixture_tree != generated_tree {
|
|
let expected = fixture_tree
|
|
.keys()
|
|
.map(|p| p.display().to_string())
|
|
.collect::<Vec<_>>()
|
|
.join("\n");
|
|
let actual = generated_tree
|
|
.keys()
|
|
.map(|p| p.display().to_string())
|
|
.collect::<Vec<_>>()
|
|
.join("\n");
|
|
let diff = TextDiff::from_lines(&expected, &actual)
|
|
.unified_diff()
|
|
.header("fixture", "generated")
|
|
.to_string();
|
|
|
|
panic!(
|
|
"Vendored app-server schema fixtures don't match freshly generated output. \
|
|
Run `just write-app-server-schema` to overwrite with your changes.\n\n{diff}"
|
|
);
|
|
}
|
|
|
|
// If the file sets match, diff contents for each file for a nicer error.
|
|
for (path, expected) in &fixture_tree {
|
|
let actual = generated_tree
|
|
.get(path)
|
|
.ok_or_else(|| anyhow::anyhow!("missing generated file: {}", path.display()))?;
|
|
|
|
if expected == actual {
|
|
continue;
|
|
}
|
|
|
|
let expected_str = String::from_utf8_lossy(expected);
|
|
let actual_str = String::from_utf8_lossy(actual);
|
|
let diff = TextDiff::from_lines(&expected_str, &actual_str)
|
|
.unified_diff()
|
|
.header("fixture", "generated")
|
|
.to_string();
|
|
panic!(
|
|
"Vendored app-server schema fixture {} differs from generated output. \
|
|
Run `just write-app-server-schema` to overwrite with your changes.\n\n{diff}",
|
|
path.display()
|
|
);
|
|
}
|
|
|
|
Ok(())
|
|
}
|