From 5999aba0a573c905fdd02e8beaeb7e2b21177303 Mon Sep 17 00:00:00 2001 From: Joseph Montanaro Date: Wed, 18 Nov 2026 10:14:36 -0500 Subject: [PATCH] test loading AppSession --- src/session.rs | 33 +++++++++++++++++++-------------- src/test_data.rs | 25 +++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 14 deletions(-) create mode 100644 src/test_data.rs diff --git a/src/session.rs b/src/session.rs index 65dd219..90568e4 100644 --- a/src/session.rs +++ b/src/session.rs @@ -18,10 +18,6 @@ impl AppSession { AppSession::Empty } } - - pub fn unlock(&mut self, passphrase: &str) -> Result { - todo!() - } } impl Global for AppSession {} @@ -29,15 +25,24 @@ impl Global for AppSession {} #[cfg(test)] mod tests { use super::*; + use std::assert_matches; + use testresult::TestResult; + use crate::test_data::TestEnv; - // #[test] - // fn test_new() { - // let passphrase = "correct horse battery staple"; - // let salt = AppSession::salt().expect("salt generation failed."); - // let session = AppSession::new(passphrase, &salt).expect("password KDF failed."); - // match session { - // AppSession::Unlocked { .. } => (), - // _ => panic!("AppSession::new() should return an unlocked session"), - // } - // } + #[test] + fn test_load_empty() -> TestResult { + let env = TestEnv::new()?; + let session = AppSession::load(&env.config); + assert_matches!(session, AppSession::Empty); + Ok(()) + } + + #[test] + fn test_load_locked() -> TestResult { + let env = TestEnv::new()?; + let _ = env.db()?; // creates the database in the temp dir + let session = AppSession::load(&env.config); + assert_matches!(session, AppSession::Locked); + Ok(()) + } } diff --git a/src/test_data.rs b/src/test_data.rs new file mode 100644 index 0000000..3b89709 --- /dev/null +++ b/src/test_data.rs @@ -0,0 +1,25 @@ +use tempfile::TempDir; +use crate::config::AppConfig; +use crate::db::Db; +use crate::error::CreddyError; + + +pub const TEST_PASSPHRASE: &'static str = "correct horse battery staple"; + +pub struct TestEnv { + // we have to keep this around or the tempdir will be deleted as soon as it's dropped + _dir: TempDir, + pub config: AppConfig, +} + +impl TestEnv { + pub fn new() -> Result { + let dir = tempfile::tempdir()?; + let config = AppConfig::load_from(dir.path().to_path_buf())?; + Ok(TestEnv { _dir: dir, config }) + } + + pub fn db(&self) -> Result { + Db::connect(&self.config, TEST_PASSPHRASE) + } +}