modified macros in the database tests

bitcoindevkit · Jun 18, 2022 · daa5dcd · daa5dcd
1 parent 9a4d4ab
commit daa5dcd
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 107 deletions.
diff --git a/src/database/keyvalue.rs b/src/database/keyvalue.rs
@@ -469,13 +469,17 @@ mod test {
     }
 
     make_tests![
-        test_script_pubkey,
-        test_iter_script_pubkey,
-        test_del_script_pubkey,
-        test_utxo,
-        test_raw_tx,
-        test_tx,
-        test_last_index,
-        test_sync_time
+        @getter get_tree(),
+        @tests(
+            test_script_pubkey,
+            test_batch_script_pubkey,
+            test_iter_script_pubkey,
+            test_del_script_pubkey,
+            test_utxo,
+            test_raw_tx,
+            test_tx,
+            test_last_index,
+            test_sync_time
+        )
     ];
 }
diff --git a/src/database/memory.rs b/src/database/memory.rs
@@ -491,57 +491,17 @@ mod test {
     }
 
     make_tests![
-        test_script_pubkey,
-        test_iter_script_pubkey,
-        test_del_script_pubkey,
-        test_utxo,
-        test_raw_tx,
-        test_tx,
-        test_last_index,
-        test_sync_time
+        @getter get_tree(),
+        @tests(
+            test_script_pubkey,
+            test_batch_script_pubkey,
+            test_iter_script_pubkey,
+            test_del_script_pubkey,
+            test_utxo,
+            test_raw_tx,
+            test_tx,
+            test_last_index,
+            test_sync_time
+        )
     ];
-    // #[test]
-    // fn test_script_pubkey() {
-    //     crate::database::test::test_script_pubkey(get_tree());
-    // }
-
-    // #[test]
-    // fn test_batch_script_pubkey() {
-    //     crate::database::test::test_batch_script_pubkey(get_tree());
-    // }
-
-    // #[test]
-    // fn test_iter_script_pubkey() {
-    //     crate::database::test::test_iter_script_pubkey(get_tree());
-    // }
-
-    // #[test]
-    // fn test_del_script_pubkey() {
-    //     crate::database::test::test_del_script_pubkey(get_tree());
-    // }
-
-    // #[test]
-    // fn test_utxo() {
-    //     crate::database::test::test_utxo(get_tree());
-    // }
-
-    // #[test]
-    // fn test_raw_tx() {
-    //     crate::database::test::test_raw_tx(get_tree());
-    // }
-
-    // #[test]
-    // fn test_tx() {
-    //     crate::database::test::test_tx(get_tree());
-    // }
-
-    // #[test]
-    // fn test_last_index() {
-    //     crate::database::test::test_last_index(get_tree());
-    // }
-
-    // #[test]
-    // fn test_sync_time() {
-    //     crate::database::test::test_sync_time(get_tree());
-    // }
 }
diff --git a/src/database/mod.rs b/src/database/mod.rs
@@ -222,12 +222,12 @@ impl<T: Database> DatabaseUtils for T {}
 #[macro_export]
 #[doc(hidden)]
 macro_rules! make_tests {
-    ($($x:tt) , + $(,)?) => {
+    (@getter $fn_name:ident(), @tests ( $($x:tt) , + $(,)? )) => {
         $(
           #[test]
           fn $x()
           {
-            $crate::database::test::$x(get_tree());
+            $crate::database::test::$x($fn_name());
           }
         )+
     };

diff --git a/src/database/sqlite.rs b/src/database/sqlite.rs
@@ -976,7 +976,7 @@ pub fn migrate(conn: &Connection) -> rusqlite::Result<()> {
 
 #[cfg(test)]
 pub mod test {
-    use crate::database::SqliteDatabase;
+    use crate::{database::SqliteDatabase, make_tests};
     use std::time::{SystemTime, UNIX_EPOCH};
 
     fn get_database() -> SqliteDatabase {
@@ -986,48 +986,18 @@ pub mod test {
         SqliteDatabase::new(String::from(dir.to_str().unwrap()))
     }
 
-    #[test]
-    fn test_script_pubkey() {
-        crate::database::test::test_script_pubkey(get_database());
-    }
-
-    #[test]
-    fn test_batch_script_pubkey() {
-        crate::database::test::test_batch_script_pubkey(get_database());
-    }
-
-    #[test]
-    fn test_iter_script_pubkey() {
-        crate::database::test::test_iter_script_pubkey(get_database());
-    }
-
-    #[test]
-    fn test_del_script_pubkey() {
-        crate::database::test::test_del_script_pubkey(get_database());
-    }
-
-    #[test]
-    fn test_utxo() {
-        crate::database::test::test_utxo(get_database());
-    }
-
-    #[test]
-    fn test_raw_tx() {
-        crate::database::test::test_raw_tx(get_database());
-    }
-
-    #[test]
-    fn test_tx() {
-        crate::database::test::test_tx(get_database());
-    }
-
-    #[test]
-    fn test_last_index() {
-        crate::database::test::test_last_index(get_database());
-    }
-
-    #[test]
-    fn test_sync_time() {
-        crate::database::test::test_sync_time(get_database());
-    }
+    make_tests![
+        @getter get_database(),
+        @tests(
+            test_script_pubkey,
+            test_batch_script_pubkey,
+            test_iter_script_pubkey,
+            test_del_script_pubkey,
+            test_utxo,
+            test_raw_tx,
+            test_tx,
+            test_last_index,
+            test_sync_time
+        )
+    ];
 }