Added unit tests for a few more error cases to improve code coverage.

Author: danieltrick

src/callback.rs

@@ -656,6 +656,7 @@ mod tests {
     use std::{
         borrow::Cow,
         ffi::CString,
+        hint::black_box,
         sync::{Arc, Mutex},
     };
 
@@ -666,6 +667,7 @@ mod tests {
     }
 
     fn do_invoke_callbacks(cb_manager: &mut CallbackManager) {
+        let _ = black_box(format!("{:?}", cb_manager));
         let _ = cb_manager.auth_cb(cstr!("/HS/SRK/my/auth/path"), Some(cstr!("some object")));
         let _ = cb_manager.sign_cb(
             cstr!("/HS/SRK/my/sign/path"),
@@ -738,14 +740,16 @@ mod tests {
         let mut cb_manager = CallbackManager::new(CallbackTest::new("my_password"));
         do_invoke_callbacks(&mut cb_manager);
 
-        let my_callbacks = cb_manager.into_inner();
+        let mut my_callbacks = cb_manager.into_inner();
         let downcasted: &CallbackTest = my_callbacks.downcast().expect("Downcast failed!");
         let paths = downcasted.get_paths();
 
         assert_paths(&paths.0, "/HS/SRK/my/auth/path");
         assert_paths(&paths.1, "/HS/SRK/my/sign/path");
         assert_paths(&paths.2, "/HS/SRK/my/bran/path");
         assert_paths(&paths.3, "/HS/SRK/my/actn/path");
+
+        let _ = black_box(my_callbacks.downcast_mut::<CallbackTest>().expect("Downcast failed!"));
     }
 
     #[test]

tests/05_key_test.rs

@@ -17,7 +17,7 @@ use function_name::named;
 use log::debug;
 use serial_test::serial;
 use std::collections::HashSet;
-use tss2_fapi_rs::{BaseErrorCode, ErrorCode, FapiContext, ImportData, KeyFlags};
+use tss2_fapi_rs::{BaseErrorCode, ErrorCode, FapiContext, ImportData, InternalError, KeyFlags};
 
 const KEY_FLAGS: &[KeyFlags] = &[KeyFlags::NoDA];
 
@@ -243,6 +243,13 @@ fn test_get_tpm_blobs() {
             Err(error) => panic!("Key creation has failed: {:?}", error),
         }
 
+        // Try with all three flags set to false
+        match context.get_tpm_blobs(key_path, false, false, false) {
+            Ok(_) => panic!("Retrieved TPM blob when it was not expected!"),
+            Err(ErrorCode::InternalError(InternalError::InvalidArguments)) => (),
+            Err(error) => panic!("Failed to obtain TPM blobs: {:?}", error),
+        };
+
         // Fetch public/private key data
         let blobs = match context.get_tpm_blobs(key_path, true, false, false) {
             Ok(value) => value,

tests/08_nv_test.rs

@@ -20,7 +20,7 @@ use log::{debug, trace};
 use rand::{Rng, SeedableRng, rng};
 use rand_chacha::ChaChaRng;
 use serial_test::serial;
-use tss2_fapi_rs::{FapiContext, NvFlags};
+use tss2_fapi_rs::{ErrorCode, FapiContext, InternalError, NvFlags};
 
 const NV_ORDINARY_FLAGS: &[NvFlags] = &[NvFlags::NoDA];
 const NV_COUNTER_FLAGS: &[NvFlags] = &[NvFlags::Counter, NvFlags::NoDA];
@@ -143,6 +143,13 @@ fn test_nv_counter() {
         // Initialize TPM, if not already initialized
         tpm_initialize!(context, PASSWORD, MyCallbacks::new(PASSWORD, None));
 
+        // Try to create with an explicit size
+        match context.create_nv(nv_path, Some(NV_COUNTER_FLAGS), NonZeroUsize::new(1usize), None, None) {
+            Ok(_) => panic!("Counter was created when it was not expected!"),
+            Err(ErrorCode::InternalError(InternalError::InvalidArguments)) => (),
+            Err(error) => panic!("NV index creation has failed: {:?}", error),
+        }
+
         // Create NV index, if not already created
         match context.create_nv(nv_path, Some(NV_COUNTER_FLAGS), None, None, None) {
             Ok(_) => debug!("NV index created."),