Author: koutou
Date: Fri Dec 12 07:35:31 2008
New Revision: 5665
Modified:
trunk/test/uim-assertions.scm
trunk/test/util/test-character-conversion.scm
Log:
* test/uim-assertions.scm: add assert-uim-raw-true and assert-uim-raw-false.
* test/util/test-character-conversion.scm: resolve FIXME:
write assertions that use escape sequences that aren't
supported by Gauche.
Modified: trunk/test/uim-assertions.scm
==============================================================================
--- trunk/test/uim-assertions.scm (original)
+++ trunk/test/uim-assertions.scm Fri Dec 12 07:35:31 2008
@@ -36,14 +36,20 @@
(define (assert-uim-equal expected uim-expression)
(assert-equal expected (uim uim-expression)))
-(define (assert-uim-raw-equal expected uim-expression-string)
- (assert-equal expected (uim-raw uim-expression-string)))
-
(define (assert-uim-true uim-expression)
(assert-true (uim uim-expression)))
(define (assert-uim-false uim-expression)
(assert-false (uim uim-expression)))
+
+(define (assert-uim-raw-equal expected uim-expression-string)
+ (assert-equal expected (uim-raw uim-expression-string)))
+
+(define (assert-uim-raw-true uim-expression-string)
+ (assert-true (uim-raw uim-expression-string)))
+
+(define (assert-uim-raw-false uim-expression-string)
+ (assert-false (uim-raw uim-expression-string)))
(define (assert-uim-error uim-expression)
(assert-error (lambda () (uim uim-expression))))
Modified: trunk/test/util/test-character-conversion.scm
==============================================================================
--- trunk/test/util/test-character-conversion.scm (original)
+++ trunk/test/util/test-character-conversion.scm Fri Dec 12 07:35:31 2008
@@ -114,10 +114,8 @@
(define (test-string->alphabetic-ichar)
(assert-uim-false '(string->alphabetic-ichar "")) ; NUL
- ;; FIXME: Since these control chars are normalized to "\x01" and so on by
- ;; Gauche at first, uim-sh cannot interpret them without SRFI-75 support.
- ;;(assert-uim-false '(string->alphabetic-ichar "")) ; SOH
- ;;(assert-uim-false '(string->alphabetic-ichar " ")) ; US
+ (assert-uim-raw-false "(string->alphabetic-ichar \"\")") ; SOH
+ (assert-uim-raw-false "(string->alphabetic-ichar \" \")") ; US
(assert-uim-false '(string->alphabetic-ichar " ")) ; SPACE
(assert-uim-false '(string->alphabetic-ichar "!")) ; !
(assert-uim-false '(string->alphabetic-ichar "/")) ; /
@@ -137,7 +135,7 @@
(assert-uim-false '(string->alphabetic-ichar "zz")) ; zz
(assert-uim-false '(string->alphabetic-ichar "{")) ; {
(assert-uim-false '(string->alphabetic-ichar "~")) ; ~
- ;;(assert-uim-false '(string->alphabetic-ichar "")) ; DEL
+ (assert-uim-raw-false "(string->alphabetic-ichar \"\")") ; DEL
#f)
(provide "test/util/test-character-conversion")
