git.iko.soy/helix
on master help sign in
Put some tests behind #[cfg(test)] (#1459)
05e5520Benoît Cortier
helix-term/src/config.rs+28−23
compare with master
unifiedsplit
@@ -20,14 +20,18 @@ pub struct LspConfig {
20 pub display_messages: bool,
20 pub display_messages: bool,
21}
21}
22
22
23+#[cfg(test)]
24+mod tests {
25+ use super::*;
26+
23−#[test]
27+ #[test]
24−fn parsing_keymaps_config_file() {
28+ fn parsing_keymaps_config_file() {
25− use crate::keymap;
29+ use crate::keymap;
26− use crate::keymap::Keymap;
30+ use crate::keymap::Keymap;
27− use helix_core::hashmap;
31+ use helix_core::hashmap;
28− use helix_view::document::Mode;
32+ use helix_view::document::Mode;
29−
33+
30− let sample_keymaps = r#"
34+ let sample_keymaps = r#"
31 [keys.insert]
35 [keys.insert]
32 y = "move_line_down"
36 y = "move_line_down"
33 S-C-a = "delete_selection"
37 S-C-a = "delete_selection"
@@ -36,19 +40,20 @@ fn parsing_keymaps_config_file() {
36 A-F12 = "move_next_word_end"
40 A-F12 = "move_next_word_end"
37 "#;
41 "#;
38
42
39− assert_eq!(
43+ assert_eq!(
40− toml::from_str::<Config>(sample_keymaps).unwrap(),
44+ toml::from_str::<Config>(sample_keymaps).unwrap(),
41− Config {
45+ Config {
42− keys: Keymaps(hashmap! {
46+ keys: Keymaps(hashmap! {
43− Mode::Insert => Keymap::new(keymap!({ "Insert mode"
47+ Mode::Insert => Keymap::new(keymap!({ "Insert mode"
44− "y" => move_line_down,
48+ "y" => move_line_down,
45− "S-C-a" => delete_selection,
49+ "S-C-a" => delete_selection,
46− })),
50+ })),
47− Mode::Normal => Keymap::new(keymap!({ "Normal mode"
51+ Mode::Normal => Keymap::new(keymap!({ "Normal mode"
48− "A-F12" => move_next_word_end,
52+ "A-F12" => move_next_word_end,
49− })),
53+ })),
50− }),
54+ }),
51− ..Default::default()
55+ ..Default::default()
52− }
56+ }
53− );
57+ );
58+ }
54}
59}
helix-view/src/theme.rs+45−40
@@ -296,53 +296,58 @@ impl TryFrom<Value> for ThemePalette {
296 }
296 }
297}
297}
298
298
299−#[test]
299+#[cfg(test)]
300−fn test_parse_style_string() {
300+mod tests {
301− let fg = Value::String("#ffffff".to_string());
301+ use super::*;
302
302
303− let mut style = Style::default();
303+ #[test]
304− let palette = ThemePalette::default();
304+ fn test_parse_style_string() {
305− palette.parse_style(&mut style, fg).unwrap();
305+ let fg = Value::String("#ffffff".to_string());
306
306
307− assert_eq!(style, Style::default().fg(Color::Rgb(255, 255, 255)));
307+ let mut style = Style::default();
308−}
308+ let palette = ThemePalette::default();
309+ palette.parse_style(&mut style, fg).unwrap();
309
310
310−#[test]
311+ assert_eq!(style, Style::default().fg(Color::Rgb(255, 255, 255)));
311−fn test_palette() {
312+ }
312− use helix_core::hashmap;
313− let fg = Value::String("my_color".to_string());
314
313
315− let mut style = Style::default();
314+ #[test]
316− let palette =
315+ fn test_palette() {
317− ThemePalette::new(hashmap! { "my_color".to_string() => Color::Rgb(255, 255, 255) });
316+ use helix_core::hashmap;
318− palette.parse_style(&mut style, fg).unwrap();
317+ let fg = Value::String("my_color".to_string());
319
318
320− assert_eq!(style, Style::default().fg(Color::Rgb(255, 255, 255)));
319+ let mut style = Style::default();
321−}
320+ let palette =
321+ ThemePalette::new(hashmap! { "my_color".to_string() => Color::Rgb(255, 255, 255) });
322+ palette.parse_style(&mut style, fg).unwrap();
322
323
323−#[test]
324+ assert_eq!(style, Style::default().fg(Color::Rgb(255, 255, 255)));
324−fn test_parse_style_table() {
325+ }
325− let table = toml::toml! {
326− "keyword" = {
327− fg = "#ffffff",
328− bg = "#000000",
329− modifiers = ["bold"],
330− }
331− };
332
326
327+ #[test]
328+ fn test_parse_style_table() {
329+ let table = toml::toml! {
330+ "keyword" = {
331+ fg = "#ffffff",
332+ bg = "#000000",
333+ modifiers = ["bold"],
334+ }
335+ };
336+
333− let mut style = Style::default();
337+ let mut style = Style::default();
334− let palette = ThemePalette::default();
338+ let palette = ThemePalette::default();
335− if let Value::Table(entries) = table {
339+ if let Value::Table(entries) = table {
336− for (_name, value) in entries {
340+ for (_name, value) in entries {
337− palette.parse_style(&mut style, value).unwrap();
341+ palette.parse_style(&mut style, value).unwrap();
342+ }
338 }
343 }
339− }
340
344
341− assert_eq!(
345+ assert_eq!(
342− style,
346+ style,
343− Style::default()
347+ Style::default()
344− .fg(Color::Rgb(255, 255, 255))
348+ .fg(Color::Rgb(255, 255, 255))
345− .bg(Color::Rgb(0, 0, 0))
349+ .bg(Color::Rgb(0, 0, 0))
346− .add_modifier(Modifier::BOLD)
350+ .add_modifier(Modifier::BOLD)
347− );
351+ );
352+ }
348}
353}