comparison tests/automated/case-tests.el @ 5136:0f66906b6e37

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 9e7f5a77cc84
children 308d34e9f07d
comparison
equal deleted inserted replaced
5113:b2dcf6a6d8ab 5136:0f66906b6e37
107 "!\"#$%&'()*+,-./0123456789:;<=>?@abcdefghijklmnopqrstuvwxyz[\\]^_`ABCDEFGHIJKLMNOPQRSTUVWXYZ{|}~" 107 "!\"#$%&'()*+,-./0123456789:;<=>?@abcdefghijklmnopqrstuvwxyz[\\]^_`ABCDEFGHIJKLMNOPQRSTUVWXYZ{|}~"
108 string-127-through-160 108 string-127-through-160
109 "¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿àáâãäåæçèéêëìíîïðñòóôõö×øùúûüýþßÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ÷ØÙÚÛÜÝÞÿ")) 109 "¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿àáâãäåæçèéêëìíîïðñòóôõö×øùúûüýþßÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ÷ØÙÚÛÜÝÞÿ"))
110 (table (standard-case-table))) 110 (table (standard-case-table)))
111 (dotimes (i 256) 111 (dotimes (i 256)
112 (Assert-eq (get-case-table 'downcase (int-to-char i) table) 112 (Assert (eq (get-case-table 'downcase (int-to-char i) table)
113 (aref downcase-string i)) 113 (aref downcase-string i)))
114 (Assert-eq (get-case-table 'upcase (int-to-char i) table) 114 (Assert (eq (get-case-table 'upcase (int-to-char i) table)
115 (aref upcase-string i)))) 115 (aref upcase-string i)))))
116 116
117 (Check-Error-Message error "Char case must be downcase or upcase" 117 (Check-Error-Message error "Char case must be downcase or upcase"
118 (get-case-table 'foo ?a (standard-case-table))) 118 (get-case-table 'foo ?a (standard-case-table)))
119 119
120 (Assert 120 (Assert
1505 ;; Comparison with `equalp' uses a canonical mapping internally and 1505 ;; Comparison with `equalp' uses a canonical mapping internally and
1506 ;; so should be able to handle multi-mappings. Just comparing 1506 ;; so should be able to handle multi-mappings. Just comparing
1507 ;; using downcase and upcase, however, won't necessarily work in 1507 ;; using downcase and upcase, however, won't necessarily work in
1508 ;; the presence of such mappings -- that's what the internal canon 1508 ;; the presence of such mappings -- that's what the internal canon
1509 ;; and eqv tables are for. 1509 ;; and eqv tables are for.
1510 (Assert-equalp lowermulti uppermulti) 1510 (Assert (equalp lowermulti uppermulti))
1511 (Assert-equalp loweruppermulti upperlowermulti) 1511 (Assert (equalp loweruppermulti upperlowermulti))
1512 (Assert-equal lower (downcase upper)) 1512 (Assert (equal lower (downcase upper)))
1513 (Assert-equal upper (upcase lower)) 1513 (Assert (equal upper (upcase lower)))
1514 (Assert-equal (downcase lower) (downcase (downcase lower))) 1514 (Assert (equal (downcase lower) (downcase (downcase lower))))
1515 (Assert-equal (upcase lowerupper) (upcase upperlower)) 1515 (Assert (equal (upcase lowerupper) (upcase upperlower)))
1516 (Assert-equal (downcase lowerupper) (downcase upperlower)) 1516 (Assert (equal (downcase lowerupper) (downcase upperlower)))
1517 ;; Individually -- we include multi-mappings since we're using 1517 ;; Individually -- we include multi-mappings since we're using
1518 ;; `equalp'. 1518 ;; `equalp'.
1519 (loop 1519 (loop
1520 for (uc lc) in uni-mappings do 1520 for (uc lc) in uni-mappings do
1521 (Assert-equalp uc lc) 1521 (Assert (equalp uc lc))
1522 (Assert-equalp (string uc) (string lc))) 1522 (Assert (equalp (string uc) (string lc))))
1523 ) 1523 )
1524 1524
1525 ;; Here we include multi-mappings -- searching should be able to 1525 ;; Here we include multi-mappings -- searching should be able to
1526 ;; handle it. 1526 ;; handle it.
1527 (with-temp-buffer 1527 (with-temp-buffer
1530 (,loweruppermulti ,upperlowermulti) 1530 (,loweruppermulti ,upperlowermulti)
1531 (,uppermulti ,lowermulti) 1531 (,uppermulti ,lowermulti)
1532 (,upperlowermulti ,loweruppermulti)) 1532 (,upperlowermulti ,loweruppermulti))
1533 do 1533 do
1534 (erase-buffer) 1534 (erase-buffer)
1535 (Assert= (point-min) 1) 1535 (Assert (= (point-min) 1))
1536 (Assert= (point) 1) 1536 (Assert (= (point) 1))
1537 (insert str1) 1537 (insert str1)
1538 (let ((point (point)) 1538 (let ((point (point))
1539 (case-fold-search t)) 1539 (case-fold-search t))
1540 (Assert= (length str1) (1- point)) 1540 (Assert (= (length str1) (1- point)))
1541 (goto-char (point-min)) 1541 (goto-char (point-min))
1542 (Assert-eql (search-forward str2 nil t) point))) 1542 (Assert (eql (search-forward str2 nil t) point))))
1543 (loop for (uc lc) in uni-mappings do 1543 (loop for (uc lc) in uni-mappings do
1544 (loop for (ch1 ch2) in `((,uc ,lc) 1544 (loop for (ch1 ch2) in `((,uc ,lc)
1545 (,lc ,uc)) 1545 (,lc ,uc))
1546 do 1546 do
1547 (erase-buffer) 1547 (erase-buffer)
1548 (insert ?0) 1548 (insert ?0)
1549 (insert ch1) 1549 (insert ch1)
1550 (insert ?1) 1550 (insert ?1)
1551 (goto-char (point-min)) 1551 (goto-char (point-min))
1552 (Assert-eql (search-forward (char-to-string ch2) nil t) 3 1552 (Assert (eql (search-forward (char-to-string ch2) nil t) 3)
1553 (format "Case-folded searching doesn't equate %s and %s" 1553 (format "Case-folded searching doesn't equate %s and %s"
1554 (char-as-unicode-escape ch1) 1554 (char-as-unicode-escape ch1)
1555 (char-as-unicode-escape ch2)))))) 1555 (char-as-unicode-escape ch2))))))
1556 ))) 1556 )))