CVS update by aidan xemacs/tests/automated ...

[xemacs-cvs at xemacs.org]

  User: aidan   
  Date: 07/04/29 15:20:01

  Modified:    xemacs/tests/automated mule-tests.el
Log:
Make the charsets-in-region algorithm irrelevant, mule-tests.el.

Revision  Changes    Path
1.88      +8 -0      XEmacs/xemacs/tests/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/tests/ChangeLog,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- ChangeLog	2007/03/25 15:57:32	1.87
+++ ChangeLog	2007/04/29 13:19:55	1.88
@@ -1,3 +1,11 @@
+2007-04-29  Aidan Kehoe  <kehoea at parhasard.net>
+
+	* automated/mule-tests.el (featurep):
+	Sort the results of charsets-in-region, charsets-in-string before
+	comparing them to the previously-determined list of character
+	sets. Eliminates a dependency on the algorithm
+	charsets-in-{region,string} uses. 
+
 2007-03-26  Stephen J. Turnbull  <stephen at xemacs.org>
 
 	* automated/syntax-tests.el: Test for regression of bug fixed by



1.14      +18 -17    XEmacs/xemacs/tests/automated/mule-tests.el

Index: mule-tests.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/tests/automated/mule-tests.el,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- mule-tests.el	2006/11/25 22:06:34	1.13
+++ mule-tests.el	2007/04/29 13:20:00	1.14
@@ -446,22 +446,23 @@ This is a naive implementation in Lisp. 
   ;;---------------------------------------------------------------
   (with-temp-buffer
     (insert-file-contents (locate-data-file "HELLO"))
-    ;; #### rewrite robustly, both assume that the tested implementation
-    ;; uses the same algorithm as was used by the version current at time
-    ;; this test was written
-    (Assert (equal (charsets-in-region (point-min) (point-max))
-		   '(korean-ksc5601 chinese-big5-1 chinese-gb2312
-		     japanese-jisx0212 katakana-jisx0201 japanese-jisx0208
-		     vietnamese-viscii-lower thai-xtis cyrillic-iso8859-5
-		     hebrew-iso8859-8 greek-iso8859-7 latin-iso8859-1
-		     latin-iso8859-2 arabic-2-column arabic-1-column
-		     ethiopic ascii)))
-    (Assert (equal (charsets-in-string (buffer-substring (point-min)
+    (Assert (equal 
+             ;; The sort is to make the algorithm of charsets-in-region
+             ;; irrelevant.
+             (sort (charsets-in-region (point-min) (point-max))
+                   'string<)
+             '(arabic-1-column arabic-2-column ascii chinese-big5-1
+               chinese-gb2312 cyrillic-iso8859-5 ethiopic greek-iso8859-7
+               hebrew-iso8859-8 japanese-jisx0208 japanese-jisx0212
+               katakana-jisx0201 korean-ksc5601 latin-iso8859-1
+               latin-iso8859-2 thai-xtis vietnamese-viscii-lower)))
+    (Assert (equal 
+             (sort (charsets-in-string (buffer-substring (point-min)
 							 (point-max)))
-		   '(korean-ksc5601 chinese-big5-1 chinese-gb2312
-		     japanese-jisx0212 katakana-jisx0201 japanese-jisx0208
-		     vietnamese-viscii-lower thai-xtis cyrillic-iso8859-5
-		     hebrew-iso8859-8 greek-iso8859-7 latin-iso8859-1
-		     latin-iso8859-2 arabic-2-column arabic-1-column
-		     ethiopic ascii))))
+                   'string<)
+             '(arabic-1-column arabic-2-column ascii chinese-big5-1
+               chinese-gb2312 cyrillic-iso8859-5 ethiopic greek-iso8859-7
+               hebrew-iso8859-8 japanese-jisx0208 japanese-jisx0212
+               katakana-jisx0201 korean-ksc5601 latin-iso8859-1
+               latin-iso8859-2 thai-xtis vietnamese-viscii-lower))))
   )