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

Make integration tests depend only on a few core crates, not all of zed

Browse source
This commit is contained in:
Max Brunsfeld 2022-03-01 12:09:35 -08:00
parent 2b64e8d4a2
commit 43f856c568
3 changed files with 32 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

39
crates/server/src/rpc.rs
View file

@ -989,10 +989,28 @@ mod tests {
github, AppState, Config,
};
use ::rpc::Peer;
use client::{
self, test::FakeHttpClient, Channel, ChannelDetails, ChannelList, Client, Credentials,
EstablishConnectionError, UserStore,
};
use collections::BTreeMap;
use editor::{
self, ConfirmCodeAction, ConfirmCompletion, ConfirmRename, Editor, Input, MultiBuffer,
Redo, Rename, ToOffset, ToggleCodeActions, Undo,
};
use gpui::{executor, ModelHandle, TestAppContext};
use language::{
tree_sitter_rust, AnchorRangeExt, Diagnostic, DiagnosticEntry, Language, LanguageConfig,
LanguageRegistry, LanguageServerConfig, Point, ToLspPosition,
};
use lsp;
use parking_lot::Mutex;
use postage::{sink::Sink, watch};
use project::{
fs::{FakeFs, Fs as _},
search::SearchQuery,
DiagnosticSummary, Project, ProjectPath,
};
use rand::prelude::*;
use rpc::PeerId;
use serde_json::json;
@ -1009,24 +1027,7 @@ mod tests {
},
time::Duration,
};
use zed::{
client::{
self, test::FakeHttpClient, Channel, ChannelDetails, ChannelList, Client, Credentials,
EstablishConnectionError, UserStore,
},
editor::{
self, ConfirmCodeAction, ConfirmCompletion, ConfirmRename, Editor, Input, MultiBuffer,
Redo, Rename, ToOffset, ToggleCodeActions, Undo,
},
fs::{FakeFs, Fs as _},
language::{
tree_sitter_rust, AnchorRangeExt, Diagnostic, DiagnosticEntry, Language,
LanguageConfig, LanguageRegistry, LanguageServerConfig, Point, ToLspPosition,
},
lsp,
project::{search::SearchQuery, DiagnosticSummary, Project, ProjectPath},
workspace::{Settings, Workspace, WorkspaceParams},
};
use workspace::{Settings, Workspace, WorkspaceParams};
#[cfg(test)]
#[ctor::ctor]
@ -4488,7 +4489,7 @@ mod tests {
pub peer_id: PeerId,
pub user_store: ModelHandle<UserStore>,
project: Option<ModelHandle<Project>>,
buffers: HashSet<ModelHandle<zed::language::Buffer>>,
buffers: HashSet<ModelHandle<language::Buffer>>,
}
impl Deref for TestClient {