matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Merge pull request #1087 from matthiasbeyer/testing-default-entry-fix

Browse source 
Testing default entry fix
This commit is contained in:
Matthias Beyer 2017-09-20 09:24:18 +02:00 committed by GitHub
commit 00256effdb
3 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bin/core/imag-link/src/main.rs
View file

@ -352,7 +352,7 @@ mod tests {
use libimagrt::runtime::Runtime; use libimagrt::runtime::Runtime;
use libimagstore::storeid::StoreId; use libimagstore::storeid::StoreId;
use libimagstore::store::{Result as StoreResult, FileLockEntry}; use libimagstore::store::{Result as StoreResult, FileLockEntry, Entry};
make_mock_app! { make_mock_app! {
app "imag-link"; app "imag-link";
@ -362,15 +362,16 @@ mod tests {
} }
use self::mock::generate_test_runtime; use self::mock::generate_test_runtime;
use self::mock::reset_test_runtime; use self::mock::reset_test_runtime;
use libimagutil::testing::DEFAULT_ENTRY;
fn create_test_default_entry<'a, S: AsRef<OsStr>>(rt: &'a Runtime, name: S) -> StoreResult<StoreId> { fn create_test_default_entry<'a, S: AsRef<OsStr>>(rt: &'a Runtime, name: S) -> StoreResult<StoreId> {
let mut path = PathBuf::new(); let mut path = PathBuf::new();
path.set_file_name(name); path.set_file_name(name);
let default_entry = Entry::new(StoreId::new_baseless(PathBuf::from("")).unwrap()).to_str();
let id = StoreId::new_baseless(path)?; let id = StoreId::new_baseless(path)?;
let mut entry = rt.store().create(id.clone())?; let mut entry = rt.store().create(id.clone())?;
entry.get_content_mut().push_str(DEFAULT_ENTRY); entry.get_content_mut().push_str(&default_entry);
Ok(id) Ok(id)
} }

7
bin/core/imag-tag/src/main.rs
View file

@ -229,7 +229,7 @@ mod tests {
use libimagrt::runtime::Runtime; use libimagrt::runtime::Runtime;
use libimagstore::storeid::StoreId; use libimagstore::storeid::StoreId;
use libimagstore::store::{Result as StoreResult, FileLockEntry}; use libimagstore::store::{Result as StoreResult, FileLockEntry, Entry};
use super::*; use super::*;
@ -240,15 +240,16 @@ mod tests {
with help "imag-tag mocking app"; with help "imag-tag mocking app";
} }
use self::mock::generate_test_runtime; use self::mock::generate_test_runtime;
use libimagutil::testing::DEFAULT_ENTRY;
fn create_test_default_entry<'a, S: AsRef<OsStr>>(rt: &'a Runtime, name: S) -> StoreResult<StoreId> { fn create_test_default_entry<'a, S: AsRef<OsStr>>(rt: &'a Runtime, name: S) -> StoreResult<StoreId> {
let mut path = PathBuf::new(); let mut path = PathBuf::new();
path.set_file_name(name); path.set_file_name(name);
let default_entry = Entry::new(StoreId::new_baseless(PathBuf::from("")).unwrap()).to_str();
let id = StoreId::new_baseless(path)?; let id = StoreId::new_baseless(path)?;
let mut entry = rt.store().create(id.clone())?; let mut entry = rt.store().create(id.clone())?;
entry.get_content_mut().push_str(DEFAULT_ENTRY); entry.get_content_mut().push_str(&default_entry);
Ok(id) Ok(id)
} }

7
lib/etc/libimagutil/src/testing.rs
View file

@ -17,13 +17,6 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
// //
pub static DEFAULT_ENTRY: &'static str = "\
---\
[imag]\
links = []\
version = \"0.4.0\"\
---";
/// Generator helper macro for mock app (for testing only) /// Generator helper macro for mock app (for testing only)
/// ///
/// Requires the following crates in scope: /// Requires the following crates in scope: