Skip to content

Commit dc30c48

Browse files
committed
Move partition/partitioned/concat/connect tests back into slice
There was no reason to remove them from slice. They're testing methods defined in slice, so that's where they belong. Leave vec with copies of the partition/partitioned tests because it has its own implementation of those methods.
1 parent f582150 commit dc30c48

File tree

2 files changed

+40
-26
lines changed

2 files changed

+40
-26
lines changed

src/libstd/slice.rs

+36
Original file line numberDiff line numberDiff line change
@@ -1368,6 +1368,42 @@ mod tests {
13681368
}
13691369
}
13701370

1371+
#[test]
1372+
fn test_partition() {
1373+
assert_eq!((box []).partition(|x: &int| *x < 3), (vec![], vec![]));
1374+
assert_eq!((box [1, 2, 3]).partition(|x: &int| *x < 4), (vec![1, 2, 3], vec![]));
1375+
assert_eq!((box [1, 2, 3]).partition(|x: &int| *x < 2), (vec![1], vec![2, 3]));
1376+
assert_eq!((box [1, 2, 3]).partition(|x: &int| *x < 0), (vec![], vec![1, 2, 3]));
1377+
}
1378+
1379+
#[test]
1380+
fn test_partitioned() {
1381+
assert_eq!(([]).partitioned(|x: &int| *x < 3), (vec![], vec![]));
1382+
assert_eq!(([1, 2, 3]).partitioned(|x: &int| *x < 4), (vec![1, 2, 3], vec![]));
1383+
assert_eq!(([1, 2, 3]).partitioned(|x: &int| *x < 2), (vec![1], vec![2, 3]));
1384+
assert_eq!(([1, 2, 3]).partitioned(|x: &int| *x < 0), (vec![], vec![1, 2, 3]));
1385+
}
1386+
1387+
#[test]
1388+
fn test_concat() {
1389+
let v: [~[int], ..0] = [];
1390+
assert_eq!(v.concat_vec(), vec![]);
1391+
assert_eq!([box [1], box [2,3]].concat_vec(), vec![1, 2, 3]);
1392+
1393+
assert_eq!([&[1], &[2,3]].concat_vec(), vec![1, 2, 3]);
1394+
}
1395+
1396+
#[test]
1397+
fn test_connect() {
1398+
let v: [~[int], ..0] = [];
1399+
assert_eq!(v.connect_vec(&0), vec![]);
1400+
assert_eq!([box [1], box [2, 3]].connect_vec(&0), vec![1, 0, 2, 3]);
1401+
assert_eq!([box [1], box [2], box [3]].connect_vec(&0), vec![1, 0, 2, 0, 3]);
1402+
1403+
assert_eq!([&[1], &[2, 3]].connect_vec(&0), vec![1, 0, 2, 3]);
1404+
assert_eq!([&[1], &[2], &[3]].connect_vec(&0), vec![1, 0, 2, 0, 3]);
1405+
}
1406+
13711407
#[test]
13721408
fn test_shift() {
13731409
let mut x = vec![1, 2, 3];

src/libstd/vec.rs

+4-26
Original file line numberDiff line numberDiff line change
@@ -1755,32 +1755,10 @@ mod tests {
17551755

17561756
#[test]
17571757
fn test_partitioned() {
1758-
assert_eq!(([]).partitioned(|x: &int| *x < 3), (vec![], vec![]))
1759-
assert_eq!(([1, 2, 3]).partitioned(|x: &int| *x < 4), (vec![1, 2, 3], vec![]));
1760-
assert_eq!(([1, 2, 3]).partitioned(|x: &int| *x < 2), (vec![1], vec![2, 3]));
1761-
assert_eq!(([1, 2, 3]).partitioned(|x: &int| *x < 0), (vec![], vec![1, 2, 3]));
1762-
}
1763-
1764-
#[test]
1765-
fn test_concat() {
1766-
let v: [Vec<int>, ..0] = [];
1767-
assert_eq!(v.concat_vec(), vec![]);
1768-
assert_eq!([vec![1], vec![2,3]].concat_vec(), vec![1, 2, 3]);
1769-
1770-
assert_eq!([&[1], &[2,3]].concat_vec(), vec![1, 2, 3]);
1771-
}
1772-
1773-
#[test]
1774-
fn test_connect() {
1775-
let v: [~[int], ..0] = [];
1776-
assert_eq!(v.connect_vec(&0), vec![]);
1777-
assert_eq!([vec![1], vec![2, 3]].connect_vec(&0), vec![1, 0, 2, 3]);
1778-
assert_eq!([vec![1], vec![2], vec![3]].connect_vec(&0), vec![1, 0, 2, 0, 3]);
1779-
1780-
let v: [&[int], ..0] = [];
1781-
assert_eq!(v.connect_vec(&0), vec![]);
1782-
assert_eq!([&[1], &[2, 3]].connect_vec(&0), vec![1, 0, 2, 3]);
1783-
assert_eq!([&[1], &[2], &[3]].connect_vec(&0), vec![1, 0, 2, 0, 3]);
1758+
assert_eq!(vec![].partitioned(|x: &int| *x < 3), (vec![], vec![]))
1759+
assert_eq!(vec![1, 2, 3].partitioned(|x: &int| *x < 4), (vec![1, 2, 3], vec![]));
1760+
assert_eq!(vec![1, 2, 3].partitioned(|x: &int| *x < 2), (vec![1], vec![2, 3]));
1761+
assert_eq!(vec![1, 2, 3].partitioned(|x: &int| *x < 0), (vec![], vec![1, 2, 3]));
17841762
}
17851763

17861764
#[test]

0 commit comments

Comments
 (0)