diff --git a/src/libstd/slice.rs b/src/libstd/slice.rs index 2650c39bdb86..21084407b8d0 100644 --- a/src/libstd/slice.rs +++ b/src/libstd/slice.rs @@ -1368,6 +1368,42 @@ mod tests { } } + #[test] + fn test_partition() { + assert_eq!((box []).partition(|x: &int| *x < 3), (vec![], vec![])); + assert_eq!((box [1, 2, 3]).partition(|x: &int| *x < 4), (vec![1, 2, 3], vec![])); + assert_eq!((box [1, 2, 3]).partition(|x: &int| *x < 2), (vec![1], vec![2, 3])); + assert_eq!((box [1, 2, 3]).partition(|x: &int| *x < 0), (vec![], vec![1, 2, 3])); + } + + #[test] + fn test_partitioned() { + assert_eq!(([]).partitioned(|x: &int| *x < 3), (vec![], vec![])); + assert_eq!(([1, 2, 3]).partitioned(|x: &int| *x < 4), (vec![1, 2, 3], vec![])); + assert_eq!(([1, 2, 3]).partitioned(|x: &int| *x < 2), (vec![1], vec![2, 3])); + assert_eq!(([1, 2, 3]).partitioned(|x: &int| *x < 0), (vec![], vec![1, 2, 3])); + } + + #[test] + fn test_concat() { + let v: [~[int], ..0] = []; + assert_eq!(v.concat_vec(), vec![]); + assert_eq!([box [1], box [2,3]].concat_vec(), vec![1, 2, 3]); + + assert_eq!([&[1], &[2,3]].concat_vec(), vec![1, 2, 3]); + } + + #[test] + fn test_connect() { + let v: [~[int], ..0] = []; + assert_eq!(v.connect_vec(&0), vec![]); + assert_eq!([box [1], box [2, 3]].connect_vec(&0), vec![1, 0, 2, 3]); + assert_eq!([box [1], box [2], box [3]].connect_vec(&0), vec![1, 0, 2, 0, 3]); + + assert_eq!([&[1], &[2, 3]].connect_vec(&0), vec![1, 0, 2, 3]); + assert_eq!([&[1], &[2], &[3]].connect_vec(&0), vec![1, 0, 2, 0, 3]); + } + #[test] fn test_shift() { let mut x = vec![1, 2, 3]; diff --git a/src/libstd/vec.rs b/src/libstd/vec.rs index 82ec1cbc56c0..da01da267095 100644 --- a/src/libstd/vec.rs +++ b/src/libstd/vec.rs @@ -1755,32 +1755,10 @@ mod tests { #[test] fn test_partitioned() { - assert_eq!(([]).partitioned(|x: &int| *x < 3), (vec![], vec![])) - assert_eq!(([1, 2, 3]).partitioned(|x: &int| *x < 4), (vec![1, 2, 3], vec![])); - assert_eq!(([1, 2, 3]).partitioned(|x: &int| *x < 2), (vec![1], vec![2, 3])); - assert_eq!(([1, 2, 3]).partitioned(|x: &int| *x < 0), (vec![], vec![1, 2, 3])); - } - - #[test] - fn test_concat() { - let v: [Vec, ..0] = []; - assert_eq!(v.concat_vec(), vec![]); - assert_eq!([vec![1], vec![2,3]].concat_vec(), vec![1, 2, 3]); - - assert_eq!([&[1], &[2,3]].concat_vec(), vec![1, 2, 3]); - } - - #[test] - fn test_connect() { - let v: [~[int], ..0] = []; - assert_eq!(v.connect_vec(&0), vec![]); - assert_eq!([vec![1], vec![2, 3]].connect_vec(&0), vec![1, 0, 2, 3]); - assert_eq!([vec![1], vec![2], vec![3]].connect_vec(&0), vec![1, 0, 2, 0, 3]); - - let v: [&[int], ..0] = []; - assert_eq!(v.connect_vec(&0), vec![]); - assert_eq!([&[1], &[2, 3]].connect_vec(&0), vec![1, 0, 2, 3]); - assert_eq!([&[1], &[2], &[3]].connect_vec(&0), vec![1, 0, 2, 0, 3]); + assert_eq!(vec![].partitioned(|x: &int| *x < 3), (vec![], vec![])) + assert_eq!(vec![1, 2, 3].partitioned(|x: &int| *x < 4), (vec![1, 2, 3], vec![])); + assert_eq!(vec![1, 2, 3].partitioned(|x: &int| *x < 2), (vec![1], vec![2, 3])); + assert_eq!(vec![1, 2, 3].partitioned(|x: &int| *x < 0), (vec![], vec![1, 2, 3])); } #[test]