diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test-ai-vterm--launch-command.el | 25 | ||||
| -rw-r--r-- | tests/test-ai-vterm--live-tmux-sessions.el | 71 | ||||
| -rw-r--r-- | tests/test-ai-vterm--pick-project.el | 74 | ||||
| -rw-r--r-- | tests/test-ai-vterm--sort-candidates.el | 51 | ||||
| -rw-r--r-- | tests/test-ai-vterm--tmux-session-name.el | 44 |
5 files changed, 225 insertions, 40 deletions
diff --git a/tests/test-ai-vterm--launch-command.el b/tests/test-ai-vterm--launch-command.el index c6b7ac2b..464c88b6 100644 --- a/tests/test-ai-vterm--launch-command.el +++ b/tests/test-ai-vterm--launch-command.el @@ -2,11 +2,12 @@ ;;; Commentary: ;; The launch command is what gets typed into a fresh vterm shell to bring -;; up Claude inside a per-project tmux session. The session is named after -;; the project basename so a second F9 on the same project reattaches to -;; the running Claude rather than spawning a new one. The trailing -;; `exec bash' keeps the tmux window alive if Claude exits, leaving the -;; session intact for recovery. +;; up Claude inside a per-project tmux session. The session is named +;; `cj/ai-vterm-tmux-session-prefix' + the project basename, so a second +;; F9 on the same project reattaches to the running Claude rather than +;; spawning a new one, and `tmux ls' output can be filtered to AI-vterm's +;; own sessions. The trailing `exec bash' keeps the tmux window alive if +;; Claude exits, leaving the session intact for recovery. ;;; Code: @@ -22,11 +23,12 @@ "tmux new-session -A " (cj/--ai-vterm-launch-command "/code/foo"))))) -(ert-deftest test-ai-vterm--launch-command-includes-session-name () - "Normal: the session name comes from the basename helper." - (let ((cj/ai-vterm-claude-command "claude")) +(ert-deftest test-ai-vterm--launch-command-includes-prefixed-session-name () + "Normal: the session name is the prefixed form from the name helper." + (let ((cj/ai-vterm-claude-command "claude") + (cj/ai-vterm-tmux-session-prefix "aiv-")) (should (string-match-p - " -s foo " + " -s aiv-foo " (cj/--ai-vterm-launch-command "/code/foo"))))) (ert-deftest test-ai-vterm--launch-command-includes-start-directory () @@ -52,9 +54,10 @@ (ert-deftest test-ai-vterm--launch-command-handles-spaces-in-basename () "Boundary: a basename with whitespace becomes hyphenated before quoting." - (let ((cj/ai-vterm-claude-command "claude")) + (let ((cj/ai-vterm-claude-command "claude") + (cj/ai-vterm-tmux-session-prefix "aiv-")) (should (string-match-p - " -s my-work " + " -s aiv-my-work " (cj/--ai-vterm-launch-command "/code/my work"))))) (provide 'test-ai-vterm--launch-command) diff --git a/tests/test-ai-vterm--live-tmux-sessions.el b/tests/test-ai-vterm--live-tmux-sessions.el new file mode 100644 index 00000000..38a0488d --- /dev/null +++ b/tests/test-ai-vterm--live-tmux-sessions.el @@ -0,0 +1,71 @@ +;;; test-ai-vterm--live-tmux-sessions.el --- Tests for cj/--ai-vterm-live-tmux-sessions -*- lexical-binding: t; -*- + +;;; Commentary: +;; Lists the live tmux sessions that carry the AI-vterm prefix so the +;; project picker can surface projects whose Claude session survived an +;; Emacs crash. tmux being absent or no server running is a normal +;; "nothing to match" outcome, not an error -- the lister returns nil. + +;;; Code: + +(require 'ert) +(require 'cl-lib) + +(add-to-list 'load-path (expand-file-name "modules" user-emacs-directory)) +(require 'ai-vterm) + +(defmacro test-ai-vterm--with-tmux-list (exit-code output &rest body) + "Run BODY with `process-file' mocked to a tmux list-sessions response. + +EXIT-CODE is what `process-file' returns (or the symbol `error' to +make it signal). OUTPUT is written to the stdout destination buffer." + (declare (indent 2)) + `(cl-letf (((symbol-function 'process-file) + (lambda (_program _infile destination _display &rest _args) + (when (eq ,exit-code 'error) + (error "tmux: command not found")) + (let ((buffer (cond + ((eq destination t) (current-buffer)) + ((bufferp destination) destination) + ((consp destination) + (and (eq (car destination) t) + (current-buffer)))))) + (when (bufferp buffer) + (with-current-buffer buffer (insert ,output)))) + ,exit-code))) + ,@body)) + +(ert-deftest test-ai-vterm--live-tmux-sessions-filters-to-prefix () + "Normal: only sessions starting with the AI-vterm prefix come back." + (let ((cj/ai-vterm-tmux-session-prefix "aiv-")) + (test-ai-vterm--with-tmux-list 0 "aiv-foo\nrandom-session\naiv-bar\n" + (should (equal (cj/--ai-vterm-live-tmux-sessions) + '("aiv-foo" "aiv-bar")))))) + +(ert-deftest test-ai-vterm--live-tmux-sessions-honors-custom-prefix () + "Normal: a non-default prefix is what gets matched." + (let ((cj/ai-vterm-tmux-session-prefix "em-")) + (test-ai-vterm--with-tmux-list 0 "em-foo\naiv-bar\nem-baz\n" + (should (equal (cj/--ai-vterm-live-tmux-sessions) + '("em-foo" "em-baz")))))) + +(ert-deftest test-ai-vterm--live-tmux-sessions-empty-output-yields-nil () + "Boundary: a running server with no matching sessions yields nil." + (let ((cj/ai-vterm-tmux-session-prefix "aiv-")) + (test-ai-vterm--with-tmux-list 0 "other-a\nother-b\n" + (should (null (cj/--ai-vterm-live-tmux-sessions)))))) + +(ert-deftest test-ai-vterm--live-tmux-sessions-no-server-yields-nil () + "Error: tmux exits non-zero (no server running) -> nil, not a signal." + (let ((cj/ai-vterm-tmux-session-prefix "aiv-")) + (test-ai-vterm--with-tmux-list 1 "no server running on /tmp/tmux-1000/default\n" + (should (null (cj/--ai-vterm-live-tmux-sessions)))))) + +(ert-deftest test-ai-vterm--live-tmux-sessions-tmux-missing-yields-nil () + "Error: tmux not installed -> `process-file' signals; lister returns nil." + (let ((cj/ai-vterm-tmux-session-prefix "aiv-")) + (test-ai-vterm--with-tmux-list 'error "" + (should (null (cj/--ai-vterm-live-tmux-sessions)))))) + +(provide 'test-ai-vterm--live-tmux-sessions) +;;; test-ai-vterm--live-tmux-sessions.el ends here diff --git a/tests/test-ai-vterm--pick-project.el b/tests/test-ai-vterm--pick-project.el index fd5295bf..a90fe822 100644 --- a/tests/test-ai-vterm--pick-project.el +++ b/tests/test-ai-vterm--pick-project.el @@ -1,10 +1,12 @@ ;;; test-ai-vterm--pick-project.el --- Tests for cj/--ai-vterm-pick-project -*- lexical-binding: t; -*- ;;; Commentary: -;; The picker presents abbreviated paths to `completing-read', then -;; returns the absolute path corresponding to the user's choice. Empty -;; candidate set raises a `user-error' rather than offering an empty -;; prompt. +;; The picker presents abbreviated paths to `completing-read' (projects +;; with a live tmux session first, then alphabetical), then returns the +;; absolute path corresponding to the user's choice. An empty candidate +;; set raises a `user-error' rather than offering an empty prompt. The +;; collection is a completion table that pins display order (so Vertico +;; doesn't re-sort and defeat the active-first grouping). ;;; Code: @@ -14,17 +16,21 @@ (add-to-list 'load-path (expand-file-name "modules" user-emacs-directory)) (require 'ai-vterm) +(defun test-ai-vterm--collection-strings (collection) + "Return the candidate display strings from a completing-read COLLECTION. +Works whether COLLECTION is an alist or a completion-table function." + (all-completions "" collection)) + (ert-deftest test-ai-vterm--pick-project-returns-absolute-path-of-choice () "Normal: user picks a candidate, picker returns its absolute path." (cl-letf (((symbol-function 'cj/--ai-vterm-candidates) (lambda () '("/home/u/code/foo" "/home/u/code/bar"))) + ((symbol-function 'cj/--ai-vterm-live-tmux-sessions) + (lambda () nil)) ((symbol-function 'completing-read) (lambda (_p collection &rest _) - ;; Pick the one whose display form matches ~/code/bar - ;; (collection is alist of display . abs) - (car (cl-find-if - (lambda (cell) (string-match-p "bar" (car cell))) - collection))))) + (seq-find (lambda (s) (string-match-p "bar" s)) + (test-ai-vterm--collection-strings collection))))) (should (equal (cj/--ai-vterm-pick-project) "/home/u/code/bar")))) (ert-deftest test-ai-vterm--pick-project-empty-candidates-raises-user-error () @@ -34,15 +40,33 @@ (ert-deftest test-ai-vterm--pick-project-presents-abbreviated-paths () "Normal: the completing-read collection holds abbreviated display forms." - (let (received-collection) + (let (received-strings) (cl-letf (((symbol-function 'cj/--ai-vterm-candidates) (lambda () (list (expand-file-name "~/code/foo")))) + ((symbol-function 'cj/--ai-vterm-live-tmux-sessions) + (lambda () nil)) ((symbol-function 'completing-read) (lambda (_p collection &rest _) - (setq received-collection collection) - (caar collection)))) + (setq received-strings (test-ai-vterm--collection-strings collection)) + (car received-strings)))) (cj/--ai-vterm-pick-project) - (should (equal (caar received-collection) "~/code/foo"))))) + (should (equal (car received-strings) "~/code/foo"))))) + +(ert-deftest test-ai-vterm--pick-project-active-sessions-sort-first () + "Normal: a project with a live tmux session leads; it carries [detached]." + (let ((cj/ai-vterm-tmux-session-prefix "aiv-") + received-strings) + (cl-letf (((symbol-function 'cj/--ai-vterm-candidates) + (lambda () '("/c/foo" "/c/bar" "/c/baz"))) + ((symbol-function 'cj/--ai-vterm-live-tmux-sessions) + (lambda () '("aiv-baz"))) + ((symbol-function 'completing-read) + (lambda (_p collection &rest _) + (setq received-strings (test-ai-vterm--collection-strings collection)) + (car received-strings)))) + (cj/--ai-vterm-pick-project) + (should (equal received-strings + '("/c/baz [detached]" "/c/bar" "/c/foo")))))) (ert-deftest test-ai-vterm--format-candidate-flags-running-project () "Normal: a path whose claude buffer has a live process gets a [running] suffix." @@ -56,6 +80,30 @@ (format "%s [running]" (abbreviate-file-name path))))) (kill-buffer buf)))) +(ert-deftest test-ai-vterm--format-candidate-flags-detached-session () + "Normal: no buffer but a matching tmux session -> [detached] suffix." + (let* ((cj/ai-vterm-tmux-session-prefix "aiv-") + (path (expand-file-name "~/code/has-session")) + (bn (cj/--ai-vterm-buffer-name path))) + (when (get-buffer bn) (kill-buffer bn)) + (should (equal (cj/--ai-vterm-format-candidate + path (list (cj/--ai-vterm-tmux-session-name path))) + (format "%s [detached]" (abbreviate-file-name path)))))) + +(ert-deftest test-ai-vterm--format-candidate-running-beats-detached () + "Boundary: a live buffer wins over a matching session -> [running], not [detached]." + (let* ((cj/ai-vterm-tmux-session-prefix "aiv-") + (path (expand-file-name "~/code/both")) + (bn (cj/--ai-vterm-buffer-name path)) + (buf (get-buffer-create bn))) + (unwind-protect + (cl-letf (((symbol-function 'cj/--ai-vterm-process-live-p) + (lambda (b) (eq b buf)))) + (should (equal (cj/--ai-vterm-format-candidate + path (list (cj/--ai-vterm-tmux-session-name path))) + (format "%s [running]" (abbreviate-file-name path))))) + (kill-buffer buf)))) + (ert-deftest test-ai-vterm--format-candidate-omits-flag-when-not-running () "Boundary: a path with no buffer or no live process -> plain abbreviated path." (let ((path (expand-file-name "~/code/not-running"))) diff --git a/tests/test-ai-vterm--sort-candidates.el b/tests/test-ai-vterm--sort-candidates.el new file mode 100644 index 00000000..0b602083 --- /dev/null +++ b/tests/test-ai-vterm--sort-candidates.el @@ -0,0 +1,51 @@ +;;; test-ai-vterm--sort-candidates.el --- Tests for cj/--ai-vterm-sort-candidates -*- lexical-binding: t; -*- + +;;; Commentary: +;; The project picker lists candidates with a live tmux session first +;; (so a Claude that survived an Emacs crash is easy to get back to), +;; then everything else. Within each group the order is alphabetical +;; by abbreviated path. + +;;; Code: + +(require 'ert) + +(add-to-list 'load-path (expand-file-name "modules" user-emacs-directory)) +(require 'ai-vterm) + +(ert-deftest test-ai-vterm--sort-candidates-active-first-then-alpha () + "Normal: the one project with a live session leads; the rest go alpha." + (let ((cj/ai-vterm-tmux-session-prefix "aiv-")) + (should (equal (cj/--ai-vterm-sort-candidates + '("/c/foo" "/c/bar" "/c/baz") + '("aiv-bar")) + '("/c/bar" "/c/baz" "/c/foo"))))) + +(ert-deftest test-ai-vterm--sort-candidates-multiple-active-each-group-alpha () + "Normal: both groups sort alphabetically internally." + (let ((cj/ai-vterm-tmux-session-prefix "aiv-")) + (should (equal (cj/--ai-vterm-sort-candidates + '("/c/foo" "/c/bar" "/c/baz") + '("aiv-foo" "aiv-bar")) + '("/c/bar" "/c/foo" "/c/baz"))))) + +(ert-deftest test-ai-vterm--sort-candidates-no-sessions-is-plain-alpha () + "Boundary: nil session set -> a plain alphabetical list." + (let ((cj/ai-vterm-tmux-session-prefix "aiv-")) + (should (equal (cj/--ai-vterm-sort-candidates + '("/c/foo" "/c/bar") nil) + '("/c/bar" "/c/foo"))))) + +(ert-deftest test-ai-vterm--sort-candidates-empty-dirs-yields-nil () + "Boundary: no candidates -> nil." + (should (null (cj/--ai-vterm-sort-candidates nil '("aiv-foo"))))) + +(ert-deftest test-ai-vterm--session-active-p-matches-by-derived-name () + "Normal: a dir is active when its derived session name is in the set." + (let ((cj/ai-vterm-tmux-session-prefix "aiv-")) + (should (cj/--ai-vterm-session-active-p "/c/foo" '("aiv-bar" "aiv-foo"))) + (should-not (cj/--ai-vterm-session-active-p "/c/qux" '("aiv-bar" "aiv-foo"))) + (should-not (cj/--ai-vterm-session-active-p "/c/foo" nil)))) + +(provide 'test-ai-vterm--sort-candidates) +;;; test-ai-vterm--sort-candidates.el ends here diff --git a/tests/test-ai-vterm--tmux-session-name.el b/tests/test-ai-vterm--tmux-session-name.el index 9d56040e..44c20a8b 100644 --- a/tests/test-ai-vterm--tmux-session-name.el +++ b/tests/test-ai-vterm--tmux-session-name.el @@ -1,11 +1,12 @@ ;;; test-ai-vterm--tmux-session-name.el --- Tests for cj/--ai-vterm-tmux-session-name -*- lexical-binding: t; -*- ;;; Commentary: -;; The tmux session name is derived from the project's basename so that -;; reopening Claude on the same project (e.g. after an Emacs crash) -;; reattaches to the same tmux session rather than spawning a new one. -;; Whitespace in the basename gets converted to hyphens so the name is -;; safe to pass on a tmux command line. +;; The tmux session name is `cj/ai-vterm-tmux-session-prefix' followed by +;; the project's basename, so reopening Claude on the same project (e.g. +;; after an Emacs crash) reattaches to the same tmux session rather than +;; spawning a new one -- and the prefix lets `tmux ls' output be filtered +;; down to AI-vterm's own sessions. Whitespace in the basename becomes +;; hyphens so the name is safe to pass on a tmux command line. ;;; Code: @@ -15,29 +16,40 @@ (require 'ai-vterm) (ert-deftest test-ai-vterm--tmux-session-name-normal-project () - "Normal: a typical project path yields its basename." - (should (equal (cj/--ai-vterm-tmux-session-name "/home/cjennings/projects/foo") - "foo"))) + "Normal: basename gets the configured prefix." + (let ((cj/ai-vterm-tmux-session-prefix "aiv-")) + (should (equal (cj/--ai-vterm-tmux-session-name "/home/cjennings/projects/foo") + "aiv-foo")))) (ert-deftest test-ai-vterm--tmux-session-name-trailing-slash () "Boundary: trailing slash collapses before basename extraction." - (should (equal (cj/--ai-vterm-tmux-session-name "/home/cjennings/projects/foo/") - "foo"))) + (let ((cj/ai-vterm-tmux-session-prefix "aiv-")) + (should (equal (cj/--ai-vterm-tmux-session-name "/home/cjennings/projects/foo/") + "aiv-foo")))) (ert-deftest test-ai-vterm--tmux-session-name-dot-prefix-dir () "Boundary: dot-prefix dirs preserve the dot (tmux accepts dots)." - (should (equal (cj/--ai-vterm-tmux-session-name "/home/cjennings/.emacs.d") - ".emacs.d"))) + (let ((cj/ai-vterm-tmux-session-prefix "aiv-")) + (should (equal (cj/--ai-vterm-tmux-session-name "/home/cjennings/.emacs.d") + "aiv-.emacs.d")))) (ert-deftest test-ai-vterm--tmux-session-name-space-becomes-hyphen () "Boundary: a space in the basename is replaced with a hyphen." - (should (equal (cj/--ai-vterm-tmux-session-name "/tmp/my work") - "my-work"))) + (let ((cj/ai-vterm-tmux-session-prefix "aiv-")) + (should (equal (cj/--ai-vterm-tmux-session-name "/tmp/my work") + "aiv-my-work")))) (ert-deftest test-ai-vterm--tmux-session-name-multiple-spaces-collapse () "Boundary: a run of whitespace collapses to a single hyphen." - (should (equal (cj/--ai-vterm-tmux-session-name "/tmp/a b\tc") - "a-b-c"))) + (let ((cj/ai-vterm-tmux-session-prefix "aiv-")) + (should (equal (cj/--ai-vterm-tmux-session-name "/tmp/a b\tc") + "aiv-a-b-c")))) + +(ert-deftest test-ai-vterm--tmux-session-name-honors-custom-prefix () + "Normal: a non-default prefix is what gets prepended." + (let ((cj/ai-vterm-tmux-session-prefix "em-")) + (should (equal (cj/--ai-vterm-tmux-session-name "/home/cjennings/projects/foo") + "em-foo")))) (provide 'test-ai-vterm--tmux-session-name) ;;; test-ai-vterm--tmux-session-name.el ends here |