zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-20 10:57:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Create test_app_state with FakeFs instead of RealFs

Browse Source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Antonio Scandurra 2021-09-23 18:17:49 +02:00
parent 2352725c58
commit e32f1f8b80
4 changed files with 110 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
zed/src/file_finder.rs
View File

@ -438,29 +438,37 @@ mod tests {
use crate::{ use crate::{
editor::{self, Insert}, editor::{self, Insert},
fs::FakeFs, fs::FakeFs,
test::{temp_tree, test_app_state}, test::test_app_state,
workspace::Workspace, workspace::Workspace,
}; };
use serde_json::json; use serde_json::json;
use std::fs; use std::path::PathBuf;
use tempdir::TempDir;
#[gpui::test] #[gpui::test]
async fn test_matching_paths(mut cx: gpui::TestAppContext) { async fn test_matching_paths(mut cx: gpui::TestAppContext) {
let tmp_dir = TempDir::new("example").unwrap(); let app_state = cx.update(test_app_state);
fs::create_dir(tmp_dir.path().join("a")).unwrap(); app_state
fs::write(tmp_dir.path().join("a/banana"), "banana").unwrap(); .fs
fs::write(tmp_dir.path().join("a/bandana"), "bandana").unwrap(); .as_fake()
.insert_tree(
"/root",
json!({
"a": {
"banana": "",
"bandana": "",
}
}),
)
.await;
cx.update(|cx| { cx.update(|cx| {
super::init(cx); super::init(cx);
editor::init(cx); editor::init(cx);
}); });
let app_state = cx.update(test_app_state);
let (window_id, workspace) = cx.add_window(|cx| Workspace::new(&app_state, cx)); let (window_id, workspace) = cx.add_window(|cx| Workspace::new(&app_state, cx));
workspace workspace
.update(&mut cx, |workspace, cx| { .update(&mut cx, |workspace, cx| {
workspace.add_worktree(tmp_dir.path(), cx) workspace.add_worktree(Path::new("/root"), cx)
}) })
.await .await
.unwrap(); .unwrap();
@ -572,17 +580,17 @@ mod tests {
#[gpui::test] #[gpui::test]
async fn test_single_file_worktrees(mut cx: gpui::TestAppContext) { async fn test_single_file_worktrees(mut cx: gpui::TestAppContext) {
let temp_dir = TempDir::new("test-single-file-worktrees").unwrap();
let dir_path = temp_dir.path().join("the-parent-dir");
let file_path = dir_path.join("the-file");
fs::create_dir(&dir_path).unwrap();
fs::write(&file_path, "").unwrap();
let app_state = cx.update(test_app_state); let app_state = cx.update(test_app_state);
app_state
.fs
.as_fake()
.insert_tree("/root", json!({ "the-parent-dir": { "the-file": "" } }))
.await;
let (_, workspace) = cx.add_window(|cx| Workspace::new(&app_state, cx)); let (_, workspace) = cx.add_window(|cx| Workspace::new(&app_state, cx));
workspace workspace
.update(&mut cx, |workspace, cx| { .update(&mut cx, |workspace, cx| {
workspace.add_worktree(&file_path, cx) workspace.add_worktree(Path::new("/root/the-parent-dir/the-file"), cx)
}) })
.await .await
.unwrap(); .unwrap();
@ -620,18 +628,25 @@ mod tests {
#[gpui::test(retries = 5)] #[gpui::test(retries = 5)]
async fn test_multiple_matches_with_same_relative_path(mut cx: gpui::TestAppContext) { async fn test_multiple_matches_with_same_relative_path(mut cx: gpui::TestAppContext) {
let tmp_dir = temp_tree(json!({ let app_state = cx.update(test_app_state);
app_state
.fs
.as_fake()
.insert_tree(
"/root",
json!({
"dir1": { "a.txt": "" }, "dir1": { "a.txt": "" },
"dir2": { "a.txt": "" } "dir2": { "a.txt": "" }
})); }),
)
.await;
let app_state = cx.update(test_app_state);
let (_, workspace) = cx.add_window(|cx| Workspace::new(&app_state, cx)); let (_, workspace) = cx.add_window(|cx| Workspace::new(&app_state, cx));
workspace workspace
.update(&mut cx, |workspace, cx| { .update(&mut cx, |workspace, cx| {
workspace.open_paths( workspace.open_paths(
&[tmp_dir.path().join("dir1"), tmp_dir.path().join("dir2")], &[PathBuf::from("/root/dir1"), PathBuf::from("/root/dir2")],
cx, cx,
) )
}) })

12
zed/src/fs.rs
View File

@ -29,6 +29,8 @@ pub trait Fs: Send + Sync {
latency: Duration, latency: Duration,
) -> Pin<Box<dyn Send + Stream<Item = Vec<fsevent::Event>>>>; ) -> Pin<Box<dyn Send + Stream<Item = Vec<fsevent::Event>>>>;
fn is_fake(&self) -> bool; fn is_fake(&self) -> bool;
#[cfg(any(test, feature = "test-support"))]
fn as_fake(&self) -> &FakeFs;
} }
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
@ -125,6 +127,11 @@ impl Fs for RealFs {
fn is_fake(&self) -> bool { fn is_fake(&self) -> bool {
false false
} }
#[cfg(any(test, feature = "test-support"))]
fn as_fake(&self) -> &FakeFs {
panic!("called `RealFs::as_fake`")
}
} }
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
@ -413,4 +420,9 @@ impl Fs for FakeFs {
fn is_fake(&self) -> bool { fn is_fake(&self) -> bool {
true true
} }
#[cfg(any(test, feature = "test-support"))]
fn as_fake(&self) -> &FakeFs {
self
}
} }

4
zed/src/test.rs
View File

@ -1,7 +1,7 @@
use crate::{ use crate::{
assets::Assets, assets::Assets,
channel::ChannelList, channel::ChannelList,
fs::RealFs, fs::FakeFs,
http::{HttpClient, Request, Response, ServerResponse}, http::{HttpClient, Request, Response, ServerResponse},
language::LanguageRegistry, language::LanguageRegistry,
rpc::{self, Client, Credentials, EstablishConnectionError}, rpc::{self, Client, Credentials, EstablishConnectionError},
@ -177,7 +177,7 @@ pub fn test_app_state(cx: &mut MutableAppContext) -> Arc<AppState> {
channel_list: cx.add_model(|cx| ChannelList::new(user_store.clone(), rpc.clone(), cx)), channel_list: cx.add_model(|cx| ChannelList::new(user_store.clone(), rpc.clone(), cx)),
rpc, rpc,
user_store, user_store,
fs: Arc::new(RealFs), fs: Arc::new(FakeFs::new()),
}) })
} }

86
zed/src/workspace.rs
View File

@ -1205,11 +1205,9 @@ mod tests {
editor::{Editor, Insert}, editor::{Editor, Insert},
fs::FakeFs, fs::FakeFs,
test::{temp_tree, test_app_state}, test::{temp_tree, test_app_state},
worktree::WorktreeHandle,
}; };
use serde_json::json; use serde_json::json;
use std::{collections::HashSet, fs}; use std::collections::HashSet;
use tempdir::TempDir;
#[gpui::test] #[gpui::test]
async fn test_open_paths_action(mut cx: gpui::TestAppContext) { async fn test_open_paths_action(mut cx: gpui::TestAppContext) {
@ -1278,20 +1276,26 @@ mod tests {
#[gpui::test] #[gpui::test]
async fn test_open_entry(mut cx: gpui::TestAppContext) { async fn test_open_entry(mut cx: gpui::TestAppContext) {
let dir = temp_tree(json!({ let app_state = cx.update(test_app_state);
app_state
.fs
.as_fake()
.insert_tree(
"/root",
json!({
"a": { "a": {
"file1": "contents 1", "file1": "contents 1",
"file2": "contents 2", "file2": "contents 2",
"file3": "contents 3", "file3": "contents 3",
}, },
})); }),
)
let app_state = cx.update(test_app_state); .await;
let (_, workspace) = cx.add_window(|cx| Workspace::new(&app_state, cx)); let (_, workspace) = cx.add_window(|cx| Workspace::new(&app_state, cx));
workspace workspace
.update(&mut cx, |workspace, cx| { .update(&mut cx, |workspace, cx| {
workspace.add_worktree(dir.path(), cx) workspace.add_worktree(Path::new("/root"), cx)
}) })
.await .await
.unwrap(); .unwrap();
@ -1455,28 +1459,30 @@ mod tests {
#[gpui::test] #[gpui::test]
async fn test_save_conflicting_item(mut cx: gpui::TestAppContext) { async fn test_save_conflicting_item(mut cx: gpui::TestAppContext) {
let dir = temp_tree(json!({
"a.txt": "",
}));
let app_state = cx.update(test_app_state); let app_state = cx.update(test_app_state);
app_state
.fs
.as_fake()
.insert_tree(
"/root",
json!({
"a.txt": "",
}),
)
.await;
let (window_id, workspace) = cx.add_window(|cx| Workspace::new(&app_state, cx)); let (window_id, workspace) = cx.add_window(|cx| Workspace::new(&app_state, cx));
workspace workspace
.update(&mut cx, |workspace, cx| { .update(&mut cx, |workspace, cx| {
workspace.add_worktree(dir.path(), cx) workspace.add_worktree(Path::new("/root"), cx)
}) })
.await .await
.unwrap(); .unwrap();
let tree = cx.read(|cx| {
let mut trees = workspace.read(cx).worktrees().iter();
trees.next().unwrap().clone()
});
tree.flush_fs_events(&cx).await;
// Open a file within an existing worktree. // Open a file within an existing worktree.
cx.update(|cx| { cx.update(|cx| {
workspace.update(cx, |view, cx| { workspace.update(cx, |view, cx| {
view.open_paths(&[dir.path().join("a.txt")], cx) view.open_paths(&[PathBuf::from("/root/a.txt")], cx)
}) })
}) })
.await; .await;
@ -1487,7 +1493,12 @@ mod tests {
}); });
cx.update(|cx| editor.update(cx, |editor, cx| editor.insert(&Insert("x".into()), cx))); cx.update(|cx| editor.update(cx, |editor, cx| editor.insert(&Insert("x".into()), cx)));
fs::write(dir.path().join("a.txt"), "changed").unwrap(); app_state
.fs
.as_fake()
.insert_file("/root/a.txt", "changed".to_string())
.await
.unwrap();
editor editor
.condition(&cx, |editor, cx| editor.has_conflict(cx)) .condition(&cx, |editor, cx| editor.has_conflict(cx))
.await; .await;
@ -1503,12 +1514,12 @@ mod tests {
#[gpui::test] #[gpui::test]
async fn test_open_and_save_new_file(mut cx: gpui::TestAppContext) { async fn test_open_and_save_new_file(mut cx: gpui::TestAppContext) {
let dir = TempDir::new("test-new-file").unwrap();
let app_state = cx.update(test_app_state); let app_state = cx.update(test_app_state);
app_state.fs.as_fake().insert_dir("/root").await.unwrap();
let (_, workspace) = cx.add_window(|cx| Workspace::new(&app_state, cx)); let (_, workspace) = cx.add_window(|cx| Workspace::new(&app_state, cx));
workspace workspace
.update(&mut cx, |workspace, cx| { .update(&mut cx, |workspace, cx| {
workspace.add_worktree(dir.path(), cx) workspace.add_worktree(Path::new("/root"), cx)
}) })
.await .await
.unwrap(); .unwrap();
@ -1521,7 +1532,6 @@ mod tests {
.unwrap() .unwrap()
.clone() .clone()
}); });
tree.flush_fs_events(&cx).await;
// Create a new untitled buffer // Create a new untitled buffer
let editor = workspace.update(&mut cx, |workspace, cx| { let editor = workspace.update(&mut cx, |workspace, cx| {
@ -1547,7 +1557,7 @@ mod tests {
workspace.save_active_item(&Save, cx) workspace.save_active_item(&Save, cx)
}); });
cx.simulate_new_path_selection(|parent_dir| { cx.simulate_new_path_selection(|parent_dir| {
assert_eq!(parent_dir, dir.path()); assert_eq!(parent_dir, Path::new("/root"));
Some(parent_dir.join("the-new-name.rs")) Some(parent_dir.join("the-new-name.rs"))
}); });
cx.read(|cx| { cx.read(|cx| {
@ -1608,8 +1618,8 @@ mod tests {
async fn test_setting_language_when_saving_as_single_file_worktree( async fn test_setting_language_when_saving_as_single_file_worktree(
mut cx: gpui::TestAppContext, mut cx: gpui::TestAppContext,
) { ) {
let dir = TempDir::new("test-new-file").unwrap();
let app_state = cx.update(test_app_state); let app_state = cx.update(test_app_state);
app_state.fs.as_fake().insert_dir("/root").await.unwrap();
let (_, workspace) = cx.add_window(|cx| Workspace::new(&app_state, cx)); let (_, workspace) = cx.add_window(|cx| Workspace::new(&app_state, cx));
// Create a new untitled buffer // Create a new untitled buffer
@ -1633,7 +1643,7 @@ mod tests {
workspace.update(&mut cx, |workspace, cx| { workspace.update(&mut cx, |workspace, cx| {
workspace.save_active_item(&Save, cx) workspace.save_active_item(&Save, cx)
}); });
cx.simulate_new_path_selection(|_| Some(dir.path().join("the-new-name.rs"))); cx.simulate_new_path_selection(|_| Some(PathBuf::from("/root/the-new-name.rs")));
editor editor
.condition(&cx, |editor, cx| !editor.is_dirty(cx)) .condition(&cx, |editor, cx| !editor.is_dirty(cx))
@ -1650,7 +1660,7 @@ mod tests {
cx.update(init); cx.update(init);
let app_state = cx.update(test_app_state); let app_state = cx.update(test_app_state);
cx.dispatch_global_action(OpenNew(app_state)); cx.dispatch_global_action(OpenNew(app_state.clone()));
let window_id = *cx.window_ids().first().unwrap(); let window_id = *cx.window_ids().first().unwrap();
let workspace = cx.root_view::<Workspace>(window_id).unwrap(); let workspace = cx.root_view::<Workspace>(window_id).unwrap();
let editor = workspace.update(&mut cx, |workspace, cx| { let editor = workspace.update(&mut cx, |workspace, cx| {
@ -1670,10 +1680,8 @@ mod tests {
workspace.save_active_item(&Save, cx) workspace.save_active_item(&Save, cx)
}); });
let dir = TempDir::new("test-new-empty-workspace").unwrap(); app_state.fs.as_fake().insert_dir("/root").await.unwrap();
cx.simulate_new_path_selection(|_| { cx.simulate_new_path_selection(|_| Some(PathBuf::from("/root/the-new-name")));
Some(dir.path().canonicalize().unwrap().join("the-new-name"))
});
editor editor
.condition(&cx, |editor, cx| editor.title(cx) == "the-new-name") .condition(&cx, |editor, cx| editor.title(cx) == "the-new-name")
@ -1686,20 +1694,26 @@ mod tests {
#[gpui::test] #[gpui::test]
async fn test_pane_actions(mut cx: gpui::TestAppContext) { async fn test_pane_actions(mut cx: gpui::TestAppContext) {
cx.update(|cx| pane::init(cx)); cx.update(|cx| pane::init(cx));
let app_state = cx.update(test_app_state);
let dir = temp_tree(json!({ app_state
.fs
.as_fake()
.insert_tree(
"/root",
json!({
"a": { "a": {
"file1": "contents 1", "file1": "contents 1",
"file2": "contents 2", "file2": "contents 2",
"file3": "contents 3", "file3": "contents 3",
}, },
})); }),
)
.await;
let app_state = cx.update(test_app_state);
let (window_id, workspace) = cx.add_window(|cx| Workspace::new(&app_state, cx)); let (window_id, workspace) = cx.add_window(|cx| Workspace::new(&app_state, cx));
workspace workspace
.update(&mut cx, |workspace, cx| { .update(&mut cx, |workspace, cx| {
workspace.add_worktree(dir.path(), cx) workspace.add_worktree(Path::new("/root"), cx)
}) })
.await .await
.unwrap(); .unwrap();