mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-18 10:16:51 +00:00
dc2d2590b2
http://lists.gnu.org/archive/html/emacs-devel/2010-03/msg01280.html * replace.el (occur-accumulate-lines): Add optional arg `pt'. (occur-engine): Add local variables `ret', `prev-after-lines', `prev-lines'. Use more arguments for `occur-context-lines'. Set first elem of its returned list to `data', and the second elem to `prev-after-lines'. Don't print the separator line. In the end, print remaining context after-lines. (occur-context-lines): Add new arguments `begpt', `endpt', `lines', `prev-lines', `prev-after-lines'. Rewrite to combine after-lines of the previous match with before-lines of the current match and not overlap them. Return a list with two values: the output line and the list of context after-lines. * search.texi (Other Repeating Search): Remove line that `occur' can not handle multiline matches. * occur-testsuite.el (occur-tests): Add tests for context lines.
348 lines
5.1 KiB
EmacsLisp
348 lines
5.1 KiB
EmacsLisp
;;; occur-testsuite.el --- Test suite for occur.
|
|
|
|
;; Copyright (C) 2010 Free Software Foundation, Inc.
|
|
|
|
;; Author: Juri Linkov <juri@jurta.org>
|
|
;; Keywords: matching, internal
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;; Type M-x test-occur RET to test the functionality of `occur'.
|
|
|
|
;;; Code:
|
|
|
|
(defconst occur-tests
|
|
'(
|
|
;; * Test one-line matches (at bob, eob, bol, eol).
|
|
("x" 0 "\
|
|
xa
|
|
b
|
|
cx
|
|
xd
|
|
xex
|
|
fx
|
|
" "\
|
|
5 matches for \"x\" in buffer: *temp*
|
|
1:xa
|
|
3:cx
|
|
4:xd
|
|
5:xex
|
|
6:fx
|
|
")
|
|
;; * Test multi-line matches, this is the first test from
|
|
;; http://lists.gnu.org/archive/html/emacs-devel/2005-06/msg01008.html
|
|
;; where numbers are replaced with letters.
|
|
("a\na" 0 "\
|
|
a
|
|
a
|
|
a
|
|
a
|
|
a
|
|
" "\
|
|
2 matches for \"a^Ja\" in buffer: *temp*
|
|
1:a
|
|
:a
|
|
3:a
|
|
:a
|
|
")
|
|
;; * Test multi-line matches, this is the second test from
|
|
;; http://lists.gnu.org/archive/html/emacs-devel/2005-06/msg01008.html
|
|
;; where numbers are replaced with letters.
|
|
("a\nb" 0 "\
|
|
a
|
|
b
|
|
c
|
|
a
|
|
b
|
|
" "\
|
|
2 matches for \"a^Jb\" in buffer: *temp*
|
|
1:a
|
|
:b
|
|
4:a
|
|
:b
|
|
")
|
|
;; * Test line numbers for multi-line matches with empty last match line.
|
|
("a\n" 0 "\
|
|
a
|
|
|
|
c
|
|
a
|
|
|
|
" "\
|
|
2 matches for \"a^J\" in buffer: *temp*
|
|
1:a
|
|
:
|
|
4:a
|
|
:
|
|
")
|
|
;; * Test multi-line matches with 3 match lines.
|
|
("x\n.x\n" 0 "\
|
|
ax
|
|
bx
|
|
c
|
|
d
|
|
ex
|
|
fx
|
|
" "\
|
|
2 matches for \"x^J.x^J\" in buffer: *temp*
|
|
1:ax
|
|
:bx
|
|
:c
|
|
5:ex
|
|
:fx
|
|
:
|
|
")
|
|
;; * Test non-overlapping context lines with matches at bob/eob.
|
|
("x" 1 "\
|
|
ax
|
|
b
|
|
c
|
|
d
|
|
ex
|
|
f
|
|
g
|
|
hx
|
|
" "\
|
|
3 matches for \"x\" in buffer: *temp*
|
|
1:ax
|
|
:b
|
|
-------
|
|
:d
|
|
5:ex
|
|
:f
|
|
-------
|
|
:g
|
|
8:hx
|
|
")
|
|
;; * Test non-overlapping context lines with matches not at bob/eob.
|
|
("x" 1 "\
|
|
a
|
|
bx
|
|
c
|
|
d
|
|
ex
|
|
f
|
|
" "\
|
|
2 matches for \"x\" in buffer: *temp*
|
|
:a
|
|
2:bx
|
|
:c
|
|
-------
|
|
:d
|
|
5:ex
|
|
:f
|
|
")
|
|
;; * Test overlapping context lines with matches at bob/eob.
|
|
("x" 2 "\
|
|
ax
|
|
bx
|
|
c
|
|
dx
|
|
e
|
|
f
|
|
gx
|
|
h
|
|
i
|
|
j
|
|
kx
|
|
" "\
|
|
5 matches for \"x\" in buffer: *temp*
|
|
1:ax
|
|
2:bx
|
|
:c
|
|
4:dx
|
|
:e
|
|
:f
|
|
7:gx
|
|
:h
|
|
:i
|
|
:j
|
|
11:kx
|
|
")
|
|
;; * Test overlapping context lines with matches not at bob/eob.
|
|
("x" 2 "\
|
|
a
|
|
b
|
|
cx
|
|
d
|
|
e
|
|
f
|
|
gx
|
|
h
|
|
i
|
|
" "\
|
|
2 matches for \"x\" in buffer: *temp*
|
|
:a
|
|
:b
|
|
3:cx
|
|
:d
|
|
:e
|
|
:f
|
|
7:gx
|
|
:h
|
|
:i
|
|
")
|
|
;; * Test overlapping context lines with empty first and last line..
|
|
("x" 2 "\
|
|
|
|
b
|
|
cx
|
|
d
|
|
e
|
|
f
|
|
gx
|
|
h
|
|
|
|
" "\
|
|
2 matches for \"x\" in buffer: *temp*
|
|
:
|
|
:b
|
|
3:cx
|
|
:d
|
|
:e
|
|
:f
|
|
7:gx
|
|
:h
|
|
:
|
|
")
|
|
;; * Test multi-line overlapping context lines.
|
|
("x\n.x" 2 "\
|
|
ax
|
|
bx
|
|
c
|
|
d
|
|
ex
|
|
fx
|
|
g
|
|
h
|
|
i
|
|
jx
|
|
kx
|
|
" "\
|
|
3 matches for \"x^J.x\" in buffer: *temp*
|
|
1:ax
|
|
:bx
|
|
:c
|
|
:d
|
|
5:ex
|
|
:fx
|
|
:g
|
|
:h
|
|
:i
|
|
10:jx
|
|
:kx
|
|
")
|
|
;; * Test multi-line non-overlapping context lines.
|
|
("x\n.x" 2 "\
|
|
ax
|
|
bx
|
|
c
|
|
d
|
|
e
|
|
f
|
|
gx
|
|
hx
|
|
" "\
|
|
2 matches for \"x^J.x\" in buffer: *temp*
|
|
1:ax
|
|
:bx
|
|
:c
|
|
:d
|
|
-------
|
|
:e
|
|
:f
|
|
7:gx
|
|
:hx
|
|
")
|
|
;; * Test non-overlapping negative (before-context) lines.
|
|
("x" -2 "\
|
|
a
|
|
bx
|
|
c
|
|
d
|
|
e
|
|
fx
|
|
g
|
|
h
|
|
ix
|
|
" "\
|
|
3 matches for \"x\" in buffer: *temp*
|
|
:a
|
|
2:bx
|
|
-------
|
|
:d
|
|
:e
|
|
6:fx
|
|
-------
|
|
:g
|
|
:h
|
|
9:ix
|
|
")
|
|
;; * Test overlapping negative (before-context) lines.
|
|
("x" -3 "\
|
|
a
|
|
bx
|
|
c
|
|
dx
|
|
e
|
|
f
|
|
gx
|
|
h
|
|
" "\
|
|
3 matches for \"x\" in buffer: *temp*
|
|
:a
|
|
2:bx
|
|
:c
|
|
4:dx
|
|
:e
|
|
:f
|
|
7:gx
|
|
")
|
|
|
|
)
|
|
"List of tests for `occur'.
|
|
Each element has the format:
|
|
\(REGEXP NLINES INPUT-BUFFER-STRING OUTPUT-BUFFER-STRING).")
|
|
|
|
(defun test-occur ()
|
|
(interactive)
|
|
(let ((count 1)
|
|
failed
|
|
(occur-hook nil))
|
|
(dolist (test occur-tests)
|
|
(let ((regexp (nth 0 test))
|
|
(nlines (nth 1 test))
|
|
(input-buffer-string (nth 2 test))
|
|
(output-buffer-string (nth 3 test)))
|
|
(save-excursion
|
|
(with-temp-buffer
|
|
(insert input-buffer-string)
|
|
(occur regexp nlines)
|
|
(unless (equal output-buffer-string
|
|
(with-current-buffer "*Occur*"
|
|
(buffer-string)))
|
|
(setq failed (cons count failed))))))
|
|
(setq count (1+ count)))
|
|
(if failed
|
|
(message "FAILED TESTS: %S" (reverse failed))
|
|
(message "SUCCESS"))))
|
|
|
|
(provide 'occur-testsuite)
|
|
|
|
;;; occur-testsuite.el ends here
|