blob: 0762e255c72f7c72300b89f622520d84e83b61cd (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
|
;;; test-cj-window-toggle-lib.el --- Tests for shared toggle-state helpers -*- lexical-binding: t; -*-
;;; Commentary:
;; cj-window-toggle-lib.el provides parameterized capture-state and
;; display-saved helpers shared by ai-vterm.el (F9) and
;; eshell-vterm-config.el (F12). Each consumer holds its own pair of
;; state variables (last-direction symbol + last-size integer/float)
;; and passes the variable symbols to the helpers. These tests cover
;; the helpers in isolation against a fresh pair of test-only vars.
;;; Code:
(require 'ert)
(require 'cl-lib)
(add-to-list 'load-path (expand-file-name "modules" user-emacs-directory))
(require 'cj-window-toggle-lib)
(defvar test-cj-window-toggle--last-direction nil)
(defvar test-cj-window-toggle--last-size nil)
(ert-deftest test-cj-window-toggle-capture-records-right-split ()
"Normal: right-split window writes direction=right and integer body-cols."
(save-window-excursion
(delete-other-windows)
(let ((right (split-window (selected-window) nil 'right))
(test-cj-window-toggle--last-direction nil)
(test-cj-window-toggle--last-size nil))
(cj/window-toggle-capture-state
right 'right
'test-cj-window-toggle--last-direction
'test-cj-window-toggle--last-size)
(should (eq test-cj-window-toggle--last-direction 'right))
(should (integerp test-cj-window-toggle--last-size))
(should (= test-cj-window-toggle--last-size
(window-body-width right))))))
(ert-deftest test-cj-window-toggle-capture-records-below-split ()
"Normal: below-split window writes direction=below and integer body-lines."
(save-window-excursion
(delete-other-windows)
(let ((below (split-window (selected-window) nil 'below))
(test-cj-window-toggle--last-direction nil)
(test-cj-window-toggle--last-size nil))
(cj/window-toggle-capture-state
below 'below
'test-cj-window-toggle--last-direction
'test-cj-window-toggle--last-size)
(should (eq test-cj-window-toggle--last-direction 'below))
(should (integerp test-cj-window-toggle--last-size))
(should (= test-cj-window-toggle--last-size
(window-body-height below))))))
(ert-deftest test-cj-window-toggle-capture-falls-back-to-default-direction ()
"Boundary: window filling the frame uses the supplied default direction."
(save-window-excursion
(delete-other-windows)
(let ((root (selected-window))
(test-cj-window-toggle--last-direction nil)
(test-cj-window-toggle--last-size nil))
(cj/window-toggle-capture-state
root 'below
'test-cj-window-toggle--last-direction
'test-cj-window-toggle--last-size)
(should (eq test-cj-window-toggle--last-direction 'below)))))
(ert-deftest test-cj-window-toggle-capture-noop-on-nil-window ()
"Error: nil window leaves both state vars unchanged."
(let ((test-cj-window-toggle--last-direction 'sentinel-dir)
(test-cj-window-toggle--last-size 0.123))
(cj/window-toggle-capture-state
nil 'right
'test-cj-window-toggle--last-direction
'test-cj-window-toggle--last-size)
(should (eq test-cj-window-toggle--last-direction 'sentinel-dir))
(should (= test-cj-window-toggle--last-size 0.123))))
(ert-deftest test-cj-window-toggle-capture-noop-on-deleted-window ()
"Error: a deleted window leaves both state vars unchanged."
(let ((test-cj-window-toggle--last-direction 'sentinel-dir)
(test-cj-window-toggle--last-size 0.123)
(dead (save-window-excursion
(delete-other-windows)
(let ((w (split-window (selected-window) nil 'right)))
(delete-window w)
w))))
(cj/window-toggle-capture-state
dead 'right
'test-cj-window-toggle--last-direction
'test-cj-window-toggle--last-size)
(should (eq test-cj-window-toggle--last-direction 'sentinel-dir))
(should (= test-cj-window-toggle--last-size 0.123))))
(ert-deftest test-cj-window-toggle-capture-allowed-keeps-permitted-direction ()
"Normal: a captured direction in ALLOWED is stored with its body size."
(save-window-excursion
(delete-other-windows)
(let ((below (split-window (selected-window) nil 'below))
(test-cj-window-toggle--last-direction nil)
(test-cj-window-toggle--last-size nil))
(cj/window-toggle-capture-state
below 'below
'test-cj-window-toggle--last-direction
'test-cj-window-toggle--last-size
'(right below left))
(should (eq test-cj-window-toggle--last-direction 'below))
(should (integerp test-cj-window-toggle--last-size)))))
(ert-deftest test-cj-window-toggle-capture-allowed-rejects-disallowed-direction ()
"Boundary: a direction not in ALLOWED falls back to default, size cleared.
The captured body size was measured on the disallowed axis, so it can't
transfer; clearing it lets the consumer's default size apply."
(save-window-excursion
(delete-other-windows)
(let ((above (split-window (selected-window) nil 'above))
(test-cj-window-toggle--last-direction 'sentinel)
(test-cj-window-toggle--last-size 99))
(cj/window-toggle-capture-state
above 'below
'test-cj-window-toggle--last-direction
'test-cj-window-toggle--last-size
'(right below left))
(should (eq test-cj-window-toggle--last-direction 'below))
(should (null test-cj-window-toggle--last-size)))))
(ert-deftest test-cj-window-toggle-capture-allowed-nil-keeps-all ()
"Boundary: omitting ALLOWED preserves the prior unconstrained behavior."
(save-window-excursion
(delete-other-windows)
(let ((above (split-window (selected-window) nil 'above))
(test-cj-window-toggle--last-direction nil)
(test-cj-window-toggle--last-size nil))
(cj/window-toggle-capture-state
above 'below
'test-cj-window-toggle--last-direction
'test-cj-window-toggle--last-size)
(should (eq test-cj-window-toggle--last-direction 'above))
(should (integerp test-cj-window-toggle--last-size)))))
(ert-deftest test-cj-window-toggle-display-saved-uses-defaults-when-state-nil ()
"Normal: nil state -> direction=edge of default, size=default."
(let (received-alist
(test-cj-window-toggle--last-direction nil)
(test-cj-window-toggle--last-size nil))
(cl-letf (((symbol-function 'display-buffer-in-direction)
(lambda (_b a) (setq received-alist a) 'fake-window)))
(cj/window-toggle-display-saved
'fake-buf
'((inhibit-same-window . t))
'test-cj-window-toggle--last-direction
'below
'test-cj-window-toggle--last-size
0.7))
(should (eq (cdr (assq 'direction received-alist)) 'bottom))
(should (= (cdr (assq 'window-height received-alist)) 0.7))
(should (eq (cdr (assq 'inhibit-same-window received-alist)) t))))
(ert-deftest test-cj-window-toggle-display-saved-maps-below-to-bottom ()
"Normal: saved below + integer size -> bottom edge, body-lines cons."
(let (received-alist
(test-cj-window-toggle--last-direction 'below)
(test-cj-window-toggle--last-size 12))
(cl-letf (((symbol-function 'display-buffer-in-direction)
(lambda (_b a) (setq received-alist a) 'fake-window)))
(cj/window-toggle-display-saved
'fake-buf nil
'test-cj-window-toggle--last-direction
'below
'test-cj-window-toggle--last-size
0.7))
(should (eq (cdr (assq 'direction received-alist)) 'bottom))
(should (equal (cdr (assq 'window-height received-alist))
'(body-lines . 12)))
(should-not (assq 'window-width received-alist))))
(ert-deftest test-cj-window-toggle-display-saved-maps-right-to-rightmost ()
"Normal: saved right + integer size -> rightmost edge, body-columns cons."
(let (received-alist
(test-cj-window-toggle--last-direction 'right)
(test-cj-window-toggle--last-size 80))
(cl-letf (((symbol-function 'display-buffer-in-direction)
(lambda (_b a) (setq received-alist a) 'fake-window)))
(cj/window-toggle-display-saved
'fake-buf nil
'test-cj-window-toggle--last-direction
'right
'test-cj-window-toggle--last-size
0.5))
(should (eq (cdr (assq 'direction received-alist)) 'rightmost))
(should (equal (cdr (assq 'window-width received-alist))
'(body-columns . 80)))
(should-not (assq 'window-height received-alist))))
(ert-deftest test-cj-window-toggle-display-saved-strips-conflicting-entries ()
"Boundary: caller-supplied direction/size are removed; saved values win."
(let (received-alist
(test-cj-window-toggle--last-direction 'right)
(test-cj-window-toggle--last-size 30))
(cl-letf (((symbol-function 'display-buffer-in-direction)
(lambda (_b a) (setq received-alist a) 'fake-window)))
(cj/window-toggle-display-saved
'fake-buf
'((direction . above)
(window-width . 0.2)
(window-height . 0.3)
(inhibit-same-window . t))
'test-cj-window-toggle--last-direction
'right
'test-cj-window-toggle--last-size
0.5))
(should (eq (cdr (assq 'direction received-alist)) 'rightmost))
(should (equal (cdr (assq 'window-width received-alist))
'(body-columns . 30)))
(should-not (assq 'window-height received-alist))
(should (eq (cdr (assq 'inhibit-same-window received-alist)) t))))
(ert-deftest test-cj-window-toggle-display-saved-passes-float-size-through ()
"Boundary: float size passes through as a fraction (no body-N wrapping)."
(let (received-alist
(test-cj-window-toggle--last-direction 'below)
(test-cj-window-toggle--last-size nil))
(cl-letf (((symbol-function 'display-buffer-in-direction)
(lambda (_b a) (setq received-alist a) 'fake-window)))
(cj/window-toggle-display-saved
'fake-buf nil
'test-cj-window-toggle--last-direction
'below
'test-cj-window-toggle--last-size
0.4))
(should (eq (cdr (assq 'direction received-alist)) 'bottom))
(should (= (cdr (assq 'window-height received-alist)) 0.4))))
;; --------------------------- side-window helpers ---------------------------
(defvar test-cj-side-window--size nil)
(ert-deftest test-cj-side-window-capture-records-bottom-height ()
"Normal: a bottom side window writes a height fraction into the size var."
(save-window-excursion
(delete-other-windows)
(let* ((buf (get-buffer-create "*cj-side-test*"))
(win (display-buffer-in-side-window
buf '((side . bottom) (window-height . 0.5))))
(test-cj-side-window--size nil))
(unwind-protect
(progn
(cj/side-window-capture-size win 'bottom 'test-cj-side-window--size)
(should (floatp test-cj-side-window--size))
(should (<= 0.05 test-cj-side-window--size 0.95)))
(when (window-live-p win) (delete-window win))
(kill-buffer buf)))))
(ert-deftest test-cj-side-window-capture-noop-on-nil-window ()
"Error: nil window leaves the size var unchanged."
(let ((test-cj-side-window--size 0.42))
(cj/side-window-capture-size nil 'bottom 'test-cj-side-window--size)
(should (= test-cj-side-window--size 0.42))))
(ert-deftest test-cj-side-window-capture-noop-on-deleted-window ()
"Error: a deleted window leaves the size var unchanged."
(let ((test-cj-side-window--size 0.42)
(dead (save-window-excursion
(delete-other-windows)
(let* ((buf (get-buffer-create "*cj-side-dead*"))
(w (display-buffer-in-side-window
buf '((side . bottom) (window-height . 0.5)))))
(delete-window w)
(kill-buffer buf)
w))))
(cj/side-window-capture-size dead 'bottom 'test-cj-side-window--size)
(should (= test-cj-side-window--size 0.42))))
(ert-deftest test-cj-side-window-display-uses-default-when-state-nil ()
"Normal: nil state -> default size under window-height for a bottom side."
(let (received-alist
(test-cj-side-window--size nil))
(cl-letf (((symbol-function 'display-buffer-in-side-window)
(lambda (_b a) (setq received-alist a) 'fake-window)))
(cj/side-window-display 'fake-buf 'bottom 'test-cj-side-window--size 0.3))
(should (eq (cdr (assq 'side received-alist)) 'bottom))
(should (= (cdr (assq 'window-height received-alist)) 0.3))
(should-not (assq 'window-width received-alist))))
(ert-deftest test-cj-side-window-display-uses-stored-size ()
"Normal: a stored fraction overrides the default."
(let (received-alist
(test-cj-side-window--size 0.55))
(cl-letf (((symbol-function 'display-buffer-in-side-window)
(lambda (_b a) (setq received-alist a) 'fake-window)))
(cj/side-window-display 'fake-buf 'bottom 'test-cj-side-window--size 0.3))
(should (= (cdr (assq 'window-height received-alist)) 0.55))))
(ert-deftest test-cj-side-window-display-left-uses-window-width ()
"Boundary: a left side puts the size under window-width, not window-height."
(let (received-alist
(test-cj-side-window--size nil))
(cl-letf (((symbol-function 'display-buffer-in-side-window)
(lambda (_b a) (setq received-alist a) 'fake-window)))
(cj/side-window-display 'fake-buf 'left 'test-cj-side-window--size 0.25))
(should (eq (cdr (assq 'side received-alist)) 'left))
(should (= (cdr (assq 'window-width received-alist)) 0.25))
(should-not (assq 'window-height received-alist))))
(provide 'test-cj-window-toggle-lib)
;;; test-cj-window-toggle-lib.el ends here
|
