* test-elmo-localdir.el

(test-elmo-folder-expand-msgdb-path-4): Remove.

* test-utf7.el (toplevel): Setup utf-translate-cjk-mode or
require 'un-define if available.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index c66b412..4fcaf1d 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,11 @@
+2004-05-05  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * test-elmo-localdir.el
+       (test-elmo-folder-expand-msgdb-path-4): Remove.
+
+       * test-utf7.el (toplevel): Setup utf-translate-cjk-mode or
+       require 'un-define if available.
+
 2004-02-21  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
        * test-rfc2368.el: New file.

diff --git a/tests/test-elmo-localdir.el b/tests/test-elmo-localdir.el
index a980d6b..b3eb877 100644 (file)
--- a/tests/test-elmo-localdir.el
+++ b/tests/test-elmo-localdir.el
@@ -25,11 +25,3 @@
     (string=
      (elmo-folder-expand-msgdb-path (wl-folder-get-elmo-folder "+/inbox"))
      (elmo-folder-expand-msgdb-path (wl-folder-get-elmo-folder "+inbox"))))))
-
-(luna-define-method test-elmo-folder-expand-msgdb-path-4 ((case test-elmo-localdir))
-  (lunit-assert
-   (string=
-    (expand-file-name "localdir/inbox" elmo-msgdb-directory)
-    (elmo-folder-expand-msgdb-path
-     (wl-folder-get-elmo-folder
-      (concat "+" elmo-localdir-folder-path "/inbox"))))))

diff --git a/tests/test-utf7.el b/tests/test-utf7.el
index 6bc2364..8f5bcc1 100644 (file)
--- a/tests/test-utf7.el
+++ b/tests/test-utf7.el
@@ -1,6 +1,12 @@
 (require 'lunit)
 (require 'utf7)
 
+;; Emacs 21.3.50 or later
+(if (boundp 'utf-translate-cjk-mode)
+    (utf-translate-cjk-mode)
+  ;; Use Mule-UCS if installed
+  (ignore-errors (require 'un-define)))
+
 (luna-define-class test-utf7 (lunit-test-case))
 
 (luna-define-method test-utf7-encode-string ((case test-utf7))