summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/pardes.zig64
-rw-r--r--test/behaviour.zig2
-rw-r--r--test/behaviour/limits.zig18
-rw-r--r--test/behaviour/placement.zig37
-rw-r--r--test/behaviour/settings.zig23
5 files changed, 80 insertions, 64 deletions
diff --git a/src/pardes.zig b/src/pardes.zig
index 3d6b6e28..b47119c4 100644
--- a/src/pardes.zig
+++ b/src/pardes.zig
@@ -1268,38 +1268,6 @@ test "acme placement: a pane made from the middle of a column moves only the one
try std.testing.expectEqual(was_bottom.h, p.rects[bottom].h);
}
-test "acme placement: New and 9P's new take the bottom half of the last pane" {
- const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 100, .rows = 40 });
- defer p.deinit();
- p.newScratchBelow(p.active);
- const last = p.active;
- p.sync();
- const was = p.rects[last];
- p.newScratchFor(last, .fs);
- const made = p.active;
- p.sync();
- try std.testing.expectEqual(layout.findPane(p, last).?.idx + 1, layout.findPane(p, made).?.idx);
- try std.testing.expectEqual(was.y + was.h, p.rects[made].y + p.rects[made].h);
- try std.testing.expect(p.rects[made].y > was.y + BOX_H);
-}
-
-test "Placement pardes brings back the old rules, and says so in DumpConfig" {
- const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 100, .rows = 40 });
- defer p.deinit();
- try std.testing.expect(p.executeBuiltinLine(p.active, "Placement pardes"));
- try std.testing.expectEqual(config.Runtime.Placement.pardes, p.settings.placement);
- const top = p.active;
- p.sync();
- const was = p.rects[top];
- p.newScratchBelow(top);
- p.sync();
- // Directly under the asking pane, as New always put it.
- try std.testing.expectEqual(@as(usize, 1), layout.findPane(p, p.active).?.idx);
- try std.testing.expectEqual(was.y + was.h, p.rects[p.active].y + p.rects[p.active].h);
- try std.testing.expect(p.executeBuiltinLine(p.active, "Placement"));
- try std.testing.expectEqual(config.Runtime.Placement.acme, p.settings.placement);
-}
-
test "an empty column shows its theme's empty_col under its tag: acme's white, else the border" {
const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 120, .rows = 20 });
defer p.deinit();
@@ -2618,18 +2586,6 @@ test "a host with no methods at all is a complete in-process pardes" {
try std.testing.expect(p.quit);
}
-test "a builtin that needs a pane reports capacity failure when every slot is full" {
- const p = try Pardes.init(std.testing.allocator, .{ .shells = 3, .cols = 100, .rows = 30 });
- defer p.deinit();
- while (p.nextEffect()) |_| {}
- for (0..MAX_PANES) |id| if (p.panes[id] == null) {
- _ = try p.newDocPane(id);
- };
- const help = std.meta.stringToEnum(Builtin, "Help") orelse return error.MissingHelpBuiltin;
- exec.runBuiltin(p, help, 0, "", null);
- try std.testing.expect(std.mem.indexOf(u8, p.panes[0].?.msg[0..p.panes[0].?.msg_len], "help: no space for a pane") != null);
-}
-
test "Font keeps requested and acknowledged faces as separate plain state" {
if (comptime !font_picker) return; // there is no Font builtin on tty or web
const p = try Pardes.init(std.testing.allocator, .{ .cols = 80, .rows = 24 });
@@ -2718,26 +2674,6 @@ test "Font size suffix reaches native request and invalid input leaves it intact
try std.testing.expectEqual(@as(u16, 1850), p.settings.font.effective_size_hundredths);
}
-test "Pet command is SDL-only optional and validates its argument" {
- const p = try Pardes.init(std.testing.allocator, .{ .cols = 80, .rows = 24 });
- defer p.deinit();
- try std.testing.expectEqual(.off, p.settings.pet);
- if (comptime platform != .gui) {
- // A terminal's view has the word and takes it not.
- try std.testing.expect(p.executeBuiltinLine(p.active, "Pet cat"));
- try std.testing.expectEqual(.off, p.settings.pet);
- return;
- }
- try std.testing.expect(p.executeBuiltinLine(p.active, "Pet cat"));
- try std.testing.expectEqual(.cat, p.settings.pet);
- try std.testing.expect(p.executeBuiltinLine(p.active, "Pet dog"));
- try std.testing.expectEqual(.cat, p.settings.pet);
- try std.testing.expect(p.executeBuiltinLine(p.active, "Pet frog"));
- try std.testing.expectEqual(.frog, p.settings.pet);
- try std.testing.expect(p.executeBuiltinLine(p.active, "Pet off"));
- try std.testing.expectEqual(.off, p.settings.pet);
-}
-
test "startup config overrides restored styling before initFromDump returns" {
const source = try Pardes.init(std.testing.allocator, .{ .startup_config = "Theme dark\n" });
defer source.deinit();
diff --git a/test/behaviour.zig b/test/behaviour.zig
index bec74d89..3049f648 100644
--- a/test/behaviour.zig
+++ b/test/behaviour.zig
@@ -5,12 +5,14 @@
test {
_ = @import("behaviour/columns_and_tags.zig");
_ = @import("behaviour/edit.zig");
+ _ = @import("behaviour/limits.zig");
_ = @import("behaviour/look_and_exec.zig");
_ = @import("behaviour/modes.zig");
_ = @import("behaviour/other_files.zig");
_ = @import("behaviour/panes.zig");
_ = @import("behaviour/placement.zig");
_ = @import("behaviour/root_ctl.zig");
+ _ = @import("behaviour/settings.zig");
_ = @import("behaviour/tags.zig");
_ = @import("behaviour/terminals.zig");
}
diff --git a/test/behaviour/limits.zig b/test/behaviour/limits.zig
new file mode 100644
index 00000000..08c864eb
--- /dev/null
+++ b/test/behaviour/limits.zig
@@ -0,0 +1,18 @@
+//! docs/typ/reference.typ, Limits <limits>.
+const std = @import("std");
+const Session = @import("session").Session;
+
+test "limits: a builtin that needs a pane says so when every slot is taken" {
+ var s = try Session.initFile(std.testing.allocator, "x\n");
+ defer s.deinit();
+ const n = try s.focused();
+ // Room on the screen for every pane, so the slots run out first.
+ s.detach();
+ try s.write("/ctl", "size 100 400\n");
+ var made: usize = 1;
+ while (s.newPane()) |_| made += 1 else |_| {}
+ try std.testing.expectEqual(@as(usize, 64), made);
+ _ = try s.refused(s.at("/pane/{d}/exec", .{n}), "Help\n");
+ try std.testing.expectEqualStrings("help: no space for a pane: 64 max", s.said);
+ try std.testing.expect(std.mem.indexOf(u8, try s.read("/log"), "help: no space for a pane") != null);
+}
diff --git a/test/behaviour/placement.zig b/test/behaviour/placement.zig
index 350e94f8..079b5a5e 100644
--- a/test/behaviour/placement.zig
+++ b/test/behaviour/placement.zig
@@ -22,3 +22,40 @@ test "placement: an empty active column takes the new pane whole, a look from an
const made = try s.focused();
try std.testing.expectEqualStrings(s.at("{d}:{d} {d}:{d}", .{ try s.column(0), first, try s.column(1), made }), try s.columns());
}
+
+/// The screen row the tag starting `name` is drawn on.
+fn tagRow(s: *Session, name: []const u8) !usize {
+ return (try s.where(s.at("{s} Save", .{name})))[1];
+}
+
+test "placement: New and 9P's new take the bottom half of the column's last pane" {
+ var s = try Session.initFile(std.testing.allocator, "x\n");
+ defer s.deinit();
+ const first = try s.focused();
+ try s.write(s.at("/pane/{d}/exec", .{first}), "New\n");
+ const last = try s.focused();
+ try s.write(s.at("/pane/{d}/name", .{last}), "/last\n");
+ const was = try tagRow(&s, "/last");
+ const made = try s.newPane();
+ try s.write(s.at("/pane/{d}/name", .{made}), "/made\n");
+ try std.testing.expectEqualStrings(s.at("{d}:{d},{d},{d}", .{ try s.column(0), first, last, made }), try s.columns());
+ // The last pane keeps its top and gives up its bottom half.
+ try std.testing.expectEqual(was, try tagRow(&s, "/last"));
+ const rows = std.mem.count(u8, try s.screen(), "\n") + 1;
+ try std.testing.expect(try tagRow(&s, "/made") >= was + (rows - was) / 2);
+}
+
+test "placement: Placement pardes puts a new pane right under the asking one, and bare it steps back to acme" {
+ var s = try Session.initFile(std.testing.allocator, "x\n");
+ defer s.deinit();
+ try s.write("/ctl", "Placement pardes\n");
+ try std.testing.expect(std.mem.indexOf(u8, try s.read("/ctl"), "\nPlacement pardes\n") != null);
+ const top = try s.focused();
+ try s.write(s.at("/pane/{d}/exec", .{top}), "New\n");
+ const below = try s.focused();
+ // Directly under the asking pane, as New always put it.
+ try s.write(s.at("/pane/{d}/exec", .{top}), "New\n");
+ try std.testing.expectEqualStrings(s.at("{d}:{d},{d},{d}", .{ try s.column(0), top, try s.focused(), below }), try s.columns());
+ try s.write("/ctl", "Placement\n");
+ try std.testing.expect(std.mem.indexOf(u8, try s.read("/ctl"), "\nPlacement acme\n") != null);
+}
diff --git a/test/behaviour/settings.zig b/test/behaviour/settings.zig
new file mode 100644
index 00000000..59e6f7c3
--- /dev/null
+++ b/test/behaviour/settings.zig
@@ -0,0 +1,23 @@
+//! docs/typ/reference.typ, Settings <settings>.
+const std = @import("std");
+const Session = @import("session").Session;
+
+test "settings: Pet is the window's: a terminal's view refuses it, from a pane and the root; a window takes only its pets" {
+ var s = try Session.initFile(std.testing.allocator, "x\n");
+ defer s.deinit();
+ if (try s.refused("/ctl", "Pet cat\n") == 0) {
+ // A window's: dog is no pet of its, and off is.
+ try std.testing.expect(std.mem.indexOf(u8, try s.read("/ctl"), "\nPet cat\n") != null);
+ _ = try s.refused("/ctl", "Pet dog\n");
+ try std.testing.expect(std.mem.indexOf(u8, try s.read("/ctl"), "\nPet cat\n") != null);
+ try s.write("/ctl", "Pet frog\n");
+ try std.testing.expect(std.mem.indexOf(u8, try s.read("/ctl"), "\nPet frog\n") != null);
+ try s.write("/ctl", "Pet off\n");
+ try std.testing.expect(std.mem.indexOf(u8, try s.read("/ctl"), "\nPet off\n") != null);
+ return;
+ }
+ try std.testing.expect(std.mem.startsWith(u8, s.said, "Pet is GUI-only, invalid here"));
+ try std.testing.expectEqual(@as(u16, 22), try s.refused(s.at("/pane/{d}/exec", .{try s.focused()}), "Pet cat\n"));
+ try std.testing.expectEqualStrings("Pet is GUI-only, invalid here", s.said);
+ try std.testing.expect(std.mem.indexOf(u8, try s.read("/ctl"), "Pet ") == null);
+}