Fix the tests of SparseArrayUsize so that it works on 32 bit computers.

orium · orium · commit bae53d3a92f1 · 2023-09-07T00:33:32.000+01:00
This issue did not affect production code which did work correctly on 32-bit platforms. Closes #81.
diff --git a/src/map/hash_trie_map/mod.rs b/src/map/hash_trie_map/mod.rs
@@ -217,9 +217,9 @@ mod node_utils {
     use core::hash::Hasher;
     use core::mem::size_of_val;
 
-    // Returns the index of the array for the given hash on depth `depth`.
-    //
-    // When the hash is exhausted, meaning that we are at the maximum depth, this returns `None`.
+    /// Returns the index of the array for the given hash on depth `depth`.
+    ///
+    /// When the hash is exhausted, meaning that we are at the maximum depth, this returns `None`.
     #[inline]
     pub fn index_from_hash(hash: HashValue, depth: usize, degree: u8) -> Option<usize> {
         debug_assert!(degree.is_power_of_two());
diff --git a/src/map/hash_trie_map/sparse_array_usize/test.rs b/src/map/hash_trie_map/sparse_array_usize/test.rs
@@ -4,8 +4,11 @@
  */
 
 use super::*;
+use core::mem::size_of;
 use pretty_assertions::assert_eq;
 
+const USIZE_BITS: usize = 8 * size_of::<usize>();
+
 #[test]
 fn test_new() {
     let empty_array: SparseArrayUsize<u32> = SparseArrayUsize::new();
@@ -21,7 +24,7 @@ fn test_set() {
 
     assert_eq!(array.size(), 0);
     assert_eq!(array.get(0), None);
-    assert_eq!(array.get(63), None);
+    assert_eq!(array.get(USIZE_BITS - 1), None);
 
     array.set(3, 'a');
     assert_eq!(array.size(), 1);
@@ -30,45 +33,45 @@ fn test_set() {
     assert_eq!(array.get(3), Some(&'a'));
     assert_eq!(array.get(4), None);
 
-    array.set(60, 'b');
+    array.set(USIZE_BITS - 4, 'b');
     assert_eq!(array.size(), 2);
 
     assert_eq!(array.get(3), Some(&'a'));
-    assert_eq!(array.get(60), Some(&'b'));
+    assert_eq!(array.get(USIZE_BITS - 4), Some(&'b'));
 
     array.set(3, 'c');
     assert_eq!(array.size(), 2);
 
     assert_eq!(array.get(3), Some(&'c'));
-    assert_eq!(array.get(60), Some(&'b'));
+    assert_eq!(array.get(USIZE_BITS - 4), Some(&'b'));
 }
 
 #[test]
 fn test_remove() {
     let mut array = SparseArrayUsize::new();
 
     array.set(3, 'a');
-    array.set(60, 'b');
+    array.set(USIZE_BITS - 4, 'b');
 
     assert_eq!(array.get(3), Some(&'a'));
-    assert_eq!(array.get(60), Some(&'b'));
+    assert_eq!(array.get(USIZE_BITS - 4), Some(&'b'));
 
-    array.remove(32);
+    array.remove(8);
 
     assert_eq!(array.get(3), Some(&'a'));
-    assert_eq!(array.get(60), Some(&'b'));
+    assert_eq!(array.get(USIZE_BITS - 4), Some(&'b'));
     assert_eq!(array.size(), 2);
 
     array.remove(3);
 
     assert_eq!(array.get(3), None);
-    assert_eq!(array.get(60), Some(&'b'));
+    assert_eq!(array.get(USIZE_BITS - 4), Some(&'b'));
     assert_eq!(array.size(), 1);
 
-    array.remove(60);
+    array.remove(USIZE_BITS - 4);
 
     assert_eq!(array.get(3), None);
-    assert_eq!(array.get(60), None);
+    assert_eq!(array.get(USIZE_BITS - 4), None);
     assert_eq!(array.size(), 0);
 }
 
@@ -78,10 +81,10 @@ fn test_first() {
 
     assert_eq!(array.first(), None);
 
-    array.set(31, 'a');
+    array.set(8, 'a');
     assert_eq!(array.first(), Some(&'a'));
 
-    array.set(60, 'b');
+    array.set(USIZE_BITS - 4, 'b');
     assert_eq!(array.first(), Some(&'a'));
 
     array.set(2, 'c');
@@ -95,8 +98,8 @@ fn test_first() {
 fn test_pop() {
     let mut array = SparseArrayUsize::new();
 
-    array.set(60, 'b');
-    array.set(31, 'a');
+    array.set(USIZE_BITS - 4, 'b');
+    array.set(8, 'a');
 
     assert_eq!(array.pop(), Some('b'));
     assert_eq!(array.pop(), Some('a'));
