Skip to content

Commit 3e29fdb

Browse files
committed
Remove a number of vec UI tests, make them unit tests in the alloc library
1 parent 1e33c74 commit 3e29fdb

File tree

7 files changed

+53
-62
lines changed

7 files changed

+53
-62
lines changed

library/alloc/tests/vec.rs

+53
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,39 @@ fn test_zst_capacity() {
7272
assert_eq!(Vec::<()>::new().capacity(), usize::MAX);
7373
}
7474

75+
#[test]
76+
fn test_indexing() {
77+
let v: Vec<isize> = vec![10, 20];
78+
assert_eq!(v[0], 10);
79+
assert_eq!(v[1], 20);
80+
let mut x: usize = 0;
81+
assert_eq!(v[x], 10);
82+
assert_eq!(v[x + 1], 20);
83+
x = x + 1;
84+
assert_eq!(v[x], 20);
85+
assert_eq!(v[x - 1], 10);
86+
}
87+
88+
#[test]
89+
fn test_debug_fmt() {
90+
let vec1: Vec<isize> = vec![];
91+
assert_eq!("[]", format!("{:?}", vec1));
92+
93+
let vec2 = vec![0, 1];
94+
assert_eq!("[0, 1]", format!("{:?}", vec2));
95+
}
96+
97+
#[test]
98+
fn test_push() {
99+
let mut v = vec![];
100+
v.push(1);
101+
assert_eq!(v, [1]);
102+
v.push(2);
103+
assert_eq!(v, [1, 2]);
104+
v.push(3);
105+
assert_eq!(v, [1, 2, 3]);
106+
}
107+
75108
#[test]
76109
fn test_extend() {
77110
let mut v = Vec::new();
@@ -117,6 +150,18 @@ fn test_extend() {
117150
assert_eq!(count_x, 1);
118151
}
119152

153+
#[test]
154+
fn test_extend_from_slice() {
155+
let a: Vec<isize> = vec![1, 2, 3, 4, 5];
156+
let b: Vec<isize> = vec![6, 7, 8, 9, 0];
157+
158+
let mut v: Vec<isize> = a;
159+
160+
v.extend_from_slice(&b);
161+
162+
assert_eq!(v, [1, 2, 3, 4, 5, 6, 7, 8, 9, 0]);
163+
}
164+
120165
#[test]
121166
fn test_extend_ref() {
122167
let mut v = vec![1, 2];
@@ -132,6 +177,14 @@ fn test_extend_ref() {
132177
assert_eq!(v, [1, 2, 3, 4, 5, 6, 7]);
133178
}
134179

180+
#[test]
181+
fn test_slice_from_ref() {
182+
let values = vec![1, 2, 3, 4, 5];
183+
let slice = &values[1..3];
184+
185+
assert_eq!(slice, [2, 3]);
186+
}
187+
135188
#[test]
136189
fn test_slice_from_mut() {
137190
let mut values = vec![1, 2, 3, 4, 5];

src/test/ui/array-slice-vec/vec-concat.rs

-14
This file was deleted.

src/test/ui/array-slice-vec/vec-growth.rs

-16
This file was deleted.

src/test/ui/array-slice-vec/vec-push.rs

-3
This file was deleted.

src/test/ui/array-slice-vec/vec-slice.rs

-9
This file was deleted.

src/test/ui/array-slice-vec/vec-to_str.rs

-5
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@
22

33

44
pub fn main() {
5-
assert_eq!(format!("{:?}", vec![0, 1]), "[0, 1]".to_string());
6-
7-
let foo = vec![3, 4];
85
let bar: &[isize] = &[4, 5];
9-
10-
assert_eq!(format!("{:?}", foo), "[3, 4]");
116
assert_eq!(format!("{:?}", bar), "[4, 5]");
127
}

src/test/ui/array-slice-vec/vec.rs

-15
This file was deleted.

0 commit comments

Comments
 (0)