diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile | 11 | ||||
| -rw-r--r-- | tests/check-deps.el | 38 | ||||
| -rw-r--r-- | tests/test-testutil-general.el | 49 | ||||
| -rw-r--r-- | tests/testutil-general.el | 31 |
4 files changed, 118 insertions, 11 deletions
diff --git a/tests/Makefile b/tests/Makefile index abf91bb..8fd2e0c 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -55,7 +55,12 @@ check-deps: printf "$(YELLOW)Warning: .eask not found — run 'make setup' from project root$(NC)\n"; \ exit 1; \ fi - @printf "$(GREEN)✓ eask available, deps installed$(NC)\n" + @$(EMACS_BATCH) -l check-deps.el >$(PROJECT_ROOT)/tests/check-deps-output.log 2>&1 || { \ + printf "$(RED)Error: required Emacs Lisp test dependencies are missing$(NC)\n"; \ + cat $(PROJECT_ROOT)/tests/check-deps-output.log; \ + exit 1; \ + } + @printf "$(GREEN)✓ eask available, required Emacs Lisp deps loadable$(NC)\n" # Run all tests (excluding :slow) test: check-deps @@ -260,7 +265,7 @@ lint: check-deps clean: @printf "$(YELLOW)Cleaning byte-compiled files...$(NC)\n" @rm -f *.elc ../*.elc - @rm -f test-output.log test-file-output.log test-unit-output.log test-integration-output.log + @rm -f check-deps-output.log test-output.log test-file-output.log test-unit-output.log test-integration-output.log @printf "$(GREEN)✓ Cleaned$(NC)\n" # Show help @@ -280,7 +285,7 @@ help: @echo " make count - Count tests per file" @echo " make list - List all test names" @echo " make clean - Remove byte-compiled files and logs" - @echo " make check-deps - Verify eask + installed deps" + @echo " make check-deps - Verify eask + loadable Emacs Lisp deps" @echo " make help - Show this help message" @echo "" @echo "Project-root targets (run from project root):" diff --git a/tests/check-deps.el b/tests/check-deps.el new file mode 100644 index 0000000..0cfa99c --- /dev/null +++ b/tests/check-deps.el @@ -0,0 +1,38 @@ +;;; check-deps.el --- Verify test dependencies are loadable -*- lexical-binding: t; -*- + +;; Copyright (C) 2026 Craig Jennings + +;;; Commentary: + +;; Loaded by tests/Makefile's check-deps target after eask has prepared the +;; test environment. Keep dependency discovery inside Emacs so package.el, +;; package-vc, Eask, Nix, and pre-populated load-path setups all work the same +;; way: a dependency is available if Emacs can require it. + +;;; Code: + +(when noninteractive + (package-initialize)) + +(defconst chime-check-deps-required-features + '(dash alert async org-agenda) + "Features required by the Chime test suite.") + +(defun chime-check-deps--missing-features () + "Return required test features that cannot be loaded." + (let (missing) + (dolist (feature chime-check-deps-required-features (nreverse missing)) + (unless (require feature nil t) + (push feature missing))))) + +(let ((missing (chime-check-deps--missing-features))) + (if missing + (progn + (message "Missing Emacs Lisp test dependencies: %s" + (mapconcat #'symbol-name missing ", ")) + (message "Run `make setup' from the project root, or make these features available on load-path.") + (kill-emacs 1)) + (message "Required Emacs Lisp dependencies are loadable: %s" + (mapconcat #'symbol-name chime-check-deps-required-features ", ")))) + +;;; check-deps.el ends here diff --git a/tests/test-testutil-general.el b/tests/test-testutil-general.el new file mode 100644 index 0000000..7b4e445 --- /dev/null +++ b/tests/test-testutil-general.el @@ -0,0 +1,49 @@ +;;; test-testutil-general.el --- Tests for shared test file utilities -*- lexical-binding: t; -*- + +;; Copyright (C) 2026 Craig Jennings + +;;; Commentary: + +;; Tests for the shared filesystem helpers in testutil-general.el. + +;;; Code: + +(require 'test-bootstrap (expand-file-name "test-bootstrap.el")) +(require 'testutil-general (expand-file-name "testutil-general.el")) + +(ert-deftest test-chime-test-default-base-dir-uses-env-override () + "Normal: CHIME_TEST_TMPDIR selects an explicit test root." + (cl-letf (((symbol-function 'getenv) + (lambda (name) + (when (string= name "CHIME_TEST_TMPDIR") + "/tmp/chime-explicit-root")))) + (should (equal "/tmp/chime-explicit-root/" + (chime-test--default-base-dir))))) + +(ert-deftest test-chime-test-default-base-dir-uses-temporary-directory () + "Normal: absent override uses a unique temp-directory path." + (let ((temporary-file-directory "/tmp/chime-parent/")) + (cl-letf (((symbol-function 'getenv) (lambda (_name) nil))) + (should (string-prefix-p + "/tmp/chime-parent/chime-tests-" + (chime-test--default-base-dir)))))) + +(ert-deftest test-chime-test-base-dir-is-not-fixed-home-path () + "Regression: default test root is no longer ~/.temp-chime-tests/." + (skip-unless (not (getenv "CHIME_TEST_TMPDIR"))) + (should-not + (equal (expand-file-name "~/.temp-chime-tests/") + chime-test-base-dir))) + +(ert-deftest test-chime-test-base-dir-create-and-delete-roundtrip () + "Normal: create and delete work for the configured test root." + (unwind-protect + (progn + (should (equal (file-name-as-directory chime-test-base-dir) + (chime-create-test-base-dir))) + (should (file-directory-p chime-test-base-dir))) + (chime-delete-test-base-dir)) + (should-not (file-exists-p chime-test-base-dir))) + +(provide 'test-testutil-general) +;;; test-testutil-general.el ends here diff --git a/tests/testutil-general.el b/tests/testutil-general.el index 556e520..2fffbca 100644 --- a/tests/testutil-general.el +++ b/tests/testutil-general.el @@ -6,22 +6,37 @@ ;; This library provides general helper functions and constants for managing ;; test directories and files across test suites. ;; -;; It establishes a user-local hidden directory as the root for all test assets, -;; provides utilities to create this directory safely, create temporary files -;; and subdirectories within it, and clean up after tests. +;; It establishes a per-process temporary directory as the root for all test +;; assets, provides utilities to create this directory safely, create temporary +;; files and subdirectories within it, and clean up after tests. ;; ;; This library should be required by test suites to ensure consistent, ;; reliable, and isolated file-system resources. ;; ;;; Code: +(defun chime-test--default-base-dir () + "Return the default base directory for CHIME test files. +When CHIME_TEST_TMPDIR is set and non-empty, use it as an explicit +override. Otherwise use a unique process-local directory under +`temporary-file-directory' so test runs do not write into the user's home +or collide with other runs." + (let ((override (getenv "CHIME_TEST_TMPDIR"))) + (file-name-as-directory + (expand-file-name + (if (and override (> (length override) 0)) + override + (make-temp-name + (expand-file-name + (format "chime-tests-%s-" (emacs-pid)) + temporary-file-directory))))))) + (defconst chime-test-base-dir - (expand-file-name "~/.temp-chime-tests/") + (chime-test--default-base-dir) "Base directory for all CHIME test files and directories. -All test file-system artifacts should be created under this hidden -directory in the user's home. This avoids relying on ephemeral system -directories like /tmp and reduces flaky test failures caused by external -cleanup.") +All test file-system artifacts should be created under this directory. +Set CHIME_TEST_TMPDIR to force a specific root; otherwise a unique +process-local directory under `temporary-file-directory' is used.") (defun chime-create-test-base-dir () "Create the test base directory `chime-test-base-dir' if it does not exist. |