From: Juri Linkov Date: Mon, 9 May 2011 23:21:32 +0000 (+0400) Subject: * test/automated/occur-tests.el: Move from test/occur-testsuite.el. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~49 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c07b2710c7a48d436e21b3c0a51dbc7f3b98230a;p=emacs.git * test/automated/occur-tests.el: Move from test/occur-testsuite.el. Convert to ERT. --- diff --git a/test/ChangeLog b/test/ChangeLog index 4793e904691..1311d66e280 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2011-05-09 Juri Linkov + + * automated/occur-tests.el: Move from test/occur-testsuite.el. + Convert to ERT. + 2011-05-09 Chong Yidong * automated/compile-tests.el: New file. diff --git a/test/automated/occur-tests.el b/test/automated/occur-tests.el new file mode 100644 index 00000000000..2ae5b1c132f --- /dev/null +++ b/test/automated/occur-tests.el @@ -0,0 +1,342 @@ +;;; occur-tests.el --- Test suite for occur. + +;; Copyright (C) 2010-2011 Free Software Foundation, Inc. + +;; Author: Juri Linkov +;; 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 . + +;;; Code: + +(require 'ert) + +(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*<2> + 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*<2> + 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*<2> + 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*<2> + 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*<2> + 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*<2> + 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*<2> + :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*<2> + 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*<2> + :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*<2> + : + :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*<2> + 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*<2> + 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*<2> + :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*<2> + :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 occur-test-case (test) + (let ((regexp (nth 0 test)) + (nlines (nth 1 test)) + (input-buffer-string (nth 2 test)) + (output-buffer-string (nth 3 test))) + (save-window-excursion + (with-temp-buffer + (insert input-buffer-string) + (occur regexp nlines) + (equal output-buffer-string + (with-current-buffer "*Occur*" + (buffer-string))))))) + +(ert-deftest occur-tests () + "Test the functionality of `occur'. +The test data is in the `occur-tests' constant." + (let ((occur-hook nil)) + (dolist (test occur-tests) + (should (occur-test-case test))))) + +(provide 'occur-tests) + +;;; occur-tests.el ends here diff --git a/test/occur-testsuite.el b/test/occur-testsuite.el deleted file mode 100644 index 6f1107e5c16..00000000000 --- a/test/occur-testsuite.el +++ /dev/null @@ -1,347 +0,0 @@ -;;; occur-testsuite.el --- Test suite for occur. - -;; Copyright (C) 2010-2011 Free Software Foundation, Inc. - -;; Author: Juri Linkov -;; 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 . - -;;; 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