From 28b7e4cecadce207d532b8d42346c3823450a35f Mon Sep 17 00:00:00 2001 From: Craig Jennings Date: Tue, 17 Feb 2026 19:14:14 -0600 Subject: refactor: tests: standardize naming, consolidate files, and expand testutil - Expand testutil-wttrin.el with shared fixtures and macros (testutil-wttrin-with-clean-weather-buffer, testutil-wttrin-mock-http-response, sample ANSI/weather constants) - Consolidate cache tests: port unique tests from cleanup-cache-constants and cleanup-cache-refactored into cleanup-cache-if-needed, delete obsolete files - Extract startup-delay tests into dedicated file - Add setup/teardown and (require 'testutil-wttrin) to all test files - Rename all 160 tests to follow test---- convention - Rename integration test file and add detailed docstrings - Update Makefile glob to discover new integration test naming pattern Co-Authored-By: Claude Opus 4.6 --- tests/test-wttrin--cleanup-cache-if-needed.el | 77 +++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) (limited to 'tests/test-wttrin--cleanup-cache-if-needed.el') diff --git a/tests/test-wttrin--cleanup-cache-if-needed.el b/tests/test-wttrin--cleanup-cache-if-needed.el index c280723..32e5f8d 100644 --- a/tests/test-wttrin--cleanup-cache-if-needed.el +++ b/tests/test-wttrin--cleanup-cache-if-needed.el @@ -120,5 +120,82 @@ (should (= 2 (testutil-wttrin-cache-size)))) (test-wttrin--cleanup-cache-if-needed-teardown))) +(ert-deftest test-wttrin--cleanup-cache-if-needed-boundary-one-over-max-removes-oldest () + "Test cleanup when cache has just one entry over max." + (test-wttrin--cleanup-cache-if-needed-setup) + (unwind-protect + (testutil-wttrin-with-cache-max 5 + ;; Add 6 entries (1 over max) + (dotimes (i 6) + (testutil-wttrin-add-to-cache (format "loc%d" i) (format "data-%d" i) (* (- 6 i) 100))) + (should (= 6 (testutil-wttrin-cache-size))) + (wttrin--cleanup-cache-if-needed) + ;; Should remove 20% of 6 = 1.2 = 1 entry (floor) + (should (= 5 (testutil-wttrin-cache-size)))) + (test-wttrin--cleanup-cache-if-needed-teardown))) + +(ert-deftest test-wttrin--cleanup-cache-if-needed-normal-large-dataset-removes-20-percent () + "Test that cleanup removes approximately 20% of entries with larger dataset." + (test-wttrin--cleanup-cache-if-needed-setup) + (unwind-protect + (testutil-wttrin-with-cache-max 10 + ;; Add 20 entries (twice the max) + (dotimes (i 20) + (testutil-wttrin-add-to-cache (format "loc%d" i) (format "data-%d" i) (* (- 20 i) 100))) + (should (= 20 (testutil-wttrin-cache-size))) + ;; Trigger cleanup - should remove 20% of 20 = 4 entries + (wttrin--cleanup-cache-if-needed) + ;; Should have 16 entries remaining (20 - 4) + (should (= 16 (testutil-wttrin-cache-size)))) + (test-wttrin--cleanup-cache-if-needed-teardown))) + +(ert-deftest test-wttrin--cleanup-cache-if-needed-boundary-custom-cleanup-percentage-removes-expected () + "Test that custom cleanup percentage is respected." + (test-wttrin--cleanup-cache-if-needed-setup) + (unwind-protect + (let ((wttrin-cache-max-entries 100) + (wttrin--cache-cleanup-percentage 0.30)) ; 30% cleanup + ;; Add 101 entries + (dotimes (i 101) + (testutil-wttrin-add-to-cache (format "loc%d" i) "data" (* (- 101 i) 10))) + (wttrin--cleanup-cache-if-needed) + ;; Should remove floor(101 * 0.30) = 30 oldest entries, leaving 71 + (should (= 71 (testutil-wttrin-cache-size)))) + (test-wttrin--cleanup-cache-if-needed-teardown))) + +(ert-deftest test-wttrin--cleanup-cache-if-needed-boundary-small-percentage-removes-minimum () + "Test that small cleanup percentage (10%) removes correct number." + (test-wttrin--cleanup-cache-if-needed-setup) + (unwind-protect + (let ((wttrin-cache-max-entries 10) + (wttrin--cache-cleanup-percentage 0.10)) ; Only 10% + ;; Add 11 entries + (dotimes (i 11) + (testutil-wttrin-add-to-cache (format "loc%d" i) "data" (* (- 11 i) 100))) + (wttrin--cleanup-cache-if-needed) + ;; Should remove floor(11 * 0.10) = 1 oldest entry + (should (= 10 (testutil-wttrin-cache-size)))) + (test-wttrin--cleanup-cache-if-needed-teardown))) + +(ert-deftest test-wttrin--cleanup-cache-if-needed-normal-multiple-cleanups-work-correctly () + "Test that multiple cleanup cycles work correctly." + (test-wttrin--cleanup-cache-if-needed-setup) + (unwind-protect + (let ((wttrin-cache-max-entries 50) + (wttrin--cache-cleanup-percentage 0.20)) + ;; First batch: 51 entries + (dotimes (i 51) + (testutil-wttrin-add-to-cache (format "batch1-%d" i) "data" (* (- 51 i) 10))) + (wttrin--cleanup-cache-if-needed) + (should (= 41 (testutil-wttrin-cache-size))) + + ;; Second batch: add 10 more (now 51 again) + (dotimes (i 10) + (testutil-wttrin-add-to-cache (format "batch2-%d" i) "data")) + (wttrin--cleanup-cache-if-needed) + ;; Should cleanup again: floor(51 * 0.20) = 10 removed, leaving 41 + (should (= 41 (testutil-wttrin-cache-size)))) + (test-wttrin--cleanup-cache-if-needed-teardown))) + (provide 'test-wttrin--cleanup-cache-if-needed) ;;; test-wttrin--cleanup-cache-if-needed.el ends here -- cgit v1.2.3