Mercurial > hg > xemacs-beta

diff tests/automated/search-tests.el @ 5136:0f66906b6e37

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Undo Assert-equal, Assert=, etc.; make `Assert' handle this automatically -------------------- ChangeLog entries follow: -------------------- lisp/ChangeLog addition: 2010-03-12 Ben Wing <ben@xemacs.org> * test-harness.el (test-harness-from-buffer): Undo change of e.g. (Assert (equalp ...)) to (Assert-equalp ...). Get rid of `Assert-equalp' and friends, `Assert-test', and `Assert-test-not'. Instead, make `Assert' smart enough to do the equivalent functionality when an expression like (Assert (equalp ...)) is seen. tests/ChangeLog addition: 2010-03-12 Ben Wing <ben@xemacs.org> * automated/base64-tests.el (bt-base64-encode-string): * automated/base64-tests.el (bt-base64-decode-string): * automated/base64-tests.el (for): * automated/byte-compiler-tests.el: * automated/byte-compiler-tests.el (before-and-after-compile-equal): * automated/case-tests.el (downcase-string): * automated/case-tests.el (uni-mappings): * automated/ccl-tests.el (ccl-test-normal-expr): * automated/ccl-tests.el (ccl-test-map-instructions): * automated/ccl-tests.el (ccl-test-suites): * automated/database-tests.el (delete-database-files): * automated/extent-tests.el (let): * automated/extent-tests.el (insert): * automated/extent-tests.el (props): * automated/file-tests.el: * automated/file-tests.el (for): * automated/hash-table-tests.el (test): * automated/hash-table-tests.el (for): * automated/hash-table-tests.el (ht): * automated/hash-table-tests.el (iterations): * automated/hash-table-tests.el (h1): * automated/hash-table-tests.el (equal): * automated/hash-table-tests.el (=): * automated/lisp-tests.el: * automated/lisp-tests.el (eq): * automated/lisp-tests.el (test-setq): * automated/lisp-tests.el (my-vector): * automated/lisp-tests.el (x): * automated/lisp-tests.el (equal): * automated/lisp-tests.el (y): * automated/lisp-tests.el (featurep): * automated/lisp-tests.el (=): * automated/lisp-tests.el (six): * automated/lisp-tests.el (three): * automated/lisp-tests.el (one): * automated/lisp-tests.el (two): * automated/lisp-tests.el (five): * automated/lisp-tests.el (test1): * automated/lisp-tests.el (division-test): * automated/lisp-tests.el (for): * automated/lisp-tests.el (check-function-argcounts): * automated/lisp-tests.el (z): * automated/lisp-tests.el (eql): * automated/lisp-tests.el (test-harness-risk-infloops): * automated/lisp-tests.el (erase-buffer): * automated/lisp-tests.el (sym): * automated/lisp-tests.el (new-char): * automated/lisp-tests.el (new-load-file-name): * automated/lisp-tests.el (cl-floor): * automated/lisp-tests.el (foo): * automated/md5-tests.el (lambda): * automated/md5-tests.el (large-string): * automated/md5-tests.el (mapcar): * automated/md5-tests.el (insert): * automated/mule-tests.el: * automated/mule-tests.el (test-chars): * automated/mule-tests.el (existing-file-name): * automated/mule-tests.el (featurep): * automated/query-coding-tests.el (featurep): * automated/regexp-tests.el: * automated/regexp-tests.el (insert): * automated/regexp-tests.el (Assert): * automated/regexp-tests.el (=): * automated/regexp-tests.el (featurep): * automated/regexp-tests.el (text): * automated/regexp-tests.el (text1): * automated/regexp-tests.el ("aáa"): * automated/regexp-tests.el (eql): * automated/search-tests.el (insert): * automated/search-tests.el (featurep): * automated/search-tests.el (let): * automated/search-tests.el (boundp): * automated/symbol-tests.el: * automated/symbol-tests.el (name): * automated/symbol-tests.el (check-weak-list-unique): * automated/symbol-tests.el (string): * automated/symbol-tests.el (list): * automated/symbol-tests.el (foo): * automated/symbol-tests.el (eq): * automated/symbol-tests.el (fresh-keyword-name): * automated/symbol-tests.el (print-gensym): * automated/symbol-tests.el (mysym): * automated/syntax-tests.el (test-forward-word): * automated/syntax-tests.el (test-backward-word): * automated/syntax-tests.el (test-syntax-table): * automated/syntax-tests.el (with-syntax-table): * automated/syntax-tests.el (Skip-Test-Unless): * automated/syntax-tests.el (with): * automated/tag-tests.el (testfile): * automated/weak-tests.el (w): * automated/weak-tests.el (p): * automated/weak-tests.el (a): Undo change of e.g. (Assert (equalp ...)) to (Assert-equalp ...). Get rid of `Assert-equalp' and friends, `Assert-test', and `Assert-test-not'. Instead, make `Assert' smart enough to do the equivalent functionality when an expression like (Assert (equalp ...)) is seen.
author Ben Wing <ben@xemacs.org>
date Fri, 12 Mar 2010 18:27:51 -0600
parents efaa6cd845e5
children 308d34e9f07d
line wrap: on
line diff
--- a/tests/automated/search-tests.el	Sun Mar 07 06:43:19 2010 -0600
+++ b/tests/automated/search-tests.el	Fri Mar 12 18:27:51 2010 -0600
@@ -45,11 +45,11 @@
   (insert "Test Buffer")
   (let ((case-fold-search t))
     (goto-char (point-min))
-    (Assert-eq (search-forward "test buffer" nil t) 12)
+    (Assert (eq (search-forward "test buffer" nil t) 12))
     (goto-char (point-min))
-    (Assert-eq (search-forward "Test buffer" nil t) 12)
+    (Assert (eq (search-forward "Test buffer" nil t) 12))
     (goto-char (point-min))
-    (Assert-eq (search-forward "Test Buffer" nil t) 12)
+    (Assert (eq (search-forward "Test Buffer" nil t) 12))
 
     (setq case-fold-search nil)
     (goto-char (point-min))
@@ -57,51 +57,51 @@
     (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)))
+    (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))
+  (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))
+  (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))
+  (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))
+  (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 (eq 16 (search-forward "ä" nil t)))
   (Assert (not (search-forward "ä" nil t)))
   (goto-char (point-min))
-  (Assert-eq 24 (search-forward "Ä" nil t))
+  (Assert (eq 24 (search-forward "Ä" nil t)))
   (goto-char 16)
-  (Assert-eq 24 (search-forward "Ä" nil t))
+  (Assert (eq 24 (search-forward "Ä" nil t)))
   (goto-char (point-max))
-  (Assert-eq 15 (search-backward "ä" nil t))
+  (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 (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))
+  (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))
+  (Assert (eq 5 (search-backward "ää" nil t 5)))
   (goto-char (point-max))
   (Assert (not (search-backward "ää" nil t 6))))
 
@@ -120,26 +120,26 @@
       (goto-char (point-min))
       (Assert (not (search-forward "ö" nil t)))
       (goto-char (point-min))
-      (Assert-eq 2 (search-forward str-hiragana-a nil t))
+      (Assert (eq 2 (search-forward str-hiragana-a nil t)))
       (goto-char (point-min))
-      (Assert-eq 2 (search-forward str-a-diaeresis nil t))
+      (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))
+      (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))
+      (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))
+      (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))
+      (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))
+      (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))
+      (Assert (eq 1 (search-backward str-a-diaeresis nil t)))
       (replace-match "a")
       (Assert (looking-at (format "abcdefg%c" a-diaeresis))))
     (with-temp-buffer
@@ -150,11 +150,11 @@
       (insert string)
       (insert string)
       (goto-char (point-min))
-      (Assert-eq 11 (search-forward string nil t 5))
+      (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))
+      (Assert (eq 1 (search-backward string nil t 5)))
       (goto-char (point-max))
       (Assert (not (search-backward string nil t 6))))))
 
@@ -177,7 +177,7 @@
     ;; 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))))
+    (Assert (= (1+ (length target)) (search-forward target nil t)))))
 
 (Skip-Test-Unless
  (boundp 'debug-searches) ; normal when we have DEBUG_XEMACS
@@ -193,7 +193,7 @@
      (insert "\n\nDer ber\xfchmte deutsche Flei\xdf\n\n")
      (goto-char (point-min))
      (Assert (search-forward "Flei\xdf"))
-     (Assert-eq 'boyer-moore search-algorithm-used)
+     (Assert (eq 'boyer-moore search-algorithm-used))
      (delete-region (point-min) (point-max))
      (when (featurep 'mule)
        (insert "\n\nDer ber\xfchmte deutsche Flei\xdf\n\n")
@@ -201,15 +201,15 @@
        (Assert 
         (search-forward (format "Fle%c\xdf"
                                 (make-char 'latin-iso8859-9 #xfd))))
-       (Assert-eq 'boyer-moore search-algorithm-used)
+       (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) 
+       (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)
+       (Assert (eq 'simple-search search-algorithm-used))
        (setq newcase (copy-case-table (standard-case-table)))
        (put-case-table-pair (make-char 'ethiopic #x23 #x23)
 			    (make-char 'ethiopic #x23 #x25)
@@ -225,21 +225,21 @@
 	 (insert (make-char 'ethiopic #x23 #x23))
 	 (insert ?1)
 	 (goto-char (point-min))
-	 (Assert-eql (search-forward
+	 (Assert (eql (search-forward
 		      (string (make-char 'ethiopic #x23 #x25))
 		      nil t)
-		     3)
-	 (Assert-eq 'simple-search search-algorithm-used)
+		     3))
+	 (Assert (eq 'simple-search search-algorithm-used))
 	 (goto-char (point-min))
-	 (Assert-eql (search-forward
+	 (Assert (eql (search-forward
 		      (string (make-char 'ethiopic #x23 #x27))
 		      nil t)
-		     nil)
-	 (Assert-eq 'boyer-moore search-algorithm-used))))))
+		     nil))
+	 (Assert (eq 'boyer-moore 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))
+  (Assert (eq (search-forward "\201" nil t) 5)))