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 | 03d04439323f60bc2f4371585ae21404dbcb7eeb (patch) | |
tree | 7ff9ab2c8d73332f01ee2fbae74b37d35c978347 /src/tests/pin.rs | |
parent | 2dbc3748f9eec4a4fc9163e979b1d9d8efb3e2a0 (diff) | |
download | nitrocli-03d04439323f60bc2f4371585ae21404dbcb7eeb.tar.gz nitrocli-03d04439323f60bc2f4371585ae21404dbcb7eeb.tar.bz2 |
Introduce builder-inspired way for configuring 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 allows for an easier
configuration of an existing object with builder-pattern-inspired
modifier methods.
Diffstat (limited to 'src/tests/pin.rs')
-rw-r--r-- | src/tests/pin.rs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/tests/pin.rs b/src/tests/pin.rs index 7770fba..484e256 100644 --- a/src/tests/pin.rs +++ b/src/tests/pin.rs @@ -21,7 +21,7 @@ fn unblock(model: nitrokey::Model) -> anyhow::Result<()> { assert!(device.get_user_retry_count()? < 3); } - let _ = Nitrocli::with_model(model).handle(&["pin", "unblock"])?; + let _ = Nitrocli::new().model(model).handle(&["pin", "unblock"])?; { let mut manager = nitrokey::force_take()?; @@ -33,9 +33,9 @@ fn unblock(model: nitrokey::Model) -> anyhow::Result<()> { #[test_device] fn set_user(model: nitrokey::Model) -> anyhow::Result<()> { - let mut ncli = Nitrocli::with_model(model); + let ncli = Nitrocli::new().model(model); // Set a new user PIN. - ncli.new_user_pin("new-pin"); + let mut ncli = ncli.new_user_pin("new-pin"); let out = ncli.handle(&["pin", "set", "user"])?; assert!(out.is_empty()); @@ -53,8 +53,9 @@ fn set_user(model: nitrokey::Model) -> anyhow::Result<()> { } // Revert to the default user PIN. - ncli.user_pin("new-pin"); - ncli.new_user_pin(nitrokey::DEFAULT_USER_PIN); + let mut ncli = ncli + .user_pin("new-pin") + .new_user_pin(nitrokey::DEFAULT_USER_PIN); let out = ncli.handle(&["pin", "set", "user"])?; assert!(out.is_empty()); |