Skip to content

Commit 506abee

Browse files
Nao-risNao-ris
authored
Remove use of deprecated functions in unit tests (#59)
1 parent d602622 commit 506abee

File tree

5 files changed

+279
-182
lines changed

5 files changed

+279
-182
lines changed

‎tests/database_tests.rs

Lines changed: 31 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ extern crate couchbase_lite;
1919
extern crate tempdir;
2020
extern crate lazy_static;
2121

22+
use crate::utils::default_collection;
23+
2224
use self::couchbase_lite::*;
2325
use self::tempdir::TempDir;
2426
use lazy_static::lazy_static;
@@ -77,14 +79,15 @@ fn copy_file() {
7779
encryption_key: None,
7880
};
7981
match Database::open(DB_NAME, Some(cfg.clone())) {
80-
Ok(mut db) => {
82+
Ok(db) => {
8183
let mut doc = Document::new_with_id("foo");
8284

8385
let mut props = doc.mutable_properties();
8486
props.at("i").put_i64(1);
8587
props.at("s").put_string("test");
8688

87-
db.save_document_with_concurency_control(&mut doc, ConcurrencyControl::FailOnConflict)
89+
default_collection(&db)
90+
.save_document_with_concurency_control(&mut doc, ConcurrencyControl::FailOnConflict)
8891
.expect("save");
8992
}
9093
Err(_) => panic!("The initial database could not be opened"),
@@ -102,7 +105,7 @@ fn copy_file() {
102105
// Check document is inside the new DB
103106
match Database::open(DB_NAME_BACKUP, Some(cfg)) {
104107
Ok(db) => {
105-
let doc = db.get_document("foo").unwrap();
108+
let doc = default_collection(&db).get_document("foo").unwrap();
106109

107110
assert_eq!(doc.properties().get("i").as_i64().unwrap(), 1);
108111
assert_eq!(doc.properties().get("s").as_string().unwrap(), "test");
@@ -116,7 +119,7 @@ fn in_transaction() {
116119
utils::with_db(|db| {
117120
let result = db.in_transaction(|db| {
118121
let mut doc = Document::new_with_id("document");
119-
let mut collection = db.default_collection_or_error().unwrap();
122+
let mut collection = default_collection(db);
120123
collection
121124
.save_document_with_concurency_control(&mut doc, ConcurrencyControl::LastWriteWins)
122125
.unwrap();
@@ -128,7 +131,7 @@ fn in_transaction() {
128131

129132
let result = db.in_transaction(|db| -> Result<String> {
130133
let mut doc = Document::new_with_id("document_error");
131-
let mut collection = db.default_collection_or_error().unwrap();
134+
let mut collection = default_collection(db);
132135
collection
133136
.save_document_with_concurency_control(&mut doc, ConcurrencyControl::LastWriteWins)
134137
.unwrap();
@@ -137,7 +140,7 @@ fn in_transaction() {
137140

138141
assert!(result.is_err());
139142

140-
let mut collection = db.default_collection_or_error().unwrap();
143+
let collection = default_collection(db);
141144
assert!(collection.get_document("document").is_ok());
142145
assert!(collection.get_document("document_error").is_err());
143146
});
@@ -146,7 +149,7 @@ fn in_transaction() {
146149
#[test]
147150
fn manual_transaction_commit() {
148151
utils::with_db(|db| {
149-
let initial_count = db.count();
152+
let initial_count = default_collection(db).count();
150153

151154
{
152155
let transaction = db.begin_transaction().unwrap();
@@ -158,16 +161,16 @@ fn manual_transaction_commit() {
158161
transaction.commit().unwrap();
159162
}
160163

161-
assert_eq!(db.count(), initial_count + 1);
162-
let mut collection = db.default_collection_or_error().unwrap();
164+
assert_eq!(default_collection(db).count(), initial_count + 1);
165+
let collection = db.default_collection_or_error().unwrap();
163166
assert!(collection.get_document("manual_commit_doc").is_ok());
164167
});
165168
}
166169

167170
#[test]
168171
fn manual_transaction_rollback() {
169172
utils::with_db(|db| {
170-
let initial_count = db.count();
173+
let initial_count = default_collection(db).count();
171174

172175
{
173176
let _transaction = db.begin_transaction().unwrap();
@@ -179,8 +182,8 @@ fn manual_transaction_rollback() {
179182
// Transaction dropped here without commit -> automatic rollback
180183
}
181184

182-
assert_eq!(db.count(), initial_count);
183-
let mut collection = db.default_collection_or_error().unwrap();
185+
assert_eq!(default_collection(db).count(), initial_count);
186+
let collection = db.default_collection_or_error().unwrap();
184187
assert!(collection.get_document("rollback_doc").is_err());
185188
});
186189
}
@@ -189,7 +192,7 @@ fn manual_transaction_rollback() {
189192
fn db_properties() {
190193
utils::with_db(|db| {
191194
assert_eq!(db.name(), utils::DB_NAME);
192-
assert_eq!(db.count(), 0);
195+
assert_eq!(default_collection(db).count(), 0);
193196
});
194197
}
195198

@@ -215,10 +218,11 @@ fn db_encryption_key() {
215218

216219
// Create database with no encryption & one document
217220
{
218-
let mut db = Database::open(utils::DB_NAME, Some(cfg_no_encryption.clone())).unwrap();
221+
let db = Database::open(utils::DB_NAME, Some(cfg_no_encryption.clone())).unwrap();
219222
let mut doc = Document::new_with_id("foo");
220223
assert!(
221-
db.save_document_with_concurency_control(&mut doc, ConcurrencyControl::LastWriteWins)
224+
default_collection(&db)
225+
.save_document_with_concurency_control(&mut doc, ConcurrencyControl::LastWriteWins)
222226
.is_ok()
223227
);
224228
}
@@ -228,7 +232,7 @@ fn db_encryption_key() {
228232
assert!(Database::open(utils::DB_NAME, Some(cfg_encryption1.clone())).is_err());
229233
{
230234
let mut db = Database::open(utils::DB_NAME, Some(cfg_no_encryption.clone())).unwrap();
231-
assert!(db.get_document("foo").is_ok());
235+
assert!(default_collection(&db).get_document("foo").is_ok());
232236
assert!(db.change_encryption_key(&encryption_key).is_ok());
233237
}
234238

@@ -237,22 +241,26 @@ fn db_encryption_key() {
237241
assert!(Database::open(utils::DB_NAME, Some(cfg_encryption1.clone())).is_ok());
238242
{
239243
let db = Database::open(utils::DB_NAME, Some(cfg_encryption1.clone())).unwrap();
240-
assert!(db.get_document("foo").is_ok());
244+
assert!(default_collection(&db).get_document("foo").is_ok());
241245
}
242246
}
243247

244248
#[test]
245249
fn add_listener() {
246250
utils::with_db(|db| {
251+
let mut default_collection = default_collection(db);
252+
247253
let (sender, receiver) = std::sync::mpsc::channel();
248-
let listener_token = db.add_listener(Box::new(move |_, doc_ids| {
254+
let listener_token = default_collection.add_listener(Box::new(move |_, doc_ids| {
255+
println!("\nDoc ids: {:?}\n", doc_ids);
249256
if doc_ids.first().unwrap() == "document" {
250257
sender.send(true).unwrap();
251258
}
252259
}));
253260

254261
let mut doc = Document::new_with_id("document");
255-
db.save_document_with_concurency_control(&mut doc, ConcurrencyControl::LastWriteWins)
262+
default_collection
263+
.save_document_with_concurency_control(&mut doc, ConcurrencyControl::LastWriteWins)
256264
.unwrap();
257265

258266
receiver.recv_timeout(Duration::from_secs(1)).unwrap();
@@ -271,14 +279,16 @@ fn buffer_notifications() {
271279
utils::set_static(&BUFFER_NOTIFICATIONS, true);
272280
});
273281

274-
let listener_token = db.add_listener(Box::new(move |_, doc_ids| {
282+
let mut default_collection = default_collection(db);
283+
let listener_token = default_collection.add_listener(Box::new(move |_, doc_ids| {
275284
if doc_ids.first().unwrap() == "document" {
276285
utils::set_static(&DOCUMENT_DETECTED, true);
277286
}
278287
}));
279288

280289
let mut doc = Document::new_with_id("document");
281-
db.save_document_with_concurency_control(&mut doc, ConcurrencyControl::LastWriteWins)
290+
default_collection
291+
.save_document_with_concurency_control(&mut doc, ConcurrencyControl::LastWriteWins)
282292
.unwrap();
283293

284294
assert!(!utils::check_static_with_wait(

0 commit comments

Comments
 (0)