Use the new access methods in the tests

This makes the tests not rely on the underlying structure of the data.

Author: mangelats

tests/iter.rs

@@ -35,9 +35,9 @@ fn iter_mut() {
     for particle in particles.iter_mut() {
         *particle.mass += 1.0;
     }
-    assert_eq!(particles.mass[0], 1.0);
-    assert_eq!(particles.mass[1], 1.0);
-    assert_eq!(particles.mass[2], 1.0);
+    assert_eq!(*particles.index(0).mass, 1.0);
+    assert_eq!(*particles.index(1).mass, 1.0);
+    assert_eq!(*particles.index(2).mass, 1.0);
 
     {
         let mut slice = particles.as_mut_slice();
@@ -46,9 +46,9 @@ fn iter_mut() {
         }
     }
 
-    assert_eq!(particles.mass[0], 2.0);
-    assert_eq!(particles.mass[1], 2.0);
-    assert_eq!(particles.mass[2], 2.0);
+    assert_eq!(*particles.index(0).mass, 2.0);
+    assert_eq!(*particles.index(1).mass, 2.0);
+    assert_eq!(*particles.index(2).mass, 2.0);
 }
 
 #[test]

tests/ptr.rs

@@ -53,11 +53,11 @@ fn slice() {
     unsafe {
         let slice = ParticleSlice::from_raw_parts(ptr, 2);
         assert_eq!(slice.len(), 2);
-        assert_eq!(slice.name[0], "Na");
-        assert_eq!(slice.name[1], "Zn");
+        assert_eq!(slice.index(0).name, "Na");
+        assert_eq!(slice.index(1).name, "Zn");
 
-        assert_eq!(slice.mass[0], 1.0);
-        assert_eq!(slice.mass[1], 2.0);
+        assert_eq!(*slice.index(0).mass, 1.0);
+        assert_eq!(*slice.index(1).mass, 2.0);
     }
 }
 
@@ -77,8 +77,8 @@ fn slice_mut() {
         *ptr.as_mut().unwrap().mass = 42.0;
     }
 
-    assert_eq!(slice.name[0], "Fe");
-    assert_eq!(slice.mass[0], 42.0);
+    assert_eq!(slice.index(0).name, "Fe");
+    assert_eq!(*slice.index(0).mass, 42.0);
 
     unsafe {
         let slice = ParticleSliceMut::from_raw_parts_mut(ptr, 2);
@@ -88,9 +88,9 @@ fn slice_mut() {
         }
     }
 
-    assert_eq!(slice.mass[0], -1.0);
-    assert_eq!(slice.mass[1], -1.0);
-    assert_eq!(slice.mass[2], 3.0);
+    assert_eq!(*slice.index(0).mass, -1.0);
+    assert_eq!(*slice.index(1).mass, -1.0);
+    assert_eq!(*slice.index(2).mass, 3.0);
 }
 
 #[test]
@@ -119,12 +119,12 @@ fn vec() {
     assert_eq!(particles.len(), len);
     assert_eq!(particles.capacity(), capacity);
 
-    assert_eq!(particles.name[0], "Fe");
-    assert_eq!(particles.mass[0], 42.0);
+    assert_eq!(particles.index(0).name, "Fe");
+    assert_eq!(*particles.index(0).mass, 42.0);
 
-    assert_eq!(particles.name[1], "Zn");
-    assert_eq!(particles.mass[1], 2.0);
+    assert_eq!(particles.index(1).name, "Zn");
+    assert_eq!(*particles.index(1).mass, 2.0);
 
-    assert_eq!(particles.name[2], "Fe");
-    assert_eq!(particles.mass[2], 3.0);
+    assert_eq!(particles.index(2).name, "Fe");
+    assert_eq!(*particles.index(2).mass, 3.0);
 }

tests/vec.rs

@@ -78,9 +78,9 @@ fn swap_remove() {
 
     let particle = particles.swap_remove(1);
     assert_eq!(particle.name, "Na");
-    assert_eq!(particles.name[0], "Cl");
-    assert_eq!(particles.name[1], "Zn");
-    assert_eq!(particles.name[2], "Br");
+    assert_eq!(particles.index(0).name, "Cl");
+    assert_eq!(particles.index(1).name, "Zn");
+    assert_eq!(particles.index(2).name, "Br");
 }
 
 #[test]
@@ -90,9 +90,9 @@ fn insert() {
     particles.push(Particle::new(String::from("Na"), 0.0));
 
     particles.insert(1, Particle::new(String::from("Zn"), 0.0));
-    assert_eq!(particles.name[0], "Cl");
-    assert_eq!(particles.name[1], "Zn");
-    assert_eq!(particles.name[2], "Na");
+    assert_eq!(particles.index(0).name, "Cl");
+    assert_eq!(particles.index(1).name, "Zn");
+    assert_eq!(particles.index(2).name, "Na");
 }
 
 #[test]
@@ -122,10 +122,10 @@ fn append() {
     others.push(Particle::new(String::from("Mg"), 0.0));
 
     particles.append(&mut others);
-    assert_eq!(particles.name[0], "Cl");
-    assert_eq!(particles.name[1], "Na");
-    assert_eq!(particles.name[2], "Zn");
-    assert_eq!(particles.name[3], "Mg");
+    assert_eq!(particles.index(0).name, "Cl");
+    assert_eq!(particles.index(1).name, "Na");
+    assert_eq!(particles.index(2).name, "Zn");
+    assert_eq!(particles.index(3).name, "Mg");
 }
 
 #[test]
@@ -140,10 +140,10 @@ fn split_off() {
     assert_eq!(particles.len(), 2);
     assert_eq!(other.len(), 2);
 
-    assert_eq!(particles.name[0], "Cl");
-    assert_eq!(particles.name[1], "Na");
-    assert_eq!(other.name[0], "Zn");
-    assert_eq!(other.name[1], "Mg");
+    assert_eq!(particles.index(0).name, "Cl");
+    assert_eq!(particles.index(1).name, "Na");
+    assert_eq!(other.index(0).name, "Zn");
+    assert_eq!(other.index(1).name, "Mg");
 }
 
 #[test]
@@ -156,6 +156,6 @@ fn retain() {
 
     particles.retain(|particle| particle.name.starts_with("C"));
     assert_eq!(particles.len(), 2);
-    assert_eq!(particles.name[0], "Cl");
-    assert_eq!(particles.name[1], "C");
+    assert_eq!(particles.index(0).name, "Cl");
+    assert_eq!(particles.index(1).name, "C");
 }