From 81eb9adf99deb3c7e9d517c3d4723a90fdafb2ed Mon Sep 17 00:00:00 2001 From: Ted Zlatanov Date: Tue, 14 Feb 2012 14:48:03 -0500 Subject: [PATCH] More registry test adjustments. * registry.el (registry-make-testable-db, registry-match-test) (registry-instantiation-test): Move to tests/gnustest-registry.el. --- lisp/ChangeLog | 2 ++ lisp/registry.el | 37 ----------------------------- lisp/tests/gnustest-registry.el | 41 +++++++++++++++++++++++++++++++-- 3 files changed, 41 insertions(+), 39 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 37c5a42ba..5f5d0a980 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -2,6 +2,8 @@ * registry.el (registry-usage-test, registry-persistence-test): Move to tests/gnustest-registry.el. + (registry-make-testable-db, registry-match-test) + (registry-instantiation-test): Move to tests/gnustest-registry.el. * gnus-registry.el (gnus-registry-misc-test) (gnus-registry-usage-test): Move to tests/gnustest-registry.el. diff --git a/lisp/registry.el b/lisp/registry.el index 8079195b7..b2130d56e 100644 --- a/lisp/registry.el +++ b/lisp/registry.el @@ -367,42 +367,5 @@ Proposes any entries over the max-hard limit minus size * prune-factor." collect k))) (list limit candidates)))) -(ert-deftest registry-instantiation-test () - (should (registry-db "Testing"))) - -(ert-deftest registry-match-test () - (let ((entry '((hello "goodbye" "bye") (blank)))) - - (message "Testing :regex matching") - (should (registry--match :regex entry '((hello "nye" "bye")))) - (should (registry--match :regex entry '((hello "good")))) - (should-not (registry--match :regex entry '((hello "nye")))) - (should-not (registry--match :regex entry '((hello)))) - - (message "Testing :member matching") - (should (registry--match :member entry '((hello "bye")))) - (should (registry--match :member entry '((hello "goodbye")))) - (should-not (registry--match :member entry '((hello "good")))) - (should-not (registry--match :member entry '((hello "nye")))) - (should-not (registry--match :member entry '((hello))))) - (message "Done with matching testing.")) - -(defun registry-make-testable-db (n &optional name file) - (let* ((db (registry-db - (or name "Testing") - :file (or file "unused") - :max-hard n - :max-soft 0 ; keep nothing not precious - :precious '(extra more-extra) - :tracked '(sender subject groups)))) - (dotimes (i n) - (registry-insert db i `((sender "me") - (subject "about you") - (more-extra) ; empty data key should be pruned - ;; first 5 entries will NOT have this extra data - ,@(when (< 5 i) (list (list 'extra "more data"))) - (groups ,(number-to-string i))))) - db)) - (provide 'registry) ;;; registry.el ends here diff --git a/lisp/tests/gnustest-registry.el b/lisp/tests/gnustest-registry.el index fb822ad61..512fab499 100644 --- a/lisp/tests/gnustest-registry.el +++ b/lisp/tests/gnustest-registry.el @@ -34,9 +34,46 @@ (require 'registry) (require 'gnus-registry) +(ert-deftest gnustest-registry-instantiation-test () + (should (registry-db "Testing"))) + +(ert-deftest gnustest-registry-match-test () + (let ((entry '((hello "goodbye" "bye") (blank)))) + + (message "Testing :regex matching") + (should (registry--match :regex entry '((hello "nye" "bye")))) + (should (registry--match :regex entry '((hello "good")))) + (should-not (registry--match :regex entry '((hello "nye")))) + (should-not (registry--match :regex entry '((hello)))) + + (message "Testing :member matching") + (should (registry--match :member entry '((hello "bye")))) + (should (registry--match :member entry '((hello "goodbye")))) + (should-not (registry--match :member entry '((hello "good")))) + (should-not (registry--match :member entry '((hello "nye")))) + (should-not (registry--match :member entry '((hello))))) + (message "Done with matching testing.")) + +(defun gnustest-registry-make-testable-db (n &optional name file) + (let* ((db (registry-db + (or name "Testing") + :file (or file "unused") + :max-hard n + :max-soft 0 ; keep nothing not precious + :precious '(extra more-extra) + :tracked '(sender subject groups)))) + (dotimes (i n) + (registry-insert db i `((sender "me") + (subject "about you") + (more-extra) ; empty data key should be pruned + ;; first 5 entries will NOT have this extra data + ,@(when (< 5 i) (list (list 'extra "more data"))) + (groups ,(number-to-string i))))) + db)) + (ert-deftest gnustest-registry-usage-test () (let* ((n 100) - (db (registry-make-testable-db n))) + (db (gnustest-registry-make-testable-db n))) (message "size %d" n) (should (= n (registry-size db))) (message "max-hard test") @@ -81,7 +118,7 @@ (let* ((n 100) (tempfile (make-temp-file "registry-persistence-")) (name "persistence tester") - (db (registry-make-testable-db n name tempfile)) + (db (gnustest-registry-make-testable-db n name tempfile)) size back) (message "Saving to %s" tempfile) (eieio-persistent-save db) -- 2.34.1