Mercurial > hg > xemacs-beta

changeset 4902:c902301f8b7d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix CRLF line endings in search-tests.el -------------------- ChangeLog entries follow: -------------------- tests/ChangeLog addition: 2010-01-30 Ben Wing <ben@xemacs.org> * automated/search-tests.el: * automated/search-tests.el (insert): Use LF not CRLF for line endings.
author Ben Wing <ben@xemacs.org>
date Sat, 30 Jan 2010 18:47:17 -0600
parents 7504864a986c
children 70089046adef
files tests/ChangeLog tests/automated/search-tests.el
diffstat 2 files changed, 237 insertions(+), 231 deletions(-) [+]
line wrap: on
line diff
--- a/tests/ChangeLog	Sat Jan 30 22:25:39 2010 +0000
+++ b/tests/ChangeLog	Sat Jan 30 18:47:17 2010 -0600
@@ -1,3 +1,9 @@
+2010-01-30  Ben Wing  <ben@xemacs.org>
+
+	* automated/search-tests.el:
+	* automated/search-tests.el (insert):
+	Use LF not CRLF for line endings.
+
 2010-01-30  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* automated/regexp-tests.el:
--- a/tests/automated/search-tests.el	Sat Jan 30 22:25:39 2010 +0000
+++ b/tests/automated/search-tests.el	Sat Jan 30 18:47:17 2010 -0600
@@ -1,231 +1,231 @@
-;;; -*- coding: iso-8859-1 -*-
-
-;; Copyright (C) 2000 Free Software Foundation, Inc.
-;; Copyright (C) 2010 Ben Wing.
-
-;; Author: Yoshiki Hayashi  <yoshiki@xemacs.org>
-;; Maintainer: Yoshiki Hayashi  <yoshiki@xemacs.org>
-;; Created: 2000
-;; Keywords: tests
-
-;; This file is part of XEmacs.
-
-;; XEmacs 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 2, or (at your option)
-;; any later version.
-
-;; XEmacs 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 XEmacs; see the file COPYING.  If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
-
-;;; Synched up with: Not in FSF.
-
-;;; Commentary:
-
-;; Test of non-regexp searching.
-
-;; Split out of case-tests.el.
-
-;; NOTE NOTE NOTE: See also:
-;;
-;; (1) regexp-tests.el, for regexp searching.
-;; (2) case-tests.el, for some case-related searches.
-
-;; NOTE NOTE NOTE: There is some domain overlap among regexp-tests.el,
-;; search-tests.el and case-tests.el.  The current rule for what goes where
-;; is:
-;;
-;; (1) Anything regexp-related goes in regexp-tests.el, including searches.
-;; (2) Non-regexp searches go in search-tests.el.  This includes case-folding
-;;     searches in the situation where the test tests both folding and
-;;     non-folding behavior.
-;; (3) If it tests specifically case-folding search behavior, it may go in
-;;     case-tets.el, especially if it is testing something non-search-related
-;;     at the same time (e.g. the Unicode case map torture tests).
-
-(with-temp-buffer
-  (insert "Test Buffer")
-  (let ((case-fold-search t))
-    (goto-char (point-min))
-    (Assert-eq (search-forward "test buffer" nil t) 12)
-    (goto-char (point-min))
-    (Assert-eq (search-forward "Test buffer" nil t) 12)
-    (goto-char (point-min))
-    (Assert-eq (search-forward "Test Buffer" nil t) 12)
-
-    (setq case-fold-search nil)
-    (goto-char (point-min))
-    (Assert (not (search-forward "test buffer" nil t)))
-    (goto-char (point-min))
-    (Assert (not (search-forward "Test buffer" nil t)))
-    (goto-char (point-min))
-    (Assert-eq (search-forward "Test Buffer" nil t) 12)))
-
-(with-temp-buffer
-  (insert "abcdefghijklmnäopqrstuÄvwxyz")
-  ;; case insensitive
-  (Assert (not (search-forward "ö" nil t)))
-  (goto-char (point-min))
-  (Assert-eq 16 (search-forward "ä" nil t))
-  (Assert-eq 24 (search-forward "ä" nil t))
-  (goto-char (point-min))
-  (Assert-eq 16 (search-forward "Ä" nil t))
-  (Assert-eq 24 (search-forward "Ä" nil t))
-  (goto-char (point-max))
-  (Assert-eq 23 (search-backward "ä" nil t))
-  (Assert-eq 15 (search-backward "ä" nil t))
-  (goto-char (point-max))
-  (Assert-eq 23 (search-backward "Ä" nil t))
-  (Assert-eq 15 (search-backward "Ä" nil t))
-  ;; case sensitive
-  (setq case-fold-search nil)
-  (goto-char (point-min))
-  (Assert (not (search-forward "ö" nil t)))
-  (goto-char (point-min))
-  (Assert-eq 16 (search-forward "ä" nil t))
-  (Assert (not (search-forward "ä" nil t)))
-  (goto-char (point-min))
-  (Assert-eq 24 (search-forward "Ä" nil t))
-  (goto-char 16)
-  (Assert-eq 24 (search-forward "Ä" nil t))
-  (goto-char (point-max))
-  (Assert-eq 15 (search-backward "ä" nil t))
-  (goto-char 15)
-  (Assert (not (search-backward "ä" nil t)))
-  (goto-char (point-max))
-  (Assert-eq 23 (search-backward "Ä" nil t))
-  (Assert (not (search-backward "Ä" nil t))))
-
-(with-temp-buffer
-  (insert "aaaaäÄäÄäÄäÄäÄbbbb")
-  (goto-char (point-min))
-  (Assert-eq 15 (search-forward "ää" nil t 5))
-  (goto-char (point-min))
-  (Assert (not (search-forward "ää" nil t 6)))
-  (goto-char (point-max))
-  (Assert-eq 5 (search-backward "ää" nil t 5))
-  (goto-char (point-max))
-  (Assert (not (search-backward "ää" nil t 6))))
-
-(when (featurep 'mule)
-  (let* ((hiragana-a (make-char 'japanese-jisx0208 36 34))
-	 (a-diaeresis ?ä)
-	 (case-table (copy-case-table (standard-case-table)))
-	 (str-hiragana-a (char-to-string hiragana-a))
-	 (str-a-diaeresis (char-to-string a-diaeresis))
-	 (string (concat str-hiragana-a str-a-diaeresis)))
-    (put-case-table-pair hiragana-a a-diaeresis case-table)
-    (with-temp-buffer
-      (set-case-table case-table)
-      (insert hiragana-a "abcdefg" a-diaeresis)
-      ;; forward
-      (goto-char (point-min))
-      (Assert (not (search-forward "ö" nil t)))
-      (goto-char (point-min))
-      (Assert-eq 2 (search-forward str-hiragana-a nil t))
-      (goto-char (point-min))
-      (Assert-eq 2 (search-forward str-a-diaeresis nil t))
-      (goto-char (1+ (point-min)))
-      (Assert-eq (point-max)
-		  (search-forward str-hiragana-a nil t))
-      (goto-char (1+ (point-min)))
-      (Assert-eq (point-max)
-		  (search-forward str-a-diaeresis nil t))
-      ;; backward
-      (goto-char (point-max))
-      (Assert (not (search-backward "ö" nil t)))
-      (goto-char (point-max))
-      (Assert-eq (1- (point-max)) (search-backward str-hiragana-a nil t))
-      (goto-char (point-max))
-      (Assert-eq (1- (point-max)) (search-backward str-a-diaeresis nil t))
-      (goto-char (1- (point-max)))
-      (Assert-eq 1 (search-backward str-hiragana-a nil t))
-      (goto-char (1- (point-max)))
-      (Assert-eq 1 (search-backward str-a-diaeresis nil t))
-      (replace-match "a")
-      (Assert (looking-at (format "abcdefg%c" a-diaeresis))))
-    (with-temp-buffer
-      (set-case-table case-table)
-      (insert string)
-      (insert string)
-      (insert string)
-      (insert string)
-      (insert string)
-      (goto-char (point-min))
-      (Assert-eq 11 (search-forward string nil t 5))
-      (goto-char (point-min))
-      (Assert (not (search-forward string nil t 6)))
-      (goto-char (point-max))
-      (Assert-eq 1 (search-backward string nil t 5))
-      (goto-char (point-max))
-      (Assert (not (search-backward string nil t 6))))))
-
-;; Bug reported in http://mid.gmane.org/y9lk5lu5orq.fsf@deinprogramm.de from
-;; Michael Sperber. Fixed 2008-01-29.
-(with-string-as-buffer-contents "\n\nDer beruhmte deutsche Flei\xdf\n\n"
-  (goto-char (point-min))
-  (Assert (search-forward "Flei\xdf")))
-
-(with-temp-buffer
-  (let ((target "M\xe9zard")
-        (debug-xemacs-searches 1))
-    (Assert (not (search-forward target nil t)))
-    (insert target)
-    (goto-char (point-min))
-    ;; #### search-algorithm-used is simple-search after the following,
-    ;; which shouldn't be necessary; it should be possible to use
-    ;; Boyer-Moore. 
-    ;;
-    ;; But searches for ASCII strings in buffers with nothing above ?\xFF
-    ;; use Boyer Moore with the current implementation, which is the
-    ;; important thing for the Gnus use case.
-    (Assert= (1+ (length target)) (search-forward target nil t))))
-
-(Skip-Test-Unless
- (boundp 'debug-xemacs-searches) ; normal when we have DEBUG_XEMACS
- "not a DEBUG_XEMACS build"
- "checks that the algorithm chosen by #'search-forward is relatively sane"
- (let ((debug-xemacs-searches 1))
-   (with-temp-buffer
-     ;;#### Ben thinks this is unnecessary.  with-temp-buffer creates
-     ;;a new buffer, which automatically inherits the standard case table.
-     ;;(set-case-table pristine-case-table)
-     (insert "\n\nDer beruhmte deutsche Fleiss\n\n")
-     (goto-char (point-min))
-     (Assert (search-forward "Fleiss"))
-     (delete-region (point-min) (point-max))
-     (insert "\n\nDer beruhmte deutsche Flei\xdf\n\n")
-     (goto-char (point-min))
-     (Assert (search-forward "Flei\xdf"))
-     (Assert-eq 'boyer-moore search-algorithm-used)
-     (delete-region (point-min) (point-max))
-     (when (featurep 'mule)
-       (insert "\n\nDer beruhmte deutsche Flei\xdf\n\n")
-       (goto-char (point-min))
-       (Assert 
-        (search-forward (format "Fle%c\xdf"
-                                (make-char 'latin-iso8859-9 #xfd))))
-       (Assert-eq 'boyer-moore search-algorithm-used)
-       (insert (make-char 'latin-iso8859-9 #xfd))
-       (goto-char (point-min))
-       (Assert (search-forward "Flei\xdf"))
-       (Assert-eq 'simple-search search-algorithm-used) 
-       (goto-char (point-min))
-       (Assert (search-forward (format "Fle%c\xdf"
-                                       (make-char 'latin-iso8859-9 #xfd))))
-       (Assert-eq 'simple-search search-algorithm-used)))))
-
-
-;; XEmacs bug of long standing.
-
-(with-temp-buffer
-  (insert "foo\201bar")
-  (goto-char (point-min))
-  (Assert-eq (search-forward "\201" nil t) 5))
+;;; -*- coding: iso-8859-1 -*-
+
+;; Copyright (C) 2000 Free Software Foundation, Inc.
+;; Copyright (C) 2010 Ben Wing.
+
+;; Author: Yoshiki Hayashi  <yoshiki@xemacs.org>
+;; Maintainer: Yoshiki Hayashi  <yoshiki@xemacs.org>
+;; Created: 2000
+;; Keywords: tests
+
+;; This file is part of XEmacs.
+
+;; XEmacs 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 2, or (at your option)
+;; any later version.
+
+;; XEmacs 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 XEmacs; see the file COPYING.  If not, write to the Free
+;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+;; 02111-1307, USA.
+
+;;; Synched up with: Not in FSF.
+
+;;; Commentary:
+
+;; Test of non-regexp searching.
+
+;; Split out of case-tests.el.
+
+;; NOTE NOTE NOTE: See also:
+;;
+;; (1) regexp-tests.el, for regexp searching.
+;; (2) case-tests.el, for some case-related searches.
+
+;; NOTE NOTE NOTE: There is some domain overlap among regexp-tests.el,
+;; search-tests.el and case-tests.el.  The current rule for what goes where
+;; is:
+;;
+;; (1) Anything regexp-related goes in regexp-tests.el, including searches.
+;; (2) Non-regexp searches go in search-tests.el.  This includes case-folding
+;;     searches in the situation where the test tests both folding and
+;;     non-folding behavior.
+;; (3) If it tests specifically case-folding search behavior, it may go in
+;;     case-tets.el, especially if it is testing something non-search-related
+;;     at the same time (e.g. the Unicode case map torture tests).
+
+(with-temp-buffer
+  (insert "Test Buffer")
+  (let ((case-fold-search t))
+    (goto-char (point-min))
+    (Assert-eq (search-forward "test buffer" nil t) 12)
+    (goto-char (point-min))
+    (Assert-eq (search-forward "Test buffer" nil t) 12)
+    (goto-char (point-min))
+    (Assert-eq (search-forward "Test Buffer" nil t) 12)
+
+    (setq case-fold-search nil)
+    (goto-char (point-min))
+    (Assert (not (search-forward "test buffer" nil t)))
+    (goto-char (point-min))
+    (Assert (not (search-forward "Test buffer" nil t)))
+    (goto-char (point-min))
+    (Assert-eq (search-forward "Test Buffer" nil t) 12)))
+
+(with-temp-buffer
+  (insert "abcdefghijklmnäopqrstuÄvwxyz")
+  ;; case insensitive
+  (Assert (not (search-forward "ö" nil t)))
+  (goto-char (point-min))
+  (Assert-eq 16 (search-forward "ä" nil t))
+  (Assert-eq 24 (search-forward "ä" nil t))
+  (goto-char (point-min))
+  (Assert-eq 16 (search-forward "Ä" nil t))
+  (Assert-eq 24 (search-forward "Ä" nil t))
+  (goto-char (point-max))
+  (Assert-eq 23 (search-backward "ä" nil t))
+  (Assert-eq 15 (search-backward "ä" nil t))
+  (goto-char (point-max))
+  (Assert-eq 23 (search-backward "Ä" nil t))
+  (Assert-eq 15 (search-backward "Ä" nil t))
+  ;; case sensitive
+  (setq case-fold-search nil)
+  (goto-char (point-min))
+  (Assert (not (search-forward "ö" nil t)))
+  (goto-char (point-min))
+  (Assert-eq 16 (search-forward "ä" nil t))
+  (Assert (not (search-forward "ä" nil t)))
+  (goto-char (point-min))
+  (Assert-eq 24 (search-forward "Ä" nil t))
+  (goto-char 16)
+  (Assert-eq 24 (search-forward "Ä" nil t))
+  (goto-char (point-max))
+  (Assert-eq 15 (search-backward "ä" nil t))
+  (goto-char 15)
+  (Assert (not (search-backward "ä" nil t)))
+  (goto-char (point-max))
+  (Assert-eq 23 (search-backward "Ä" nil t))
+  (Assert (not (search-backward "Ä" nil t))))
+
+(with-temp-buffer
+  (insert "aaaaäÄäÄäÄäÄäÄbbbb")
+  (goto-char (point-min))
+  (Assert-eq 15 (search-forward "ää" nil t 5))
+  (goto-char (point-min))
+  (Assert (not (search-forward "ää" nil t 6)))
+  (goto-char (point-max))
+  (Assert-eq 5 (search-backward "ää" nil t 5))
+  (goto-char (point-max))
+  (Assert (not (search-backward "ää" nil t 6))))
+
+(when (featurep 'mule)
+  (let* ((hiragana-a (make-char 'japanese-jisx0208 36 34))
+	 (a-diaeresis ?ä)
+	 (case-table (copy-case-table (standard-case-table)))
+	 (str-hiragana-a (char-to-string hiragana-a))
+	 (str-a-diaeresis (char-to-string a-diaeresis))
+	 (string (concat str-hiragana-a str-a-diaeresis)))
+    (put-case-table-pair hiragana-a a-diaeresis case-table)
+    (with-temp-buffer
+      (set-case-table case-table)
+      (insert hiragana-a "abcdefg" a-diaeresis)
+      ;; forward
+      (goto-char (point-min))
+      (Assert (not (search-forward "ö" nil t)))
+      (goto-char (point-min))
+      (Assert-eq 2 (search-forward str-hiragana-a nil t))
+      (goto-char (point-min))
+      (Assert-eq 2 (search-forward str-a-diaeresis nil t))
+      (goto-char (1+ (point-min)))
+      (Assert-eq (point-max)
+		  (search-forward str-hiragana-a nil t))
+      (goto-char (1+ (point-min)))
+      (Assert-eq (point-max)
+		  (search-forward str-a-diaeresis nil t))
+      ;; backward
+      (goto-char (point-max))
+      (Assert (not (search-backward "ö" nil t)))
+      (goto-char (point-max))
+      (Assert-eq (1- (point-max)) (search-backward str-hiragana-a nil t))
+      (goto-char (point-max))
+      (Assert-eq (1- (point-max)) (search-backward str-a-diaeresis nil t))
+      (goto-char (1- (point-max)))
+      (Assert-eq 1 (search-backward str-hiragana-a nil t))
+      (goto-char (1- (point-max)))
+      (Assert-eq 1 (search-backward str-a-diaeresis nil t))
+      (replace-match "a")
+      (Assert (looking-at (format "abcdefg%c" a-diaeresis))))
+    (with-temp-buffer
+      (set-case-table case-table)
+      (insert string)
+      (insert string)
+      (insert string)
+      (insert string)
+      (insert string)
+      (goto-char (point-min))
+      (Assert-eq 11 (search-forward string nil t 5))
+      (goto-char (point-min))
+      (Assert (not (search-forward string nil t 6)))
+      (goto-char (point-max))
+      (Assert-eq 1 (search-backward string nil t 5))
+      (goto-char (point-max))
+      (Assert (not (search-backward string nil t 6))))))
+
+;; Bug reported in http://mid.gmane.org/y9lk5lu5orq.fsf@deinprogramm.de from
+;; Michael Sperber. Fixed 2008-01-29.
+(with-string-as-buffer-contents "\n\nDer beruhmte deutsche Flei\xdf\n\n"
+  (goto-char (point-min))
+  (Assert (search-forward "Flei\xdf")))
+
+(with-temp-buffer
+  (let ((target "M\xe9zard")
+        (debug-xemacs-searches 1))
+    (Assert (not (search-forward target nil t)))
+    (insert target)
+    (goto-char (point-min))
+    ;; #### search-algorithm-used is simple-search after the following,
+    ;; which shouldn't be necessary; it should be possible to use
+    ;; Boyer-Moore. 
+    ;;
+    ;; But searches for ASCII strings in buffers with nothing above ?\xFF
+    ;; use Boyer Moore with the current implementation, which is the
+    ;; important thing for the Gnus use case.
+    (Assert= (1+ (length target)) (search-forward target nil t))))
+
+(Skip-Test-Unless
+ (boundp 'debug-xemacs-searches) ; normal when we have DEBUG_XEMACS
+ "not a DEBUG_XEMACS build"
+ "checks that the algorithm chosen by #'search-forward is relatively sane"
+ (let ((debug-xemacs-searches 1))
+   (with-temp-buffer
+     ;;#### Ben thinks this is unnecessary.  with-temp-buffer creates
+     ;;a new buffer, which automatically inherits the standard case table.
+     ;;(set-case-table pristine-case-table)
+     (insert "\n\nDer beruhmte deutsche Fleiss\n\n")
+     (goto-char (point-min))
+     (Assert (search-forward "Fleiss"))
+     (delete-region (point-min) (point-max))
+     (insert "\n\nDer beruhmte deutsche Flei\xdf\n\n")
+     (goto-char (point-min))
+     (Assert (search-forward "Flei\xdf"))
+     (Assert-eq 'boyer-moore search-algorithm-used)
+     (delete-region (point-min) (point-max))
+     (when (featurep 'mule)
+       (insert "\n\nDer beruhmte deutsche Flei\xdf\n\n")
+       (goto-char (point-min))
+       (Assert 
+        (search-forward (format "Fle%c\xdf"
+                                (make-char 'latin-iso8859-9 #xfd))))
+       (Assert-eq 'boyer-moore search-algorithm-used)
+       (insert (make-char 'latin-iso8859-9 #xfd))
+       (goto-char (point-min))
+       (Assert (search-forward "Flei\xdf"))
+       (Assert-eq 'simple-search search-algorithm-used) 
+       (goto-char (point-min))
+       (Assert (search-forward (format "Fle%c\xdf"
+                                       (make-char 'latin-iso8859-9 #xfd))))
+       (Assert-eq 'simple-search search-algorithm-used)))))
+
+
+;; XEmacs bug of long standing.
+
+(with-temp-buffer
+  (insert "foo\201bar")
+  (goto-char (point-min))
+  (Assert-eq (search-forward "\201" nil t) 5))