Author: koutou
Date: Sat Mar 21 21:05:48 2009
New Revision: 5909
Modified:
trunk/test/uim-assertions.scm
trunk/test/util/test-character-conversion.scm
trunk/test/util/test-misc.scm
Log:
* test/uim-assertions.scm: assert-uim-raw-* -> assert-uim-*-raw.
* test/util/test-character-conversion.scm,
test/util/test-misc.scm: follow the above change.
Modified: trunk/test/uim-assertions.scm
==============================================================================
--- trunk/test/uim-assertions.scm (original)
+++ trunk/test/uim-assertions.scm Sat Mar 21 21:05:48 2009
@@ -42,13 +42,13 @@
(define (assert-uim-false uim-expression)
(assert-false (uim uim-expression)))
-(define (assert-uim-raw-equal expected uim-expression-string)
+(define (assert-uim-equal-raw expected uim-expression-string)
(assert-equal expected (uim-raw uim-expression-string)))
-(define (assert-uim-raw-true uim-expression-string)
+(define (assert-uim-true-raw uim-expression-string)
(assert-true (uim-raw uim-expression-string)))
-(define (assert-uim-raw-false uim-expression-string)
+(define (assert-uim-false-raw uim-expression-string)
(assert-false (uim-raw uim-expression-string)))
(define (assert-uim-equal-ces expected uim-expression ces)
Modified: trunk/test/util/test-character-conversion.scm
==============================================================================
--- trunk/test/util/test-character-conversion.scm (original)
+++ trunk/test/util/test-character-conversion.scm Sat Mar 21 21:05:48 2009
@@ -114,8 +114,8 @@
(define (test-string->alphabetic-ichar)
(assert-uim-false '(string->alphabetic-ichar "")) ; NUL
- (assert-uim-raw-false "(string->alphabetic-ichar \"\")") ; SOH
- (assert-uim-raw-false "(string->alphabetic-ichar \" \")") ; US
+ (assert-uim-false-raw "(string->alphabetic-ichar \"\")") ; SOH
+ (assert-uim-false-raw "(string->alphabetic-ichar \" \")") ; US
(assert-uim-false '(string->alphabetic-ichar " ")) ; SPACE
(assert-uim-false '(string->alphabetic-ichar "!")) ; !
(assert-uim-false '(string->alphabetic-ichar "/")) ; /
@@ -135,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-raw-false "(string->alphabetic-ichar \"\")") ; DEL
+ (assert-uim-false-raw "(string->alphabetic-ichar \"\")") ; DEL
#f)
(provide "test/util/test-character-conversion")
Modified: trunk/test/util/test-misc.scm
==============================================================================
--- trunk/test/util/test-misc.scm (original)
+++ trunk/test/util/test-misc.scm Sat Mar 21 21:05:48 2009
@@ -79,11 +79,11 @@
;; supported escape sequences. We can replace uim-raw with
;; uim after "test-gauche-unsupported-escape-sequences"
;; test fails which means Gauche supports them.
- (assert-uim-raw-equal "\"\\a\""
+ (assert-uim-equal-raw "\"\\a\""
"(string-escape \"\\a\")") ;; #\alarm
- (assert-uim-raw-equal "\"\\b\""
+ (assert-uim-equal-raw "\"\\b\""
"(string-escape \"\\b\")") ;; #\backspace
- (assert-uim-raw-equal "\"\\v\""
+ (assert-uim-equal-raw "\"\\v\""
"(string-escape \"\\v\")") ;; #\vtab
;; R5RS
