Author: koutou
Date: Fri Dec 12 07:27:59 2008
New Revision: 5664
Modified:
trunk/test/uim-assertions.scm
trunk/test/util/test-srfi.scm
trunk/test/util/test-string-list.scm
Log:
* test/uim-assertions.scm: don't normalize boolean value in
assert-uim-true and assert-uim-false.
* test/util/test-srfi.scm, test/util/test-string-list.scm:
specify expected value instead of checking 'not false' value.
Modified: trunk/test/uim-assertions.scm
==============================================================================
--- trunk/test/uim-assertions.scm (original)
+++ trunk/test/uim-assertions.scm Fri Dec 12 07:27:59 2008
@@ -40,10 +40,10 @@
(assert-equal expected (uim-raw uim-expression-string)))
(define (assert-uim-true uim-expression)
- (assert-true (uim-bool uim-expression)))
+ (assert-true (uim uim-expression)))
(define (assert-uim-false uim-expression)
- (assert-false (uim-bool uim-expression)))
+ (assert-false (uim uim-expression)))
(define (assert-uim-error uim-expression)
(assert-error (lambda () (uim uim-expression))))
Modified: trunk/test/util/test-srfi.scm
==============================================================================
--- trunk/test/util/test-srfi.scm (original)
+++ trunk/test/util/test-srfi.scm Fri Dec 12 07:27:59 2008
@@ -28,6 +28,8 @@
;;;
(define-module test.util.test-srfi
+ (use srfi-1)
+ (use gauche.sequence)
(use test.unit.test-case)
(use test.uim-test))
(select-module test.util.test-srfi)
@@ -193,12 +195,16 @@
(assert-uim-true '(any string? lst2))
(assert-uim-true '(any string? lst3))
(assert-uim-false '(any string? lst4))
- (assert-uim-true '(any proc-or lst2))
+ (assert-uim-equal 1
+ '(any proc-or lst2))
(assert-uim-false '(any proc-or lst6))
- (assert-uim-true '(any proc-or lst2 lst6))
- (assert-uim-true '(any proc-or lst6 lst2))
+ (assert-uim-equal 1
+ '(any proc-or lst2 lst6))
+ (assert-uim-equal 1
+ '(any proc-or lst6 lst2))
(assert-uim-false '(any proc-or lst6 lst7))
- (assert-uim-true '(any proc-or lst5 lst6 lst7))
+ (assert-uim-equal 1
+ '(any proc-or lst5 lst6 lst7))
(assert-uim-false '(any string? '()))
#f)
@@ -207,13 +213,17 @@
(assert-uim-false '(every string? lst2))
(assert-uim-true '(every string? lst3))
(assert-uim-false '(every string? lst4))
- (assert-uim-true '(every proc-or lst))
+ (assert-uim-equal (last (uim 'lst))
+ '(every proc-or lst))
(assert-uim-false '(every proc-or lst2))
(assert-uim-false '(every proc-or lst6))
- (assert-uim-true '(every proc-or lst2 lst6))
- (assert-uim-true '(every proc-or lst6 lst2))
+ (assert-uim-equal "2"
+ '(every proc-or lst2 lst6))
+ (assert-uim-equal "2"
+ '(every proc-or lst6 lst2))
(assert-uim-false '(every proc-or lst6 lst7))
- (assert-uim-true '(every proc-or lst4 lst6 lst7))
+ (assert-uim-equal 2
+ '(every proc-or lst4 lst6 lst7))
(assert-uim-false '(every proc-or lst5 lst6 lst7))
(assert-uim-true '(every string? '()))
#f)
Modified: trunk/test/util/test-string-list.scm
==============================================================================
--- trunk/test/util/test-string-list.scm (original)
+++ trunk/test/util/test-string-list.scm Fri Dec 12 07:27:59 2008
@@ -55,16 +55,22 @@
(assert-uim-false '(string-find () ""))
(assert-uim-false '(string-find () "quux"))
(assert-uim-false '(string-find '("foo") ""))
- (assert-uim-true '(string-find '("foo") "foo"))
+ (assert-uim-equal '("foo")
+ '(string-find '("foo") "foo"))
(assert-uim-false '(string-find '("foo") "quux"))
(assert-uim-false '(string-find '("foo" "bar") ""))
- (assert-uim-true '(string-find '("foo" "bar") "foo"))
- (assert-uim-true '(string-find '("foo" "bar") "bar"))
+ (assert-uim-equal '("foo" "bar")
+ '(string-find '("foo" "bar") "foo"))
+ (assert-uim-equal '("bar")
+ '(string-find '("foo" "bar") "bar"))
(assert-uim-false '(string-find '("foo" "bar") "quux"))
(assert-uim-false '(string-find '("foo" "bar" "baz") ""))
- (assert-uim-true '(string-find '("foo" "bar" "baz") "foo"))
- (assert-uim-true '(string-find '("foo" "bar" "baz") "bar"))
- (assert-uim-true '(string-find '("foo" "bar" "baz") "baz"))
+ (assert-uim-equal '("foo" "bar" "baz")
+ '(string-find '("foo" "bar" "baz") "foo"))
+ (assert-uim-equal '("bar" "baz")
+ '(string-find '("foo" "bar" "baz") "bar"))
+ (assert-uim-equal '("baz")
+ '(string-find '("foo" "bar" "baz") "baz"))
(assert-uim-false '(string-find '("foo" "bar" "baz") "quux"))
#f)
