Harden sorting tests.

Also confirm elements are intact.

Author: n3vu0r

src/par/merge_sort.rs

@@ -956,6 +956,7 @@ mod test {
 		}
 	}
 
+	#[derive(Debug, Clone, Copy)]
 	struct Item {
 		index: usize,
 		value: u32,
@@ -995,15 +996,14 @@ mod test {
 			.enumerate()
 			.map(Item::from)
 			.collect::<Vec<Item>>();
+		let mut sorted = xs.clone();
+		sorted.sort();
+		let sorted = Array1::from_vec(sorted);
 		let mut array = Array1::from_vec(xs);
 		par_merge_sort(array.view_mut(), Item::lt);
-		for i in 1..array.len() {
-			let [a, b] = [&array[i - 1], &array[i]];
-			if a.value == b.value {
-				assert!(a.index < b.index);
-			} else {
-				assert!(a.value < b.value);
-			}
+		for (a, s) in array.iter().zip(&sorted) {
+			assert_eq!(a.index, s.index);
+			assert_eq!(a.value, s.value);
 		}
 	}
 }

src/par/quick_sort.rs

@@ -149,10 +149,11 @@ mod test {
 	#[cfg_attr(miri, ignore)]
 	#[quickcheck]
 	fn sorted(xs: Vec<u32>) {
+		let mut sorted = xs.clone();
+		sorted.sort_unstable();
+		let sorted = Array1::from_vec(sorted);
 		let mut array = Array1::from_vec(xs);
 		par_quick_sort(array.view_mut(), u32::lt);
-		for i in 1..array.len() {
-			assert!(array[i - 1] <= array[i]);
-		}
+		assert_eq!(array, sorted);
 	}
 }

src/quick_sort.rs

@@ -132,10 +132,11 @@ mod test {
 
 	#[quickcheck]
 	fn sorted(xs: Vec<u32>) {
+		let mut sorted = xs.clone();
+		sorted.sort_unstable();
+		let sorted = Array1::from_vec(sorted);
 		let mut array = Array1::from_vec(xs);
 		quick_sort(array.view_mut(), &mut u32::lt);
-		for i in 1..array.len() {
-			assert!(array[i - 1] <= array[i]);
-		}
+		assert_eq!(array, sorted);
 	}
 }

src/stable_sort.rs

@@ -79,6 +79,7 @@ mod test {
 	use ndarray::Array1;
 	use quickcheck_macros::quickcheck;
 
+	#[derive(Debug, Clone, Copy)]
 	struct Item {
 		index: usize,
 		value: u32,
@@ -117,15 +118,14 @@ mod test {
 			.enumerate()
 			.map(Item::from)
 			.collect::<Vec<Item>>();
+		let mut sorted = xs.clone();
+		sorted.sort();
+		let sorted = Array1::from_vec(sorted);
 		let mut array = Array1::from_vec(xs);
 		stable_sort(array.view_mut(), &mut Item::lt);
-		for i in 1..array.len() {
-			let [a, b] = [&array[i - 1], &array[i]];
-			if a.value == b.value {
-				assert!(a.index < b.index);
-			} else {
-				assert!(a.value < b.value);
-			}
+		for (a, s) in array.iter().zip(&sorted) {
+			assert_eq!(a.index, s.index);
+			assert_eq!(a.value, s.value);
 		}
 	}
 }