OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix up tests

Browse Source
This commit is contained in:
djzin 2016-12-23 23:51:32 +00:00
parent 18f1b1fce4
commit c72605ac62
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/libcollectionstest/btree/map.rs
View File

@ -170,7 +170,7 @@ fn test_range_small() {
let map: BTreeMap<_, _> = (0..size).map(|i| (i, i)).collect(); let map: BTreeMap<_, _> = (0..size).map(|i| (i, i)).collect();
let mut j = 0; let mut j = 0;
for ((&k, &v), i) in map.range(Included(&2), Unbounded).zip(2..size) { for ((&k, &v), i) in map.range(2..).zip(2..size) {
assert_eq!(k, i); assert_eq!(k, i);
assert_eq!(v, i); assert_eq!(v, i);
j += 1; j += 1;
@ -184,7 +184,7 @@ fn test_range_1000() {
let map: BTreeMap<_, _> = (0..size).map(|i| (i, i)).collect(); let map: BTreeMap<_, _> = (0..size).map(|i| (i, i)).collect();
fn test(map: &BTreeMap<u32, u32>, size: u32, min: Bound<&u32>, max: Bound<&u32>) { fn test(map: &BTreeMap<u32, u32>, size: u32, min: Bound<&u32>, max: Bound<&u32>) {
let mut kvs = map.range(min, max).map(|(&k, &v)| (k, v)); let mut kvs = map.range((min, max)).map(|(&k, &v)| (k, v));
let mut pairs = (0..size).map(|i| (i, i)); let mut pairs = (0..size).map(|i| (i, i));
for (kv, pair) in kvs.by_ref().zip(pairs.by_ref()) { for (kv, pair) in kvs.by_ref().zip(pairs.by_ref()) {
@ -201,6 +201,20 @@ fn test_range_1000() {
test(&map, size, Unbounded, Unbounded); test(&map, size, Unbounded, Unbounded);
} }
#[test]
fn test_range_borrowed_key() {
let mut map = BTreeMap::new();
map.insert("aardvark".to_string(), 1);
map.insert("baboon".to_string(), 2);
map.insert("coyote".to_string(), 3);
map.insert("dingo".to_string(), 4);
// NOTE: would like to use simply "a".."d" here...
let mut iter = map.range("b".to_string().."d".to_string());
assert_eq!(iter.next(), Some((&"baboon".to_string(), &2)));
assert_eq!(iter.next(), Some((&"coyote".to_string(), &3)));
assert_eq!(iter.next(), None);
}
#[test] #[test]
fn test_range() { fn test_range() {
let size = 200; let size = 200;
@ -208,7 +222,7 @@ fn test_range() {
for i in 0..size { for i in 0..size {
for j in i..size { for j in i..size {
let mut kvs = map.range(Included(&i), Included(&j)).map(|(&k, &v)| (k, v)); let mut kvs = map.range((Included(&i), Included(&j))).map(|(&k, &v)| (k, v));
let mut pairs = (i..j + 1).map(|i| (i, i)); let mut pairs = (i..j + 1).map(|i| (i, i));
for (kv, pair) in kvs.by_ref().zip(pairs.by_ref()) { for (kv, pair) in kvs.by_ref().zip(pairs.by_ref()) {