Ensure all tests use the new LeakChecked utility

Author: Nao-ris

tests/database_tests.rs

@@ -22,7 +22,7 @@ extern crate lazy_static;
 use self::couchbase_lite::*;
 use self::tempdir::TempDir;
 use lazy_static::lazy_static;
-use utils::init_logging;
+use utils::{init_logging, LeakChecker};
 
 pub mod utils;
 
@@ -44,6 +44,7 @@ fn delete_file() {
     pub const DB_NAME: &str = "test_db";
 
     init_logging();
+    let _leak_checker = LeakChecker::new();
 
     let tmp_dir = TempDir::new("cbl_rust").expect("create temp dir");
     let cfg = DatabaseConfiguration {
@@ -66,6 +67,7 @@ fn copy_file() {
     pub const DB_NAME_BACKUP: &str = "test_db_backup";
 
     init_logging();
+    let _leak_checker = LeakChecker::new();
 
     // Initial DB
     let tmp_dir = TempDir::new("cbl_rust").expect("create temp dir");
@@ -147,6 +149,9 @@ fn db_properties() {
 #[test]
 #[cfg(feature = "enterprise")]
 fn db_encryption_key() {
+    init_logging();
+    let _leak_checker = LeakChecker::new();
+
     let tmp_dir = TempDir::new("cbl_rust").expect("create temp dir");
     let cfg_no_encryption = DatabaseConfiguration {
         directory: tmp_dir.path(),

tests/document_tests.rs

@@ -3,11 +3,15 @@ extern crate couchbase_lite;
 
 use self::couchbase_lite::*;
 use std::time::Duration;
+use utils::{init_logging, LeakChecker};
 
 pub mod utils;
 
 #[test]
 fn document_new() {
+    init_logging();
+    let _leak_checker = LeakChecker::new();
+
     let document = Document::new();
     assert_ne!(document.id(), "");
     assert_eq!(document.revision_id(), None);
@@ -18,6 +22,9 @@ fn document_new() {
 
 #[test]
 fn document_new_with_id() {
+    init_logging();
+    let _leak_checker = LeakChecker::new();
+
     let document = Document::new_with_id("foo");
     assert_eq!(document.id(), "foo");
     assert_eq!(document.revision_id(), None);
@@ -70,6 +77,9 @@ fn document_sequence() {
 
 #[test]
 fn document_properties() {
+    init_logging();
+    let _leak_checker = LeakChecker::new();
+
     let mut document = Document::new();
     let mut properties = MutableDict::new();
     properties.at("foo").put_bool(false);
@@ -87,6 +97,9 @@ fn document_properties() {
 
 #[test]
 fn document_properties_as_json() {
+    init_logging();
+    let _leak_checker = LeakChecker::new();
+
     let mut document = Document::new();
     document
         .set_properties_as_json(r#"{"foo":true,"bar":true}"#)

tests/fleece_tests.rs

@@ -20,9 +20,15 @@
 extern crate couchbase_lite;
 
 use couchbase_lite::*;
+use utils::{init_logging, LeakChecker};
+
+pub mod utils;
 
 #[test]
 fn empty_values() {
+    init_logging();
+    let _leak_checker = LeakChecker::new();
+
     let v = Value::default();
     assert_eq!(v.get_type(), ValueType::Undefined);
     assert!(!v.is_type(ValueType::Bool));
@@ -38,6 +44,9 @@ fn empty_values() {
 
 #[test]
 fn basic_values() {
+    init_logging();
+    let _leak_checker = LeakChecker::new();
+
     let doc = Fleece::parse_json(r#"{"i":1234,"f":12.34,"a":[1, 2],"s":"Foo"}"#).unwrap();
     let dict = doc.as_dict();
     assert_eq!(dict.count(), 4);
@@ -82,6 +91,9 @@ fn basic_values() {
 
 #[test]
 fn nested_borrow_check() {
+    init_logging();
+    let _leak_checker = LeakChecker::new();
+
     let v: Value;
     let mut str = String::new();
 
@@ -116,6 +128,9 @@ fn borrow_check() {
 
 #[test]
 fn dict_to_hash_set() {
+    init_logging();
+    let _leak_checker = LeakChecker::new();
+
     let mut mut_dict = MutableDict::new();
 
     mut_dict.at("id1").put_bool(true);
@@ -132,6 +147,9 @@ fn dict_to_hash_set() {
 
 #[test]
 fn mutable_dict() {
+    init_logging();
+    let _leak_checker = LeakChecker::new();
+
     let mut dict = MutableDict::new();
     assert_eq!(dict.count(), 0);
     assert_eq!(dict.get("a"), Value::UNDEFINED);
@@ -152,6 +170,9 @@ fn mutable_dict() {
 
 #[test]
 fn mutable_dict_to_from_hash_map() {
+    init_logging();
+    let _leak_checker = LeakChecker::new();
+
     let mut dict = MutableDict::new();
 
     dict.at("id1").put_string("value1");
@@ -170,6 +191,9 @@ fn mutable_dict_to_from_hash_map() {
 
 #[test]
 fn dict_exact_size_iterator() {
+    init_logging();
+    let _leak_checker = LeakChecker::new();
+
     let mut mut_dict = MutableDict::new();
     mut_dict.at("1").put_string("value1");
     mut_dict.at("2").put_string("value2");
@@ -182,6 +206,9 @@ fn dict_exact_size_iterator() {
 
 #[test]
 fn dict_from_iterator() {
+    init_logging();
+    let _leak_checker = LeakChecker::new();
+
     let dict: MutableDict = Fleece::parse_json(r#"{"1": "value1","f":12.34}"#)
         .unwrap()
         .as_dict()
@@ -202,6 +229,9 @@ fn dict_from_iterator() {
 
 #[test]
 fn array_at() {
+    init_logging();
+    let _leak_checker = LeakChecker::new();
+
     let mut mut_arr = MutableArray::new();
     assert!(mut_arr.at(0).is_none());
     mut_arr.append().put_string("value1");
@@ -210,6 +240,9 @@ fn array_at() {
 
 #[test]
 fn array_exact_size_iterator() {
+    init_logging();
+    let _leak_checker = LeakChecker::new();
+
     let mut mut_arr = MutableArray::new();
     mut_arr.append().put_string("value1");
     mut_arr.append().put_string("value2");
@@ -222,6 +255,9 @@ fn array_exact_size_iterator() {
 
 #[test]
 fn array_from_iterator() {
+    init_logging();
+    let _leak_checker = LeakChecker::new();
+
     let arr: MutableArray = Fleece::parse_json(r#"["value1","value2"]"#)
         .unwrap()
         .as_array()

tests/utils.rs

@@ -11,11 +11,6 @@ use std::{
 #[cfg(feature = "enterprise")]
 use std::collections::HashMap;
 
-// Enables check for leaks of native CBL objects after `with_db()` finishes.
-// WARNING: These checks only work if one test method runs at a time, i.e. testing is single
-//          threaded. Run as `cargo test -- --test-threads=1` or you'll get false positives.
-const LEAK_CHECK: Option<&'static str> = option_env!("LEAK_CHECK");
-
 pub const DB_NAME: &str = "test_db";
 
 const LEVEL_PREFIX: [&str; 5] = ["((", "_", "", "WARNING: ", "***ERROR: "];
@@ -36,7 +31,7 @@ pub fn init_logging() {
     logging::set_console_level(logging::Level::None);
 }
 
-struct LeakChecker {
+pub struct LeakChecker {
     is_checking: bool,
     start_instance_count: usize,
     end_instance_count: usize,