test: refactor return statement in tests

In many tests, the structure at the end of the test function is like
this:

```rust
eval_test(...);
Ok(())
```

It can be simplified to just:

```rust
eval_test(...)
```
main
Angelo Fallaria 2 years ago
parent f9e0db9309
commit 560f69dc0a

@ -364,8 +364,7 @@ r
eval_config_test( eval_config_test(
contents, contents,
vec![Hotkey::new(evdev::Key::KEY_R, vec![], String::from("alacritty"))], vec![Hotkey::new(evdev::Key::KEY_R, vec![], String::from("alacritty"))],
)?; )
Ok(())
} }
#[test] #[test]
@ -385,8 +384,7 @@ t
let hotkey_2 = Hotkey::new(evdev::Key::KEY_W, vec![], String::from("kitty")); let hotkey_2 = Hotkey::new(evdev::Key::KEY_W, vec![], String::from("kitty"));
let hotkey_3 = Hotkey::new(evdev::Key::KEY_T, vec![], String::from("/bin/firefox")); let hotkey_3 = Hotkey::new(evdev::Key::KEY_T, vec![], String::from("/bin/firefox"));
eval_config_test(contents, vec![hotkey_1, hotkey_2, hotkey_3])?; eval_config_test(contents, vec![hotkey_1, hotkey_2, hotkey_3])
Ok(())
} }
#[test] #[test]
@ -407,8 +405,7 @@ w
Hotkey::new(evdev::Key::KEY_W, vec![], String::from("kitty")), Hotkey::new(evdev::Key::KEY_W, vec![], String::from("kitty")),
]; ];
eval_config_test(contents, expected_keybinds)?; eval_config_test(contents, expected_keybinds)
Ok(())
} }
#[test] #[test]
@ -421,8 +418,7 @@ super + 5
let expected_keybinds = let expected_keybinds =
vec![Hotkey::new(evdev::Key::KEY_5, vec![Modifier::Super], String::from("alacritty"))]; vec![Hotkey::new(evdev::Key::KEY_5, vec![Modifier::Super], String::from("alacritty"))];
eval_config_test(contents, expected_keybinds)?; eval_config_test(contents, expected_keybinds)
Ok(())
} }
#[test] #[test]
@ -522,8 +518,7 @@ p
String::from("xbacklight -inc 10 -fps 30 -time 200"), String::from("xbacklight -inc 10 -fps 30 -time 200"),
)]; )];
eval_config_test(contents, expected_keybinds)?; eval_config_test(contents, expected_keybinds)
Ok(())
} }
#[test] #[test]
@ -536,8 +531,7 @@ pesto
xterm xterm
"; ";
eval_invalid_config_test(contents, ParseError::UnknownSymbol(5))?; eval_invalid_config_test(contents, ParseError::UnknownSymbol(5))
Ok(())
} }
#[test] #[test]
@ -549,8 +543,7 @@ pesto
brave brave
"; ";
eval_invalid_config_test(contents, ParseError::CommandWithoutWhitespace(5))?; eval_invalid_config_test(contents, ParseError::CommandWithoutWhitespace(5))
Ok(())
} }
#[test] #[test]
@ -561,8 +554,7 @@ k
c "; c ";
eval_invalid_config_test(contents, ParseError::MissingCommand(5))?; eval_invalid_config_test(contents, ParseError::MissingCommand(5))
Ok(())
} }
#[test] #[test]
@ -656,8 +648,7 @@ super + minus
), ),
]; ];
eval_config_test(contents, expected_result)?; eval_config_test(contents, expected_result)
Ok(())
} }
#[test] #[test]
@ -674,8 +665,7 @@ k
String::from("mpc ls | dmenu | sed -i 's/foo/bar/g'"), String::from("mpc ls | dmenu | sed -i 's/foo/bar/g'"),
); );
eval_config_test(contents, vec![expected_keybind])?; eval_config_test(contents, vec![expected_keybind])
Ok(())
} }
#[test] #[test]
@ -685,8 +675,7 @@ k
gimp gimp
"; ";
eval_invalid_config_test(contents, ParseError::UnknownSymbol(3))?; eval_invalid_config_test(contents, ParseError::UnknownSymbol(3))
Ok(())
} }
// TODO: Write these tests as needed. // TODO: Write these tests as needed.

Loading…
Cancel
Save