From 0e2d3d41bb42abe1c40585d2ed06aea2840e664f Mon Sep 17 00:00:00 2001
From: Stjepan Glavina <stjepang@gmail.com>
Date: Fri, 31 Mar 2017 16:59:01 +0200
Subject: [PATCH] Test sort algorithms using a random cmp function
---
src/libcollectionstest/slice.rs | 16 +++++++++++++++-
src/libcoretest/slice.rs | 12 ++++++++++++
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/src/libcollectionstest/slice.rs b/src/libcollectionstest/slice.rs
index 00d4dbe9c0458..c3e5304fb2b35 100644
--- a/src/libcollectionstest/slice.rs
+++ b/src/libcollectionstest/slice.rs
@@ -383,9 +383,11 @@ fn test_reverse() {
#[test]
fn test_sort() {
+ let mut rng = thread_rng();
+
for len in (2..25).chain(500..510) {
for _ in 0..100 {
- let mut v: Vec<_> = thread_rng().gen_iter::<i32>().take(len).collect();
+ let mut v: Vec<_> = rng.gen_iter::<i32>().take(len).collect();
let mut v1 = v.clone();
v.sort();
@@ -399,6 +401,18 @@ fn test_sort() {
}
}
+ // Sort using a completely random comparison function.
+ // This will reorder the elements *somehow*, but won't panic.
+ let mut v = [0; 500];
+ for i in 0..v.len() {
+ v[i] = i as i32;
+ }
+ v.sort_by(|_, _| *rng.choose(&[Less, Equal, Greater]).unwrap());
+ v.sort();
+ for i in 0..v.len() {
+ assert_eq!(v[i], i as i32);
+ }
+
// Should not panic.
[0i32; 0].sort();
[(); 10].sort();
diff --git a/src/libcoretest/slice.rs b/src/libcoretest/slice.rs
index 89bd3be08519c..ec38345030fa5 100644
--- a/src/libcoretest/slice.rs
+++ b/src/libcoretest/slice.rs
@@ -8,6 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
+use core::cmp::Ordering::{Equal, Greater, Less};
use core::slice::heapsort;
use core::result::Result::{Ok, Err};
use rand::{Rng, XorShiftRng};
@@ -268,6 +269,17 @@ fn sort_unstable() {
}
}
+ // Sort using a completely random comparison function.
+ // This will reorder the elements *somehow*, but won't panic.
+ for i in 0..v.len() {
+ v[i] = i as i32;
+ }
+ v.sort_unstable_by(|_, _| *rng.choose(&[Less, Equal, Greater]).unwrap());
+ v.sort_unstable();
+ for i in 0..v.len() {
+ assert_eq!(v[i], i as i32);
+ }
+
// Should not panic.
[0i32; 0].sort_unstable();
[(); 10].sort_unstable();