05e5520 · helix · git.iko.soy

git.iko.soy/helix

Put some tests behind #[cfg(test)] (#1459)

It was missing in a few places.

commit05e5520ec0fba35316519dca233277761e8fd17f authorBenoît Cortier <benoit.cortier@fried-world.eu> dateSat 8 Jan 2022, 10:32 (5 years ago) parent939261f

2 files changed+73−63

compare with master

unifiedsplit

helix-term/src/config.rs+28−23 helix-view/src/theme.rs+45−40

helix-term/src/config.rs+28−23

@@ -20,14 +20,18 @@ pub struct LspConfig {

2020 pub display_messages: bool,

2121}

2222

23−#[test]

24−fn parsing_keymaps_config_file() {

25− use crate::keymap;

26− use crate::keymap::Keymap;

27− use helix_core::hashmap;

28− use helix_view::document::Mode;

29−

30− let sample_keymaps = r#"

23+#[cfg(test)]

24+mod tests {

25+ use super::*;

26+

27+ #[test]

28+ fn parsing_keymaps_config_file() {

29+ use crate::keymap;

30+ use crate::keymap::Keymap;

31+ use helix_core::hashmap;

32+ use helix_view::document::Mode;

33+

34+ let sample_keymaps = r#"

3135 [keys.insert]

3236 y = "move_line_down"

3337 S-C-a = "delete_selection"

@@ -36,19 +40,20 @@ fn parsing_keymaps_config_file() {

3640 A-F12 = "move_next_word_end"

3741 "#;

3842

39− assert_eq!(

40− toml::from_str::<Config>(sample_keymaps).unwrap(),

41− Config {

42− keys: Keymaps(hashmap! {

43− Mode::Insert => Keymap::new(keymap!({ "Insert mode"

44− "y" => move_line_down,

45− "S-C-a" => delete_selection,

46− })),

47− Mode::Normal => Keymap::new(keymap!({ "Normal mode"

48− "A-F12" => move_next_word_end,

49− })),

50− }),

51− ..Default::default()

52− }

53− );

43+ assert_eq!(

44+ toml::from_str::<Config>(sample_keymaps).unwrap(),

45+ Config {

46+ keys: Keymaps(hashmap! {

47+ Mode::Insert => Keymap::new(keymap!({ "Insert mode"

48+ "y" => move_line_down,

49+ "S-C-a" => delete_selection,

50+ })),

51+ Mode::Normal => Keymap::new(keymap!({ "Normal mode"

52+ "A-F12" => move_next_word_end,

53+ })),

54+ }),

55+ ..Default::default()

56+ }

57+ );

58+ }

5459}

helix-view/src/theme.rs+45−40

@@ -296,53 +296,58 @@ impl TryFrom<Value> for ThemePalette {

296296 }

297297}

298298

299−#[test]

300−fn test_parse_style_string() {

301− let fg = Value::String("#ffffff".to_string());

299+#[cfg(test)]

300+mod tests {

301+ use super::*;

302302

303− let mut style = Style::default();

304− let palette = ThemePalette::default();

305− palette.parse_style(&mut style, fg).unwrap();

303+ #[test]

304+ fn test_parse_style_string() {

305+ let fg = Value::String("#ffffff".to_string());

306306

307− assert_eq!(style, Style::default().fg(Color::Rgb(255, 255, 255)));

308−}

307+ let mut style = Style::default();

308+ let palette = ThemePalette::default();

309+ palette.parse_style(&mut style, fg).unwrap();

309310

310−#[test]

311−fn test_palette() {

312− use helix_core::hashmap;

313− let fg = Value::String("my_color".to_string());

311+ assert_eq!(style, Style::default().fg(Color::Rgb(255, 255, 255)));

312+ }

314313

315− let mut style = Style::default();

316− let palette =

317− ThemePalette::new(hashmap! { "my_color".to_string() => Color::Rgb(255, 255, 255) });

318− palette.parse_style(&mut style, fg).unwrap();

314+ #[test]

315+ fn test_palette() {

316+ use helix_core::hashmap;

317+ let fg = Value::String("my_color".to_string());

319318

320− assert_eq!(style, Style::default().fg(Color::Rgb(255, 255, 255)));

321−}

319+ let mut style = Style::default();

320+ let palette =

321+ ThemePalette::new(hashmap! { "my_color".to_string() => Color::Rgb(255, 255, 255) });

322+ palette.parse_style(&mut style, fg).unwrap();

322323

323−#[test]

324−fn test_parse_style_table() {

325− let table = toml::toml! {

326− "keyword" = {

327− fg = "#ffffff",

328− bg = "#000000",

329− modifiers = ["bold"],

330− }

331− };

324+ assert_eq!(style, Style::default().fg(Color::Rgb(255, 255, 255)));

325+ }

332326

333− let mut style = Style::default();

334− let palette = ThemePalette::default();

335− if let Value::Table(entries) = table {

336− for (_name, value) in entries {

337− palette.parse_style(&mut style, value).unwrap();

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+

337+ let mut style = Style::default();

338+ let palette = ThemePalette::default();

339+ if let Value::Table(entries) = table {

340+ for (_name, value) in entries {

341+ palette.parse_style(&mut style, value).unwrap();

342+ }

338343 }

339− }

340344

341− assert_eq!(

342− style,

343− Style::default()

344− .fg(Color::Rgb(255, 255, 255))

345− .bg(Color::Rgb(0, 0, 0))

346− .add_modifier(Modifier::BOLD)

347− );

345+ assert_eq!(

346+ style,

347+ Style::default()

348+ .fg(Color::Rgb(255, 255, 255))

349+ .bg(Color::Rgb(0, 0, 0))

350+ .add_modifier(Modifier::BOLD)

351+ );

352+ }

348353}