diff options
Diffstat (limited to 'src/libstd/oldmap.rs')
| -rw-r--r-- | src/libstd/oldmap.rs | 164 |
1 files changed, 82 insertions, 82 deletions
diff --git a/src/libstd/oldmap.rs b/src/libstd/oldmap.rs index eb5ad2b6d73..0f6434f1b2b 100644 --- a/src/libstd/oldmap.rs +++ b/src/libstd/oldmap.rs @@ -427,59 +427,59 @@ mod tests { debug!("uint -> uint"); let hm_uu: HashMap<uint, uint> = HashMap::<uint, uint>(); - assert (hm_uu.insert(10u, 12u)); - assert (hm_uu.insert(11u, 13u)); - assert (hm_uu.insert(12u, 14u)); - assert (hm_uu.get(&11) == 13u); - assert (hm_uu.get(&12) == 14u); - assert (hm_uu.get(&10) == 12u); - assert (!hm_uu.insert(12u, 14u)); - assert (hm_uu.get(&12) == 14u); - assert (!hm_uu.insert(12u, 12u)); - assert (hm_uu.get(&12) == 12u); + fail_unless!((hm_uu.insert(10u, 12u))); + fail_unless!((hm_uu.insert(11u, 13u))); + fail_unless!((hm_uu.insert(12u, 14u))); + fail_unless!((hm_uu.get(&11) == 13u)); + fail_unless!((hm_uu.get(&12) == 14u)); + fail_unless!((hm_uu.get(&10) == 12u)); + fail_unless!((!hm_uu.insert(12u, 14u))); + fail_unless!((hm_uu.get(&12) == 14u)); + fail_unless!((!hm_uu.insert(12u, 12u))); + fail_unless!((hm_uu.get(&12) == 12u)); let ten: ~str = ~"ten"; let eleven: ~str = ~"eleven"; let twelve: ~str = ~"twelve"; debug!("str -> uint"); let hm_su: HashMap<~str, uint> = HashMap::<~str, uint>(); - assert (hm_su.insert(~"ten", 12u)); - assert (hm_su.insert(eleven, 13u)); - assert (hm_su.insert(~"twelve", 14u)); - assert (hm_su.get(&eleven) == 13u); - assert (hm_su.get(&~"eleven") == 13u); - assert (hm_su.get(&~"twelve") == 14u); - assert (hm_su.get(&~"ten") == 12u); - assert (!hm_su.insert(~"twelve", 14u)); - assert (hm_su.get(&~"twelve") == 14u); - assert (!hm_su.insert(~"twelve", 12u)); - assert (hm_su.get(&~"twelve") == 12u); + fail_unless!((hm_su.insert(~"ten", 12u))); + fail_unless!((hm_su.insert(eleven, 13u))); + fail_unless!((hm_su.insert(~"twelve", 14u))); + fail_unless!((hm_su.get(&eleven) == 13u)); + fail_unless!((hm_su.get(&~"eleven") == 13u)); + fail_unless!((hm_su.get(&~"twelve") == 14u)); + fail_unless!((hm_su.get(&~"ten") == 12u)); + fail_unless!((!hm_su.insert(~"twelve", 14u))); + fail_unless!((hm_su.get(&~"twelve") == 14u)); + fail_unless!((!hm_su.insert(~"twelve", 12u))); + fail_unless!((hm_su.get(&~"twelve") == 12u)); debug!("uint -> str"); let hm_us: HashMap<uint, ~str> = HashMap::<uint, ~str>(); - assert (hm_us.insert(10u, ~"twelve")); - assert (hm_us.insert(11u, ~"thirteen")); - assert (hm_us.insert(12u, ~"fourteen")); - assert hm_us.get(&11) == ~"thirteen"; - assert hm_us.get(&12) == ~"fourteen"; - assert hm_us.get(&10) == ~"twelve"; - assert (!hm_us.insert(12u, ~"fourteen")); - assert hm_us.get(&12) == ~"fourteen"; - assert (!hm_us.insert(12u, ~"twelve")); - assert hm_us.get(&12) == ~"twelve"; + fail_unless!((hm_us.insert(10u, ~"twelve"))); + fail_unless!((hm_us.insert(11u, ~"thirteen"))); + fail_unless!((hm_us.insert(12u, ~"fourteen"))); + fail_unless!(hm_us.get(&11) == ~"thirteen"); + fail_unless!(hm_us.get(&12) == ~"fourteen"); + fail_unless!(hm_us.get(&10) == ~"twelve"); + fail_unless!((!hm_us.insert(12u, ~"fourteen"))); + fail_unless!(hm_us.get(&12) == ~"fourteen"); + fail_unless!((!hm_us.insert(12u, ~"twelve"))); + fail_unless!(hm_us.get(&12) == ~"twelve"); debug!("str -> str"); let hm_ss: HashMap<~str, ~str> = HashMap::<~str, ~str>(); - assert (hm_ss.insert(ten, ~"twelve")); - assert (hm_ss.insert(eleven, ~"thirteen")); - assert (hm_ss.insert(twelve, ~"fourteen")); - assert hm_ss.get(&~"eleven") == ~"thirteen"; - assert hm_ss.get(&~"twelve") == ~"fourteen"; - assert hm_ss.get(&~"ten") == ~"twelve"; - assert (!hm_ss.insert(~"twelve", ~"fourteen")); - assert hm_ss.get(&~"twelve") == ~"fourteen"; - assert (!hm_ss.insert(~"twelve", ~"twelve")); - assert hm_ss.get(&~"twelve") == ~"twelve"; + fail_unless!((hm_ss.insert(ten, ~"twelve"))); + fail_unless!((hm_ss.insert(eleven, ~"thirteen"))); + fail_unless!((hm_ss.insert(twelve, ~"fourteen"))); + fail_unless!(hm_ss.get(&~"eleven") == ~"thirteen"); + fail_unless!(hm_ss.get(&~"twelve") == ~"fourteen"); + fail_unless!(hm_ss.get(&~"ten") == ~"twelve"); + fail_unless!((!hm_ss.insert(~"twelve", ~"fourteen"))); + fail_unless!(hm_ss.get(&~"twelve") == ~"fourteen"); + fail_unless!((!hm_ss.insert(~"twelve", ~"twelve"))); + fail_unless!(hm_ss.get(&~"twelve") == ~"twelve"); debug!("*** finished test_simple"); } @@ -498,7 +498,7 @@ mod tests { HashMap::<uint, uint>(); let mut i: uint = 0u; while i < num_to_insert { - assert (hm_uu.insert(i, i * i)); + fail_unless!((hm_uu.insert(i, i * i))); debug!("inserting %u -> %u", i, i*i); i += 1u; } @@ -506,16 +506,16 @@ mod tests { i = 0u; while i < num_to_insert { debug!("get(%u) = %u", i, hm_uu.get(&i)); - assert (hm_uu.get(&i) == i * i); + fail_unless!((hm_uu.get(&i) == i * i)); i += 1u; } - assert (hm_uu.insert(num_to_insert, 17u)); - assert (hm_uu.get(&num_to_insert) == 17u); + fail_unless!((hm_uu.insert(num_to_insert, 17u))); + fail_unless!((hm_uu.get(&num_to_insert) == 17u)); debug!("-----"); i = 0u; while i < num_to_insert { debug!("get(%u) = %u", i, hm_uu.get(&i)); - assert (hm_uu.get(&i) == i * i); + fail_unless!((hm_uu.get(&i) == i * i)); i += 1u; } debug!("str -> str"); @@ -523,8 +523,8 @@ mod tests { HashMap::<~str, ~str>(); i = 0u; while i < num_to_insert { - assert hm_ss.insert(uint::to_str_radix(i, 2u), - uint::to_str_radix(i * i, 2u)); + fail_unless!(hm_ss.insert(uint::to_str_radix(i, 2u), + uint::to_str_radix(i * i, 2u))); debug!("inserting \"%s\" -> \"%s\"", uint::to_str_radix(i, 2u), uint::to_str_radix(i*i, 2u)); @@ -536,22 +536,22 @@ mod tests { debug!("get(\"%s\") = \"%s\"", uint::to_str_radix(i, 2u), hm_ss.get(&uint::to_str_radix(i, 2u))); - assert hm_ss.get(&uint::to_str_radix(i, 2u)) == - uint::to_str_radix(i * i, 2u); + fail_unless!(hm_ss.get(&uint::to_str_radix(i, 2u)) == + uint::to_str_radix(i * i, 2u)); i += 1u; } - assert (hm_ss.insert(uint::to_str_radix(num_to_insert, 2u), + fail_unless!(hm_ss.insert(uint::to_str_radix(num_to_insert, 2u), uint::to_str_radix(17u, 2u))); - assert hm_ss.get(&uint::to_str_radix(num_to_insert, 2u)) == - uint::to_str_radix(17u, 2u); + fail_unless!(hm_ss.get(&uint::to_str_radix(num_to_insert, 2u)) == + uint::to_str_radix(17u, 2u)); debug!("-----"); i = 0u; while i < num_to_insert { debug!("get(\"%s\") = \"%s\"", uint::to_str_radix(i, 2u), hm_ss.get(&uint::to_str_radix(i, 2u))); - assert hm_ss.get(&uint::to_str_radix(i, 2u)) == - uint::to_str_radix(i * i, 2u); + fail_unless!(hm_ss.get(&uint::to_str_radix(i, 2u)) == + uint::to_str_radix(i * i, 2u)); i += 1u; } debug!("*** finished test_growth"); @@ -565,55 +565,55 @@ mod tests { HashMap::<uint, uint>(); let mut i: uint = 0u; while i < num_to_insert { - assert (hm.insert(i, i * i)); + fail_unless!((hm.insert(i, i * i))); debug!("inserting %u -> %u", i, i*i); i += 1u; } - assert (hm.len() == num_to_insert); + fail_unless!((hm.len() == num_to_insert)); debug!("-----"); debug!("removing evens"); i = 0u; while i < num_to_insert { let v = hm.remove(&i); - assert v; + fail_unless!(v); i += 2u; } - assert (hm.len() == num_to_insert / 2u); + fail_unless!((hm.len() == num_to_insert / 2u)); debug!("-----"); i = 1u; while i < num_to_insert { debug!("get(%u) = %u", i, hm.get(&i)); - assert (hm.get(&i) == i * i); + fail_unless!((hm.get(&i) == i * i)); i += 2u; } debug!("-----"); i = 1u; while i < num_to_insert { debug!("get(%u) = %u", i, hm.get(&i)); - assert (hm.get(&i) == i * i); + fail_unless!((hm.get(&i) == i * i)); i += 2u; } debug!("-----"); i = 0u; while i < num_to_insert { - assert (hm.insert(i, i * i)); + fail_unless!((hm.insert(i, i * i))); debug!("inserting %u -> %u", i, i*i); i += 2u; } - assert (hm.len() == num_to_insert); + fail_unless!((hm.len() == num_to_insert)); debug!("-----"); i = 0u; while i < num_to_insert { debug!("get(%u) = %u", i, hm.get(&i)); - assert (hm.get(&i) == i * i); + fail_unless!((hm.get(&i) == i * i)); i += 1u; } debug!("-----"); - assert (hm.len() == num_to_insert); + fail_unless!((hm.len() == num_to_insert)); i = 0u; while i < num_to_insert { debug!("get(%u) = %u", i, hm.get(&i)); - assert (hm.get(&i) == i * i); + fail_unless!((hm.get(&i) == i * i)); i += 1u; } debug!("*** finished test_removal"); @@ -623,18 +623,18 @@ mod tests { fn test_contains_key() { let key = ~"k"; let map = HashMap::<~str, ~str>(); - assert (!map.contains_key(&key)); + fail_unless!((!map.contains_key(&key))); map.insert(key, ~"val"); - assert (map.contains_key(&key)); + fail_unless!((map.contains_key(&key))); } #[test] fn test_find() { let key = ~"k"; let map = HashMap::<~str, ~str>(); - assert map.find(&key).is_none(); + fail_unless!(map.find(&key).is_none()); map.insert(key, ~"val"); - assert map.find(&key).get() == ~"val"; + fail_unless!(map.find(&key).get() == ~"val"); } #[test] @@ -642,11 +642,11 @@ mod tests { let key = ~"k"; let mut map = HashMap::<~str, ~str>(); map.insert(key, ~"val"); - assert (map.len() == 1); - assert (map.contains_key(&key)); + fail_unless!((map.len() == 1)); + fail_unless!((map.contains_key(&key))); map.clear(); - assert (map.len() == 0); - assert (!map.contains_key(&key)); + fail_unless!((map.len() == 0)); + fail_unless!((!map.contains_key(&key))); } #[test] @@ -656,10 +656,10 @@ mod tests { (~"b", 2), (~"c", 3) ]); - assert map.len() == 3u; - assert map.get(&~"a") == 1; - assert map.get(&~"b") == 2; - assert map.get(&~"c") == 3; + fail_unless!(map.len() == 3u); + fail_unless!(map.get(&~"a") == 1); + fail_unless!(map.get(&~"b") == 2); + fail_unless!(map.get(&~"c") == 3); } #[test] @@ -685,11 +685,11 @@ mod tests { map.update_with_key(~"cat", 2, addMoreToCount); // check the total counts - assert map.find(&~"cat").get() == 10; - assert map.find(&~"ferret").get() == 3; - assert map.find(&~"mongoose").get() == 1; + fail_unless!(map.find(&~"cat").get() == 10); + fail_unless!(map.find(&~"ferret").get() == 3); + fail_unless!(map.find(&~"mongoose").get() == 1); // sadly, no mythical animals were counted! - assert map.find(&~"unicorn").is_none(); + fail_unless!(map.find(&~"unicorn").is_none()); } } |