Skip to content

Commit 753bdd4

Browse files
nicholasbishopnicholasbishop
committed
tests: Update all tests to include the expected output
The assert_eq_fmt macro now expects ` => "expected"` at the end, where "expected" is whatever the print should produce. This makes it easier to see what each test is supposed to cover. Note that this does make the tests somewhat platform dependent, as the expected string might differ depending on the target and toolchain. However, in practice these tests are always being run on `x86_64-unknown-linux-gnu` currently, and we can cfg the tests to cover other toolchains later.
1 parent 619eafc commit 753bdd4

File tree

1 file changed

+103
-103
lines changed

1 file changed

+103
-103
lines changed

‎tests/tests.rs‎

Lines changed: 103 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -57,146 +57,146 @@ macro_rules! assert_eq_fmt {
5757
#[test]
5858
fn test_plain() {
5959
unsafe {
60-
assert_eq_fmt!(c"abc");
61-
assert_eq_fmt!(c"");
62-
assert_eq_fmt!(c"%%");
63-
assert_eq_fmt!(c"%% def");
64-
assert_eq_fmt!(c"abc %%");
65-
assert_eq_fmt!(c"abc %% def");
66-
assert_eq_fmt!(c"abc %%%% def");
67-
assert_eq_fmt!(c"%%%%%%");
60+
assert_eq_fmt!(c"abc" => "abc");
61+
assert_eq_fmt!(c"" => "");
62+
assert_eq_fmt!(c"%%" => "%");
63+
assert_eq_fmt!(c"%% def" => "% def");
64+
assert_eq_fmt!(c"abc %%" => "abc %");
65+
assert_eq_fmt!(c"abc %% def" => "abc % def");
66+
assert_eq_fmt!(c"abc %%%% def" => "abc %% def");
67+
assert_eq_fmt!(c"%%%%%%" => "%%%");
6868
}
6969
}
7070

7171
#[test]
7272
fn test_str() {
7373
unsafe {
74-
assert_eq_fmt!(c"hello %s", c"world");
75-
assert_eq_fmt!(c"hello %%%s", c"world");
76-
assert_eq_fmt!(c"%10s", c"world");
77-
assert_eq_fmt!(c"%.4s", c"world");
78-
assert_eq_fmt!(c"%10.4s", c"world");
79-
assert_eq_fmt!(c"%-10.4s", c"world");
80-
assert_eq_fmt!(c"%-10s", c"world");
81-
assert_eq_fmt!(c"%s", null_mut::<c_char>());
74+
assert_eq_fmt!(c"hello %s", c"world" => "hello world");
75+
assert_eq_fmt!(c"hello %%%s", c"world" => "hello %world");
76+
assert_eq_fmt!(c"%10s", c"world" => " world");
77+
assert_eq_fmt!(c"%.4s", c"world" => "worl");
78+
assert_eq_fmt!(c"%10.4s", c"world" => " worl");
79+
assert_eq_fmt!(c"%-10.4s", c"world" => "worl ");
80+
assert_eq_fmt!(c"%-10s", c"world" => "world ");
81+
assert_eq_fmt!(c"%s", null_mut::<c_char>() => "(null)");
8282
}
8383
}
8484

8585
#[test]
8686
fn test_int() {
8787
unsafe {
88-
assert_eq_fmt!(c"% 0*i", 17, 23125);
89-
assert_eq_fmt!(c"% 010i", 23125);
90-
assert_eq_fmt!(c"% 10i", 23125);
91-
assert_eq_fmt!(c"% 5i", 23125);
92-
assert_eq_fmt!(c"% 4i", 23125);
93-
assert_eq_fmt!(c"%- 010i", 23125);
94-
assert_eq_fmt!(c"%- 10i", 23125);
95-
assert_eq_fmt!(c"%- 5i", 23125);
96-
assert_eq_fmt!(c"%- 4i", 23125);
97-
assert_eq_fmt!(c"%+ 010i", 23125);
98-
assert_eq_fmt!(c"%+ 10i", 23125);
99-
assert_eq_fmt!(c"%+ 5i", 23125);
100-
assert_eq_fmt!(c"%+ 4i", 23125);
101-
assert_eq_fmt!(c"%-010i", 23125);
102-
assert_eq_fmt!(c"%-10i", 23125);
103-
assert_eq_fmt!(c"%-5i", 23125);
104-
assert_eq_fmt!(c"%-4i", 23125);
88+
assert_eq_fmt!(c"% 0*i", 17, 23125 => " 0000000000023125");
89+
assert_eq_fmt!(c"% 010i", 23125 => " 000023125");
90+
assert_eq_fmt!(c"% 10i", 23125 => " 23125");
91+
assert_eq_fmt!(c"% 5i", 23125 => " 23125");
92+
assert_eq_fmt!(c"% 4i", 23125 => " 23125");
93+
assert_eq_fmt!(c"%- 010i", 23125 => " 23125 ");
94+
assert_eq_fmt!(c"%- 10i", 23125 => " 23125 ");
95+
assert_eq_fmt!(c"%- 5i", 23125 => " 23125");
96+
assert_eq_fmt!(c"%- 4i", 23125 => " 23125");
97+
assert_eq_fmt!(c"%+ 010i", 23125 => "+000023125");
98+
assert_eq_fmt!(c"%+ 10i", 23125 => " +23125");
99+
assert_eq_fmt!(c"%+ 5i", 23125 => "+23125");
100+
assert_eq_fmt!(c"%+ 4i", 23125 => "+23125");
101+
assert_eq_fmt!(c"%-010i", 23125 => "23125 ");
102+
assert_eq_fmt!(c"%-10i", 23125 => "23125 ");
103+
assert_eq_fmt!(c"%-5i", 23125 => "23125");
104+
assert_eq_fmt!(c"%-4i", 23125 => "23125");
105105
}
106106
}
107107

108108
#[test]
109109
fn test_octal() {
110110
unsafe {
111-
assert_eq_fmt!(c"% 010o", 23125);
112-
assert_eq_fmt!(c"% 10o", 23125);
113-
assert_eq_fmt!(c"% 5o", 23125);
114-
assert_eq_fmt!(c"% 4o", 23125);
115-
assert_eq_fmt!(c"%- 010o", 23125);
116-
assert_eq_fmt!(c"%- 10o", 23125);
117-
assert_eq_fmt!(c"%- 5o", 23125);
118-
assert_eq_fmt!(c"%- 4o", 23125);
119-
assert_eq_fmt!(c"%+ 010o", 23125);
120-
assert_eq_fmt!(c"%+ 10o", 23125);
121-
assert_eq_fmt!(c"%+ 5o", 23125);
122-
assert_eq_fmt!(c"%+ 4o", 23125);
123-
assert_eq_fmt!(c"%-010o", 23125);
124-
assert_eq_fmt!(c"%-10o", 23125);
125-
assert_eq_fmt!(c"%-5o", 23125);
126-
assert_eq_fmt!(c"%-4o", 23125);
111+
assert_eq_fmt!(c"% 010o", 23125 => "0000055125");
112+
assert_eq_fmt!(c"% 10o", 23125 => " 55125");
113+
assert_eq_fmt!(c"% 5o", 23125 => "55125");
114+
assert_eq_fmt!(c"% 4o", 23125 => "55125");
115+
assert_eq_fmt!(c"%- 010o", 23125 => "55125 ");
116+
assert_eq_fmt!(c"%- 10o", 23125 => "55125 ");
117+
assert_eq_fmt!(c"%- 5o", 23125 => "55125");
118+
assert_eq_fmt!(c"%- 4o", 23125 => "55125");
119+
assert_eq_fmt!(c"%+ 010o", 23125 => "0000055125");
120+
assert_eq_fmt!(c"%+ 10o", 23125 => " 55125");
121+
assert_eq_fmt!(c"%+ 5o", 23125 => "55125");
122+
assert_eq_fmt!(c"%+ 4o", 23125 => "55125");
123+
assert_eq_fmt!(c"%-010o", 23125 => "55125 ");
124+
assert_eq_fmt!(c"%-10o", 23125 => "55125 ");
125+
assert_eq_fmt!(c"%-5o", 23125 => "55125");
126+
assert_eq_fmt!(c"%-4o", 23125 => "55125");
127127
}
128128
}
129129

130130
#[test]
131131
fn test_hex() {
132132
unsafe {
133-
assert_eq_fmt!(c"% 010x", 23125);
134-
assert_eq_fmt!(c"% 10x", 23125);
135-
assert_eq_fmt!(c"% 5x", 23125);
136-
assert_eq_fmt!(c"% 4x", 23125);
137-
assert_eq_fmt!(c"%- 010x", 23125);
138-
assert_eq_fmt!(c"%- 10x", 23125);
139-
assert_eq_fmt!(c"%- 5x", 23125);
140-
assert_eq_fmt!(c"%- 4x", 23125);
141-
assert_eq_fmt!(c"%+ 010x", 23125);
142-
assert_eq_fmt!(c"%+ 10x", 23125);
143-
assert_eq_fmt!(c"%+ 5x", 23125);
144-
assert_eq_fmt!(c"%+ 4x", 23125);
145-
assert_eq_fmt!(c"%-010x", 23125);
146-
assert_eq_fmt!(c"%-10x", 23125);
147-
assert_eq_fmt!(c"%-5x", 23125);
148-
assert_eq_fmt!(c"%-4x", 23125);
133+
assert_eq_fmt!(c"% 010x", 23125 => "0000005a55");
134+
assert_eq_fmt!(c"% 10x", 23125 => " 5a55");
135+
assert_eq_fmt!(c"% 5x", 23125 => " 5a55");
136+
assert_eq_fmt!(c"% 4x", 23125 => "5a55");
137+
assert_eq_fmt!(c"%- 010x", 23125 => "5a55 ");
138+
assert_eq_fmt!(c"%- 10x", 23125 => "5a55 ");
139+
assert_eq_fmt!(c"%- 5x", 23125 => "5a55 ");
140+
assert_eq_fmt!(c"%- 4x", 23125 => "5a55");
141+
assert_eq_fmt!(c"%+ 010x", 23125 => "0000005a55");
142+
assert_eq_fmt!(c"%+ 10x", 23125 => " 5a55");
143+
assert_eq_fmt!(c"%+ 5x", 23125 => " 5a55");
144+
assert_eq_fmt!(c"%+ 4x", 23125 => "5a55");
145+
assert_eq_fmt!(c"%-010x", 23125 => "5a55 ");
146+
assert_eq_fmt!(c"%-10x", 23125 => "5a55 ");
147+
assert_eq_fmt!(c"%-5x", 23125 => "5a55 ");
148+
assert_eq_fmt!(c"%-4x", 23125 => "5a55");
149149

150-
assert_eq_fmt!(c"%# 010x", 23125);
151-
assert_eq_fmt!(c"%# 10x", 23125);
152-
assert_eq_fmt!(c"%# 5x", 23125);
153-
assert_eq_fmt!(c"%# 4x", 23125);
154-
assert_eq_fmt!(c"%#- 010x", 23125);
155-
assert_eq_fmt!(c"%#- 10x", 23125);
156-
assert_eq_fmt!(c"%#- 5x", 23125);
157-
assert_eq_fmt!(c"%#- 4x", 23125);
158-
assert_eq_fmt!(c"%#+ 010x", 23125);
159-
assert_eq_fmt!(c"%#+ 10x", 23125);
160-
assert_eq_fmt!(c"%#+ 5x", 23125);
161-
assert_eq_fmt!(c"%#+ 4x", 23125);
162-
assert_eq_fmt!(c"%#-010x", 23125);
163-
assert_eq_fmt!(c"%#-10x", 23125);
164-
assert_eq_fmt!(c"%#-5x", 23125);
165-
assert_eq_fmt!(c"%#-4x", 23125);
150+
assert_eq_fmt!(c"%# 010x", 23125 => "0x00005a55");
151+
assert_eq_fmt!(c"%# 10x", 23125 => " 0x5a55");
152+
assert_eq_fmt!(c"%# 5x", 23125 => "0x5a55");
153+
assert_eq_fmt!(c"%# 4x", 23125 => "0x5a55");
154+
assert_eq_fmt!(c"%#- 010x", 23125 => "0x5a55 ");
155+
assert_eq_fmt!(c"%#- 10x", 23125 => "0x5a55 ");
156+
assert_eq_fmt!(c"%#- 5x", 23125 => "0x5a55");
157+
assert_eq_fmt!(c"%#- 4x", 23125 => "0x5a55");
158+
assert_eq_fmt!(c"%#+ 010x", 23125 => "0x00005a55");
159+
assert_eq_fmt!(c"%#+ 10x", 23125 => " 0x5a55");
160+
assert_eq_fmt!(c"%#+ 5x", 23125 => "0x5a55");
161+
assert_eq_fmt!(c"%#+ 4x", 23125 => "0x5a55");
162+
assert_eq_fmt!(c"%#-010x", 23125 => "0x5a55 ");
163+
assert_eq_fmt!(c"%#-10x", 23125 => "0x5a55 ");
164+
assert_eq_fmt!(c"%#-5x", 23125 => "0x5a55");
165+
assert_eq_fmt!(c"%#-4x", 23125 => "0x5a55");
166166

167-
assert_eq_fmt!(c"% 010X", 23125);
168-
assert_eq_fmt!(c"% 10X", 23125);
169-
assert_eq_fmt!(c"% 5X", 23125);
170-
assert_eq_fmt!(c"% 4X", 23125);
171-
assert_eq_fmt!(c"%- 010X", 23125);
172-
assert_eq_fmt!(c"%- 10X", 23125);
173-
assert_eq_fmt!(c"%- 5X", 23125);
174-
assert_eq_fmt!(c"%- 4X", 23125);
175-
assert_eq_fmt!(c"%+ 010X", 23125);
176-
assert_eq_fmt!(c"%+ 10X", 23125);
177-
assert_eq_fmt!(c"%+ 5X", 23125);
178-
assert_eq_fmt!(c"%+ 4X", 23125);
179-
assert_eq_fmt!(c"%-010X", 23125);
180-
assert_eq_fmt!(c"%-10X", 23125);
181-
assert_eq_fmt!(c"%-5X", 23125);
182-
assert_eq_fmt!(c"%-4X", 23125);
167+
assert_eq_fmt!(c"% 010X", 23125 => "0000005A55");
168+
assert_eq_fmt!(c"% 10X", 23125 => " 5A55");
169+
assert_eq_fmt!(c"% 5X", 23125 => " 5A55");
170+
assert_eq_fmt!(c"% 4X", 23125 => "5A55");
171+
assert_eq_fmt!(c"%- 010X", 23125 => "5A55 ");
172+
assert_eq_fmt!(c"%- 10X", 23125 => "5A55 ");
173+
assert_eq_fmt!(c"%- 5X", 23125 => "5A55 ");
174+
assert_eq_fmt!(c"%- 4X", 23125 => "5A55");
175+
assert_eq_fmt!(c"%+ 010X", 23125 => "0000005A55");
176+
assert_eq_fmt!(c"%+ 10X", 23125 => " 5A55");
177+
assert_eq_fmt!(c"%+ 5X", 23125 => " 5A55");
178+
assert_eq_fmt!(c"%+ 4X", 23125 => "5A55");
179+
assert_eq_fmt!(c"%-010X", 23125 => "5A55 ");
180+
assert_eq_fmt!(c"%-10X", 23125 => "5A55 ");
181+
assert_eq_fmt!(c"%-5X", 23125 => "5A55 ");
182+
assert_eq_fmt!(c"%-4X", 23125 => "5A55");
183183
}
184184
}
185185

186186
#[test]
187187
fn test_float() {
188188
unsafe {
189-
assert_eq_fmt!(c"%f", 1234f64);
190-
assert_eq_fmt!(c"%.5f", 1234f64);
191-
assert_eq_fmt!(c"%.*f", 1234f64, 3);
189+
assert_eq_fmt!(c"%f", 1234f64 => "1234.000000");
190+
assert_eq_fmt!(c"%.5f", 1234f64 => "1234.00000");
191+
assert_eq_fmt!(c"%.*f", 1234f64, 3 => "1234.000");
192192
}
193193
}
194194

195195
#[test]
196196
fn test_char() {
197197
unsafe {
198-
assert_eq_fmt!(c"%c", b'a' as c_int);
199-
assert_eq_fmt!(c"%10c", b'a' as c_int);
200-
assert_eq_fmt!(c"%-10c", b'a' as c_int);
198+
assert_eq_fmt!(c"%c", b'a' as c_int => "a");
199+
assert_eq_fmt!(c"%10c", b'a' as c_int => " a");
200+
assert_eq_fmt!(c"%-10c", b'a' as c_int => "a ");
201201
}
202202
}

0 commit comments

Comments
 (0)