Skip to content

Commit

Permalink
Put some tests behind #[cfg(test)] (#1459)
Browse files Browse the repository at this point in the history
It was missing in a few places.
  • Loading branch information
CBenoit authored Jan 8, 2022
1 parent 939261f commit 05e5520
Show file tree
Hide file tree
Showing 2 changed files with 73 additions and 63 deletions.
51 changes: 28 additions & 23 deletions helix-term/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,18 @@ pub struct LspConfig {
pub display_messages: bool,
}

#[test]
fn parsing_keymaps_config_file() {
use crate::keymap;
use crate::keymap::Keymap;
use helix_core::hashmap;
use helix_view::document::Mode;

let sample_keymaps = r#"
#[cfg(test)]
mod tests {
use super::*;

#[test]
fn parsing_keymaps_config_file() {
use crate::keymap;
use crate::keymap::Keymap;
use helix_core::hashmap;
use helix_view::document::Mode;

let sample_keymaps = r#"
[keys.insert]
y = "move_line_down"
S-C-a = "delete_selection"
Expand All @@ -36,19 +40,20 @@ fn parsing_keymaps_config_file() {
A-F12 = "move_next_word_end"
"#;

assert_eq!(
toml::from_str::<Config>(sample_keymaps).unwrap(),
Config {
keys: Keymaps(hashmap! {
Mode::Insert => Keymap::new(keymap!({ "Insert mode"
"y" => move_line_down,
"S-C-a" => delete_selection,
})),
Mode::Normal => Keymap::new(keymap!({ "Normal mode"
"A-F12" => move_next_word_end,
})),
}),
..Default::default()
}
);
assert_eq!(
toml::from_str::<Config>(sample_keymaps).unwrap(),
Config {
keys: Keymaps(hashmap! {
Mode::Insert => Keymap::new(keymap!({ "Insert mode"
"y" => move_line_down,
"S-C-a" => delete_selection,
})),
Mode::Normal => Keymap::new(keymap!({ "Normal mode"
"A-F12" => move_next_word_end,
})),
}),
..Default::default()
}
);
}
}
85 changes: 45 additions & 40 deletions helix-view/src/theme.rs
Original file line number Diff line number Diff line change
Expand Up @@ -296,53 +296,58 @@ impl TryFrom<Value> for ThemePalette {
}
}

#[test]
fn test_parse_style_string() {
let fg = Value::String("#ffffff".to_string());
#[cfg(test)]
mod tests {
use super::*;

let mut style = Style::default();
let palette = ThemePalette::default();
palette.parse_style(&mut style, fg).unwrap();
#[test]
fn test_parse_style_string() {
let fg = Value::String("#ffffff".to_string());

assert_eq!(style, Style::default().fg(Color::Rgb(255, 255, 255)));
}
let mut style = Style::default();
let palette = ThemePalette::default();
palette.parse_style(&mut style, fg).unwrap();

#[test]
fn test_palette() {
use helix_core::hashmap;
let fg = Value::String("my_color".to_string());
assert_eq!(style, Style::default().fg(Color::Rgb(255, 255, 255)));
}

let mut style = Style::default();
let palette =
ThemePalette::new(hashmap! { "my_color".to_string() => Color::Rgb(255, 255, 255) });
palette.parse_style(&mut style, fg).unwrap();
#[test]
fn test_palette() {
use helix_core::hashmap;
let fg = Value::String("my_color".to_string());

assert_eq!(style, Style::default().fg(Color::Rgb(255, 255, 255)));
}
let mut style = Style::default();
let palette =
ThemePalette::new(hashmap! { "my_color".to_string() => Color::Rgb(255, 255, 255) });
palette.parse_style(&mut style, fg).unwrap();

#[test]
fn test_parse_style_table() {
let table = toml::toml! {
"keyword" = {
fg = "#ffffff",
bg = "#000000",
modifiers = ["bold"],
}
};
assert_eq!(style, Style::default().fg(Color::Rgb(255, 255, 255)));
}

let mut style = Style::default();
let palette = ThemePalette::default();
if let Value::Table(entries) = table {
for (_name, value) in entries {
palette.parse_style(&mut style, value).unwrap();
#[test]
fn test_parse_style_table() {
let table = toml::toml! {
"keyword" = {
fg = "#ffffff",
bg = "#000000",
modifiers = ["bold"],
}
};

let mut style = Style::default();
let palette = ThemePalette::default();
if let Value::Table(entries) = table {
for (_name, value) in entries {
palette.parse_style(&mut style, value).unwrap();
}
}
}

assert_eq!(
style,
Style::default()
.fg(Color::Rgb(255, 255, 255))
.bg(Color::Rgb(0, 0, 0))
.add_modifier(Modifier::BOLD)
);
assert_eq!(
style,
Style::default()
.fg(Color::Rgb(255, 255, 255))
.bg(Color::Rgb(0, 0, 0))
.add_modifier(Modifier::BOLD)
);
}
}

0 comments on commit 05e5520

Please # to comment.