From c538b2a4db9a7f7d35d7718629caef253fa63ad8 Mon Sep 17 00:00:00 2001 From: Gabriel Schneider Date: Wed, 4 Nov 2026 23:51:04 -0300 Subject: build: the perf and fs bench programs' tests, which compile no editor, run with unit-test, and their perf-test and fs-bench-test steps go; lspbench-test and hxdiff-test go, with lspbench's three tests, which only that step ran, and hxdiff's --self-test (hxdiff's own four tests stay: test/panes.zig runs them in pane-test) Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_016Y9MNAtZenFv4weoMD3cge --- test/hxdiff.zig | 92 ------------------------------------------------------- test/lspbench.zig | 50 ------------------------------ 2 files changed, 142 deletions(-) (limited to 'test') diff --git a/test/hxdiff.zig b/test/hxdiff.zig index 257cce42..1cb4d86f 100644 --- a/test/hxdiff.zig +++ b/test/hxdiff.zig @@ -31,7 +31,6 @@ pub fn main(init: std.process.Init) !void { defer arena_state.deinit(); const arena = arena_state.allocator(); const args = try init.minimal.args.toSlice(init.arena.allocator()); - if (args.len == 2 and std.mem.eql(u8, args[1], "--self-test")) return testCli(init); var parity = false; var verbose = false; @@ -575,97 +574,6 @@ fn fatal(comptime fmt: []const u8, args: anytype) noreturn { std.process.exit(1); } -fn testCli(init: std.process.Init) !void { - const io = init.io; - const arena = init.arena.allocator(); - const exe = try std.process.executablePathAlloc(io, arena); - var random: [12]u8 = undefined; - io.random(&random); - const path = try std.fmt.allocPrint(arena, "hxdiff-{x}", .{random}); - var parent = try std.Io.Dir.cwd().createDirPathOpen(io, ".zig-cache/tmp", .{}); - defer parent.close(io); - try parent.createDir(io, path, .default_dir); - defer parent.deleteTree(io, path) catch {}; - var dir = try parent.openDir(io, path, .{}); - defer dir.close(io); - - const case_a = "{\"name\":\"a\",\"text\":\"a\\n\",\"keys\":\"\"}\n"; - const case_b = "{\"name\":\"b\",\"text\":\"b\\n\",\"keys\":\"\"}\n"; - const result_tail = ",\"mode\":\"normal\",\"cursor\":{\"row\":0,\"col\":0},\"anchor\":{\"row\":0,\"col\":0}}"; - const result_a = "{\"name\":\"a\",\"text\":\"a\\n\"" ++ result_tail; - const result_b = "{\"name\":\"b\",\"text\":\"b\\n\"" ++ result_tail; - const different = "{\"name\":\"a\",\"text\":\"different\\n\"" ++ result_tail; - const changed = "{\"name\":\"a\",\"text\":\"changed\\n\"" ++ result_tail; - const waiver = "{\"name\":\"a\",\"reason\":\"fixture\",\"reference\":" ++ different ++ ",\"expected\":" ++ result_a ++ "}\n"; - const missing_waiver = "{\"name\":\"b\",\"reason\":\"fixture\",\"reference\":" ++ result_b ++ ",\"expected\":" ++ result_b ++ "}\n"; - const Fixture = struct { - name: []const u8, - cases: []const u8 = case_a, - reference: []const u8 = result_a, - waivers: []const u8 = "", - args: []const []const u8 = &.{ "--strict", "cases", "reference", "waivers" }, - message: []const u8 = "", - }; - const fixtures = [_]Fixture{ - .{ .name = "equal" }, - .{ .name = "subset", .reference = result_a ++ "\n" ++ result_b, .args = &.{ "cases", "reference" } }, - .{ .name = "missing reference", .cases = case_a ++ case_b, .message = "no golden for case b" }, - .{ .name = "unused reference", .reference = result_a ++ "\n" ++ result_b, .message = "UnusedReferenceCases" }, - .{ .name = "empty corpus", .cases = "\n", .reference = "", .message = "NoCases" }, - .{ .name = "duplicate cases", .cases = case_a ++ case_a, .message = "duplicate case name" }, - .{ .name = "duplicate references", .reference = result_a ++ "\n" ++ result_a, .message = "duplicate golden name" }, - .{ .name = "empty name", .cases = "{\"name\":\"\",\"text\":\"a\",\"keys\":\"\"}\n", .message = "empty or duplicate case name" }, - .{ .name = "mismatch", .reference = different, .message = "MISMATCH a" }, - .{ .name = "pinned waiver", .reference = different, .waivers = waiver }, - .{ .name = "changed actual", .cases = "{\"name\":\"a\",\"text\":\"changed\\n\",\"keys\":\"\"}\n", .reference = different, .waivers = waiver, .message = "CHANGED WAIVER a" }, - .{ .name = "changed reference", .reference = changed, .waivers = waiver, .message = "CHANGED WAIVER a" }, - .{ .name = "stale waiver", .waivers = waiver, .message = "stale waiver: a" }, - .{ .name = "unused waiver", .waivers = missing_waiver, .message = "unused waiver: b" }, - .{ .name = "duplicate waivers", .reference = different, .waivers = waiver ++ waiver, .message = "duplicate waiver name" }, - .{ .name = "unknown case field", .cases = "{\"name\":\"a\",\"text\":\"a\\n\",\"keys\":\"\",\"typo\":true}\n", .message = "UnknownField" }, - .{ .name = "unknown reference field", .reference = "{\"name\":\"a\",\"text\":\"a\\n\",\"typo\":true" ++ result_tail, .message = "UnknownField" }, - .{ .name = "unknown mode", .reference = "{\"name\":\"a\",\"text\":\"a\\n\",\"mode\":\"unknown\",\"cursor\":{\"row\":0,\"col\":0},\"anchor\":{\"row\":0,\"col\":0}}\n", .message = "UnknownMode" }, - .{ .name = "primary without selections", .reference = "{\"name\":\"a\",\"text\":\"a\\n\",\"primary\":0" ++ result_tail, .message = "PrimaryWithoutSelections" }, - .{ .name = "empty selections", .reference = "{\"name\":\"a\",\"text\":\"a\\n\",\"sels\":[]" ++ result_tail, .message = "NotMultipleSelections" }, - .{ .name = "missing waiver argument", .args = &.{ "cases", "--waivers" }, .message = "usage:" }, - .{ .name = "flag instead of waiver path", .args = &.{ "cases", "--waivers", "--strict" }, .message = "MissingWaiverPath" }, - .{ .name = "duplicate waiver option", .args = &.{ "cases", "reference", "--waivers", "waivers", "--waivers", "waivers" }, .message = "DuplicateWaiverPath" }, - .{ .name = "positional and named waiver", .args = &.{ "cases", "reference", "waivers", "--waivers", "waivers" }, .message = "DuplicateWaiverPath" }, - .{ .name = "unknown option", .args = &.{ "cases", "--typo" }, .message = "UnknownOption" }, - .{ .name = "too many paths", .args = &.{ "cases", "reference", "waivers", "extra" }, .message = "TooManyPaths" }, - .{ .name = "waivers without comparison", .args = &.{ "cases", "--waivers", "waivers" }, .message = "WaiversNeedComparison" }, - .{ .name = "conflicting pane modes", .args = &.{ "--parity", "--pane=file", "cases" }, .message = "ConflictingPaneModes" }, - .{ .name = "unknown pane", .args = &.{ "--pane=unknown", "cases" }, .message = "UnknownPane" }, - .{ .name = "parity", .args = &.{ "--parity", "--strict", "cases" } }, - .{ .name = "parity option after path", .args = &.{ "cases", "--strict", "--parity" } }, - .{ .name = "emit", .args = &.{"cases"} }, - }; - for (fixtures) |fixture| { - try dir.writeFile(io, .{ .sub_path = "cases", .data = fixture.cases }); - try dir.writeFile(io, .{ .sub_path = "reference", .data = fixture.reference }); - try dir.writeFile(io, .{ .sub_path = "waivers", .data = fixture.waivers }); - const argv = try arena.alloc([]const u8, fixture.args.len + 1); - argv[0] = exe; - @memcpy(argv[1..], fixture.args); - const result = try std.process.run(arena, io, .{ - .argv = argv, - .cwd = .{ .dir = dir }, - .stdout_limit = .limited(1024 * 1024), - .stderr_limit = .limited(1024 * 1024), - .timeout = .{ .duration = .{ .clock = .awake, .raw = .fromSeconds(5) } }, - }); - const passed = result.term == .exited and result.term.exited == 0; - if (result.term != .exited or passed != (fixture.message.len == 0) or - std.mem.indexOf(u8, result.stderr, fixture.message) == null) - { - std.debug.print("CLI fixture {s}: {s}\n{s}\n", .{ fixture.name, result.stdout, result.stderr }); - return error.DifferentialDriverTestFailed; - } - if (std.mem.eql(u8, fixture.name, "emit") and !std.mem.eql(u8, result.stdout, result_a ++ "\n")) return error.WrongEmittedResult; - } - std.debug.print("hxdiff: {d} CLI regression fixtures passed\n", .{fixtures.len}); -} - test "differential cases deliver each Unicode scalar as one key event" { var arena_state: std.heap.ArenaAllocator = .init(std.testing.allocator); defer arena_state.deinit(); diff --git a/test/lspbench.zig b/test/lspbench.zig index 87b6d83e..9857b61c 100644 --- a/test/lspbench.zig +++ b/test/lspbench.zig @@ -89,27 +89,6 @@ const Options = struct { } }; -test "lspbench options reject unknown flags and multiple roots before probing" { - const defaults = try Options.parse(&.{}); - try std.testing.expect(!defaults.json and !defaults.check); - try std.testing.expectEqualStrings(".", defaults.root); - for ([_][]const []const u8{ - &.{ "--json", "repo root", "--check" }, - &.{ "repo root", "--check", "--json" }, - }) |args| { - const options = try Options.parse(args); - try std.testing.expect(options.json and options.check); - try std.testing.expectEqualStrings("repo root", options.root); - } - for ([_][]const []const u8{ - &.{ "--reps", "3" }, - &.{ "--json", "--unknown" }, - &.{ "repo", "--check=true" }, - }) |args| try std.testing.expectError(error.UnknownArgument, Options.parse(args)); - try std.testing.expectError(error.MultipleRoots, Options.parse(&.{ "first", "second" })); - try std.testing.expectError(error.MultipleRoots, Options.parse(&.{ "first", "--check", "second" })); -} - /// The process's Io, for the queries: their waits are woken by the client's /// reader threads, which a single-threaded Io cannot be. var query_io: std.Io = undefined; @@ -194,35 +173,6 @@ fn runOnce(gpa: std.mem.Allocator, req_in: lsp.Req, expected: []const u8, r: *Re return ns / 1000; } -test "lspbench check rejects omitted empty and incorrect probes" { - var result: Result = .{ .kind = .definition }; - try std.testing.expectError(error.MissingProbes, checkResults(&.{}, 1)); - try std.testing.expectError(error.IncorrectProbe, checkResults(&.{result}, 1)); - result.accept("actual.zig:1:1: symbol\n", "expected.zig"); - try std.testing.expect(!result.empty); - try std.testing.expectError(error.IncorrectProbe, checkResults(&.{result}, 1)); - result.accept("actual.zig:1:1: symbol\n", "actual.zig"); - try checkResults(&.{result}, 1); - try std.testing.expectError(error.MissingProbes, checkResults(&.{result}, 2)); - result.accept("", ""); - try std.testing.expectError(error.IncorrectProbe, checkResults(&.{result}, 1)); -} - -test "lspbench reports missing fixture and anchor before querying a backend" { - var tmp = std.testing.tmpDir(.{}); - defer tmp.cleanup(); - var path_buf: [4096]u8 = undefined; - const root = path_buf[0..try tmp.dir.realPath(std.testing.io, &path_buf)]; - const anchor: Anchor = .{ .file = "source.zig", .needle = "pub const value", .kind = .definition }; - try std.testing.expectError(error.OpenFailed, probe(std.testing.allocator, root, anchor)); - try tmp.dir.writeFile(std.testing.io, .{ .sub_path = anchor.file, .data = "const value = 1;\n" }); - try std.testing.expectError(error.MissingAnchor, probe(std.testing.allocator, root, anchor)); - var invalid = anchor; - invalid.needle = "value"; - invalid.at = 6; - try std.testing.expectError(error.InvalidAnchor, probe(std.testing.allocator, root, invalid)); -} - fn reportText(rs: []const Result, rss: u64) void { const o = std.debug.print; o("backend: {s}\n\n", .{lsp.backend_name}); -- cgit v1.3