diff options
Diffstat (limited to 'tests/test-chime-whitelist-blacklist-conflicts.el')
| -rw-r--r-- | tests/test-chime-whitelist-blacklist-conflicts.el | 64 |
1 files changed, 28 insertions, 36 deletions
diff --git a/tests/test-chime-whitelist-blacklist-conflicts.el b/tests/test-chime-whitelist-blacklist-conflicts.el index f79bffd..5becfe0 100644 --- a/tests/test-chime-whitelist-blacklist-conflicts.el +++ b/tests/test-chime-whitelist-blacklist-conflicts.el @@ -39,22 +39,14 @@ "Setup function run before each test." (chime-create-test-base-dir) ;; Reset all whitelist/blacklist settings - (setq chime-keyword-whitelist nil) - (setq chime-tags-whitelist nil) - (setq chime-predicate-whitelist nil) - (setq chime-keyword-blacklist nil) - (setq chime-tags-blacklist nil) - (setq chime-predicate-blacklist nil)) + (setq chime-include-filters nil) + (setq chime-exclude-filters nil)) (defun test-chime-conflicts-teardown () "Teardown function run after each test." (chime-delete-test-base-dir) - (setq chime-keyword-whitelist nil) - (setq chime-tags-whitelist nil) - (setq chime-predicate-whitelist nil) - (setq chime-keyword-blacklist nil) - (setq chime-tags-blacklist nil) - (setq chime-predicate-blacklist nil)) + (setq chime-include-filters nil) + (setq chime-exclude-filters nil)) ;;; Keyword Conflict Tests @@ -74,11 +66,11 @@ Current behavior: blacklist wins (item is filtered out)." (let ((marker2 (point-marker))) (forward-line 1) (let ((marker3 (point-marker)) - (chime-keyword-whitelist '("TODO" "DONE")) - (chime-keyword-blacklist '("DONE"))) ; DONE in both lists + (chime-include-filters `((keywords . ,'("TODO" "DONE")))) + (chime-exclude-filters `((keywords . ,'("DONE"))))) ; DONE in both lists ;; Apply both filters (simulating what happens in chime--gather-timestamps) - (let* ((after-whitelist (chime--apply-whitelist (list marker1 marker2 marker3))) - (after-blacklist (chime--apply-blacklist after-whitelist))) + (let* ((after-whitelist (chime--apply-include-filters (list marker1 marker2 marker3))) + (after-blacklist (chime--apply-exclude-filters after-whitelist))) ;; Whitelist should keep all three (all are TODO or DONE) (should (= (length after-whitelist) 3)) (should (member marker1 after-whitelist)) @@ -105,10 +97,10 @@ Current behavior: blacklist wins, all items filtered out." (let ((marker1 (point-marker))) (forward-line 1) (let ((marker2 (point-marker)) - (chime-keyword-whitelist '("TODO" "DONE")) - (chime-keyword-blacklist '("TODO" "DONE"))) - (let* ((after-whitelist (chime--apply-whitelist (list marker1 marker2))) - (after-blacklist (chime--apply-blacklist after-whitelist))) + (chime-include-filters `((keywords . ,'("TODO" "DONE")))) + (chime-exclude-filters `((keywords . ,'("TODO" "DONE"))))) + (let* ((after-whitelist (chime--apply-include-filters (list marker1 marker2))) + (after-blacklist (chime--apply-exclude-filters after-whitelist))) ;; Whitelist should keep both (should (= (length after-whitelist) 2)) ;; Blacklist should remove both @@ -133,10 +125,10 @@ Current behavior: blacklist wins (item is filtered out)." (let ((marker2 (point-marker))) (forward-line 1) (let ((marker3 (point-marker)) - (chime-tags-whitelist '("urgent" "important")) - (chime-tags-blacklist '("urgent"))) ; urgent in both lists - (let* ((after-whitelist (chime--apply-whitelist (list marker1 marker2 marker3))) - (after-blacklist (chime--apply-blacklist after-whitelist))) + (chime-include-filters `((tags . ,'("urgent" "important")))) + (chime-exclude-filters `((tags . ,'("urgent"))))) ; urgent in both lists + (let* ((after-whitelist (chime--apply-include-filters (list marker1 marker2 marker3))) + (after-blacklist (chime--apply-exclude-filters after-whitelist))) ;; Whitelist should keep urgent and important (markers 1 and 3) (should (= (length after-whitelist) 2)) (should (member marker1 after-whitelist)) @@ -163,10 +155,10 @@ Current behavior: blacklist wins (OR logic means tag match filters it out)." (let ((marker1 (point-marker))) (forward-line 1) (let ((marker2 (point-marker)) - (chime-keyword-whitelist '("TODO")) - (chime-tags-blacklist '("urgent"))) - (let* ((after-whitelist (chime--apply-whitelist (list marker1 marker2))) - (after-blacklist (chime--apply-blacklist after-whitelist))) + (chime-include-filters `((keywords . ,'("TODO")))) + (chime-exclude-filters `((tags . ,'("urgent"))))) + (let* ((after-whitelist (chime--apply-include-filters (list marker1 marker2))) + (after-blacklist (chime--apply-exclude-filters after-whitelist))) ;; Whitelist should keep TODO (marker1) (should (= (length after-whitelist) 1)) (should (member marker1 after-whitelist)) @@ -187,10 +179,10 @@ Current behavior: blacklist wins (OR logic means keyword match filters it out)." (let ((marker1 (point-marker))) (forward-line 1) (let ((marker2 (point-marker)) - (chime-tags-whitelist '("urgent")) - (chime-keyword-blacklist '("TODO"))) - (let* ((after-whitelist (chime--apply-whitelist (list marker1 marker2))) - (after-blacklist (chime--apply-blacklist after-whitelist))) + (chime-include-filters `((tags . ,'("urgent")))) + (chime-exclude-filters `((keywords . ,'("TODO"))))) + (let* ((after-whitelist (chime--apply-include-filters (list marker1 marker2))) + (after-blacklist (chime--apply-exclude-filters after-whitelist))) ;; Whitelist should keep urgent tag (marker1) (should (= (length after-whitelist) 1)) (should (member marker1 after-whitelist)) @@ -219,10 +211,10 @@ Current behavior: only items with conflicts are filtered out." (let ((marker3 (point-marker))) (forward-line 1) (let ((marker4 (point-marker)) - (chime-keyword-whitelist '("TODO")) - (chime-tags-blacklist '("urgent"))) - (let* ((after-whitelist (chime--apply-whitelist (list marker1 marker2 marker3 marker4))) - (after-blacklist (chime--apply-blacklist after-whitelist))) + (chime-include-filters `((keywords . ,'("TODO")))) + (chime-exclude-filters `((tags . ,'("urgent"))))) + (let* ((after-whitelist (chime--apply-include-filters (list marker1 marker2 marker3 marker4))) + (after-blacklist (chime--apply-exclude-filters after-whitelist))) ;; Whitelist should keep TODO (markers 1, 3, 4) (should (= (length after-whitelist) 3)) (should (member marker1 after-whitelist)) |