Author: koutou
Date: Sat Mar 21 22:57:01 2009
New Revision: 5913
Modified:
trunk/test/util/test-rk.scm (contents, props changed)
Log:
* test/util/test-rk.scm: use assert-uim-* assertions.
Modified: trunk/test/util/test-rk.scm
==============================================================================
--- trunk/test/util/test-rk.scm (original)
+++ trunk/test/util/test-rk.scm Sat Mar 21 22:57:01 2009
@@ -66,117 +66,117 @@
(define (test-rk-lib-find-seq)
;; non existence seq does not match
- (assert-false (uim-bool '(rk-lib-find-seq () test-rk-rule)))
- (assert-false (uim-bool '(rk-lib-find-seq '("") test-rk-rule)))
+ (assert-uim-false '(rk-lib-find-seq () test-rk-rule))
+ (assert-uim-false '(rk-lib-find-seq '("") test-rk-rule))
;; test first rule
- (assert-equal '((("a"). ())("あ" "ア" "ア"))
- (uim '(rk-lib-find-seq '("a") test-rk-rule)))
+ (assert-uim-equal '((("a"). ())("あ" "ア" "ア"))
+ '(rk-lib-find-seq '("a") test-rk-rule))
- (assert-equal '((("i"). ())("い" "イ" "イ"))
- (uim '(rk-lib-find-seq '("i") test-rk-rule)))
- (assert-equal '((("o"). ())("お" "オ" "オ"))
- (uim '(rk-lib-find-seq '("o") test-rk-rule)))
+ (assert-uim-equal '((("i"). ())("い" "イ" "イ"))
+ '(rk-lib-find-seq '("i") test-rk-rule))
+ (assert-uim-equal '((("o"). ())("お" "オ" "オ"))
+ '(rk-lib-find-seq '("o") test-rk-rule))
;; non existence seq does not match
- (assert-false (uim-bool '(rk-lib-find-seq '("z") test-rk-rule)))
+ (assert-uim-false '(rk-lib-find-seq '("z") test-rk-rule))
- (assert-equal '((("k" "y" "a"). ())("きゃ" "キャ" "キャ"))
- (uim '(rk-lib-find-seq '("k" "y" "a") test-rk-rule)))
- (assert-equal '((("k" "y" "i"). ())("きぃ" "キィ" "キィ"))
- (uim '(rk-lib-find-seq '("k" "y" "i") test-rk-rule)))
- (assert-equal '((("k" "y" "o"). ())("きょ" "キョ" "キョ"))
- (uim '(rk-lib-find-seq '("k" "y" "o") test-rk-rule)))
+ (assert-uim-equal '((("k" "y" "a"). ())("きゃ" "キャ" "キャ"))
+ '(rk-lib-find-seq '("k" "y" "a") test-rk-rule))
+ (assert-uim-equal '((("k" "y" "i"). ())("きぃ" "キィ" "キィ"))
+ '(rk-lib-find-seq '("k" "y" "i") test-rk-rule))
+ (assert-uim-equal '((("k" "y" "o"). ())("きょ" "キョ" "キョ"))
+ '(rk-lib-find-seq '("k" "y" "o") test-rk-rule))
;; partial seq does not match
- (assert-false (uim-bool '(rk-lib-find-seq '("k" "y") test-rk-rule)))
- (assert-false (uim-bool '(rk-lib-find-seq '("k" "y" "y") test-rk-rule)))
+ (assert-uim-false '(rk-lib-find-seq '("k" "y") test-rk-rule))
+ (assert-uim-false '(rk-lib-find-seq '("k" "y" "y") test-rk-rule))
- (assert-equal '((("s" "s"). ("s"))("っ" "ッ" "ッ"))
- (uim '(rk-lib-find-seq '("s" "s") test-rk-rule)))
+ (assert-uim-equal '((("s" "s"). ("s"))("っ" "ッ" "ッ"))
+ '(rk-lib-find-seq '("s" "s") test-rk-rule))
;; partial seq does not match
- (assert-false (uim-bool '(rk-lib-find-seq '("s") test-rk-rule)))
- (assert-false (uim-bool '(rk-lib-find-seq '("s" "s" "s") test-rk-rule)))
+ (assert-uim-false '(rk-lib-find-seq '("s") test-rk-rule))
+ (assert-uim-false '(rk-lib-find-seq '("s" "s" "s") test-rk-rule))
;; test last rule
- (assert-equal '((("p" "p"). ("p"))("っ" "ッ" "ッ"))
- (uim '(rk-lib-find-seq '("p" "p") test-rk-rule)))
- (assert-false (uim-bool '(rk-lib-find-seq '("p") test-rk-rule)))
- (assert-false (uim-bool '(rk-lib-find-seq '("p" "p" "p") test-rk-rule)))
+ (assert-uim-equal '((("p" "p"). ("p"))("っ" "ッ" "ッ"))
+ '(rk-lib-find-seq '("p" "p") test-rk-rule))
+ (assert-uim-false '(rk-lib-find-seq '("p") test-rk-rule))
+ (assert-uim-false '(rk-lib-find-seq '("p" "p" "p") test-rk-rule))
#f)
(define (test-rk-lib-find-partial-seq)
;; null sequence matches first rule
- (assert-equal '((("a"). ())("あ" "ア" "ア"))
- (uim '(rk-lib-find-partial-seq () test-rk-rule)))
+ (assert-uim-equal '((("a"). ())("あ" "ア" "ア"))
+ '(rk-lib-find-partial-seq () test-rk-rule))
;; non existence seq does not match
- (assert-false (uim-bool '(rk-lib-find-partial-seq '("") test-rk-rule)))
+ (assert-uim-false '(rk-lib-find-partial-seq '("") test-rk-rule))
;; test first rule: exact key does not match
- (assert-false (uim-bool '(rk-lib-find-partial-seq '("a") test-rk-rule)))
- (assert-false (uim-bool '(rk-lib-find-partial-seq '("i") test-rk-rule)))
- (assert-false (uim-bool '(rk-lib-find-partial-seq '("o") test-rk-rule)))
+ (assert-uim-false '(rk-lib-find-partial-seq '("a") test-rk-rule))
+ (assert-uim-false '(rk-lib-find-partial-seq '("i") test-rk-rule))
+ (assert-uim-false '(rk-lib-find-partial-seq '("o") test-rk-rule))
;; non existence seq does not match
- (assert-false (uim-bool '(rk-lib-find-partial-seq '("z") test-rk-rule)))
+ (assert-uim-false '(rk-lib-find-partial-seq '("z") test-rk-rule))
;; exact key does not match
- (assert-false (uim-bool '(rk-lib-find-partial-seq '("k" "y" "a")
- test-rk-rule)))
- (assert-false (uim-bool '(rk-lib-find-partial-seq '("k" "y" "i")
- test-rk-rule)))
- (assert-false (uim-bool '(rk-lib-find-partial-seq '("k" "y" "o")
- test-rk-rule)))
+ (assert-uim-false '(rk-lib-find-partial-seq '("k" "y" "a")
+ test-rk-rule))
+ (assert-uim-false '(rk-lib-find-partial-seq '("k" "y" "i")
+ test-rk-rule))
+ (assert-uim-false '(rk-lib-find-partial-seq '("k" "y" "o")
+ test-rk-rule))
;; partial seq matches first entry
- (assert-equal '((("k" "a"). ())("か" "カ" "カ"))
- (uim '(rk-lib-find-partial-seq '("k") test-rk-rule)))
- (assert-equal '((("k" "y" "a"). ())("きゃ" "キャ" "キャ"))
- (uim '(rk-lib-find-partial-seq '("k" "y") test-rk-rule)))
+ (assert-uim-equal '((("k" "a"). ())("か" "カ" "カ"))
+ '(rk-lib-find-partial-seq '("k") test-rk-rule))
+ (assert-uim-equal '((("k" "y" "a"). ())("きゃ" "キャ" "キャ"))
+ '(rk-lib-find-partial-seq '("k" "y") test-rk-rule))
;; non existence seq does not match
- (assert-false (uim-bool '(rk-lib-find-partial-seq '("k" "y" "y")
test-rk-rule)))
+ (assert-uim-false '(rk-lib-find-partial-seq '("k" "y" "y") test-rk-rule))
;; exact key does not match
- (assert-false (uim-bool '(rk-lib-find-partial-seq '("s" "s")
test-rk-rule)))
+ (assert-uim-false '(rk-lib-find-partial-seq '("s" "s") test-rk-rule))
;; partial match
- (assert-equal '((("s" "s"). ("s"))("っ" "ッ" "ッ"))
- (uim '(rk-lib-find-partial-seq '("s") test-rk-rule)))
+ (assert-uim-equal '((("s" "s"). ("s"))("っ" "ッ" "ッ"))
+ '(rk-lib-find-partial-seq '("s") test-rk-rule))
;; non existence seq does not match
- (assert-false (uim-bool '(rk-lib-find-partial-seq '("s" "s" "s")
- test-rk-rule)))
+ (assert-uim-false '(rk-lib-find-partial-seq '("s" "s" "s")
+ test-rk-rule))
;; test last rule
- (assert-false (uim-bool '(rk-lib-find-partial-seq '("p" "p")
test-rk-rule)))
- (assert-equal '((("p" "p"). ("p"))("っ" "ッ" "ッ"))
- (uim '(rk-lib-find-partial-seq '("p") test-rk-rule)))
- (assert-false (uim-bool '(rk-lib-find-partial-seq '("p" "p" "p")
- test-rk-rule)))
+ (assert-uim-false '(rk-lib-find-partial-seq '("p" "p") test-rk-rule))
+ (assert-uim-equal '((("p" "p"). ("p"))("っ" "ッ" "ッ"))
+ '(rk-lib-find-partial-seq '("p") test-rk-rule))
+ (assert-uim-false '(rk-lib-find-partial-seq '("p" "p" "p")
+ test-rk-rule))
#f)
(define (test-rk-lib-expect-seq)
- (assert-equal '("p" "s" "s" "s" "s" "s" "s"
+ (assert-uim-equal '("p" "s" "s" "s" "s" "s" "s"
"k" "k" "k" "k" "k" "k" "k" "k" "k" "k"
"o" "e" "u" "i" "a")
- (uim '(rk-lib-expect-seq () test-rk-rule)))
- (assert-equal '("y" "y" "y" "y" "y" "o" "e" "u" "i" "a")
- (uim '(rk-lib-expect-seq '("k") test-rk-rule)))
- (assert-equal '("o" "e" "u" "i" "a")
- (uim '(rk-lib-expect-seq '("k" "y") test-rk-rule)))
- (assert-equal '("o" "e" "u" "i" "a")
- (uim '(rk-lib-expect-seq '("k" "y") test-rk-rule)))
+ '(rk-lib-expect-seq () test-rk-rule))
+ (assert-uim-equal '("y" "y" "y" "y" "y" "o" "e" "u" "i" "a")
+ '(rk-lib-expect-seq '("k") test-rk-rule))
+ (assert-uim-equal '("o" "e" "u" "i" "a")
+ '(rk-lib-expect-seq '("k" "y") test-rk-rule))
+ (assert-uim-equal '("o" "e" "u" "i" "a")
+ '(rk-lib-expect-seq '("k" "y") test-rk-rule))
;; rk-lib-expect-seq returns null list on exact match
- (assert-equal ()
- (uim '(rk-lib-expect-seq '("k" "y" "a") test-rk-rule)))
+ (assert-uim-equal ()
+ '(rk-lib-expect-seq '("k" "y" "a") test-rk-rule))
;; rk-lib-expect-seq returns null list on fail
- (assert-equal ()
- (uim '(rk-lib-expect-seq '("k" "y" "a" "a") test-rk-rule)))
- (assert-equal '("o" "e" "u" "i" "a")
- (uim '(rk-lib-expect-seq '("k" "y") test-rk-rule)))
-
- (assert-equal '("o" "e" "u" "i" "a" "s")
- (uim '(rk-lib-expect-seq '("s") test-rk-rule)))
- (assert-equal ()
- (uim '(rk-lib-expect-seq '("s" "s") test-rk-rule)))
- (assert-equal '("p")
- (uim '(rk-lib-expect-seq '("p") test-rk-rule)))
- (assert-equal ()
- (uim '(rk-lib-expect-seq '("p" "p") test-rk-rule)))
+ (assert-uim-equal ()
+ '(rk-lib-expect-seq '("k" "y" "a" "a") test-rk-rule))
+ (assert-uim-equal '("o" "e" "u" "i" "a")
+ '(rk-lib-expect-seq '("k" "y") test-rk-rule))
+
+ (assert-uim-equal '("o" "e" "u" "i" "a" "s")
+ '(rk-lib-expect-seq '("s") test-rk-rule))
+ (assert-uim-equal ()
+ '(rk-lib-expect-seq '("s" "s") test-rk-rule))
+ (assert-uim-equal '("p")
+ '(rk-lib-expect-seq '("p") test-rk-rule))
+ (assert-uim-equal ()
+ '(rk-lib-expect-seq '("p" "p") test-rk-rule))
#f)
(provide "test/util/test-rk")
