diff options
Diffstat (limited to 'test/lisp/replace-tests.el')
| -rw-r--r-- | test/lisp/replace-tests.el | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/test/lisp/replace-tests.el b/test/lisp/replace-tests.el index 2db570c97dd..7f62a417a02 100644 --- a/test/lisp/replace-tests.el +++ b/test/lisp/replace-tests.el @@ -465,7 +465,12 @@ Return the last evalled form in BODY." ;; isearch-lazy-highlight-new-loop and sit-for (bug#36328) ((symbol-function 'replace-highlight) (lambda (&rest _args) - (string-match "[A-Z ]" "ForestGreen")))) + (string-match "[A-Z ]" "ForestGreen"))) + ;; Override `sit-for' and `ding' so that we don't have + ;; to wait and listen to bells when running the test. + ((symbol-function 'sit-for) + (lambda (&rest _args) (redisplay))) + ((symbol-function 'ding) 'ignore)) (perform-replace ,from ,to t replace-tests-perform-replace-regexp-flag nil)) ,@body)))) @@ -584,7 +589,7 @@ bound to HIGHLIGHT-LOCUS." (replace-tests-with-highlighted-occurrence highlight-locus (occur-mode-display-occurrence) (with-current-buffer (marker-buffer - (get-text-property (point) 'occur-target)) + (caar (get-text-property (point) 'occur-target))) (should (funcall check-overlays has-overlay))))))) (ert-deftest replace-regexp-bug45973 () @@ -601,4 +606,15 @@ bound to HIGHLIGHT-LOCUS." (if (match-string 2) "R" "L"))) (should (equal (buffer-string) after))))) +(ert-deftest test-count-matches () + (with-temp-buffer + (insert "oooooooooo") + (goto-char (point-min)) + (should (= (count-matches "oo") 5)) + (should (= (count-matches "o+") 1))) + (with-temp-buffer + (insert "o\n\n\n\no\n\n") + (goto-char (point-min)) + (should (= (count-matches "^$") 4)))) + ;;; replace-tests.el ends here |