mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-19 18:13:55 +00:00
Code Issues Releases Activity

* automated/fns-tests.el (fns-tests--collate-enabled-p): New function.

Browse Source 
(fns-tests-collate-strings, fns-tests-collate-sort): Use it.
This commit is contained in:
Michael Albinus 2014-09-07 10:24:44 +02:00
parent b3bf18b3b8
commit 47ae4ce33d
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/ChangeLog
View File

@ -1,3 +1,8 @@
2014-09-07 Michael Albinus <michael.albinus@gmx.de>
* automated/fns-tests.el (fns-tests--collate-enabled-p): New function.
(fns-tests-collate-strings, fns-tests-collate-sort): Use it.
2014-09-05 Michael Albinus <michael.albinus@gmx.de>
* automated/fns-tests.el (fns-tests-compare-strings): In case

17
test/automated/fns-tests.el
View File

@ -101,10 +101,19 @@
(should (= (compare-strings "んにちはｺﾝﾆﾁﾊこ" nil nil "こんにちはｺﾝﾆﾁﾊ" nil nil) 1))
(should (= (compare-strings "こんにちはｺﾝﾆﾁﾊ" nil nil "んにちはｺﾝﾆﾁﾊこ" nil nil) -1)))
(defun fns-tests--collate-enabled-p ()
"Check whether collation functions are enabled."
(and
;; When there is no collation library, collation functions fall back
;; to their lexicographic counterparts. We don't need to test then.
(not (ignore-errors (string-collate-equalp "" "" t)))
;; We use a locale, which might not be installed. Check it.
(ignore-errors
(string-collate-equalp
"" "" (if (eq system-type 'windows-nt) "enu_USA" "en_US.UTF-8")))))
(ert-deftest fns-tests-collate-strings ()
;; When there is no collation library, collation functions fall back
;; to their lexicographic counterparts. We don't need to test then.
(skip-unless (not (ignore-errors (string-collate-equalp "" "" t))))
(skip-unless (fns-tests--collate-enabled-p))
(should (string-collate-equalp "xyzzy" "xyzzy"))
(should-not (string-collate-equalp "xyzzy" "XYZZY"))
@ -146,6 +155,8 @@
(9 . "aaa") (9 . "zzz") (9 . "ppp") (9 . "fff")])))
(ert-deftest fns-tests-collate-sort ()
(skip-unless (fns-tests--collate-enabled-p))
;; Punctuation and whitespace characters are relevant for POSIX.
(should
(equal