Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More tests

Browse source
This commit is contained in:
Ben Brandt 2025-08-08 13:20:38 +02:00
parent e06f54054a
commit 63b625236d
No known key found for this signature in database
GPG key ID: D4618C5D3B500571
4 changed files with 111 additions and 261 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -179,6 +179,7 @@ dependencies = [
"language_model", "language_model",
"language_models", "language_models",
"log", "log",
"lsp",
"paths", "paths",
"pretty_assertions", "pretty_assertions",
"project", "project",

1
crates/agent2/Cargo.toml
View file

@ -56,6 +56,7 @@ gpui = { workspace = true, "features" = ["test-support"] }
gpui_tokio.workspace = true gpui_tokio.workspace = true
language = { workspace = true, "features" = ["test-support"] } language = { workspace = true, "features" = ["test-support"] }
language_model = { workspace = true, "features" = ["test-support"] } language_model = { workspace = true, "features" = ["test-support"] }
lsp = { workspace = true, "features" = ["test-support"] }
project = { workspace = true, "features" = ["test-support"] } project = { workspace = true, "features" = ["test-support"] }
reqwest_client.workspace = true reqwest_client.workspace = true
settings = { workspace = true, "features" = ["test-support"] } settings = { workspace = true, "features" = ["test-support"] }

285
crates/agent2/src/tools/edit_file_tool.rs
View file

@ -195,7 +195,7 @@ impl AgentTool for EditFileTool {
let project = self.thread.read(cx).project().clone(); let project = self.thread.read(cx).project().clone();
let project_path = match resolve_path(&input, project.clone(), cx) { let project_path = match resolve_path(&input, project.clone(), cx) {
Ok(path) => path, Ok(path) => path,
Err(err) => return Task::ready(Err(anyhow!(err))).into(), Err(err) => return Task::ready(Err(anyhow!(err))),
}; };
let request = self.thread.update(cx, |thread, cx| { let request = self.thread.update(cx, |thread, cx| {
@ -473,189 +473,97 @@ mod tests {
); );
} }
// #[gpui::test] #[gpui::test]
// async fn test_resolve_path_for_creating_file(cx: &mut TestAppContext) { async fn test_resolve_path_for_creating_file(cx: &mut TestAppContext) {
// let mode = &EditFileMode::Create; let mode = &EditFileMode::Create;
// let result = test_resolve_path(mode, "root/new.txt", cx); let result = test_resolve_path(mode, "root/new.txt", cx);
// assert_resolved_path_eq(result.await, "new.txt"); assert_resolved_path_eq(result.await, "new.txt");
// let result = test_resolve_path(mode, "new.txt", cx); let result = test_resolve_path(mode, "new.txt", cx);
// assert_resolved_path_eq(result.await, "new.txt"); assert_resolved_path_eq(result.await, "new.txt");
// let result = test_resolve_path(mode, "dir/new.txt", cx); let result = test_resolve_path(mode, "dir/new.txt", cx);
// assert_resolved_path_eq(result.await, "dir/new.txt"); assert_resolved_path_eq(result.await, "dir/new.txt");
// let result = test_resolve_path(mode, "root/dir/subdir/existing.txt", cx); let result = test_resolve_path(mode, "root/dir/subdir/existing.txt", cx);
// assert_eq!( assert_eq!(
// result.await.unwrap_err().to_string(), result.await.unwrap_err().to_string(),
// "Can't create file: file already exists" "Can't create file: file already exists"
// ); );
// let result = test_resolve_path(mode, "root/dir/nonexistent_dir/new.txt", cx); let result = test_resolve_path(mode, "root/dir/nonexistent_dir/new.txt", cx);
// assert_eq!( assert_eq!(
// result.await.unwrap_err().to_string(), result.await.unwrap_err().to_string(),
// "Can't create file: parent directory doesn't exist" "Can't create file: parent directory doesn't exist"
// ); );
// }
// #[gpui::test]
// async fn test_resolve_path_for_editing_file(cx: &mut TestAppContext) {
// let mode = &EditFileMode::Edit;
// let path_with_root = "root/dir/subdir/existing.txt";
// let path_without_root = "dir/subdir/existing.txt";
// let result = test_resolve_path(mode, path_with_root, cx);
// assert_resolved_path_eq(result.await, path_without_root);
// let result = test_resolve_path(mode, path_without_root, cx);
// assert_resolved_path_eq(result.await, path_without_root);
// let result = test_resolve_path(mode, "root/nonexistent.txt", cx);
// assert_eq!(
// result.await.unwrap_err().to_string(),
// "Can't edit file: path not found"
// );
// let result = test_resolve_path(mode, "root/dir", cx);
// assert_eq!(
// result.await.unwrap_err().to_string(),
// "Can't edit file: path is a directory"
// );
// }
// async fn test_resolve_path(
// mode: &EditFileMode,
// path: &str,
// cx: &mut TestAppContext,
// ) -> anyhow::Result<ProjectPath> {
// init_test(cx);
// let fs = project::FakeFs::new(cx.executor());
// fs.insert_tree(
// "/root",
// json!({
// "dir": {
// "subdir": {
// "existing.txt": "hello"
// }
// }
// }),
// )
// .await;
// let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
// let input = EditFileToolInput {
// display_description: "Some edit".into(),
// path: path.into(),
// mode: mode.clone(),
// };
// let result = cx.update(|cx| resolve_path(&input, project, cx));
// result
// }
// fn assert_resolved_path_eq(path: anyhow::Result<ProjectPath>, expected: &str) {
// let actual = path
// .expect("Should return valid path")
// .path
// .to_str()
// .unwrap()
// .replace("\\", "/"); // Naive Windows paths normalization
// assert_eq!(actual, expected);
// }
// #[test]
// fn still_streaming_ui_text_with_path() {
// let input = json!({
// "path": "src/main.rs",
// "display_description": "",
// "old_string": "old code",
// "new_string": "new code"
// });
// assert_eq!(EditFileTool.still_streaming_ui_text(&input), "src/main.rs");
// }
// #[test]
// fn still_streaming_ui_text_with_description() {
// let input = json!({
// "path": "",
// "display_description": "Fix error handling",
// "old_string": "old code",
// "new_string": "new code"
// });
// assert_eq!(
// EditFileTool.still_streaming_ui_text(&input),
// "Fix error handling",
// );
// }
// #[test]
// fn still_streaming_ui_text_with_path_and_description() {
// let input = json!({
// "path": "src/main.rs",
// "display_description": "Fix error handling",
// "old_string": "old code",
// "new_string": "new code"
// });
// assert_eq!(
// EditFileTool.still_streaming_ui_text(&input),
// "Fix error handling",
// );
// }
// #[test]
// fn still_streaming_ui_text_no_path_or_description() {
// let input = json!({
// "path": "",
// "display_description": "",
// "old_string": "old code",
// "new_string": "new code"
// });
// assert_eq!(
// EditFileTool.still_streaming_ui_text(&input),
// DEFAULT_UI_TEXT,
// );
// }
// #[test]
// fn still_streaming_ui_text_with_null() {
// let input = serde_json::Value::Null;
// assert_eq!(
// EditFileTool.still_streaming_ui_text(&input),
// DEFAULT_UI_TEXT,
// );
// }
fn init_test(cx: &mut TestAppContext) {
cx.update(|cx| {
let settings_store = SettingsStore::test(cx);
cx.set_global(settings_store);
language::init(cx);
TelemetrySettings::register(cx);
agent_settings::AgentSettings::register(cx);
Project::init_settings(cx);
});
} }
// fn init_test_with_config(cx: &mut TestAppContext, data_dir: &Path) { #[gpui::test]
// cx.update(|cx| { async fn test_resolve_path_for_editing_file(cx: &mut TestAppContext) {
// // Set custom data directory (config will be under data_dir/config) let mode = &EditFileMode::Edit;
// paths::set_custom_data_dir(data_dir.to_str().unwrap());
// let settings_store = SettingsStore::test(cx); let path_with_root = "root/dir/subdir/existing.txt";
// cx.set_global(settings_store); let path_without_root = "dir/subdir/existing.txt";
// language::init(cx); let result = test_resolve_path(mode, path_with_root, cx);
// TelemetrySettings::register(cx); assert_resolved_path_eq(result.await, path_without_root);
// agent_settings::AgentSettings::register(cx);
// Project::init_settings(cx); let result = test_resolve_path(mode, path_without_root, cx);
// }); assert_resolved_path_eq(result.await, path_without_root);
// }
let result = test_resolve_path(mode, "root/nonexistent.txt", cx);
assert_eq!(
result.await.unwrap_err().to_string(),
"Can't edit file: path not found"
);
let result = test_resolve_path(mode, "root/dir", cx);
assert_eq!(
result.await.unwrap_err().to_string(),
"Can't edit file: path is a directory"
);
}
async fn test_resolve_path(
mode: &EditFileMode,
path: &str,
cx: &mut TestAppContext,
) -> anyhow::Result<ProjectPath> {
init_test(cx);
let fs = project::FakeFs::new(cx.executor());
fs.insert_tree(
"/root",
json!({
"dir": {
"subdir": {
"existing.txt": "hello"
}
}
}),
)
.await;
let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
let input = EditFileToolInput {
display_description: "Some edit".into(),
path: path.into(),
mode: mode.clone(),
};
let result = cx.update(|cx| resolve_path(&input, project, cx));
result
}
fn assert_resolved_path_eq(path: anyhow::Result<ProjectPath>, expected: &str) {
let actual = path
.expect("Should return valid path")
.path
.to_str()
.unwrap()
.replace("\\", "/"); // Naive Windows paths normalization
assert_eq!(actual, expected);
}
// #[gpui::test] // #[gpui::test]
// async fn test_format_on_save(cx: &mut TestAppContext) { // async fn test_format_on_save(cx: &mut TestAppContext) {
@ -1633,4 +1541,29 @@ mod tests {
// ); // );
// }); // });
// } // }
fn init_test(cx: &mut TestAppContext) {
cx.update(|cx| {
let settings_store = SettingsStore::test(cx);
cx.set_global(settings_store);
language::init(cx);
TelemetrySettings::register(cx);
agent_settings::AgentSettings::register(cx);
Project::init_settings(cx);
});
}
fn init_test_with_config(cx: &mut TestAppContext, data_dir: &Path) {
cx.update(|cx| {
// Set custom data directory (config will be under data_dir/config)
paths::set_custom_data_dir(data_dir.to_str().unwrap());
let settings_store = SettingsStore::test(cx);
cx.set_global(settings_store);
language::init(cx);
TelemetrySettings::register(cx);
agent_settings::AgentSettings::register(cx);
Project::init_settings(cx);
});
}
} }

85
crates/assistant_tools/src/edit_file_tool.rs
View file

@ -120,8 +120,6 @@ struct PartialInput {
display_description: String, display_description: String,
} }
const DEFAULT_UI_TEXT: &str = "Editing file";
impl Tool for EditFileTool { impl Tool for EditFileTool {
fn name(&self) -> String { fn name(&self) -> String {
"edit_file".into() "edit_file".into()
@ -211,22 +209,6 @@ impl Tool for EditFileTool {
} }
} }
fn still_streaming_ui_text(&self, input: &serde_json::Value) -> String {
if let Some(input) = serde_json::from_value::<PartialInput>(input.clone()).ok() {
let description = input.display_description.trim();
if !description.is_empty() {
return description.to_string();
}
let path = input.path.trim();
if !path.is_empty() {
return path.to_string();
}
}
DEFAULT_UI_TEXT.to_string()
}
fn run( fn run(
self: Arc<Self>, self: Arc<Self>,
input: serde_json::Value, input: serde_json::Value,
@ -1370,73 +1352,6 @@ mod tests {
assert_eq!(actual, expected); assert_eq!(actual, expected);
} }
#[test]
fn still_streaming_ui_text_with_path() {
let input = json!({
"path": "src/main.rs",
"display_description": "",
"old_string": "old code",
"new_string": "new code"
});
assert_eq!(EditFileTool.still_streaming_ui_text(&input), "src/main.rs");
}
#[test]
fn still_streaming_ui_text_with_description() {
let input = json!({
"path": "",
"display_description": "Fix error handling",
"old_string": "old code",
"new_string": "new code"
});
assert_eq!(
EditFileTool.still_streaming_ui_text(&input),
"Fix error handling",
);
}
#[test]
fn still_streaming_ui_text_with_path_and_description() {
let input = json!({
"path": "src/main.rs",
"display_description": "Fix error handling",
"old_string": "old code",
"new_string": "new code"
});
assert_eq!(
EditFileTool.still_streaming_ui_text(&input),
"Fix error handling",
);
}
#[test]
fn still_streaming_ui_text_no_path_or_description() {
let input = json!({
"path": "",
"display_description": "",
"old_string": "old code",
"new_string": "new code"
});
assert_eq!(
EditFileTool.still_streaming_ui_text(&input),
DEFAULT_UI_TEXT,
);
}
#[test]
fn still_streaming_ui_text_with_null() {
let input = serde_json::Value::Null;
assert_eq!(
EditFileTool.still_streaming_ui_text(&input),
DEFAULT_UI_TEXT,
);
}
fn init_test(cx: &mut TestAppContext) { fn init_test(cx: &mut TestAppContext) {
cx.update(|cx| { cx.update(|cx| {
let settings_store = SettingsStore::test(cx); let settings_store = SettingsStore::test(cx);