diff options
author | Daniel Mueller <deso@posteo.net> | 2020-08-24 18:04:20 -0700 |
---|---|---|
committer | Daniel Mueller <deso@posteo.net> | 2020-08-24 18:04:20 -0700 |
commit | b114125dfbb4c97580ae076c07c6816ccdca51b8 (patch) | |
tree | a6663810c402dbd4f99f07e485872dd5f80702bf /src/tests/config.rs | |
parent | 147d01663f9b95c6819d3c6afe8694cd291dbc3d (diff) | |
download | nitrocli-b114125dfbb4c97580ae076c07c6816ccdca51b8.tar.gz nitrocli-b114125dfbb4c97580ae076c07c6816ccdca51b8.tar.bz2 |
Introduce builder infrastructure for assembling Nitrocli instance
In the future we would like to provide more ways for tests to create a
Nitrocli instance. In order to prevent explosion of with_XXX methods for
each possible combination of arguments, this change introduces a Builder
struct that can be used to create such an instance in an idiomatic way.
Diffstat (limited to 'src/tests/config.rs')
-rw-r--r-- | src/tests/config.rs | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/tests/config.rs b/src/tests/config.rs index fa311d5..3fec240 100644 --- a/src/tests/config.rs +++ b/src/tests/config.rs @@ -48,14 +48,22 @@ $"#, ) .unwrap(); - let out = Nitrocli::with_model(model).handle(&["config", "get"])?; + let out = Nitrocli::make() + .model(model) + .build() + .handle(&["config", "get"])?; + assert!(re.is_match(&out), out); Ok(()) } #[test_device] fn set_wrong_usage(model: nitrokey::Model) { - let res = Nitrocli::with_model(model).handle(&["config", "set", "--numlock", "2", "-N"]); + let res = + Nitrocli::make() + .model(model) + .build() + .handle(&["config", "set", "--numlock", "2", "-N"]); let err = res.unwrap_str_err(); assert!( err.contains("The argument '--numlock <numlock>' cannot be used with '--no-numlock'"), @@ -65,7 +73,7 @@ fn set_wrong_usage(model: nitrokey::Model) { #[test_device] fn set_get(model: nitrokey::Model) -> crate::Result<()> { - let mut ncli = Nitrocli::with_model(model); + let mut ncli = Nitrocli::make().model(model).build(); let _ = ncli.handle(&["config", "set", "-s", "1", "-c", "0", "-N"])?; let re = regex::Regex::new( |