partial refactor to separate taskdb and storage

This commit is contained in:
Dustin J. Mitchell
2020-01-05 13:17:07 -05:00
parent 727db7f669
commit e228c99b83
8 changed files with 208 additions and 78 deletions

View File

@@ -73,6 +73,6 @@ proptest! {
if let Some(o) = o1p {
db2.apply(o).map_err(|e| TestCaseError::Fail(format!("Applying to db2: {}", e).into()))?;
}
assert_eq!(db1.tasks(), db2.tasks());
assert_eq!(db1.sorted_tasks(), db2.sorted_tasks());
}
}

View File

@@ -37,7 +37,7 @@ fn test_sync() {
db1.sync("me", &mut server);
db2.sync("me", &mut server);
db1.sync("me", &mut server);
assert_eq!(db1.tasks(), db2.tasks());
assert_eq!(db1.sorted_tasks(), db2.sorted_tasks());
// now make updates to the same task on both sides
db1.apply(Operation::Update {
@@ -59,7 +59,7 @@ fn test_sync() {
db1.sync("me", &mut server);
db2.sync("me", &mut server);
db1.sync("me", &mut server);
assert_eq!(db1.tasks(), db2.tasks());
assert_eq!(db1.sorted_tasks(), db2.sorted_tasks());
}
#[test]
@@ -87,7 +87,7 @@ fn test_sync_create_delete() {
db1.sync("me", &mut server);
db2.sync("me", &mut server);
db1.sync("me", &mut server);
assert_eq!(db1.tasks(), db2.tasks());
assert_eq!(db1.sorted_tasks(), db2.sorted_tasks());
// delete and re-create the task on db1
db1.apply(Operation::Delete { uuid }).unwrap();
@@ -112,5 +112,5 @@ fn test_sync_create_delete() {
db1.sync("me", &mut server);
db2.sync("me", &mut server);
db1.sync("me", &mut server);
assert_eq!(db1.tasks(), db2.tasks());
assert_eq!(db1.sorted_tasks(), db2.sorted_tasks());
}

View File

@@ -59,11 +59,11 @@ proptest! {
}
}
println!("{:?}", dbs[0].tasks());
println!("{:?}", dbs[1].tasks());
println!("{:?}", dbs[2].tasks());
println!("{:?}", dbs[0]);
println!("{:?}", dbs[1]);
println!("{:?}", dbs[2]);
assert_eq!(dbs[0].tasks(), dbs[1].tasks());
assert_eq!(dbs[1].tasks(), dbs[2].tasks());
assert_eq!(dbs[0].sorted_tasks(), dbs[0].sorted_tasks());
assert_eq!(dbs[1].sorted_tasks(), dbs[2].sorted_tasks());
}
}