From 83909651ea99eb45c67ead40b5fcb5773d1998d5 Mon Sep 17 00:00:00 2001 From: r00ster91 Date: Sat, 13 Aug 2022 11:44:19 +0200 Subject: [PATCH] test: simplify testTokenize What this does is already done by `expectEqual`. Now the trace seems to be shorter and more concise so the errors should be easier to read now. --- lib/std/zig/tokenizer.zig | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/std/zig/tokenizer.zig b/lib/std/zig/tokenizer.zig index 89d4ee59d9..eaa0ddd716 100644 --- a/lib/std/zig/tokenizer.zig +++ b/lib/std/zig/tokenizer.zig @@ -2061,17 +2061,14 @@ test "saturating operators" { try testTokenize("-|=", &.{.minus_pipe_equal}); } -fn testTokenize(source: [:0]const u8, expected_tokens: []const Token.Tag) !void { +fn testTokenize(source: [:0]const u8, expected_token_tags: []const Token.Tag) !void { var tokenizer = Tokenizer.init(source); - for (expected_tokens) |expected_token_id| { + for (expected_token_tags) |expected_token_tag| { const token = tokenizer.next(); - if (token.tag != expected_token_id) { - std.debug.panic("expected {s}, found {s}\n", .{ - @tagName(expected_token_id), @tagName(token.tag), - }); - } + try std.testing.expectEqual(expected_token_tag, token.tag); } const last_token = tokenizer.next(); try std.testing.expectEqual(Token.Tag.eof, last_token.tag); try std.testing.expectEqual(source.len, last_token.loc.start); + try std.testing.expectEqual(source.len, last_token.loc.end); }