From b114125dfbb4c97580ae076c07c6816ccdca51b8 Mon Sep 17 00:00:00 2001 From: Daniel Mueller Date: Mon, 24 Aug 2020 18:04:20 -0700 Subject: 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. --- src/tests/encrypted.rs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/tests/encrypted.rs') diff --git a/src/tests/encrypted.rs b/src/tests/encrypted.rs index aed2662..4705df6 100644 --- a/src/tests/encrypted.rs +++ b/src/tests/encrypted.rs @@ -44,7 +44,7 @@ $"#, regex::Regex::new(&re).unwrap() } - let mut ncli = Nitrocli::with_model(model); + let mut ncli = Nitrocli::make().model(model).build(); let out = ncli.handle(&["status"])?; assert!(make_re(None).is_match(&out), out); @@ -61,7 +61,11 @@ $"#, #[test_device(pro)] fn encrypted_open_on_pro(model: nitrokey::Model) { - let res = Nitrocli::with_model(model).handle(&["encrypted", "open"]); + let res = Nitrocli::make() + .model(model) + .build() + .handle(&["encrypted", "open"]); + assert_eq!( res.unwrap_str_err(), "This command is only available on the Nitrokey Storage", @@ -70,7 +74,7 @@ fn encrypted_open_on_pro(model: nitrokey::Model) { #[test_device(storage)] fn encrypted_open_close(model: nitrokey::Model) -> crate::Result<()> { - let mut ncli = Nitrocli::with_model(model); + let mut ncli = Nitrocli::make().model(model).build(); let out = ncli.handle(&["encrypted", "open"])?; assert!(out.is_empty()); -- cgit v1.2.1