chore: more test & optimize test

dfinity · Oct 3, 2023 · 676a888 · 676a888
1 parent 5466117
commit 676a888
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/src/btreemap.rs b/src/btreemap.rs
@@ -1412,9 +1412,11 @@ mod test {
             assert_eq!(btree.allocator.num_allocated_chunks(), 0);
 
             assert_eq!(btree.insert(b(&[]), b(&[])), None);
+            assert!(!btree.is_empty());
             assert_eq!(btree.allocator.num_allocated_chunks(), 1);
 
             assert_eq!(btree.pop_last(), Some((b(&[]), b(&[]))));
+            assert!(btree.is_empty());
             assert_eq!(btree.allocator.num_allocated_chunks(), 0);
         });
     }
@@ -1425,9 +1427,11 @@ mod test {
             assert_eq!(btree.allocator.num_allocated_chunks(), 0);
 
             assert_eq!(btree.insert(b(&[]), b(&[])), None);
+            assert!(!btree.is_empty());
             assert_eq!(btree.allocator.num_allocated_chunks(), 1);
 
             assert_eq!(btree.pop_first(), Some((b(&[]), b(&[]))));
+            assert!(btree.is_empty());
             assert_eq!(btree.allocator.num_allocated_chunks(), 0);
         });
     }
@@ -1572,6 +1576,16 @@ mod test {
         });
     }
 
+    #[test]
+    fn pop_on_empty_tree_simple() {
+        btree_test(
+            |mut btree: BTreeMap<Blob<10>, Blob<10>, Rc<RefCell<Vec<u8>>>>| {
+                assert_eq!(btree.pop_last(), None);
+                assert_eq!(btree.pop_first(), None);
+            },
+        );
+    }
+
     #[test]
     fn remove_case_2a_and_2c() {
         btree_test(|mut btree| {
@@ -2053,6 +2067,8 @@ mod test {
         }
 
         // We've deallocated everything.
+        assert!(std_btree.is_empty());
+        assert!(btree.is_empty());
         assert_eq!(btree.allocator.num_allocated_chunks(), 0);
     }
 
@@ -2093,6 +2109,8 @@ mod test {
         }
 
         // We've deallocated everything.
+        assert!(std_btree.is_empty());
+        assert!(btree.is_empty());
         assert_eq!(btree.allocator.num_allocated_chunks(), 0);
     }
 

diff --git a/src/btreemap/proptests.rs b/src/btreemap/proptests.rs
@@ -202,9 +202,6 @@ fn execute_operation<M: Memory>(
         }
         Operation::PopLast => {
             assert_eq!(std_btree.len(), btree.len() as usize);
-            if std_btree.is_empty() {
-                return;
-            }
 
             let idx = std_btree.len();
 
@@ -216,9 +213,6 @@ fn execute_operation<M: Memory>(
         }
         Operation::PopFirst => {
             assert_eq!(std_btree.len(), btree.len() as usize);
-            if std_btree.is_empty() {
-                return;
-            }
 
             let idx = std_btree.len();