From d571fad20eac23cadf6116742ad4abab5ed281e5 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Mon, 9 Dec 2019 00:03:08 -0500 Subject: [PATCH] update tests to new format API --- .../special/compiler_rt/truncXfYf2_test.zig | 2 +- test/compare_output.zig | 66 +++++++++---------- test/standalone/guess_number/main.zig | 14 ++-- 3 files changed, 41 insertions(+), 41 deletions(-) diff --git a/lib/std/special/compiler_rt/truncXfYf2_test.zig b/lib/std/special/compiler_rt/truncXfYf2_test.zig index d1dd837ddc..baec2a4450 100644 --- a/lib/std/special/compiler_rt/truncXfYf2_test.zig +++ b/lib/std/special/compiler_rt/truncXfYf2_test.zig @@ -217,7 +217,7 @@ fn test__truncdfsf2(a: f64, expected: u32) void { } } - @import("std").debug.warn("got 0x{x} wanted 0x{x}\n", rep, expected); + @import("std").debug.warn("got 0x{x} wanted 0x{x}\n", .{ rep, expected }); @panic("__trunctfsf2 test failure"); } diff --git a/test/compare_output.zig b/test/compare_output.zig index 35687b6a6c..80bac9b1f7 100644 --- a/test/compare_output.zig +++ b/test/compare_output.zig @@ -20,7 +20,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void { \\pub fn main() void { \\ privateFunction(); \\ const stdout = &getStdOut().outStream().stream; - \\ stdout.print("OK 2\n") catch unreachable; + \\ stdout.print("OK 2\n", .{}) catch unreachable; \\} \\ \\fn privateFunction() void { @@ -35,7 +35,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void { \\// but it's private so it should be OK \\fn privateFunction() void { \\ const stdout = &getStdOut().outStream().stream; - \\ stdout.print("OK 1\n") catch unreachable; + \\ stdout.print("OK 1\n", .{}) catch unreachable; \\} \\ \\pub fn printText() void { @@ -61,7 +61,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void { \\usingnamespace @import("std").io; \\pub fn foo_function() void { \\ const stdout = &getStdOut().outStream().stream; - \\ stdout.print("OK\n") catch unreachable; + \\ stdout.print("OK\n", .{}) catch unreachable; \\} ); @@ -72,7 +72,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void { \\pub fn bar_function() void { \\ if (foo_function()) { \\ const stdout = &getStdOut().outStream().stream; - \\ stdout.print("OK\n") catch unreachable; + \\ stdout.print("OK\n", .{}) catch unreachable; \\ } \\} ); @@ -104,7 +104,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void { \\ \\pub fn ok() void { \\ const stdout = &io.getStdOut().outStream().stream; - \\ stdout.print(b_text) catch unreachable; + \\ stdout.print(b_text, .{}) catch unreachable; \\} ); @@ -122,7 +122,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void { \\ \\pub fn main() void { \\ const stdout = &io.getStdOut().outStream().stream; - \\ stdout.print("Hello, world!\n{d:4} {x:3} {c}\n", @as(u32, 12), @as(u16, 0x12), @as(u8, 'a')) catch unreachable; + \\ stdout.print("Hello, world!\n{d:4} {x:3} {c}\n", .{@as(u32, 12), @as(u16, 0x12), @as(u8, 'a')}) catch unreachable; \\} , "Hello, world!\n 12 12 a\n"); @@ -265,7 +265,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void { \\} \\fn print_ok(val: @typeOf(x)) @typeOf(foo) { \\ const stdout = &io.getStdOut().outStream().stream; - \\ stdout.print("OK\n") catch unreachable; + \\ stdout.print("OK\n", .{}) catch unreachable; \\ return 0; \\} \\const foo : i32 = 0; @@ -348,12 +348,12 @@ pub fn addCases(cases: *tests.CompareOutputContext) void { \\ const foo = Foo {.field1 = bar,}; \\ const stdout = &io.getStdOut().outStream().stream; \\ if (!foo.method()) { - \\ stdout.print("BAD\n") catch unreachable; + \\ stdout.print("BAD\n", .{}) catch unreachable; \\ } \\ if (!bar.method()) { - \\ stdout.print("BAD\n") catch unreachable; + \\ stdout.print("BAD\n", .{}) catch unreachable; \\ } - \\ stdout.print("OK\n") catch unreachable; + \\ stdout.print("OK\n", .{}) catch unreachable; \\} , "OK\n"); @@ -361,11 +361,11 @@ pub fn addCases(cases: *tests.CompareOutputContext) void { \\const io = @import("std").io; \\pub fn main() void { \\ const stdout = &io.getStdOut().outStream().stream; - \\ stdout.print("before\n") catch unreachable; - \\ defer stdout.print("defer1\n") catch unreachable; - \\ defer stdout.print("defer2\n") catch unreachable; - \\ defer stdout.print("defer3\n") catch unreachable; - \\ stdout.print("after\n") catch unreachable; + \\ stdout.print("before\n", .{}) catch unreachable; + \\ defer stdout.print("defer1\n", .{}) catch unreachable; + \\ defer stdout.print("defer2\n", .{}) catch unreachable; + \\ defer stdout.print("defer3\n", .{}) catch unreachable; + \\ stdout.print("after\n", .{}) catch unreachable; \\} , "before\nafter\ndefer3\ndefer2\ndefer1\n"); @@ -374,13 +374,13 @@ pub fn addCases(cases: *tests.CompareOutputContext) void { \\const os = @import("std").os; \\pub fn main() void { \\ const stdout = &io.getStdOut().outStream().stream; - \\ stdout.print("before\n") catch unreachable; - \\ defer stdout.print("defer1\n") catch unreachable; - \\ defer stdout.print("defer2\n") catch unreachable; + \\ stdout.print("before\n", .{}) catch unreachable; + \\ defer stdout.print("defer1\n", .{}) catch unreachable; + \\ defer stdout.print("defer2\n", .{}) catch unreachable; \\ var args_it = @import("std").process.args(); \\ if (args_it.skip() and !args_it.skip()) return; - \\ defer stdout.print("defer3\n") catch unreachable; - \\ stdout.print("after\n") catch unreachable; + \\ defer stdout.print("defer3\n", .{}) catch unreachable; + \\ stdout.print("after\n", .{}) catch unreachable; \\} , "before\ndefer2\ndefer1\n"); @@ -391,12 +391,12 @@ pub fn addCases(cases: *tests.CompareOutputContext) void { \\} \\fn do_test() !void { \\ const stdout = &io.getStdOut().outStream().stream; - \\ stdout.print("before\n") catch unreachable; - \\ defer stdout.print("defer1\n") catch unreachable; - \\ errdefer stdout.print("deferErr\n") catch unreachable; + \\ stdout.print("before\n", .{}) catch unreachable; + \\ defer stdout.print("defer1\n", .{}) catch unreachable; + \\ errdefer stdout.print("deferErr\n", .{}) catch unreachable; \\ try its_gonna_fail(); - \\ defer stdout.print("defer3\n") catch unreachable; - \\ stdout.print("after\n") catch unreachable; + \\ defer stdout.print("defer3\n", .{}) catch unreachable; + \\ stdout.print("after\n", .{}) catch unreachable; \\} \\fn its_gonna_fail() !void { \\ return error.IToldYouItWouldFail; @@ -410,12 +410,12 @@ pub fn addCases(cases: *tests.CompareOutputContext) void { \\} \\fn do_test() !void { \\ const stdout = &io.getStdOut().outStream().stream; - \\ stdout.print("before\n") catch unreachable; - \\ defer stdout.print("defer1\n") catch unreachable; - \\ errdefer stdout.print("deferErr\n") catch unreachable; + \\ stdout.print("before\n", .{}) catch unreachable; + \\ defer stdout.print("defer1\n", .{}) catch unreachable; + \\ errdefer stdout.print("deferErr\n", .{}) catch unreachable; \\ try its_gonna_pass(); - \\ defer stdout.print("defer3\n") catch unreachable; - \\ stdout.print("after\n") catch unreachable; + \\ defer stdout.print("defer3\n", .{}) catch unreachable; + \\ stdout.print("after\n", .{}) catch unreachable; \\} \\fn its_gonna_pass() anyerror!void { } , "before\nafter\ndefer3\ndefer1\n"); @@ -427,7 +427,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void { \\ \\pub fn main() void { \\ const stdout = &io.getStdOut().outStream().stream; - \\ stdout.print(foo_txt) catch unreachable; + \\ stdout.print(foo_txt, .{}) catch unreachable; \\} , "1234\nabcd\n"); @@ -452,7 +452,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void { \\ _ = args_it.skip(); \\ while (args_it.next(allocator)) |arg_or_err| : (index += 1) { \\ const arg = try arg_or_err; - \\ try stdout.print("{}: {}\n", index, arg); + \\ try stdout.print("{}: {}\n", .{index, arg}); \\ } \\} , @@ -493,7 +493,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void { \\ _ = args_it.skip(); \\ while (args_it.next(allocator)) |arg_or_err| : (index += 1) { \\ const arg = try arg_or_err; - \\ try stdout.print("{}: {}\n", index, arg); + \\ try stdout.print("{}: {}\n", .{index, arg}); \\ } \\} , diff --git a/test/standalone/guess_number/main.zig b/test/standalone/guess_number/main.zig index 588a4ddcbd..ce7d58ac17 100644 --- a/test/standalone/guess_number/main.zig +++ b/test/standalone/guess_number/main.zig @@ -6,7 +6,7 @@ const fmt = std.fmt; pub fn main() !void { const stdout = &io.getStdOut().outStream().stream; - try stdout.print("Welcome to the Guess Number Game in Zig.\n"); + try stdout.print("Welcome to the Guess Number Game in Zig.\n", .{}); var seed_bytes: [@sizeOf(u64)]u8 = undefined; std.crypto.randomBytes(seed_bytes[0..]) catch |err| { @@ -19,27 +19,27 @@ pub fn main() !void { const answer = prng.random.range(u8, 0, 100) + 1; while (true) { - try stdout.print("\nGuess a number between 1 and 100: "); + try stdout.print("\nGuess a number between 1 and 100: ", .{}); var line_buf: [20]u8 = undefined; const line = io.readLineSlice(line_buf[0..]) catch |err| switch (err) { error.OutOfMemory => { - try stdout.print("Input too long.\n"); + try stdout.print("Input too long.\n", .{}); continue; }, else => return err, }; const guess = fmt.parseUnsigned(u8, line, 10) catch { - try stdout.print("Invalid number.\n"); + try stdout.print("Invalid number.\n", .{}); continue; }; if (guess > answer) { - try stdout.print("Guess lower.\n"); + try stdout.print("Guess lower.\n", .{}); } else if (guess < answer) { - try stdout.print("Guess higher.\n"); + try stdout.print("Guess higher.\n", .{}); } else { - try stdout.print("You win!\n"); + try stdout.print("You win!\n", .{}); return; } }