Skip to content

Commit e94bbc2

Browse files
ZapAntonandrewrk
authored andcommitted
std.testing: Added newline to the error messages
Added newline to every `std.debug.print` message. Closes #8777
1 parent 1e5e664 commit e94bbc2

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

lib/std/testing.zig

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ pub var zig_exe_path: []const u8 = undefined;
2929
/// and then aborts when actual_error_union is not expected_error.
3030
pub fn expectError(expected_error: anyerror, actual_error_union: anytype) !void {
3131
if (actual_error_union) |actual_payload| {
32-
std.debug.print("expected error.{s}, found {any}", .{ @errorName(expected_error), actual_payload });
32+
std.debug.print("expected error.{s}, found {any}\n", .{ @errorName(expected_error), actual_payload });
3333
return error.TestUnexpectedError;
3434
} else |actual_error| {
3535
if (expected_error != actual_error) {
36-
std.debug.print("expected error.{s}, found error.{s}", .{
36+
std.debug.print("expected error.{s}, found error.{s}\n", .{
3737
@errorName(expected_error),
3838
@errorName(actual_error),
3939
});
@@ -62,7 +62,7 @@ pub fn expectEqual(expected: anytype, actual: @TypeOf(expected)) !void {
6262

6363
.Type => {
6464
if (actual != expected) {
65-
std.debug.print("expected type {s}, found type {s}", .{ @typeName(expected), @typeName(actual) });
65+
std.debug.print("expected type {s}, found type {s}\n", .{ @typeName(expected), @typeName(actual) });
6666
return error.TestExpectedEqual;
6767
}
6868
},
@@ -78,7 +78,7 @@ pub fn expectEqual(expected: anytype, actual: @TypeOf(expected)) !void {
7878
.ErrorSet,
7979
=> {
8080
if (actual != expected) {
81-
std.debug.print("expected {}, found {}", .{ expected, actual });
81+
std.debug.print("expected {}, found {}\n", .{ expected, actual });
8282
return error.TestExpectedEqual;
8383
}
8484
},
@@ -87,17 +87,17 @@ pub fn expectEqual(expected: anytype, actual: @TypeOf(expected)) !void {
8787
switch (pointer.size) {
8888
.One, .Many, .C => {
8989
if (actual != expected) {
90-
std.debug.print("expected {*}, found {*}", .{ expected, actual });
90+
std.debug.print("expected {*}, found {*}\n", .{ expected, actual });
9191
return error.TestExpectedEqual;
9292
}
9393
},
9494
.Slice => {
9595
if (actual.ptr != expected.ptr) {
96-
std.debug.print("expected slice ptr {*}, found {*}", .{ expected.ptr, actual.ptr });
96+
std.debug.print("expected slice ptr {*}, found {*}\n", .{ expected.ptr, actual.ptr });
9797
return error.TestExpectedEqual;
9898
}
9999
if (actual.len != expected.len) {
100-
std.debug.print("expected slice len {}, found {}", .{ expected.len, actual.len });
100+
std.debug.print("expected slice len {}, found {}\n", .{ expected.len, actual.len });
101101
return error.TestExpectedEqual;
102102
}
103103
},
@@ -110,7 +110,7 @@ pub fn expectEqual(expected: anytype, actual: @TypeOf(expected)) !void {
110110
var i: usize = 0;
111111
while (i < vectorType.len) : (i += 1) {
112112
if (!std.meta.eql(expected[i], actual[i])) {
113-
std.debug.print("index {} incorrect. expected {}, found {}", .{ i, expected[i], actual[i] });
113+
std.debug.print("index {} incorrect. expected {}, found {}\n", .{ i, expected[i], actual[i] });
114114
return error.TestExpectedEqual;
115115
}
116116
}
@@ -153,12 +153,12 @@ pub fn expectEqual(expected: anytype, actual: @TypeOf(expected)) !void {
153153
if (actual) |actual_payload| {
154154
try expectEqual(expected_payload, actual_payload);
155155
} else {
156-
std.debug.print("expected {any}, found null", .{expected_payload});
156+
std.debug.print("expected {any}, found null\n", .{expected_payload});
157157
return error.TestExpectedEqual;
158158
}
159159
} else {
160160
if (actual) |actual_payload| {
161-
std.debug.print("expected null, found {any}", .{actual_payload});
161+
std.debug.print("expected null, found {any}\n", .{actual_payload});
162162
return error.TestExpectedEqual;
163163
}
164164
}
@@ -169,12 +169,12 @@ pub fn expectEqual(expected: anytype, actual: @TypeOf(expected)) !void {
169169
if (actual) |actual_payload| {
170170
try expectEqual(expected_payload, actual_payload);
171171
} else |actual_err| {
172-
std.debug.print("expected {any}, found {}", .{ expected_payload, actual_err });
172+
std.debug.print("expected {any}, found {}\n", .{ expected_payload, actual_err });
173173
return error.TestExpectedEqual;
174174
}
175175
} else |expected_err| {
176176
if (actual) |actual_payload| {
177-
std.debug.print("expected {}, found {any}", .{ expected_err, actual_payload });
177+
std.debug.print("expected {}, found {any}\n", .{ expected_err, actual_payload });
178178
return error.TestExpectedEqual;
179179
} else |actual_err| {
180180
try expectEqual(expected_err, actual_err);
@@ -225,7 +225,7 @@ pub fn expectApproxEqAbs(expected: anytype, actual: @TypeOf(expected), tolerance
225225

226226
switch (@typeInfo(T)) {
227227
.Float => if (!math.approxEqAbs(T, expected, actual, tolerance)) {
228-
std.debug.print("actual {}, not within absolute tolerance {} of expected {}", .{ actual, tolerance, expected });
228+
std.debug.print("actual {}, not within absolute tolerance {} of expected {}\n", .{ actual, tolerance, expected });
229229
return error.TestExpectedApproxEqAbs;
230230
},
231231

@@ -257,7 +257,7 @@ pub fn expectApproxEqRel(expected: anytype, actual: @TypeOf(expected), tolerance
257257

258258
switch (@typeInfo(T)) {
259259
.Float => if (!math.approxEqRel(T, expected, actual, tolerance)) {
260-
std.debug.print("actual {}, not within relative tolerance {} of expected {}", .{ actual, tolerance, expected });
260+
std.debug.print("actual {}, not within relative tolerance {} of expected {}\n", .{ actual, tolerance, expected });
261261
return error.TestExpectedApproxEqRel;
262262
},
263263

@@ -292,13 +292,13 @@ pub fn expectEqualSlices(comptime T: type, expected: []const T, actual: []const
292292
// If the child type is u8 and no weird bytes, we could print it as strings
293293
// Even for the length difference, it would be useful to see the values of the slices probably.
294294
if (expected.len != actual.len) {
295-
std.debug.print("slice lengths differ. expected {d}, found {d}", .{ expected.len, actual.len });
295+
std.debug.print("slice lengths differ. expected {d}, found {d}\n", .{ expected.len, actual.len });
296296
return error.TestExpectedEqual;
297297
}
298298
var i: usize = 0;
299299
while (i < expected.len) : (i += 1) {
300300
if (!std.meta.eql(expected[i], actual[i])) {
301-
std.debug.print("index {} incorrect. expected {any}, found {any}", .{ i, expected[i], actual[i] });
301+
std.debug.print("index {} incorrect. expected {any}, found {any}\n", .{ i, expected[i], actual[i] });
302302
return error.TestExpectedEqual;
303303
}
304304
}

0 commit comments

Comments
 (0)