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

Use deterministic executor in randomized synchronous tests

Browse source 
Remove App::test function
This commit is contained in:
Max Brunsfeld 2021-07-30 14:07:37 -07:00
parent 4c3f97d123
commit 8785f1f9c6
2 changed files with 24 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

25
gpui/src/app.rs
View file

@ -118,26 +118,6 @@ pub struct TestAppContext {
} }
impl App { impl App {
pub fn test<T, F: FnOnce(&mut MutableAppContext) -> T>(
foreground_platform: Rc<platform::test::ForegroundPlatform>,
platform: Arc<dyn Platform>,
font_cache: Arc<FontCache>,
f: F,
) -> T {
let foreground = Rc::new(executor::Foreground::test());
let cx = Rc::new(RefCell::new(MutableAppContext::new(
foreground,
Arc::new(executor::Background::new()),
platform,
foreground_platform,
font_cache,
(),
)));
cx.borrow_mut().weak_self = Some(Rc::downgrade(&cx));
let mut cx = cx.borrow_mut();
f(&mut *cx)
}
pub fn new(asset_source: impl AssetSource) -> Result<Self> { pub fn new(asset_source: impl AssetSource) -> Result<Self> {
let platform = platform::current::platform(); let platform = platform::current::platform();
let foreground_platform = platform::current::foreground_platform(); let foreground_platform = platform::current::foreground_platform();
@ -723,7 +703,10 @@ impl MutableAppContext {
if let Some(arg) = arg.downcast_ref() { if let Some(arg) = arg.downcast_ref() {
handler(arg, cx); handler(arg, cx);
} else { } else {
log::error!("Could not downcast argument for global action {}", name_clone); log::error!(
"Could not downcast argument for global action {}",
name_clone
);
} }
}); });

30
gpui_macros/src/lib.rs
View file

@ -73,13 +73,15 @@ pub fn test(args: TokenStream, function: TokenStream) -> TokenStream {
match last_segment.map(|s| s.ident.to_string()).as_deref() { match last_segment.map(|s| s.ident.to_string()).as_deref() {
Some("TestAppContext") => { Some("TestAppContext") => {
let first_entity_id = ix * 100_000; let first_entity_id = ix * 100_000;
inner_fn_args.extend(quote!(#namespace::TestAppContext::new( inner_fn_args.extend(quote!(
foreground_platform.clone(), #namespace::TestAppContext::new(
platform.clone(), foreground_platform.clone(),
foreground.clone(), platform.clone(),
background.clone(), foreground.clone(),
font_cache.clone(), background.clone(),
#first_entity_id), font_cache.clone(),
#first_entity_id,
),
)); ));
} }
Some("StdRng") => { Some("StdRng") => {
@ -222,9 +224,17 @@ pub fn test(args: TokenStream, function: TokenStream) -> TokenStream {
dbg!(seed); dbg!(seed);
} }
#namespace::App::test(foreground_platform.clone(), platform.clone(), font_cache.clone(), |cx| { let (foreground, background) = #namespace::executor::deterministic(seed);
#inner_fn_name(#inner_fn_args); let mut cx = #namespace::TestAppContext::new(
}); foreground_platform.clone(),
platform.clone(),
foreground.clone(),
background.clone(),
font_cache.clone(),
0,
);
cx.update(|cx| #inner_fn_name(#inner_fn_args));
atomic_seed.fetch_add(1, std::sync::atomic::Ordering::SeqCst); atomic_seed.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
} }
}); });