From 53fd3a1a92002e39253cf3cbf205d4ab51bffca4 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Thu, 22 Jul 2021 20:42:18 -0700 Subject: [PATCH] Move LineWrapper test to line_wrapper.rs --- zed/src/editor/display_map/line_wrapper.rs | 37 ++++++++++++++++++++++ zed/src/editor/display_map/wrap_map.rs | 32 ------------------- 2 files changed, 37 insertions(+), 32 deletions(-) diff --git a/zed/src/editor/display_map/line_wrapper.rs b/zed/src/editor/display_map/line_wrapper.rs index 0e3a9f7b6b2187979233a97f401b815a9905ad94..317d011f5c16213539f89e8a66e0614efec6faab 100644 --- a/zed/src/editor/display_map/line_wrapper.rs +++ b/zed/src/editor/display_map/line_wrapper.rs @@ -106,3 +106,40 @@ impl LineWrapper { .width } } + +#[cfg(test)] +mod tests { + use super::*; + + #[gpui::test] + fn test_line_wrapper(cx: &mut gpui::MutableAppContext) { + let font_cache = cx.font_cache().clone(); + let font_system = cx.platform().fonts(); + let settings = Settings { + tab_size: 4, + buffer_font_family: font_cache.load_family(&["Courier"]).unwrap(), + buffer_font_size: 16.0, + ..Settings::new(&font_cache).unwrap() + }; + + let mut wrapper = LineWrapper::new(font_system, font_cache, settings); + + assert_eq!( + wrapper.wrap_line_with_shaping("aa bbb cccc ddddd eeee", 72.0), + &[7, 12, 18], + ); + assert_eq!( + wrapper.wrap_line_without_shaping("aa bbb cccc ddddd eeee", 72.0), + &[7, 12, 18], + ); + + assert_eq!( + wrapper.wrap_line_with_shaping("aaa aaaaaaaaaaaaaaaaaa", 72.0), + &[4, 11, 18], + ); + assert_eq!( + wrapper.wrap_line_without_shaping("aaa aaaaaaaaaaaaaaaaaa", 72.0), + &[4, 11, 18], + ); + } +} diff --git a/zed/src/editor/display_map/wrap_map.rs b/zed/src/editor/display_map/wrap_map.rs index ee906c07a04a4e4d4cd9645a2973c5d5e19d83ef..20d326a5a23f6cf62f6184d8a331b8d219533421 100644 --- a/zed/src/editor/display_map/wrap_map.rs +++ b/zed/src/editor/display_map/wrap_map.rs @@ -741,38 +741,6 @@ mod tests { use rand::prelude::*; use std::env; - #[gpui::test] - fn test_line_wrapper(cx: &mut gpui::MutableAppContext) { - let font_cache = cx.font_cache().clone(); - let font_system = cx.platform().fonts(); - let settings = Settings { - tab_size: 4, - buffer_font_family: font_cache.load_family(&["Courier"]).unwrap(), - buffer_font_size: 16.0, - ..Settings::new(&font_cache).unwrap() - }; - - let mut wrapper = LineWrapper::new(font_system, font_cache, settings); - - assert_eq!( - wrapper.wrap_line_with_shaping("aa bbb cccc ddddd eeee", 72.0), - &[7, 12, 18], - ); - assert_eq!( - wrapper.wrap_line_without_shaping("aa bbb cccc ddddd eeee", 72.0), - &[7, 12, 18], - ); - - assert_eq!( - wrapper.wrap_line_with_shaping("aaa aaaaaaaaaaaaaaaaaa", 72.0), - &[4, 11, 18], - ); - assert_eq!( - wrapper.wrap_line_without_shaping("aaa aaaaaaaaaaaaaaaaaa", 72.0), - &[4, 11, 18], - ); - } - #[gpui::test] fn test_random_wraps(cx: &mut gpui::MutableAppContext) { let iterations = env::var("ITERATIONS")