(test-utf7-decode-string-nihongo): Rename from `test-utf7-decode-string'. Use `make...

(test-utf7-encode-string-nihongo): Rename from `test-utf7-encode-string'. Use `make-char'.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 97e653b..9f1cf8b 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -2,12 +2,15 @@
 
        * test-utf7.el (toplevel): Use `fboundp' instead of `boundp'.
        Fix (require 'utf7) order for Mule-UCS.
-       Add coding: comment.
-
        (test-utf7-decode-string-plus): New testcase.
        (test-utf7-decode-string-noconv): Ditto.
        (test-utf7-encode-string-plus): Ditto.
        (test-utf7-encode-string-noconv): Ditto.
+       (test-utf7-decode-string-nihongo): Rename from
+       `test-utf7-decode-string'. Use `make-char'.
+       (test-utf7-encode-string-nihongo): Rename from
+       `test-utf7-encode-string'. Use `make-char'.
+
 
 2008-02-19  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 

diff --git a/tests/test-utf7.el b/tests/test-utf7.el
index 2846919..af56113 100644 (file)
--- a/tests/test-utf7.el
+++ b/tests/test-utf7.el
@@ -1,4 +1,3 @@
-;; -*- coding: iso-2022-jp -*-
 (require 'lunit)
 
 ;; Emacs 21
@@ -12,11 +11,14 @@
 
 (luna-define-class test-utf7 (lunit-test-case))
 
-(luna-define-method test-utf7-encode-string ((case test-utf7))
+(luna-define-method test-utf7-encode-string-nihongo ((case test-utf7))
   (lunit-assert
    (string=
     "+ZeVnLIqe-"
-    (utf7-encode-string "\e$BF|K\8l\e(B"))))     ; FIXME!!: don't care coding system
+    (utf7-encode-string
+     (string (make-char 'japanese-jisx0208 70 124)
+            (make-char 'japanese-jisx0208 75 92)
+            (make-char 'japanese-jisx0208 56 108))))))
 
 (luna-define-method test-utf7-encode-string-plus ((case test-utf7))
   (lunit-assert
@@ -33,10 +35,12 @@
    (string= "=" (utf7-encode-string "="))))
 
 
-(luna-define-method test-utf7-decode-string ((case test-utf7))
+(luna-define-method test-utf7-decode-string-nihongo ((case test-utf7))
   (lunit-assert
    (string=
-    "\e$BF|K\8l\e(B"                             ; FIXME!!: don't care coding system
+    (string (make-char 'japanese-jisx0208 70 124)
+           (make-char 'japanese-jisx0208 75 92)
+           (make-char 'japanese-jisx0208 56 108))
     (utf7-decode-string "+ZeVnLIqe-"))))
 
 (luna-define-method test-utf7-decode-string-plus ((case test-utf7))